Rename USE="iphone" to USE="ios" wrt #344763.

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

5 files changed, 21 insertions, 17 deletions

diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index 5dcf10e859f6..cebb34203757 100644
--- a/media-sound/clementine/ChangeLog
+++ b/media-sound/clementine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/clementine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.30 2011/03/26 14:07:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.31 2011/03/27 15:41:48 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> clementine-0.6-r2.ebuild,
+  clementine-0.7_rc1.ebuild, metadata.xml:
+  Rename USE="iphone" to USE="ios" wrt #344763.
 
 *clementine-0.7_rc1 (26 Mar 2011)
 
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index be4b2a0556df..2dde974c271a 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -3,7 +3,7 @@ AUX clementine-0.7_rc1-tests-liblastfm.patch 775 RMD160 f080f888a3780bef25ba6203
 DIST clementine-0.6-patchset-1.tar.xz 10252 RMD160 4735946c6a05701f902d7179589626d7651d00b8 SHA1 753c8b2dabb443ed45c27aee3f3789d22b66cd5e SHA256 8016b39c3cdfc7c5cbf2072bd5460afd808d630e68e6b9f65f0e31a41bc8b2ef
 DIST clementine-0.6.tar.gz 5601219 RMD160 5b7418bef5bed9a9f1837741ea31fa3304894f88 SHA1 02f2ca926aad9748e3b4f58642b1daf95dadbc16 SHA256 7a7393af462a3c0864279d8cb2fc59afeec718837e5a1d0818a16b8a20d7cd0c
 DIST clementine-0.7rc1.tar.gz 5955486 RMD160 4fe6199be36dab416d8c85da34441653a959981a SHA1 34dac5d9140bb699e24032b1bc6edcc35b0049a4 SHA256 269f8541ce124a986bd65a52e706fdb6d9efd1fdd374c85b7a79cbe10dab11fe
-EBUILD clementine-0.6-r2.ebuild 3296 RMD160 ab67a6125876cc74a9b294139dafb87dfec40283 SHA1 d80052e016239f5b4d4f33015f0ca29e4a154668 SHA256 dcc36a0b625d18daa3e8c953da97285d070803262dab32da0d8706b73ac7db60
-EBUILD clementine-0.7_rc1.ebuild 3323 RMD160 003427f78ef93b421f3ba66e89560f6ff816b4c9 SHA1 83633a332aca8cca214a278c7c522143ba5debac SHA256 715139e06b7f55139e6143e69f087e55e326f3c7268ad2171814067c3858820d
-MISC ChangeLog 4688 RMD160 ce53e7465554188fa811499f5b00b1b918d4afee SHA1 8315a42ed0dfb3efad2b5f8a0c5cd5c48c0c096d SHA256 110ea3781759f4bb14b892e02139d3e89da107126df7d0028dedb26ca715bab0
-MISC metadata.xml 796 RMD160 f8013d0be71993dc142670815b5f96565c26ac4c SHA1 51b384427e6eb9dbdacc3be406db4c9e98d1a7b8 SHA256 bd737ecf3604b5ddd66b07a90bd073c1b867a4bf349823b234f90435a068a166
+EBUILD clementine-0.6-r2.ebuild 3296 RMD160 b8b50b0ea867c945e9ad3d0f740777b1da3561c0 SHA1 9dabb3c20b1521c115ef596cb5aa821e4a285162 SHA256 b8d63af5c2ba0e170abb22528ddbf730306b0b33ee692131aa2c0991547cd648
+EBUILD clementine-0.7_rc1.ebuild 3316 RMD160 76ac21b70ee0b0535399ea920cbf8ec4f92e7a94 SHA1 ba8cc90a6ec6f446005b0a614b697181e674331b SHA256 5b171159a78439377fd44a17ccf9d5ab69298f436ed5f6d3d9a9bbbda854e6e3
+MISC ChangeLog 4860 RMD160 325e4830e8ea310d66973e584549aee6a5e21c9b SHA1 9b9ee443e24c62d3955fe424c509f78c5ab2f8a9 SHA256 431d4e8ee8bcb29b6d208c16e4f70000d5bc8bfc0feba6a223b10b4cbdf575fb
+MISC metadata.xml 768 RMD160 8e6624c1d37ec4436f85585cf33527fd71e3550a SHA1 29ad21a5ba6d935a27283e849f0b510ca3507240 SHA256 43ce1d9dc64d9e6e2f9f609f1d2e010389d95dcc64db383c717fef14af3023e8
diff --git a/media-sound/clementine/clementine-0.6-r2.ebuild b/media-sound/clementine/clementine-0.6-r2.ebuild
index 96b9ce7207cc..52c7213256d1 100644
--- a/media-sound/clementine/clementine-0.6-r2.ebuild
+++ b/media-sound/clementine/clementine-0.6-r2.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/media-sound/clementine/clementine-0.6-r2.ebuild,v 1.4 2011/03/16 18:07:48 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.6-r2.ebuild,v 1.5 2011/03/27 15:41:48 ssuominen Exp $
 
 EAPI=3
 
@@ -16,7 +16,7 @@ SRC_URI="http://clementine-player.googlecode.com/files/${P}.tar.gz
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="ayatana +dbus iphone ipod +lastfm mtp projectm +udev wiimote"
+IUSE="ayatana +dbus ios ipod +lastfm mtp projectm +udev wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 COMMON_DEPEND="
@@ -31,8 +31,8 @@ COMMON_DEPEND="
 	>=media-libs/gst-plugins-base-0.10
 	ayatana? ( dev-libs/libindicate-qt )
 	ipod? (
-		>=media-libs/libgpod-0.7.92
-		iphone? (
+		>=media-libs/libgpod-0.8.0[ios?]
+		ios? (
 			app-pda/libplist
 			>=app-pda/libimobiledevice-1.0
 			app-pda/usbmuxd
@@ -83,7 +83,7 @@ src_configure() {
 		$(cmake-utils_use dbus ENABLE_DBUS)
 		$(cmake-utils_use udev ENABLE_DEVICEKIT)
 		$(cmake-utils_use ipod ENABLE_LIBGPOD)
-		$(cmake-utils_use iphone ENABLE_IMOBILEDEVICE)
+		$(cmake-utils_use ios ENABLE_IMOBILEDEVICE)
 		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
 		$(cmake-utils_use mtp ENABLE_LIBMTP)
 		-DENABLE_GIO=ON
diff --git a/media-sound/clementine/clementine-0.7_rc1.ebuild b/media-sound/clementine/clementine-0.7_rc1.ebuild
index 223831a78b47..468eb09ce225 100644
--- a/media-sound/clementine/clementine-0.7_rc1.ebuild
+++ b/media-sound/clementine/clementine-0.7_rc1.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/media-sound/clementine/clementine-0.7_rc1.ebuild,v 1.1 2011/03/26 14:07:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.7_rc1.ebuild,v 1.2 2011/03/27 15:41:48 ssuominen Exp $
 
 EAPI=4
 
@@ -15,11 +15,11 @@ SRC_URI="http://clementine-player.googlecode.com/files/${P/_r/r}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ayatana +dbus iphone ipod +lastfm mtp projectm +udev wiimote"
+IUSE="ayatana +dbus ios ipod +lastfm mtp projectm +udev wiimote"
 IUSE+="${LANGS// / linguas_}"
 
 REQUIRED_USE="
-	iphone? ( ipod )
+	ios? ( ipod )
 	udev? ( dbus )
 	wiimote? ( dbus )
 "
@@ -37,8 +37,8 @@ COMMON_DEPEND="
 	>=media-libs/gst-plugins-base-0.10
 	ayatana? ( dev-libs/libindicate-qt )
 	ipod? (
-		>=media-libs/libgpod-0.7.92
-		iphone? (
+		>=media-libs/libgpod-0.8.0[ios?]
+		ios? (
 			app-pda/libplist
 			>=app-pda/libimobiledevice-1.0
 			app-pda/usbmuxd
@@ -92,7 +92,7 @@ src_configure() {
 		$(cmake-utils_use dbus ENABLE_DBUS)
 		$(cmake-utils_use udev ENABLE_DEVICEKIT)
 		$(cmake-utils_use ipod ENABLE_LIBGPOD)
-		$(cmake-utils_use iphone ENABLE_IMOBILEDEVICE)
+		$(cmake-utils_use ios ENABLE_IMOBILEDEVICE)
 		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
 		$(cmake-utils_use mtp ENABLE_LIBMTP)
 		-DENABLE_GIO=ON
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index cfaca3608d2f..4d269824d280 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -12,7 +12,7 @@
   </maintainer> 
   <use>
     <flag name="ayatana">Build in support for Ayatana notification using the libindicate-qt plugin.</flag>
-    <flag name="iphone">Enable support for iPod Touch, iPhone, iPad</flag>
+    <flag name="ios">Enable iOS support</flag>
 	<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
     <flag name='projectm'>Build with ProjectM visualization</flag>
     <flag name="wiimote">Enable support for Wii remote</flag>