[gentoo-commits] proj/qt:master commit in: razorqt-base/razorqt-panel/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     07e3b363c79a56535cacd2089611cbafe8a7bc20
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  4 21:02:07 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct  4 21:02:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=07e3b363

[razorqt-base/razorqt-panel] Rename 'mount' USE flag to 'udisks' wrt bug #517962.

Package-Manager: portage-2.2.14_rc1

---
 razorqt-base/razorqt-panel/metadata.xml              |  2 --
 razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild | 13 +++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/razorqt-base/razorqt-panel/metadata.xml b/razorqt-base/razorqt-panel/metadata.xml
index 6826f07..98818a8 100644
--- a/razorqt-base/razorqt-panel/metadata.xml
+++ b/razorqt-base/razorqt-panel/metadata.xml
@@ -9,8 +9,6 @@
       <pkg>sys-libs/libstatgrab</pkg></flag>
     <flag name='desktopswitch'>Add desktop switch panel applet</flag>
     <flag name='mainmenu'>Add main menu panel applet</flag>
-    <flag name='mount'>Add external storage mounting panel applet; depends on
-      <pkg>sys-fs/udisks</pkg></flag>
     <flag name='networkmonitor'>Add network monitor panel applet; depends on
       <pkg>sys-libs/libstatgrab</pkg></flag>
     <flag name='quicklaunch'>Add quicklaunch panel applet</flag>

diff --git a/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild b/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild
index fcbfb49..3513c62 100644
--- a/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild
+++ b/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild
@@ -21,9 +21,8 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="+alsa +clock colorpicker cpuload +desktopswitch +mainmenu +mount
-	networkmonitor pulseaudio +quicklaunch screensaver sensors +showdesktop
-	+taskbar +tray +volume"
+IUSE="+alsa +clock colorpicker cpuload +desktopswitch +mainmenu networkmonitor pulseaudio
+	+quicklaunch screensaver sensors +showdesktop +taskbar +tray +udisks +volume"
 REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
 
 DEPEND="razorqt-base/razorqt-libs
@@ -34,7 +33,7 @@ DEPEND="razorqt-base/razorqt-libs
 		pulseaudio? ( media-sound/pulseaudio ) )"
 RDEPEND="${DEPEND}
 	razorqt-base/razorqt-data
-	mount? ( sys-fs/udisks )"
+	udisks? ( sys-fs/udisks )"
 
 src_configure() {
 	local mycmakeargs=(
@@ -43,15 +42,17 @@ src_configure() {
 	)
 
 	local i
-	for i in clock colorpicker cpuload desktopswitch mainmenu mount networkmonitor \
-			quicklaunch screensaver sensors showdesktop taskbar tray volume; do
+	for i in clock colorpicker cpuload desktopswitch mainmenu networkmonitor \
+		quicklaunch screensaver sensors showdesktop taskbar tray volume; do
 		use $i || mycmakeargs+=( -D${i^^}_PLUGIN=No )
 	done
+	use udisks || mycmakeargs+=( -DMOUNT_PLUGIN=No )
 
 	if use volume; then
 		for i in alsa pulseaudio; do
 			use $i || mycmakeargs+=( -DVOLUME_USE_${i^^}=No )
 		done
 	fi
+
 	cmake-utils_src_configure
 }