Wiped out broken oss support, fixing bug #150652.

Package-Manager: portage-2.1.1-r2

diff --git a/x11-plugins/wmmixer/ChangeLog b/x11-plugins/wmmixer/ChangeLog
index c13c3b66edb376559172e710b434bc917f7c5c9b..ee05c9705e4caa79f6e39a3c8dfc44c9e5613af4 100644 (file)
--- a/x11-plugins/wmmixer/ChangeLog
+++ b/x11-plugins/wmmixer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmixer
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.11 2006/10/15 19:31:46 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.12 2007/01/25 16:11:30 s4t4n Exp $
+
+  25 Jan 2007; Michele Noberasco <s4t4n@gentoo.org> wmmixer-2.0_beta4-r1.ebuild:
+  Fix DEPEND and RDEPEND. Wiped out broken oss support. Fixes bug #150652.
 
   15 Oct 2006; Jason Wever <weeve@gentoo.org> wmmixer-2.0_beta4-r1.ebuild:
   Stable on SPARC wrt bug #142663.

diff --git a/x11-plugins/wmmixer/Manifest b/x11-plugins/wmmixer/Manifest
index 02dec086d3edf505defbab04148f59a054bb9f6e..96ef1dae8ac95e0d0be8a559a8a91476daf233a2 100644 (file)
--- a/x11-plugins/wmmixer/Manifest
+++ b/x11-plugins/wmmixer/Manifest
@@ -7,14 +7,14 @@ MD5 1ebe55fdb272383c1cae1db36a7ae320 files/wmmixer-cflags.patch 189
 RMD160 e78d2920d44b5ebb14fc11f862fb7d5e8ecdb26c files/wmmixer-cflags.patch 189
 SHA256 ed906a5e991b52da0d1e85395f9a5e1fbbf40f768a9c9771209d6eb10028ae1e files/wmmixer-cflags.patch 189
 DIST wmmixer-2.0b4.tar.gz 105985 RMD160 cc9c5c9d1c9c1d4153a6cf390b9079db0938e809 SHA1 a7b32977135406d7b29717eb3741e654ed96407c SHA256 0bb350bb6fc0da5cade3426df7ff821b5ec40b0d3aba67ddfcb981c1141c6ecc
-EBUILD wmmixer-2.0_beta4-r1.ebuild 1526 RMD160 4294bc26449cc78a7f93921b0ebefca007053875 SHA1 8a54e5f2ca72068218003b6942b3bd9f79847154 SHA256 b36f0f9d7e43b49eab339d1c786c7cb719e3356c8fa00bc61d2afaf967774d10
-MD5 d45fa47edaf6f11acdccd9b67ae29960 wmmixer-2.0_beta4-r1.ebuild 1526
-RMD160 4294bc26449cc78a7f93921b0ebefca007053875 wmmixer-2.0_beta4-r1.ebuild 1526
-SHA256 b36f0f9d7e43b49eab339d1c786c7cb719e3356c8fa00bc61d2afaf967774d10 wmmixer-2.0_beta4-r1.ebuild 1526
-MISC ChangeLog 1501 RMD160 ec028071b28018358d5f187437e17be12cc606e8 SHA1 fb7cb35e6722d64977a808de79a55c716310545f SHA256 5a05068322181671e8dc59c4023871e787366e479792ce5689aa759a4765cd42
-MD5 fe0e7b2c86937da3411a43582a09f4ba ChangeLog 1501
-RMD160 ec028071b28018358d5f187437e17be12cc606e8 ChangeLog 1501
-SHA256 5a05068322181671e8dc59c4023871e787366e479792ce5689aa759a4765cd42 ChangeLog 1501
+EBUILD wmmixer-2.0_beta4-r1.ebuild 1423 RMD160 5733f04cf13caea441cb1dcf8ee6583e74729af4 SHA1 735ee574639c784458825fcd6d66c8cee0e6f4d7 SHA256 c8a281750e0d7ce8fde0d63c79e5ca83fb129b30d45a507b2779de0472c9453f
+MD5 5a52f9afcec43942a13d6e8f2edb50b3 wmmixer-2.0_beta4-r1.ebuild 1423
+RMD160 5733f04cf13caea441cb1dcf8ee6583e74729af4 wmmixer-2.0_beta4-r1.ebuild 1423
+SHA256 c8a281750e0d7ce8fde0d63c79e5ca83fb129b30d45a507b2779de0472c9453f wmmixer-2.0_beta4-r1.ebuild 1423
+MISC ChangeLog 1658 RMD160 7aa82f2ca37c6ae976e608fcecc8f9c1fe042a27 SHA1 45d4447064efd8648ef9a59e37707cb4190e9c55 SHA256 4be4c98f677d1eab889717793074b3219f1ff17e93d80b990701b5a04fd66b31
+MD5 ed00feff59ee619be3dee58c28ffc82e ChangeLog 1658
+RMD160 7aa82f2ca37c6ae976e608fcecc8f9c1fe042a27 ChangeLog 1658
+SHA256 4be4c98f677d1eab889717793074b3219f1ff17e93d80b990701b5a04fd66b31 ChangeLog 1658
 MISC metadata.xml 310 RMD160 8546219521cf9994a7259aaede5d57d62ed980c9 SHA1 89ac21868177ce142226012086b768b52f325f61 SHA256 630886836a1fea1a30357088ab42a2850734bd43b9a69e29fb5ddf790e72d994
 MD5 e84eaa5e07fc9fe46f005861971b4b68 metadata.xml 310
 RMD160 8546219521cf9994a7259aaede5d57d62ed980c9 metadata.xml 310

diff --git a/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild b/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild
index 5c13c8a14aa5b755dd2a19d1514be8e7e469fb42..ffafc8b80186cec1558080455e9cd13b8d2dccd2 100644 (file)
--- a/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild
+++ b/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild,v 1.3 2006/10/15 19:31:46 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild,v 1.4 2007/01/25 16:11:30 s4t4n Exp $
 
 inherit eutils
 
-IUSE="alsa oss"
+IUSE="alsa"
 
 DESCRIPTION="The next generation of WMMixer with native ALSA and OSS support."
 SRC_URI="http://freakzone.net/gordon/src/${PN}-2.0b4.tar.gz"
@@ -13,14 +13,12 @@ HOMEPAGE="http://freakzone.net/gordon/#wmmixer"
 RDEPEND="|| ( (
                x11-libs/libX11
                x11-libs/libXext
-               x11-libs/libXpm )
-       virtual/x11 )"
-DEPEND="${RDEPEND}
-       || ( (
+               x11-libs/libXpm
                x11-proto/xproto
                x11-proto/xextproto )
        virtual/x11 )
-       alsa? ( media-libs/alsa-lib )
+       alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}
        >=sys-apps/sed-4"
 
 SLOT="0"
@@ -48,8 +46,6 @@ src_compile() {
 
        if use alsa ; then
                myconf="${myconf} --enable-alsa"
-       elif use oss ; then
-               myconf="${myconf} --disable-alsatest --enable-oss"
        fi
 
        econf "${myconf}" || die