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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

5 files changed, 26 insertions, 61 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/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>