Warn if ipod is given withou hal; bug #191700

Package-Manager: portage-2.1.3.9

3 files changed, 27 insertions, 10 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 418395232ce3..8d638c445f64 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.104 2007/09/01 13:11:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.105 2007/09/18 15:46:19 dang Exp $
+
+  18 Sep 2007; Daniel Gryniewicz <dang@gentoo.org> rhythmbox-0.10.1.ebuild:
+  Warn if ipod is given withou hal; bug #191700
 
   01 Sep 2007; nixnut <nixnut@gentoo.org> rhythmbox-0.10.1.ebuild:
   Stable on ppc wrt bug 185186
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 0f03348f4b4f..9bb3a9b12891 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rhythmbox-0.9.7-daap_fix.patch 1185 RMD160 5529b848990e410ca090c778d05d45e8bbea1501 SHA1 8663ed05c2c08630b5f5d3b63b7229f9d41eeaf6 SHA256 56c0af8afa900c267bc7eb2d17dbce216b080c837cefc7524d557b1eb2f3dd5c
 MD5 8411cab9f1d3894aee9c56d8ed4c4eaf files/rhythmbox-0.9.7-daap_fix.patch 1185
 RMD160 5529b848990e410ca090c778d05d45e8bbea1501 files/rhythmbox-0.9.7-daap_fix.patch 1185
@@ -26,10 +29,10 @@ EBUILD rhythmbox-0.10.0.ebuild 3342 RMD160 3baaee0514d913b0738921eab5de95f19f724
 MD5 71f39c806ba2014f48d0d5dd4a8e679d rhythmbox-0.10.0.ebuild 3342
 RMD160 3baaee0514d913b0738921eab5de95f19f724e61 rhythmbox-0.10.0.ebuild 3342
 SHA256 e07bddcafb914ab488837edf09d82a02443fcb94e1e89104c7fa4b47503c3f12 rhythmbox-0.10.0.ebuild 3342
-EBUILD rhythmbox-0.10.1.ebuild 3339 RMD160 8ae434fb8bb2abf4ebe4626f87a9be69d64f28a6 SHA1 b954dae0450a1f05232e80fa3a3f97d9d0176696 SHA256 574d6e92f189fdcb4e864ba29a676b0a7bcfaef9f8376f4b82e46a60e00e6e86
-MD5 5fc2be24562945ec38c7a69ae8c5f941 rhythmbox-0.10.1.ebuild 3339
-RMD160 8ae434fb8bb2abf4ebe4626f87a9be69d64f28a6 rhythmbox-0.10.1.ebuild 3339
-SHA256 574d6e92f189fdcb4e864ba29a676b0a7bcfaef9f8376f4b82e46a60e00e6e86 rhythmbox-0.10.1.ebuild 3339
+EBUILD rhythmbox-0.10.1.ebuild 3482 RMD160 93f2d5ddf25b8a5be6850e07215e12838d0a807d SHA1 52b1377a53fcd48a968c164f20045d1466774070 SHA256 1c43087d1aa939c76abf1619e5c82a8116b33fe82b0e963722bac5348a9632ae
+MD5 bf5ebc14123f06c1591c8f5752b6fe33 rhythmbox-0.10.1.ebuild 3482
+RMD160 93f2d5ddf25b8a5be6850e07215e12838d0a807d rhythmbox-0.10.1.ebuild 3482
+SHA256 1c43087d1aa939c76abf1619e5c82a8116b33fe82b0e963722bac5348a9632ae rhythmbox-0.10.1.ebuild 3482
 EBUILD rhythmbox-0.9.7-r3.ebuild 3635 RMD160 4e462395073496a2389309ed4a8a1727ec874740 SHA1 57581347212b64cd5da1c6d3cf6f21401e71aaef SHA256 901ba52be639caf4eb8ec7752c95418788353f6c342c9d2d69d8fa173f3de6eb
 MD5 a30ca67f818c80a4df1200952a2b6098 rhythmbox-0.9.7-r3.ebuild 3635
 RMD160 4e462395073496a2389309ed4a8a1727ec874740 rhythmbox-0.9.7-r3.ebuild 3635
@@ -38,10 +41,10 @@ EBUILD rhythmbox-0.9.8.ebuild 3545 RMD160 d8b4fd0ea89a88d6cf93f418d15e7f13137978
 MD5 5e838272fb74f34aa2d9b00e89376dc1 rhythmbox-0.9.8.ebuild 3545
 RMD160 d8b4fd0ea89a88d6cf93f418d15e7f1313797821 rhythmbox-0.9.8.ebuild 3545
 SHA256 ef84f926963507849485743d4e9c847396487840d048768a73be5ca2b9ab9849 rhythmbox-0.9.8.ebuild 3545
-MISC ChangeLog 14580 RMD160 27d050559cace21b561f693125b14dfa4eb2ac01 SHA1 dc5701dab1bb02b4105a4c9d6c09f4638e7746cf SHA256 b2888c918dfbdb96eaff8a1812499e59efd9ee81cf09461fe975779d7bb89b42
-MD5 5079adacbe8116c781b6f581675cdbc4 ChangeLog 14580
-RMD160 27d050559cace21b561f693125b14dfa4eb2ac01 ChangeLog 14580
-SHA256 b2888c918dfbdb96eaff8a1812499e59efd9ee81cf09461fe975779d7bb89b42 ChangeLog 14580
+MISC ChangeLog 14703 RMD160 a06563dc88eda150cc7d62e7b8d2f2bb9f28a10a SHA1 4741ae2ab685877e22ba4e449a66a2a20e686758 SHA256 1554c77e12f951ecf5a426c185d2a9707405264535e85ca73210f7786363fef3
+MD5 74af51688c5b5b1d1e823614a52f1d74 ChangeLog 14703
+RMD160 a06563dc88eda150cc7d62e7b8d2f2bb9f28a10a ChangeLog 14703
+SHA256 1554c77e12f951ecf5a426c185d2a9707405264535e85ca73210f7786363fef3 ChangeLog 14703
 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 metadata.xml 200
@@ -58,3 +61,10 @@ SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/di
 MD5 90da601e7950a0462d66a20b216407b0 files/digest-rhythmbox-0.9.8 253
 RMD160 018e1e56389639ca2f9310ce3ee17ac4c3fcd856 files/digest-rhythmbox-0.9.8 253
 SHA256 5d53e69ac6d6ba974b5338b29cbf4fac2b584da32f8555628aa508191a56010d files/digest-rhythmbox-0.9.8 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG7/MYomPajV0RnrERAj3nAJ9XBH+3r3hcRwIMo0IH1nWITuxW8gCfRDOj
+0Ua0nUBkyy5GU3sYpPXHBNo=
+=NNqm
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/rhythmbox-0.10.1.ebuild b/media-sound/rhythmbox/rhythmbox-0.10.1.ebuild
index 9e7c8a114070..8823d58f9d9f 100644
--- a/media-sound/rhythmbox/rhythmbox-0.10.1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.10.1.ebuild,v 1.7 2007/09/01 13:11:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.10.1.ebuild,v 1.8 2007/09/18 15:46:19 dang Exp $
 
 inherit gnome2 eutils
 
@@ -60,6 +60,10 @@ pkg_setup() {
 		ewarn "USE=avahi or USE=howl"
 		fi
 	fi
+	if ! use hal && use ipod; then
+		ewarn "ipod support requires hal support.  Please"
+		ewarn "re-emerge with USE=hal to enable ipod support"
+	fi
 	if use howl || use avahi ; then
 		G2CONF="${G2CONF} $(use_enable daap)"
 	fi