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

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

5 files changed, 24 insertions, 36 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/Manifest b/app-misc/tracker/Manifest
index 35383280412f..5bd4da22a2a8 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tracker-0.8.0-strigi.patch 1385 RMD160 69d07b6145de6919cc1550e4722737cf5b96051d SHA1 5221ac64d5c21e540bb0bb07bd074b3ad5ce0a27 SHA256 7ae959cd52ac96f6427646089b554e0572727f27d5d4aab1913f795e270a4ccb
 AUX tracker-0.8.17-build-with-eds232.patch 807 RMD160 7f681d67da66c66c82171557462e74e095d5f1b5 SHA1 cb56616bd34a0a81a8df6117c2901e6f5d834a0d SHA256 bced568783664b0128903094db05a1f881519754d6fa1588f1050620fb73f989
 AUX tracker-0.8.17-poppler-0.16.patch 1209 RMD160 6ae54087f8d2b3ea864cfaa035e3b1153a749a67 SHA1 a2f7429149ecfa7e45dd58e0a0d37f9385fbefb1 SHA256 8d1ed288fc14655e36ddda9af6d30b5b00572feca08b643951c1b5ac2d4eba1c
@@ -8,15 +5,8 @@ AUX tracker-0.8.17-tests-fixes.patch 2499 RMD160 fb8b749e2addeaa004fd2e6de585357
 AUX tracker-0.8.17-use-upower.patch 16884 RMD160 a9545a4aa89b6574ccb58d5b9796386eeb62a1ef SHA1 16ad6730798279f9a09459b50e1380bbf16c8e83 SHA256 542432544663f0c1a9c43c08e816f42a95fa31f828e33f6d470cafc60a33a7a1
 DIST tracker-0.10.5.tar.bz2 7867918 RMD160 34dfb68fb0744c78b88c31019afaa0a5adaaca3e SHA1 8e02645adadd4bb8644c4e413712d52ecdc04d5b SHA256 efc8c53cdb192d27c6a92bc11ef4ad5677afaeea7d58be4563e53a0133b54f10
 DIST tracker-0.8.17.tar.bz2 4959334 RMD160 b33abe9ab955e5e392258657ad3a664ff5cb4cc6 SHA1 460f3d56bd0ed24c5d064a398829f4289a6b081f SHA256 56cf09f41fec1afaf7199e0728f4339b567a7893a51fc2affc5069fa26e2e9d8
-EBUILD tracker-0.10.5.ebuild 6116 RMD160 3cdd8168d0fdab9dfce10e63daff3510b45a88b1 SHA1 d2814a76fd0ab175fc95d3bc31099bb4e4ed8bee SHA256 b169be5181863f395c6ca4284a4f1b0361a572fb6b0a48f1dfa2472366964456
-EBUILD tracker-0.8.17.ebuild 5624 RMD160 da0e59b1454864113e7a1bbf2ea47f70f8cdc0b4 SHA1 86e7ad931db95f2b25441865bb2af22f79fb26cd SHA256 c6f3a84991110dd8efde180fc4900d04112ce4fa408fbbd0dbe867f196a1d28c
-EBUILD tracker-9999.ebuild 5903 RMD160 113e6391d7956d9f8203096924a0e5879c8631a3 SHA1 64c1ac8442e36ab63499d4f3a8a5e10e16bf1c9d SHA256 13ba34c6a1d9c6b4275d3007c6102b8812a706a0d4ae57cd72e54e39af8865b2
-MISC ChangeLog 17952 RMD160 9293d0c9ddd127f6b56c331c07a921ab045041d5 SHA1 3a4b2e782df7a25406e507ad21e4b1c4030d882b SHA256 7fee00828c751bd09a67d1dbdc527482b1a069a0c28c4e5781cbe9481b3c6367
+EBUILD tracker-0.10.5.ebuild 6053 RMD160 b3c997d2dab8c334da2da9da0f31e0f0286cf8ba SHA1 a1d6f8817940f470207d6f9c822c70c01ee4a283 SHA256 c376e705470a058b48034aabbdbd17f6d6a401aeb2bbfeaf1e06790f528a6123
+EBUILD tracker-0.8.17.ebuild 5557 RMD160 aed3da3f171d63196ad9e8738542b19835a533d6 SHA1 09263cbc56b4d269f381c0bc87759fd076ecd9a7 SHA256 0942750014d4cd78541e9ae4fd3bd33c9955e15fc15f4932d36f35dc7531697f
+EBUILD tracker-9999.ebuild 5840 RMD160 7bc0a9d4bdd345cbb9276638da344f06cf5d55b1 SHA1 147a71c17eb5e79e51238ceb38346b5d9be016f4 SHA256 ec797c22fe1916a42963b89a4b865a16db603ccf06649a40281547c1a1cf1e46
+MISC ChangeLog 18130 RMD160 b5eaca577bea8e4f0415338018c44b667340b1dc SHA1 82e89824ad3c77b989e6d8635739332735bacbe3 SHA256 9d511e2c2e76e752d460ef31c2566ed03f0b330a75d6d53b08e03d9cef09bb3c
 MISC metadata.xml 909 RMD160 47100344948079430541942d3841bc4cde102800 SHA1 4fb4e473e4cdf507733555623f28af9121f2d9b7 SHA256 b3bc2efef244353c50faf03ca2fa944698bac1b6a6d023a484e46eb5c3ce02a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2OTVIACgkQ1fmVwcYIWAaVmQCfZkVBxK/OtJ0lyDEPD7Dn+syG
-KiUAn2jYuD4IGcyIPVzdY3wnS8AufYt2
-=kH+p
------END PGP SIGNATURE-----
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