Check for use dbus in audacious, needed both compile and runtime. Depend on pkg-config wrt #205084.

Package-Manager: portage-2.1.4

3 files changed, 37 insertions, 22 deletions

diff --git a/x11-plugins/wmauda/ChangeLog b/x11-plugins/wmauda/ChangeLog
index adb9eedee8a0..bb41c4a3d40b 100644
--- a/x11-plugins/wmauda/ChangeLog
+++ b/x11-plugins/wmauda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmauda
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmauda/ChangeLog,v 1.9 2007/11/10 17:45:49 joker Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmauda/ChangeLog,v 1.10 2008/01/14 10:21:49 drac Exp $
+
+  14 Jan 2008; Samuli Suominen <drac@gentoo.org> wmauda-0.7.ebuild:
+  Check for use dbus in audacious, needed both compile and runtime. Depend on
+  pkg-config wrt #205084.
 
   10 Nov 2007; Christian Birchinger <joker@gentoo.org> wmauda-0.7.ebuild:
   Remove built-with dbus check because Audacious has a hard dependency on it now.
diff --git a/x11-plugins/wmauda/Manifest b/x11-plugins/wmauda/Manifest
index 064bd03d072b..eb647b2a8b61 100644
--- a/x11-plugins/wmauda/Manifest
+++ b/x11-plugins/wmauda/Manifest
@@ -4,14 +4,14 @@ EBUILD wmauda-0.3.ebuild 655 RMD160 1ade3475c5334a13008704c102aab67125e56092 SHA
 MD5 929d38f850df1bb63606fca9aff92636 wmauda-0.3.ebuild 655
 RMD160 1ade3475c5334a13008704c102aab67125e56092 wmauda-0.3.ebuild 655
 SHA256 46c2cf5c53d6d6880f49d508e168a0e4aca4c4b082d8a726ea6b824b31670073 wmauda-0.3.ebuild 655
-EBUILD wmauda-0.7.ebuild 658 RMD160 f3a440b281ea621bf6a92cf74b3529bf64f0415a SHA1 a86442e250ea1541426cd75ac3b86818b6efb72b SHA256 66fe2c83d9d55681f782e27bd376c2df62e830cd38c35a6571dfe8ebba8b436e
-MD5 e8488ad4360167521444f32794af4a0f wmauda-0.7.ebuild 658
-RMD160 f3a440b281ea621bf6a92cf74b3529bf64f0415a wmauda-0.7.ebuild 658
-SHA256 66fe2c83d9d55681f782e27bd376c2df62e830cd38c35a6571dfe8ebba8b436e wmauda-0.7.ebuild 658
-MISC ChangeLog 1344 RMD160 b5e0f6635198574f1f8a82077d7935aff93b127b SHA1 a9f451c2f1c4fb8b01d73ae7408478cc35a1ec81 SHA256 774d511552df5e150d7655a85353778e45f2d0a30968925c2e86e0befc4997e9
-MD5 ce476eea03ec3196189f126f90316ce4 ChangeLog 1344
-RMD160 b5e0f6635198574f1f8a82077d7935aff93b127b ChangeLog 1344
-SHA256 774d511552df5e150d7655a85353778e45f2d0a30968925c2e86e0befc4997e9 ChangeLog 1344
+EBUILD wmauda-0.7.ebuild 912 RMD160 c21b1b3f2b517d6184d35eebc3c8dd79c41662d1 SHA1 b1dd8787c1bf97a94d3fcabf519ccfe67d91557a SHA256 64e54eed2c92b82d1d0cdab5abcf1ffe64d9925d14d3b4ea30e4ee14508697de
+MD5 d86c26b97f8ecc86eb2b71c73212c1a3 wmauda-0.7.ebuild 912
+RMD160 c21b1b3f2b517d6184d35eebc3c8dd79c41662d1 wmauda-0.7.ebuild 912
+SHA256 64e54eed2c92b82d1d0cdab5abcf1ffe64d9925d14d3b4ea30e4ee14508697de wmauda-0.7.ebuild 912
+MISC ChangeLog 1517 RMD160 90df980d5085facf6aea054367673813981de6df SHA1 56e017cb9e0bd3e870032cd3f445a8446291f58a SHA256 d03867acede2e2fb24bb8498fb31bb801110724f0a2989e9b27af30f6fbf7bbc
+MD5 42eed971629fe3956ac2c429b88bc5bf ChangeLog 1517
+RMD160 90df980d5085facf6aea054367673813981de6df ChangeLog 1517
+SHA256 d03867acede2e2fb24bb8498fb31bb801110724f0a2989e9b27af30f6fbf7bbc ChangeLog 1517
 MISC metadata.xml 167 RMD160 407c7d2b252afa7f63c4743fedf94da43b716623 SHA1 f42c260c0a7ce58db5124a80e8f65e9d570294b2 SHA256 0b161d83e9e7cad5a69cc5c2a23a5ba0fcac0d20751516b605dc232d9a2e7284
 MD5 4cc946a98c43a3fd878daaa79f3c0396 metadata.xml 167
 RMD160 407c7d2b252afa7f63c4743fedf94da43b716623 metadata.xml 167
diff --git a/x11-plugins/wmauda/wmauda-0.7.ebuild b/x11-plugins/wmauda/wmauda-0.7.ebuild
index 5e9b00e88597..0b4db04db56c 100644
--- a/x11-plugins/wmauda/wmauda-0.7.ebuild
+++ b/x11-plugins/wmauda/wmauda-0.7.ebuild
@@ -1,26 +1,37 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmauda/wmauda-0.7.ebuild,v 1.2 2007/11/10 17:45:49 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmauda/wmauda-0.7.ebuild,v 1.3 2008/01/14 10:21:49 drac Exp $
 
-IUSE=""
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Dockable applet for WindowMaker that controls Audacious."
+HOMEPAGE="http://www.netswarm.net"
 SRC_URI="http://www.netswarm.net/misc/${P}.tar.gz"
-HOMEPAGE="http://www.netswarm.net/"
-
-DEPEND="=x11-libs/gtk+-2*
-	dev-libs/dbus-glib
-	>=media-sound/audacious-1.4"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/dbus-glib
+	x11-libs/libX11
+	>=x11-libs/gtk+-2
+	>=media-sound/audacious-1.4"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	built_with_use media-sound/audacious dbus || \
+		die "needs media-sound/audacious with USE dbus."
+}
 
 src_compile() {
-	emake || die
+	tc-export CC
+	emake || die "emake failed."
 }
 
 src_install () {
-	make DESTDIR="${D}" PREFIX="/usr" install || die "make install failed"
-	dodoc README AUTHORS
+	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed."
+	dodoc AUTHORS README
 }