Punt USE="udisks udisks2" and always select sys-fs/udisks:2 wrt #517956. Ack from maksbotan.

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

6 files changed, 39 insertions, 74 deletions

diff --git a/app-leechcraft/lc-vrooby/ChangeLog b/app-leechcraft/lc-vrooby/ChangeLog
index ea301a12ecd5..a976463cfa91 100644
--- a/app-leechcraft/lc-vrooby/ChangeLog
+++ b/app-leechcraft/lc-vrooby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-leechcraft/lc-vrooby
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-vrooby/ChangeLog,v 1.12 2014/04/10 18:04:50 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-vrooby/ChangeLog,v 1.13 2014/07/27 16:25:30 ssuominen Exp $
+
+  27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> lc-vrooby-0.6.60.ebuild,
+  lc-vrooby-0.6.65.ebuild, lc-vrooby-9999.ebuild, metadata.xml:
+  Punt USE="udisks udisks2" and always select sys-fs/udisks:2 wrt #517956. Ack
+  from maksbotan.
 
 *lc-vrooby-0.6.65 (10 Apr 2014)
 
diff --git a/app-leechcraft/lc-vrooby/Manifest b/app-leechcraft/lc-vrooby/Manifest
index 1afecec1bc5a..1be773cc2497 100644
--- a/app-leechcraft/lc-vrooby/Manifest
+++ b/app-leechcraft/lc-vrooby/Manifest
@@ -3,19 +3,19 @@ Hash: SHA256
 
 DIST leechcraft-0.6.60.tar.xz 5089252 SHA256 669c2325235c3c49dfc9a30d38c1ad08c0a6abf1ebbf2c8d33eca27e976e1b6d SHA512 0bac75f96bfc43c692e8b61ba5e9b6b82d535a78bd310966c36579666feb8b87217a9d74cfe792fa32b57b9b04e158239acbf2422014735d2316cbda2d8b39ec WHIRLPOOL f3056faab0006830afbcf5f3448094e530c908d432cebec731f305f34347e514db55416a911674c28445a3cd4e542136fd053ee5e444b3cf93e086dc9e88428c
 DIST leechcraft-0.6.65.tar.xz 5067580 SHA256 b821fb8716b3ba04862bbb358a738609ead84cd9c86b569fe31c712b48c2a7fd SHA512 94e3cfa42bea572cb2feeaf4c7153c8d7e08e0597d447db5033b72222cea67370e8948d0dd0e2b89585583a88b4ee3df7b32d72dcd624d383e79b9472ceffe30 WHIRLPOOL bc589f46c89351328e25e6e32febdcba8ead639a8d1daf18df7352372d66fb8f8e7e5bbef02d49b6a00a7f5ffa15d66699b79cc73f64ea1bf8b59949fcd81b8a
-EBUILD lc-vrooby-0.6.60.ebuild 926 SHA256 b59423a996e5b95999b2bb6bd7dd5a35f81032135a45a9e6eb18e10f794bb4b5 SHA512 c1324f384ab7fcd319fea9f1785626bbd7d0b9492cf2c0cd945e0d03659ce0ab49f4774e1ed473c43758c6838a7f27bf515c8e91440a2b2b311ccf057707afed WHIRLPOOL dc96ce236996be76bd4a6233bdb6814f21796437d76714648be1ba0c49d1c350e0efcc1a88934406441b171f995521b76b0bca5d4d2c09d67bcce40252162c2e
-EBUILD lc-vrooby-0.6.65.ebuild 931 SHA256 5c8c5cdcf7153c3648959bf4087b43c855d0264f5a2b87ccd2cb3adcdf95fa1b SHA512 6529eee76dcbf658fb53ed856990b519146caa6cba8a9588b7fb1fb5b13d9192c9839cc320dafd41cc2545ac79eea2c21f8c87d250f8e80b8f238c44f66b6967 WHIRLPOOL e7e43e4941fe627cd582e277a3abd99be76f3473d93f655515de04bebd4ae50322f8ab8b4a70415beb1fdfb2725fd80a07412e1e89926fd4d0fd668e51c7e90d
-EBUILD lc-vrooby-9999.ebuild 916 SHA256 f5c563a81b7f3f43e546a48b5dbfceb45c4f9e1593ff72d44cf5a52c5d44827e SHA512 c9ffcc5f1ebcc17df30779e33e2e817b588fffbe115f31da6eb3286ec32cb79836f9329658d8b1fbaf1e53d076a3ef7d0594ab60f980e7ad8be26df9264ce97c WHIRLPOOL 5b3b9c94a659f5483e7db95a6796961fdc09661dc3a6f4bca95f38ede40f2d307187e20ac1d648b3e9a5c95d17e42846025934ae3d887e7d5e2ad72455adccf8
-MISC ChangeLog 4362 SHA256 644ae6419093af1796cec83dd5a02932cae72de8aa7eccd6b61f4112a363521c SHA512 5864e5702337c54babd5f92ea9e8d500d1ca3c3c0f03f9f0731800eddb06adc6f0f49a9354387eca197240142fb7c2015494a3dc42e1712dd39edcc76c2ba385 WHIRLPOOL e2a1d77fd27d57feef912fb29c0c2b444cbfc05019f93a02c0f3d3ab9b6ddc225ae7374c7654c8fecbb8b0fc1a37c10d5e0c94276adb95fe8c8a646f929ebf1e
-MISC metadata.xml 390 SHA256 e611a5df49d69e392d43a12733c44ee4231a9f83c5f1a537d5fff31f43b8d43b SHA512 94fa67dde44250fb442410fdbeba806cfadd549d77f05dcb584a593285401101b3520906f1baa5b443590e6ca7be713ca82bb2f902cae97ea521e853e74b2443 WHIRLPOOL 214e0febe6370cd6307e0b0a9b0f8ba49634f58911d9e472cbd9d01a297beaa8e397be70e88a04f112ba4a4216dd357ad6da630bdcb1b5dd07e456cdf0691c05
+EBUILD lc-vrooby-0.6.60.ebuild 599 SHA256 50a5d89fe7478128479c0ddc62178ff06fd10144122ae8f709bbc9f75e955a7e SHA512 eec72ade30a24842d89ce0948aa7ced01be4d7feb5ce96eb5beba9aa828d0a96b0a595c368ee6398b9cd4a1cfd72f22a9362e4aa38b67d1848bd6286efd90fdc WHIRLPOOL 73ddd2ee60ee681fd687687abdfdf9391b4d2ba41155e21aac7ee52dc7c4beebf27b93406389dec6d8cc2a4b82a6bf7415fae0e54b4e1c8021eae96c992831a4
+EBUILD lc-vrooby-0.6.65.ebuild 601 SHA256 ae65a0a9b8f546ba549b0b6044b7d5645db3fb2850c8ce768e41b6be9f3fabe2 SHA512 3594a4cf995017c77bab3178c6b7e2d2d5aa19ed338989cff514209f0b6ce0f326c793898acaee8761ca7b94aa1b445e2f5ac2b948ab731a9226a693007bf475 WHIRLPOOL 3b7ce5e2430e59719d8f9ca06d0fc4242072a6a42888ee0d79091f44714b5b9c8049bc612d72282d1b7441adbce3d785122d956f73cfb40a6a7f55d111eace40
+EBUILD lc-vrooby-9999.ebuild 588 SHA256 148056d11218cdd58af02f5b84da493252c0f5aa9312de277724c2573b082af1 SHA512 44ec4958b35fdddca66b2d8821ef787e686db8d44a31a30e028979876a4f091fdc6935f7870e6393a9454cb98d05520458d4a2ef08ba10e3bf54dd3cc79f249b WHIRLPOOL 55bd59000e3f6afbe3cf37b0b044e61a1fec3bc77d66b053d6cba3b62c607dea32cbce9352490cb3638b032167a2e379005550375bd1a0bf52be1f9bee21fcd9
+MISC ChangeLog 4603 SHA256 11f7d79b1b66ed3cdbc5db2daefff12a98aba3e5828d48267d4f2e386e7de883 SHA512 f2bd79e54fbafa6cfc5aee07167c563381e808a7ceaedcc2f49e88c99ebcc841439656f6899025b988404f4e1d2fe783d82290f9bc43f2dd67630ce65b060d93 WHIRLPOOL a5f14dc698ff12651dbb6778f4128176c7ba75741798410f3ac8015d2eb54c9b63d13a97eef4923ec35a6da491d14a00c1cf806b71df258d0aac7893287837a7
+MISC metadata.xml 164 SHA256 d3d50c47cc72568dcc457fe11ddfc6849ba6572bc2d581aad1deac910ee1d488 SHA512 ce478accd06c9c530d86b3ca8abaf3680428a7ab07ed8bb5b78e60c7e3240c3be349993f73e2ef904642efec5cd9c8abb7196675b46723103290ef9ab5d1cc10 WHIRLPOOL 4c2d59059bc69ff27c720b093f582968e2778d23875e0f7d3edba0ec6634e1b50e7403974c4a32638eeaae4d7baf45ca163e5e80f5bd692590b7d075882d51f0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTXo+WAAoJECo/aRed92670HYH/RzY6YsSkQUo/cKZEYqUgbpJ
-M27XILoCp0QcpXC4MEDv8iLehJ3OaWzHXYWYJx2Zd3qOEQQIRv6ddemeUgAHGZhd
-DuXbzznopc5Wt6THzgF2WFg54aMdFg4R0sUCFyapmcGlL83os9a8YMdSM0HWjdPr
-l0lZifXkAMvm9hF8GuHO8jljOiWc3ZG+oXBxv1/HFjcqSs1hJ5goaSXgAPayOI46
-xkMB1eoOSwWxrP5sCtuo5W/SRBX6IV6mQKlnO9jmKXKiEHX9q0T0HdfeGwMT6RGj
-I0L4ahMq4TnptEV5tS6LlA0EMBimX65ZSfzEfnbu31kMjKZsuc32YokX0I1O5FE=
-=tu6c
+iQEcBAEBCAAGBQJT1SfvAAoJEEdUh39IaPFNavoIAKSIGTCsvT0op2Baq6ffZTDc
+uqrxn2fZODz/bmXnuLShqZISdFsF+9C2Hk1vGDgBsmisYICuFm6hLFmm/cOp3HAS
+y9iRRFIzHxijPKwaLPt/XhwPTj3WffLz2m8NYu87jILgC850i1Dec/+OXzMCR1kn
+mmFqhB2wvwXOtS/PzC6h+73hPt3pPEuqGBLvkOR9Di/vxGoHuQnZmncYcmbdY1Ne
+gYbw5N31DGMA7OUgodF+KJ9vhs+e1fdE4uuH8XNePRXv5nJmViWdLrLTgcscaCZ0
+zGxHETK+L+qaInLQ/VXYy8XAGM4M1Bfe5dHM65qrdLpM/t/TF/6lM7h3nZ5IU9c=
+=wdrq
 -----END PGP SIGNATURE-----
diff --git a/app-leechcraft/lc-vrooby/lc-vrooby-0.6.60.ebuild b/app-leechcraft/lc-vrooby/lc-vrooby-0.6.60.ebuild
index 462f239e6e2c..e541713c129c 100644
--- a/app-leechcraft/lc-vrooby/lc-vrooby-0.6.60.ebuild
+++ b/app-leechcraft/lc-vrooby/lc-vrooby-0.6.60.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/app-leechcraft/lc-vrooby/lc-vrooby-0.6.60.ebuild,v 1.3 2014/04/03 08:58:19 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-vrooby/lc-vrooby-0.6.60.ebuild,v 1.4 2014/07/27 16:25:30 ssuominen Exp $
 
 EAPI="5"
 
@@ -10,30 +10,18 @@ DESCRIPTION="Vrooby, removable device manager for LeechCraft."
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug udisks udisks2"
+IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 		dev-qt/qtdbus:4"
 RDEPEND="${DEPEND}
-		udisks? ( sys-fs/udisks:0 )
-		udisks2? ( sys-fs/udisks:2 )
-		"
-
-REQUIRED_USE="|| ( udisks udisks2 )"
+		sys-fs/udisks:2"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable udisks VROOBY_UDISKS)
-		$(cmake-utils_use_enable udisks2 VROOBY_UDISKS2)
-	)
+		-DENABLE_VROOBY_UDISKS=OFF
+		-DENABLE_VROOBY_UDISKS2=ON
+		)
 
 	cmake-utils_src_configure
 }
-
-pkg_postinst() {
-	if use udisks2; then
-		elog "You have enabled the experimental UDisks2 backend. "
-		elog "Please try the old udisks:0-based one before "
-		elog "reporting issues."
-	fi
-}
diff --git a/app-leechcraft/lc-vrooby/lc-vrooby-0.6.65.ebuild b/app-leechcraft/lc-vrooby/lc-vrooby-0.6.65.ebuild
index c5c109b0c634..818dcbf60522 100644
--- a/app-leechcraft/lc-vrooby/lc-vrooby-0.6.65.ebuild
+++ b/app-leechcraft/lc-vrooby/lc-vrooby-0.6.65.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/app-leechcraft/lc-vrooby/lc-vrooby-0.6.65.ebuild,v 1.1 2014/04/10 18:04:50 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-vrooby/lc-vrooby-0.6.65.ebuild,v 1.2 2014/07/27 16:25:30 ssuominen Exp $
 
 EAPI="5"
 
@@ -9,31 +9,19 @@ inherit leechcraft
 DESCRIPTION="Vrooby, removable device manager for LeechCraft."
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="debug udisks udisks2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 		dev-qt/qtdbus:4"
 RDEPEND="${DEPEND}
-		udisks? ( sys-fs/udisks:0 )
-		udisks2? ( sys-fs/udisks:2 )
-		"
-
-REQUIRED_USE="|| ( udisks udisks2 )"
+		sys-fs/udisks:2"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable udisks VROOBY_UDISKS)
-		$(cmake-utils_use_enable udisks2 VROOBY_UDISKS2)
-	)
+		-DENABLE_VROOBY_UDISKS=OFF
+		-DENABLE_VROOBY_UDISKS2=ON
+		)
 
 	cmake-utils_src_configure
 }
-
-pkg_postinst() {
-	if use udisks2; then
-		elog "You have enabled the experimental UDisks2 backend. "
-		elog "Please try the old udisks:0-based one before "
-		elog "reporting issues."
-	fi
-}
diff --git a/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild b/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild
index 29cf91841877..d778c91b4a4f 100644
--- a/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild
+++ b/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild,v 1.2 2013/04/12 08:44:34 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild,v 1.3 2014/07/27 16:25:30 ssuominen Exp $
 
 EAPI="5"
 
@@ -10,30 +10,18 @@ DESCRIPTION="Vrooby, removable device manager for LeechCraft."
 
 SLOT="0"
 KEYWORDS=""
-IUSE="debug udisks udisks2"
+IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 		dev-qt/qtdbus:4"
 RDEPEND="${DEPEND}
-		udisks? ( sys-fs/udisks:0 )
-		udisks2? ( sys-fs/udisks:2 )
-		"
-
-REQUIRED_USE="|| ( udisks udisks2 )"
+		sys-fs/udisks:2"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable udisks VROOBY_UDISKS)
-		$(cmake-utils_use_enable udisks2 VROOBY_UDISKS2)
-	)
+		-DENABLE_VROOBY_UDISKS=OFF
+		-DENABLE_VROOBY_UDISKS2=ON
+		)
 
 	cmake-utils_src_configure
 }
-
-pkg_postinst() {
-	if use udisks2; then
-		elog "You have enabled the experimental UDisks2 backend. "
-		elog "Please try the old udisks:0-based one before "
-		elog "reporting issues."
-	fi
-}
diff --git a/app-leechcraft/lc-vrooby/metadata.xml b/app-leechcraft/lc-vrooby/metadata.xml
index 0cd3b568c738..2c857dda08d3 100644
--- a/app-leechcraft/lc-vrooby/metadata.xml
+++ b/app-leechcraft/lc-vrooby/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>leechcraft</herd>
-	<use>
-		<flag name="udisks">Use <pkg>sys-fs/udisks:0</pkg> for block device access (e.g., automounting)</flag>
-		<flag name="udisks2">Use <pkg>sys-fs/udisks:2</pkg> for block device access (e.g., automounting)</flag>
-	</use>
 </pkgmetadata>