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

[Ben de Groot]

commit:     d9db15b17fd720f3c6a0573a4e863bbcc27ce9fc
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Wed Oct 31 07:54:26 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 07:54:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d9db15b1

razorqt-base/razorqt-panel: backport improvements in 0.5.1-r1 from Enlik

---
 .../razorqt-panel/razorqt-panel-9999.ebuild        |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild b/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild
index fe19648..a07544b 100644
--- a/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild
+++ b/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild
@@ -21,14 +21,17 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="+clock colorpicker cpuload +desktopswitch +mainmenu +mount networkmonitor
-	+quicklaunch screensaver sensors +showdesktop +taskbar +tray +volume"
+IUSE="+alsa +clock colorpicker cpuload +desktopswitch +mainmenu +mount
+	networkmonitor pulseaudio +quicklaunch screensaver sensors +showdesktop
+	+taskbar +tray +volume"
+REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
 
 DEPEND="razorqt-base/razorqt-libs
 	cpuload? ( sys-libs/libstatgrab )
 	networkmonitor? ( sys-libs/libstatgrab )
 	sensors? ( sys-apps/lm_sensors )
-	volume? ( || ( media-libs/alsa-lib media-sound/pulseaudio ) )"
+	volume? ( alsa? ( media-libs/alsa-lib )
+		pulseaudio? ( media-sound/pulseaudio ) )"
 RDEPEND="${DEPEND}
 	razorqt-base/razorqt-data
 	mount? ( sys-fs/udisks )"
@@ -38,10 +41,17 @@ src_configure() {
 		-DSPLIT_BUILD=On
 		-DMODULE_PANEL=On
 	)
-	# probably needs fixing for automagic deps (e.g. alsa / pulse)
+
+	local i
 	for i in clock colorpicker cpuload desktopswitch mainmenu mount networkmonitor \
 			quicklaunch screensaver sensors showdesktop taskbar tray volume; do
 		use $i || mycmakeargs+=( -D${i^^}_PLUGIN=No )
 	done
+
+	if use volume; then
+		for i in alsa pulseaudio; do
+			use $i || mycmakeargs+=( -DVOLUME_USE_${i^^}=No )
+		done
+	fi
 	cmake-utils_src_configure
 }