Rename USE="ipod" to USE="ios" because this package is using libimobiledevice instead of libgpod wrt #344763.

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

5 files changed, 20 insertions, 14 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 32f2f59152b2..570fd6a151fe 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.38 2011/03/27 08:21:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.39 2011/03/27 15:52:26 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.8.ebuild,
+  upower-0.9.9.ebuild:
+  Rename USE="ipod" to USE="ios" because this package is using libimobiledevice
+  instead of libgpod wrt #344763.
 
   27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.8.ebuild,
   upower-0.9.9.ebuild:
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 7fd25a00b46e..5d96f589c01d 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,6 +1,6 @@
 DIST upower-0.9.8.tar.bz2 462754 RMD160 cf3f0ec75e4e53b3e57a6429329c19e4826844be SHA1 4eb30f974dd817e7552698483e47c2d27838fbdc SHA256 7afaec3cb10ebbc898308c7abd250c27fd58e10379a42e80444d7a4b32f2eb91
 DIST upower-0.9.9.tar.bz2 478434 RMD160 78990545f56ba99b9cb335dfe3e9f55c498fc303 SHA1 6109a934cce6c6ab38e471f7d50ff6927561a3ab SHA256 39e19bab2c776000477d6d0ddb4bc508808954f63867a2da2be40eaf341214e2
-EBUILD upower-0.9.8.ebuild 2112 RMD160 8b0c80dba3280e202c294da8fc424b52acc36e6b SHA1 d7ee8ed1f161117fd3f1732baa1e06e2d881ab5f SHA256 7e5a97d4a01c9d0b5358a87857c2054c8a9c9467c5ac79b77a58e04ff3284cfe
-EBUILD upower-0.9.9.ebuild 2118 RMD160 378d6c4179be0e9c4bd09de20e9d24044ad827ac SHA1 165102cc832c93390587cb6aa0a13eeb6e5a71c2 SHA256 2a2e08ce2001d158a77bf7e3ed41aac3ba97164e8c118a003b110e4326309af0
-MISC ChangeLog 4979 RMD160 1e608a0cde353c4e4eb13187626a709b6651ca64 SHA1 22650c4e8214f85a4e1ad8a4bfc2f39e5ce68f99 SHA256 ef71a53ef79c45e214a7dfc2e95e4c03a83104008d580957433cc38f649ffa23
-MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
+EBUILD upower-0.9.8.ebuild 2108 RMD160 3a69bd29a654098081d453e496aca42ecf730479 SHA1 2a6b79c481711bc6e8278db2077ecdae844f32cb SHA256 fb32eb276b2e6cb9e1fbf559b38df3bb34e33c4dab0ee2e18026fb5c26bc43c1
+EBUILD upower-0.9.9.ebuild 2115 RMD160 63cd096fbae86a309e80da72fa69b919849051d2 SHA1 daca73bbcefc62c99af528c145e107a01932cc14 SHA256 d4ba17276fa4946b031c2795a0ff35efa7ffd147818a00593655b183e66175f8
+MISC ChangeLog 5192 RMD160 4dcefa5fb5ced1cbe388b194b44ec68e9fb4130c SHA1 97347599676edf280263d85b95c91e60af05edb5 SHA256 663fb85fb0e4c1ed6e58fe9a680f7fbf75bd87934bd11267ed74dca3a9a92144
+MISC metadata.xml 410 RMD160 732a2f87cf5413bc633cf6e0276396b2618b463d SHA1 262222fde58aeb43087a244b1a5e5bb77baf60b7 SHA256 c39b3187d8246dc883b289a134eaa225b2f165bf63c5a2dfc8c353419a7fd477
diff --git a/sys-power/upower/metadata.xml b/sys-power/upower/metadata.xml
index 1d2462d712ff..8f2f6f72e95c 100644
--- a/sys-power/upower/metadata.xml
+++ b/sys-power/upower/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+    <flag name="ios">Enable iOS support</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-power/upower/upower-0.9.8.ebuild b/sys-power/upower/upower-0.9.8.ebuild
index ab359634ddd2..63067f10c0bd 100644
--- a/sys-power/upower/upower-0.9.8.ebuild
+++ b/sys-power/upower/upower-0.9.8.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/sys-power/upower/upower-0.9.8.ebuild,v 1.9 2011/03/27 08:21:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.8.ebuild,v 1.10 2011/03/27 15:52:27 ssuominen Exp $
 
 EAPI=3
 inherit linux-info
@@ -12,7 +12,7 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug doc +introspection ipod kernel_FreeBSD kernel_linux"
+IUSE="debug doc +introspection ios kernel_FreeBSD kernel_linux"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
 	>=dev-libs/glib-2.21.5:2
@@ -21,7 +21,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
 	introspection? ( dev-libs/gobject-introspection )
 	kernel_linux? ( >=sys-fs/udev-151[extras]
 		virtual/libusb:1
-		ipod? ( >=app-pda/libimobiledevice-0.9.7
+		ios? ( >=app-pda/libimobiledevice-0.9.7
 			>=app-pda/libplist-0.12 ) )
 	!sys-apps/devicekit-power
 	!sys-apps/hal"
@@ -72,12 +72,12 @@ src_configure() {
 		--disable-tests \
 		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--with-backend=${backend} \
-		$(use_with ipod idevice)
+		$(use_with ios idevice)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS HACKING NEWS README
 
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
diff --git a/sys-power/upower/upower-0.9.9.ebuild b/sys-power/upower/upower-0.9.9.ebuild
index 94413561a020..3e01ec3085b9 100644
--- a/sys-power/upower/upower-0.9.9.ebuild
+++ b/sys-power/upower/upower-0.9.9.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/sys-power/upower/upower-0.9.9.ebuild,v 1.2 2011/03/27 08:21:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.9.ebuild,v 1.3 2011/03/27 15:52:27 ssuominen Exp $
 
 EAPI=3
 inherit linux-info
@@ -12,7 +12,7 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc +introspection ipod kernel_FreeBSD kernel_linux"
+IUSE="debug doc +introspection ios kernel_FreeBSD kernel_linux"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.88
 	>=dev-libs/glib-2.21.5:2
@@ -21,7 +21,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.88
 	introspection? ( dev-libs/gobject-introspection )
 	kernel_linux? ( >=sys-fs/udev-151[extras]
 		virtual/libusb:1
-		ipod? ( >=app-pda/libimobiledevice-0.9.7
+		ios? ( >=app-pda/libimobiledevice-0.9.7
 			>=app-pda/libplist-0.12 ) )
 	!sys-apps/devicekit-power
 	!sys-apps/hal"
@@ -72,7 +72,7 @@ src_configure() {
 		--disable-tests \
 		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		--with-backend=${backend} \
-		$(use_with ipod idevice)
+		$(use_with ios idevice)
 }
 
 src_install() {