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

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

4 files changed, 16 insertions, 10 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/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() {