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

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

4 files changed, 100 insertions, 2 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/Manifest b/razorqt-base/razorqt-panel/Manifest
index 4484445d9b6f..e4c8158e2ba7 100644
--- a/razorqt-base/razorqt-panel/Manifest
+++ b/razorqt-base/razorqt-panel/Manifest
@@ -1,6 +1,8 @@
+AUX razorqt-panel-0.5.1-automagic.patch 1003 SHA256 7d36b61f1470bd24480dec1d7e6012f9639baef320afe6f76f3c76442e185d5b SHA512 3abb3c435ab78c7abeebf3a6e86336055826e91f5418463ddde52e18e5f642b3b54a396b0a9a71d870013eebb00cf2ab750a40c582e8663c26043a95e4008230 WHIRLPOOL 912660536452d81b4d34ccfc52336a81c53467dcc1dbb1eafc02e4afff4bccf155ba6fd57cf1bf56488d9e94a41e8e208f7c246f882feb93c430df1ea44027df
 DIST razorqt-0.5.0.tar.bz2 10414360 SHA256 f6a0b941209d5be90c05fbf064c68fa2da9e27941be57cbfd2da028445e0a4b4 SHA512 1b92642c1fc7edd6d4e3f7e3882d481bc9f0eb51beebbf64d499d230d6e7bb369b5434c65025320626aae3f2465dcd365a5398e9284dd7652436d17887c21db4 WHIRLPOOL 444e15a0ee21bdabf9a0dc313f3f09ba2ac6fe234253816fc70261299ef61ed8e155694a2628a2d169d154ba143d4a0ebde5ddb27bb3c3b4491f4637328cd80a
 DIST razorqt-0.5.1.tar.bz2 10379213 SHA256 b301cc652e48256d6dfa804d63e6cefa06bbe965c30227edb0a6726b5689d74f SHA512 736e9f38a959cb70465e9d4331c912b26ca9c0ed1e354702a29e1f10b2aec95352b96c6af24022f447bc9526a4f6c77b10aa59cac620837c8355c99884323521 WHIRLPOOL 24dc1cf7366bf1843e65e5dc0286909e9b8f7a0de1bb1ebf189df803afeadb09c8a022c86e4272ea0b5d71b8f9608e0000e4d128dcf97c75d656d67f45a90120
 EBUILD razorqt-panel-0.5.0.ebuild 1466 SHA256 658200bc3b0321dac922cbedc7dc6b43d755e91cce758ba8c5915ea9dba36499 SHA512 a01d26b88269267add5aef31db08411bc7ee651b871c039b76affa8a234fcebe2c7ebac5788afe495af8b2031b35053c57f290520571e243c78304bf394c7457 WHIRLPOOL 466d257cdc8e7d4eeefec646b510d6c12d68242d50c0f905f8120cf49abed31299b15244704625ecb45990979ba37cb6f4657a1cb47be73f3c77ba13a27ed3d7
+EBUILD razorqt-panel-0.5.1-r1.ebuild 1669 SHA256 93762f3bce8ffd040e26383308557186f2625bbf6be6a71d87b22028620440a3 SHA512 ad26ddbbbf893b1f5ac94ff28ca81c005c2fee8cf23261da0cffdd285a70db6732e836ec130f09e73938cd3c5ae97c3b75f3f2a25c34ab4e8c159fa06d76f099 WHIRLPOOL 9bad6fdbf713b295bffd02d34cb0100736f3e7096ba7d49642f5dcdc7dca652f3f556ca295a494b5d2cfa0fe6eeb1633cbb467db9d17028e21faff2d67721ae0
 EBUILD razorqt-panel-0.5.1.ebuild 1466 SHA256 76d03f1c314006f318c6b8daa561a5e93e1a4e64328a39c93d6ec05fb20d6275 SHA512 791ad34ef45ddd1c1190bd4cc8cec4962029866cc712c8757505262b03bb5714f58faec231bc4c3043797e965838855b56e4d88a05616a032438345d19ad57af WHIRLPOOL 50dc0065ad156d1b4fdbec302e8c16f21f5cc41662fdbcd714190a8e1bd12129b80148ade3fe41c06fd2953b82ec9790f47cddeac901d41b4cd3f4ee4fbcefe9
-MISC ChangeLog 546 SHA256 c50a97c758f7361720c79fbf832f976c0a5a608f8706d424b2590bce42dca622 SHA512 085235f5299e0b741f3d1a90bb4d7428836683db302f8efa96ca9ac0e48116d95c36cab666b28f49570b2ed5e9a2528a1dc3549bfcd02756aef826600a3a1277 WHIRLPOOL 3c31e9e3a8692f1fc4d66fa25609586f8add5db60d8f504f9693c6672b41a90fe35e40111caaaf8908d41b9289efbf7a02baf84087dc3372eeada378bb803618
+MISC ChangeLog 776 SHA256 caef43da8299a0b682addbf61170c2d2a4928de02a2ac13c91371ddf1124b925 SHA512 ae76e5473278aaddd910aa359077fed2a3611dd771f663bd245901f9ba96e0c14737051a5f4265fa7161921efce61b5d153e6b1d3174ed6630390c765dee28fe WHIRLPOOL 44ec4726a155767c35cd28ab3fc78374fdbe305f6c6d6e1f47aa77375d950c1472e2fb3ea3c96be8f269decd2ebeebe48dcf809618d83a69d56bca8a6dc696a4
 MISC metadata.xml 1339 SHA256 62a1885f0d89b1ce5447e3e6f5078afcc6c48851d55760db7b2d8e46b757661c SHA512 4293be9005256c755b8ad36e32e10c22749dfe40268643e0e9aa4a447561bdb9b290051436664df1aaa7c5ba5cb1528547bd2cc205cedf1fd64a1ba3ffdbae27 WHIRLPOOL cc8da0789af92541d6ab16d0c1a42de0f7de574640006c4b18c1f9226a9f8c5a615d1b2f28fbe72da6b5f73ac01db550e6423f62211e8ede88ffd60b4d27afa5
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
+}