Rename local USE flag devices to global USE flag udisks, bug #517966.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

5 files changed, 35 insertions, 34 deletions

diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index afb9f6dcc010..dd81bc5c0377 100644
--- a/media-sound/cantata/ChangeLog
+++ b/media-sound/cantata/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cantata
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.27 2014/05/30 21:51:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.28 2014/07/24 15:13:24 johu Exp $
+
+  24 Jul 2014; Johannes Huber <johu@gentoo.org> cantata-1.3.3.ebuild,
+  cantata-1.3.4.ebuild, metadata.xml:
+  Rename local USE flag devices to global USE flag udisks, bug #517966.
 
   30 May 2014; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Remove qt from metadata.
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 428acd5ccbcc..578c9479b964 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -3,26 +3,24 @@ Hash: SHA256
 
 DIST cantata-1.3.3.tar.bz2 1587518 SHA256 74a4bbfaa1472f551f95b09236ebd3b45191df3c55c2b6c8498039b135f2b5e2 SHA512 1f50abf9e92316ba3cd8da0a542a6fbdabfa58bb8dd7349058ffeffa5f95a4db31e4810e580497fea5c08f31f8e891c1c7b600f66f81f400527d40c58f14148a WHIRLPOOL 1f66a415d1e0d0e91a2fe05ef27587a736523a385fcee9333609a301457169c4bc982e2be3f34d5bc924828d070ac6201739756d78b0ed5e60ac382988aa6fae
 DIST cantata-1.3.4.tar.bz2 1587599 SHA256 985ffa0ccb5651f7733ee3760a7d4b0830ef69b249c73f1c328d5b4276203a66 SHA512 7bd8886d194d5a7c83d4cf41cbaae1f216cb2fa41642588f4be903e1f03fcdddcaa809ac56d061859ed570f54e52fa2c42ac49d742eb636d2b3b29352e3e2343 WHIRLPOOL 96d24387aa5b6d568baa4fe7bdb9736a1d6f940d65c967f107d5b27121232327bec96178fbe5641c1f888714bb6c5f43a94d1e841b4cfcf10f9cf1747acc1253
-EBUILD cantata-1.3.3.ebuild 3014 SHA256 8e40a82db832ecea8e355f7bf38fae0372a3a5ad694eb0149c46989c33bda48d SHA512 c5f009689a4a9b4216019735606c05127662856cd03e57698f8dbfd150d8921cdd0d5c5f7606100abd29638143bbca97055de248145ecc4fba2111926c25efa8 WHIRLPOOL 98a8294d5b4c7e2634123856f0155783bf0ed65e8060afb4f27b44375d449df31fefeb6da5b1315e02563ec4c78835a954ad668481ad8078e7fbbd073eccb3a6
-EBUILD cantata-1.3.4.ebuild 3014 SHA256 47a8ca65c2eb2203f0f2304f5c605437022de4bb6dec03b1eef266d0a0c29ff5 SHA512 d14e4e81afe764684faa92711bee79a9ea2904ea3f1c16214adb12f105caaad0feeab1134bcf9fc309caf1ae0d19e1cecefbf3893b90a7300af01fb2f0007504 WHIRLPOOL 823bdd29bd3d044e39750d4905b95d3a72fbb8bdf677fe3ff2fff0e34dc142875b1de7da78a1e45dd9313a4a68fc1bcd7169f9dd872e49d2cf42a2f24ee012d9
-MISC ChangeLog 4523 SHA256 7ba9e6ce340d9870abd339c8de174e94a05b39ac9d91e66215e22e6e50803c84 SHA512 0e2ccb908b3e801cb3a76cc42d428216c0ffc46f0ec0bd948235fed31c31a46a6dd314debe2174580febbecca0dff3f2199b7cfe1035ed20ea26e579c842fd2e WHIRLPOOL 09a1a103bbe8b81681a755978bc63c635932838fcd53c6893e142d42f25fc724ecf31a0f5527daf864adb4446aa45d5b519cd3aaf5d31224f7a05c265d14fb12
-MISC metadata.xml 712 SHA256 7722f078020893c0d96e3a18df9e09bc1c2f9b5b4eabcff7c30a157ee5d62bb9 SHA512 2cf4d1acd29c3aa8e394def681299fbaa63d0c850d9e8f75f72df6e5fa01f7bc9f7261257fb84842139af634c5c98283fc9cea3122d498cfb57db869ce4c5830 WHIRLPOOL 86adbaa1ffbd5d3b6b396684241dfdf2bd6ca490802b55a92fc3bab1568f90bcf35dd87b084a3a9958124fb4dd5cf8caf0fed4ed66617ba68671521a098955e8
+EBUILD cantata-1.3.3.ebuild 3009 SHA256 087fcb88889fe225b51dc8e0e36f0689ff81efef9b97ead343e6345f09e4ab56 SHA512 1acfb581bc54371dbadceeb3bcf151269ffca501dda7fc6c16be1dbf2659619ee90ad1d4595030525b9e6e66f1cc0517b9b5e5d0981addcc1830a56fd149770d WHIRLPOOL 2cd3c3841bcee89a2309ec39a2a266f6c1524daf5aea9e16f4fe22447632e01988ee9c03ea6a1fd279b251aa621ac48471670d3f0cabcfef3e4bfd0fdcee5ea6
+EBUILD cantata-1.3.4.ebuild 3009 SHA256 67bd54f4ce5691a5c98f7cdcfb58cfcaf3776f6340993dd964431b291e4f07c1 SHA512 56d5702d9c93cbe4a98e864f403db77de6c90d847c55e0f687142b4ca5a252bde24aa358dbb0f8fdaff270b2b69aecb45ef20f342aa997c81837d0cdc949736b WHIRLPOOL f712c5f7b51e25db24153137e4fd5e26d8bd013d2e9c730cb2407c436f4f3ff4480590654a1f740534205f6ddb05521b759a8480ae6fe7b6db9ad5718bd6a2b9
+MISC ChangeLog 4704 SHA256 88a41adf1bd02bb2ad9ed6f81a7fa1303c7d46807c685a2da6c00f05957d9d93 SHA512 1ed9883db2695daec9f6d8824bb401b66ecbb7c6bbd711ba96252a7f5966de7d7f04eb0548333f821db2363ffc8e538ba15200ae0422b9facfab9849ec7c3364 WHIRLPOOL c793693a475c90bf91927450263ca68a6be246cebc8d90be204bfdd7915fc9b17f1f13f65b49b75d097b1545a161737932cf40f8f3ab7ac5fe44d2032aabc8b5
+MISC metadata.xml 647 SHA256 c2a0e4d1db640c37173b448d2141c70f7a7ab91d11f3ce2cf915c7e947c0ed24 SHA512 c7184d26e4c0a260c8baa3e4552bafdac72cf0cde99e5797dbe4e325b56a6c72acc1098ae8b8eb29723e5478cd6a9ecda05026ec19a17ef719ed6b171c019e76 WHIRLPOOL b4f65ad0cb4ee54beaf2d6016d4cf8e09c67d6de986b598f89e631f6cd836a6498ed72b837bb64e60abf15f7194505476ed36adcc690977c824468bc00ad0550
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTiP1vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9ud8P/ROyqRZ3UEAb84XMbgC5gYXW
-mcwA70mhkB94IN5JMu3hxfbNkUqid8qNVwBogHIO6tLkpt7idJyYSwOWqRMjV4uP
-A1pLPu3G6nTZNP2GGdVlbm5UdGsGQG8KxvNjMG6ZmvUm9B5NZTAPBDMFaiKeSn23
-t/oFpWPS98M6uuHI58/cDwvZXqrUrai/awqPE3SZ7roXzub82hthJG+V4fhGl/kb
-BH8V6yZ4GHbJSxWYAtnUgT7fsSo+HDB6jOH0LoRzXGrAYMUrnbzBuNpc0GvXrwFr
-HyUODmRgWOXMrkUI5Vsxn62z0kEJH9FRjyfC7Pxf7x0ZcJ4bJdWfcABj2D8uoNZt
-YIeuIgZdEW64axqQ8n0BmmdjPx6wDFIgDxT0Kxv62iYDI/mtoid57Z901GZtyEyM
-wv6UfvMDsKs6O6KOY7RbrlJgrUUidV9zeqm8LWS8jsnPB3sXV+T3VZVV+KrlSAkL
-2cgoTJytpG1CA0YFFTHSY7DiATF45gMc1Elm4JqA+6PoMmjLc+OnQxFHYcOF8cZP
-V2sv9UCLrKmP5niHXyXxAtCIfuLgX6TrFnVA4k3MCTxgs8cNgTcu6LWfuOsMWJ06
-FMXSYPwXvU2N2dc0LYO8jy7Iyd0RfI0ULxIGIVjJeSJzUD0+wKYnGQDVXIZgLJfW
-UPSdexGHie0862Fjafzz
-=0xY1
+iQIcBAEBCAAGBQJT0SKYAAoJEGVpnaTzz9K90NcP/iKG80Qrw8rDLrKQSG9O65s0
+e+Nf7PT8knAef89P3EPv1NtRCaE9vsVFS+p847wpYAKu8qiudtqBgzkp6XEnXOiF
+pLL2LbSzKD4Wx2EYxHWyUSvk4PoPEO7fvDfdhrbUFEF9qO5FJqGalTacHXoLYEOE
+66GJhQltc25K4H90sHm9cToJXLAe6THjUneiqFYIha5sVq+gOR9G4aptWT1GF+iE
+k+p2KLknB7ZdmOCHEhkkItJs7cbHJyXmSWi3zyENdZoLyH+rQ+i88Gu9jKX+s6/Z
+Fwaqu+3SKBzcq25IU1YMcsVr6h/cM57TD9uiWyLUhjxztJoqk5+5GI2qUlrjLo0r
+3JTZYiFmg3yDpM82nnt03thhPXjF7Igs0oeku7/2rwAJz0sijrAyVJXik1FfnwSg
+qWJZrPt/q9sifgLYIo1eelG1uwG7L43t39S7QBeBXoPIITH1BohJZn/IpJ5hC6FU
+pkCvDB8I2QTyZB9iuTRWEfNhDUMThgILZRNtNGimVL8Hck7ZjJh55E8MHoEFi2XT
+V843+wtj5fYfUW831VFdWIapaPr4r7+MSn9f6lTMdWZxDPeqpAC2uni8GExbCb4t
+NyxuaDP/8sl5Vtpir+0jrrwnd691AetNEDJIXduw3QiPcU592FkW6R1FJsL5dA6y
+z3dQ08oJXT4YdAQYZqlu
+=U0j8
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cantata/cantata-1.3.3.ebuild b/media-sound/cantata/cantata-1.3.3.ebuild
index 56edf1b52993..c2a05f63cc90 100644
--- a/media-sound/cantata/cantata-1.3.3.ebuild
+++ b/media-sound/cantata/cantata-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.3.3.ebuild,v 1.1 2014/04/05 20:53:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.3.3.ebuild,v 1.2 2014/07/24 15:13:24 johu Exp $
 
 EAPI=5
 
@@ -15,12 +15,12 @@ SRC_URI="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60ZUN1NThacGF
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="cddb cdda devices dynamic http-server kde lame mtp musicbrainz online-services qt5 replaygain streams taglib"
+IUSE="cddb cdda dynamic http-server kde lame mtp musicbrainz online-services qt5 replaygain streams taglib udisks"
 REQUIRED_USE="
 	cddb? ( cdda taglib )
-	cdda? ( devices || ( cddb musicbrainz )  )
+	cdda? ( udisks || ( cddb musicbrainz )  )
 	lame? ( cdda taglib )
-	mtp? ( devices taglib )
+	mtp? ( taglib udisks )
 	musicbrainz? ( cdda taglib )
 	online-services? ( taglib )
 	qt5? ( !kde )
@@ -59,7 +59,7 @@ RDEPEND="
 	taglib? (
 		media-libs/taglib[asf,mp4]
 		media-libs/taglib-extras
-		!kde? ( devices? ( sys-fs/udisks:2 ) )
+		!kde? ( udisks? ( sys-fs/udisks:2 ) )
 	)
 "
 DEPEND="${RDEPEND}
@@ -87,7 +87,6 @@ src_configure() {
 		-DCANTATA_TRANSLATIONS="${langs// /;}"
 		$(cmake-utils_use_enable cdda CDPARANOIA)
 		$(cmake-utils_use_enable cddb)
-		$(cmake-utils_use_enable devices DEVICES_SUPPORT)
 		$(cmake-utils_use_enable dynamic)
 		$(cmake-utils_use_enable http-server HTTP_SERVER)
 		$(cmake-utils_use_enable kde)
@@ -103,6 +102,7 @@ src_configure() {
 		$(cmake-utils_use_enable replaygain SPEEXDSP)
 		$(cmake-utils_use_enable taglib)
 		$(cmake-utils_use_enable taglib TAGLIB_EXTRAS)
+		$(cmake-utils_use_enable udisks DEVICES_SUPPORT)
 		-DENABLE_HTTPS_SUPPORT=ON
 		-DENABLE_HTTP_STREAM_PLAYBACK=OFF
 		-DENABLE_REMOTE_DEVICES=OFF
diff --git a/media-sound/cantata/cantata-1.3.4.ebuild b/media-sound/cantata/cantata-1.3.4.ebuild
index db9a7bd0b0e0..7d9d2f6eff1f 100644
--- a/media-sound/cantata/cantata-1.3.4.ebuild
+++ b/media-sound/cantata/cantata-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.3.4.ebuild,v 1.1 2014/04/09 22:29:33 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.3.4.ebuild,v 1.2 2014/07/24 15:13:24 johu Exp $
 
 EAPI=5
 
@@ -15,12 +15,12 @@ SRC_URI="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WTYtaXk3c1I
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="cddb cdda devices dynamic http-server kde lame mtp musicbrainz online-services qt5 replaygain streams taglib"
+IUSE="cddb cdda dynamic http-server kde lame mtp musicbrainz online-services qt5 replaygain streams taglib udisks"
 REQUIRED_USE="
 	cddb? ( cdda taglib )
-	cdda? ( devices || ( cddb musicbrainz )  )
+	cdda? ( udisks || ( cddb musicbrainz )  )
 	lame? ( cdda taglib )
-	mtp? ( devices taglib )
+	mtp? ( taglib udisks )
 	musicbrainz? ( cdda taglib )
 	online-services? ( taglib )
 	qt5? ( !kde )
@@ -59,7 +59,7 @@ RDEPEND="
 	taglib? (
 		media-libs/taglib[asf,mp4]
 		media-libs/taglib-extras
-		!kde? ( devices? ( sys-fs/udisks:2 ) )
+		!kde? ( udisks? ( sys-fs/udisks:2 ) )
 	)
 "
 DEPEND="${RDEPEND}
@@ -87,7 +87,6 @@ src_configure() {
 		-DCANTATA_TRANSLATIONS="${langs// /;}"
 		$(cmake-utils_use_enable cdda CDPARANOIA)
 		$(cmake-utils_use_enable cddb)
-		$(cmake-utils_use_enable devices DEVICES_SUPPORT)
 		$(cmake-utils_use_enable dynamic)
 		$(cmake-utils_use_enable http-server HTTP_SERVER)
 		$(cmake-utils_use_enable kde)
@@ -103,6 +102,7 @@ src_configure() {
 		$(cmake-utils_use_enable replaygain SPEEXDSP)
 		$(cmake-utils_use_enable taglib)
 		$(cmake-utils_use_enable taglib TAGLIB_EXTRAS)
+		$(cmake-utils_use_enable udisks DEVICES_SUPPORT)
 		-DENABLE_HTTPS_SUPPORT=ON
 		-DENABLE_HTTP_STREAM_PLAYBACK=OFF
 		-DENABLE_REMOTE_DEVICES=OFF
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index 20ee897ea879..4bf3ab690394 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<use>
-		<flag name="devices">Enable suport for external devices</flag>
 		<flag name="dynamic">Enable support for dynamic playlists</flag>
 		<flag name="http-server">Enable internal HTTP server to play non-MPD files</flag>
 		<flag name="online-services">Enable support for online services (Jamendo, Magnatune, SoundCloud, and Podcasts)</flag>