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

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

4 files changed, 20 insertions, 22 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 7d22f8f581eb..05b3022f6370 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.99 2011/03/26 20:32:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.100 2011/03/27 08:11:39 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> tracker-0.8.17.ebuild,
+  tracker-0.10.5.ebuild, tracker-9999.ebuild:
+  Remove support for sys-apps/hal wrt #313389.
 
 *tracker-0.10.5 (26 Mar 2011)
 
diff --git a/app-misc/tracker/tracker-0.10.5.ebuild b/app-misc/tracker/tracker-0.10.5.ebuild
index 786dea23ab02..701cc63bd89f 100644
--- a/app-misc/tracker/tracker-0.10.5.ebuild
+++ b/app-misc/tracker/tracker-0.10.5.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-misc/tracker/tracker-0.10.5.ebuild,v 1.1 2011/03/26 20:32:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.5.ebuild,v 1.2 2011/03/27 08:11:39 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac gif gnome-keyring gsf gstreamer gtk hal iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist qt4 rss strigi test +tiff upnp +vorbis xine +xml xmp"
+IUSE="applet doc eds exif flac gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist qt4 rss strigi test +tiff upnp +vorbis xine +xml xmp"
 
 # Test suite highly disfunctional, loops forever
 # putting aside for now
@@ -58,9 +58,7 @@ RDEPEND="
 		>=x11-libs/gtk+-2.18:2 )
 	iptc? ( media-libs/libiptcdata )
 	jpeg? ( virtual/jpeg:0 )
-	laptop? (
-		hal? ( >=sys-apps/hal-0.5 )
-		!hal? ( >=sys-power/upower-0.9 ) )
+	laptop? ( >=sys-power/upower-0.9 )
 	mp3? (
 		>=media-libs/taglib-1.6
 		gtk? ( x11-libs/gdk-pixbuf:2 )
@@ -129,9 +127,9 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-video-extractor=external"
 	fi
 
-	# hal and upower are used for AC power detection
+	# upower is used for AC power detection
 	if use laptop; then
-		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal upower)"
+		G2CONF="${G2CONF} --disable-hal --enable-upower"
 	else
 		G2CONF="${G2CONF} --disable-hal --disable-upower"
 	fi
diff --git a/app-misc/tracker/tracker-0.8.17.ebuild b/app-misc/tracker/tracker-0.8.17.ebuild
index 30da7a5ffc00..f06be7921f24 100644
--- a/app-misc/tracker/tracker-0.8.17.ebuild
+++ b/app-misc/tracker/tracker-0.8.17.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-misc/tracker/tracker-0.8.17.ebuild,v 1.11 2011/02/02 15:59:25 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.17.ebuild,v 1.12 2011/03/27 08:11:39 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
 # USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac gnome-keyring gsf gstreamer gtk hal iptc +jpeg kmail laptop mp3 nautilus pdf playlist rss strigi test +tiff +vorbis xine +xml xmp"
+IUSE="applet doc eds exif flac gnome-keyring gsf gstreamer gtk iptc +jpeg kmail laptop mp3 nautilus pdf playlist rss strigi test +tiff +vorbis xine +xml xmp"
 
 # Automagic, gconf, uuid, and probably more
 # TODO: quill support
@@ -50,9 +50,7 @@ RDEPEND="
 		>=x11-libs/gtk+-2.18:2 )
 	iptc? ( media-libs/libiptcdata )
 	jpeg? ( virtual/jpeg:0 )
-	laptop? (
-		hal? ( >=sys-apps/hal-0.5 )
-		!hal? ( >=sys-power/upower-0.9 ) )
+	laptop? ( >=sys-power/upower-0.9 )
 	mp3? ( >=media-libs/id3lib-3.8.3 )
 	nautilus? (
 		gnome-base/nautilus
@@ -112,9 +110,9 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-video-extractor=external"
 	fi
 
-	# hal and upower are used for AC power detection
+	# upower is used for AC power detection
 	if use laptop; then
-		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal upower)"
+		G2CONF="${G2CONF} --disable-hal --enable-upower"
 	else
 		G2CONF="${G2CONF} --disable-hal --disable-upower"
 	fi
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 003643d28585..40a2e9c733d4 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.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-misc/tracker/tracker-9999.ebuild,v 1.37 2011/03/26 20:32:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.38 2011/03/27 08:11:39 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 # USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac gif gnome-keyring gsf gstreamer gtk hal iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist qt4 rss strigi test +tiff upnp +vorbis xine +xml xmp"
+IUSE="applet doc eds exif flac gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist qt4 rss strigi test +tiff upnp +vorbis xine +xml xmp"
 
 # TODO: rest -> flickr
 # vala is built with debug by default (see VALAFLAGS)
@@ -56,9 +56,7 @@ RDEPEND="
 		>=x11-libs/gtk+-2.18:2 )
 	iptc? ( media-libs/libiptcdata )
 	jpeg? ( virtual/jpeg:0 )
-	laptop? (
-		hal? ( >=sys-apps/hal-0.5 )
-		!hal? ( >=sys-power/upower-0.9 ) )
+	laptop? ( >=sys-power/upower-0.9 )
 	mp3? (
 		>=media-libs/taglib-1.6
 		gtk? ( x11-libs/gdk-pixbuf:2 )
@@ -128,9 +126,9 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-video-extractor=external"
 	fi
 
-	# hal and upower are used for AC power detection
+	# upower is used for AC power detection
 	if use laptop; then
-		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal upower)"
+		G2CONF="${G2CONF} --disable-hal --enable-upower"
 	else
 		G2CONF="${G2CONF} --disable-hal --disable-upower"
 	fi