Remove support for sys-apps/hal wrt #313389.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

4 files changed, 19 insertions, 20 deletions

diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog
index eb4630893dff..a77ea91438af 100644
--- a/app-pda/gnome-pilot/ChangeLog
+++ b/app-pda/gnome-pilot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/gnome-pilot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.69 2011/03/22 18:47:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.70 2011/03/27 10:11:11 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-pilot-2.0.17-r1.ebuild, gnome-pilot-2.32.0.ebuild,
+  gnome-pilot-2.32.1.ebuild:
+  Remove support for sys-apps/hal wrt #313389.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gnome-pilot-2.32.0.ebuild:
   Marking gnome-pilot-2.32.0 ppc stable for bug 353436
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild
index 017d9a296785..c535efffd39c 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild,v 1.6 2009/10/10 14:42:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild,v 1.7 2011/03/27 10:11:11 ssuominen Exp $
 
 inherit gnome2 eutils autotools
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://live.gnome.org/GnomePilot"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="hal"
+IUSE=""
 
 RDEPEND=">=gnome-base/libgnome-2.0.0
 	>=gnome-base/libgnomeui-2.0.0
@@ -19,11 +19,7 @@ RDEPEND=">=gnome-base/libgnome-2.0.0
 	>=gnome-base/gnome-panel-2.0
 	>=gnome-base/gconf-2.0
 	dev-libs/libxml2
-	>=app-pda/pilot-link-0.11.7
-	hal? (
-		dev-libs/dbus-glib
-		>=sys-apps/hal-0.5.4
-	)"
+	>=app-pda/pilot-link-0.11.7"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
@@ -40,7 +36,7 @@ pkg_setup() {
 		--enable-usb
 		--enable-network
 		--enable-pilotlinktest
-		$(use_with hal)"
+		--without-hal"
 }
 
 src_unpack() {
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild
index d40d3ec3c43a..6a8f5f0079a8 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild,v 1.6 2011/03/22 18:47:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild,v 1.7 2011/03/27 10:11:11 ssuominen Exp $
 
 EAPI="3"
 G2CONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/GnomePilot"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="eds hal"
+IUSE="eds"
 
 RDEPEND="
 	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
@@ -22,8 +22,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.13:2
 	>=dev-libs/dbus-glib-0.74
 
-	eds? ( >=gnome-extra/evolution-data-server-2 )
-	hal? ( >=sys-apps/hal-0.5.4 )"
+	eds? ( >=gnome-extra/evolution-data-server-2 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -38,7 +37,7 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable eds eds-conduits)
-		$(use_with hal)"
+		--without-hal"
 }
 
 src_install() {
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild
index 69ba203c4405..b8408dbde8ee 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild,v 1.1 2011/03/21 10:07:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.1.ebuild,v 1.2 2011/03/27 10:11:11 ssuominen Exp $
 
 EAPI="3"
 G2CONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/GnomePilot"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="eds hal"
+IUSE="eds"
 
 RDEPEND="
 	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
@@ -21,8 +21,7 @@ RDEPEND="
 	>=app-pda/pilot-link-0.11.7
 	>=x11-libs/gtk+-2.13:2
 	>=dev-libs/dbus-glib-0.74
-	eds? ( >=gnome-extra/evolution-data-server-2 )
-	hal? ( >=sys-apps/hal-0.5.4 )"
+	eds? ( >=gnome-extra/evolution-data-server-2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext
@@ -36,7 +35,7 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable eds eds-conduits)
-		$(use_with hal)"
+		--without-hal"
 }
 
 src_install() {