Fix automagic deps, bug #440136. Thanks to Enlik for patches.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 97 insertions, 1 deletions

diff --git a/razorqt-base/razorqt-panel/ChangeLog b/razorqt-base/razorqt-panel/ChangeLog
index 1e023c6f9bd1..75b24d9ac5b2 100644
--- a/razorqt-base/razorqt-panel/ChangeLog
+++ b/razorqt-base/razorqt-panel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for razorqt-base/razorqt-panel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/ChangeLog,v 1.2 2012/10/24 11:38:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/ChangeLog,v 1.3 2012/10/29 16:07:35 yngwin Exp $
+
+*razorqt-panel-0.5.1-r1 (29 Oct 2012)
+
+  29 Oct 2012; Ben de Groot <yngwin@gentoo.org>
+  +files/razorqt-panel-0.5.1-automagic.patch, +razorqt-panel-0.5.1-r1.ebuild:
+  Fix automagic deps, bug #440136. Thanks to Enlik for patches.
 
 *razorqt-panel-0.5.1 (24 Oct 2012)
 
diff --git a/razorqt-base/razorqt-panel/files/razorqt-panel-0.5.1-automagic.patch b/razorqt-base/razorqt-panel/files/razorqt-panel-0.5.1-automagic.patch
new file mode 100644
index 000000000000..5ac5a030761a
--- /dev/null
+++ b/razorqt-base/razorqt-panel/files/razorqt-panel-0.5.1-automagic.patch
@@ -0,0 +1,31 @@
+diff -ur razorqt-0.5.1.orig/razorqt-panel/CMakeLists.txt razorqt-0.5.1/razorqt-panel/CMakeLists.txt
+--- razorqt-0.5.1.orig/razorqt-panel/CMakeLists.txt	2012-10-29 14:43:48.237180971 +0100
++++ razorqt-0.5.1/razorqt-panel/CMakeLists.txt	2012-10-29 15:10:39.384567282 +0100
+@@ -33,7 +33,11 @@
+ setByDefault(CPULOAD_PLUGIN Yes)
+ setByDefault(NETWORKMONITOR_PLUGIN Yes)
+ setByDefault(SENSORS_PLUGIN Yes)
++
+ setByDefault(VOLUME_PLUGIN Yes)
++# Options for the volume plugin.
++setByDefault(VOLUME_USE_PULSEAUDIO Yes)
++setByDefault(VOLUME_USE_ALSA Yes)
+ # *******************************************************************
+ 
+ 
+@@ -162,8 +166,13 @@
+ endif (SENSORS_PLUGIN)
+ 
+ if (VOLUME_PLUGIN)
+-  FIND_PACKAGE(PulseAudio)
+-  FIND_PACKAGE(ALSA)
++  if (VOLUME_USE_PULSEAUDIO)
++    FIND_PACKAGE(PulseAudio)
++  endif (VOLUME_USE_PULSEAUDIO)
++
++  if (VOLUME_USE_ALSA)
++    FIND_PACKAGE(ALSA)
++  endif (VOLUME_USE_ALSA)
+ 
+   if (PULSEAUDIO_FOUND OR ALSA_FOUND)
+     set(ENABLED_PLUGINS ${ENABLED_PLUGINS}   "Volume")
diff --git a/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild b/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..fa8172996bfc
--- /dev/null
+++ b/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild,v 1.1 2012/10/29 16:07:35 yngwin Exp $
+
+EAPI=4
+inherit cmake-utils
+
+DESCRIPTION="Razor-qt panel and its plugins"
+HOMEPAGE="http://razor-qt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/Razor-qt/razor-qt.git"
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/downloads/Razor-qt/razor-qt/razorqt-${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/razorqt-${PV}"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+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? ( alsa? ( media-libs/alsa-lib )
+		pulseaudio? ( media-sound/pulseaudio ) )"
+RDEPEND="${DEPEND}
+	razorqt-base/razorqt-data
+	mount? ( sys-fs/udisks )"
+
+PATCHES=( "${FILESDIR}/${P}-automagic.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPLIT_BUILD=On
+		-DMODULE_PANEL=On
+	)
+
+	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
+}