Revision bump, with patch to fix running on systems with recent gcc/glibc. Closes bug #142663.

Package-Manager: portage-2.1.1

6 files changed, 129 insertions, 10 deletions

diff --git a/x11-plugins/wmmixer/ChangeLog b/x11-plugins/wmmixer/ChangeLog
index 6c5b38284524..017f5a725abb 100644
--- a/x11-plugins/wmmixer/ChangeLog
+++ b/x11-plugins/wmmixer/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2006/01/31 19:56:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.9 2006/09/12 12:48:10 s4t4n Exp $
+
+*wmmixer-2.0_beta4 (12 Sep 2006)
+
+  12 Sep 2006; Michele Noberasco <s4t4n@gentoo.org> wmmixer-2.0_beta4-r1.ebuild:
+  Revision bump, with patch to fix running issues on systems with newer gcc/glibc.
+  Fixes bug #142663.
 
   31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   wmmixer-2.0_beta4.ebuild:
diff --git a/x11-plugins/wmmixer/Manifest b/x11-plugins/wmmixer/Manifest
index 4ed391f6a7c7..b5fe71807885 100644
--- a/x11-plugins/wmmixer/Manifest
+++ b/x11-plugins/wmmixer/Manifest
@@ -1,15 +1,31 @@
-MD5 57ccfcfbf440045af9ee0552bcccd36e ChangeLog 1041
-RMD160 fe5a262cb5131bf85ffab7eb742eb6f028fdf923 ChangeLog 1041
-SHA256 1af489a375aebf0b064647a0ddc8c1db07d489c3d3290baf6837e1dc8b2ca809 ChangeLog 1041
-MD5 9b925052e5249f001a659e0c353ff29f files/digest-wmmixer-2.0_beta4 65
-RMD160 5e013db8a4317a8b578d5ca288ef165886f5276e files/digest-wmmixer-2.0_beta4 65
-SHA256 72bd1e8c5a126994541e050e60205477e53a0a851bafa6654e1c0066a4b20e53 files/digest-wmmixer-2.0_beta4 65
+AUX wmmixer-2.0_beta4.gcc.patch 737 RMD160 c914556f65702b8cd4be9a228cb9ce1372d6ab8d SHA1 c9a81c72670fac43c0b749fa7ac1b5e218e6d508 SHA256 4ab78a11fb7ba7ae37575be1586a47b61ffa0ff69e10d0c9cddb6d37c27e1246
+MD5 372a96e35d8dfa8267def68967914c46 files/wmmixer-2.0_beta4.gcc.patch 737
+RMD160 c914556f65702b8cd4be9a228cb9ce1372d6ab8d files/wmmixer-2.0_beta4.gcc.patch 737
+SHA256 4ab78a11fb7ba7ae37575be1586a47b61ffa0ff69e10d0c9cddb6d37c27e1246 files/wmmixer-2.0_beta4.gcc.patch 737
+AUX wmmixer-cflags.patch 189 RMD160 e78d2920d44b5ebb14fc11f862fb7d5e8ecdb26c SHA1 08aaff016618b0c334937f9f93f1e22fbf3859c5 SHA256 ed906a5e991b52da0d1e85395f9a5e1fbbf40f768a9c9771209d6eb10028ae1e
 MD5 1ebe55fdb272383c1cae1db36a7ae320 files/wmmixer-cflags.patch 189
 RMD160 e78d2920d44b5ebb14fc11f862fb7d5e8ecdb26c files/wmmixer-cflags.patch 189
 SHA256 ed906a5e991b52da0d1e85395f9a5e1fbbf40f768a9c9771209d6eb10028ae1e files/wmmixer-cflags.patch 189
-MD5 e84eaa5e07fc9fe46f005861971b4b68 metadata.xml 310
-RMD160 8546219521cf9994a7259aaede5d57d62ed980c9 metadata.xml 310
-SHA256 630886836a1fea1a30357088ab42a2850734bd43b9a69e29fb5ddf790e72d994 metadata.xml 310
+DIST wmmixer-2.0b4.tar.gz 105985 RMD160 cc9c5c9d1c9c1d4153a6cf390b9079db0938e809 SHA1 a7b32977135406d7b29717eb3741e654ed96407c SHA256 0bb350bb6fc0da5cade3426df7ff821b5ec40b0d3aba67ddfcb981c1141c6ecc
+EBUILD wmmixer-2.0_beta4-r1.ebuild 1528 RMD160 809e4ca3291d94cb1a226503a93706df0daf3d55 SHA1 8c8bbbde3e19143cf721dd829844b5790f1e062d SHA256 ba53081a6d002415e65e664eab39ec60651c9aaa925b0664dfd2baaa04f8c6f5
+MD5 bb10cf7683bbdba12d5f5982f925d77a wmmixer-2.0_beta4-r1.ebuild 1528
+RMD160 809e4ca3291d94cb1a226503a93706df0daf3d55 wmmixer-2.0_beta4-r1.ebuild 1528
+SHA256 ba53081a6d002415e65e664eab39ec60651c9aaa925b0664dfd2baaa04f8c6f5 wmmixer-2.0_beta4-r1.ebuild 1528
+EBUILD wmmixer-2.0_beta4.ebuild 1442 RMD160 bab85f35e972d55a20bd6efbc6f1a7b270946a9c SHA1 648c8ef7b1c315dafe4511a3caa172a90e40d108 SHA256 7e43d929c0cebae3b58fec0b66ced66144b07b79e2ff709ce6d2edce58bbbbf5
 MD5 a8f11cde907fc18fdfa9bad6eb9ef28a wmmixer-2.0_beta4.ebuild 1442
 RMD160 bab85f35e972d55a20bd6efbc6f1a7b270946a9c wmmixer-2.0_beta4.ebuild 1442
 SHA256 7e43d929c0cebae3b58fec0b66ced66144b07b79e2ff709ce6d2edce58bbbbf5 wmmixer-2.0_beta4.ebuild 1442
+MISC ChangeLog 1258 RMD160 ced13360547101292fc78a08c2d7812de7fb69f6 SHA1 1a52e3aa51583ee6f1f7b02a2ff4899b2bcffe50 SHA256 3f2252d53803b79559c8d75e3e06ebb3a7f9445967cb61efbe1e6d99cf2fb364
+MD5 b25dfbc9c906d1bb3d8fd883d4913db3 ChangeLog 1258
+RMD160 ced13360547101292fc78a08c2d7812de7fb69f6 ChangeLog 1258
+SHA256 3f2252d53803b79559c8d75e3e06ebb3a7f9445967cb61efbe1e6d99cf2fb364 ChangeLog 1258
+MISC metadata.xml 310 RMD160 8546219521cf9994a7259aaede5d57d62ed980c9 SHA1 89ac21868177ce142226012086b768b52f325f61 SHA256 630886836a1fea1a30357088ab42a2850734bd43b9a69e29fb5ddf790e72d994
+MD5 e84eaa5e07fc9fe46f005861971b4b68 metadata.xml 310
+RMD160 8546219521cf9994a7259aaede5d57d62ed980c9 metadata.xml 310
+SHA256 630886836a1fea1a30357088ab42a2850734bd43b9a69e29fb5ddf790e72d994 metadata.xml 310
+MD5 c325922e2ab0f3f7d591ffc880264139 files/digest-wmmixer-2.0_beta4 241
+RMD160 0f83d13e20ca8ae409a67d911ae8477f40dfafeb files/digest-wmmixer-2.0_beta4 241
+SHA256 ada831c376de0f37a3c323fdaedf60efd2619ed585b9f85f780dcc643cc013da files/digest-wmmixer-2.0_beta4 241
+MD5 c325922e2ab0f3f7d591ffc880264139 files/digest-wmmixer-2.0_beta4-r1 241
+RMD160 0f83d13e20ca8ae409a67d911ae8477f40dfafeb files/digest-wmmixer-2.0_beta4-r1 241
+SHA256 ada831c376de0f37a3c323fdaedf60efd2619ed585b9f85f780dcc643cc013da files/digest-wmmixer-2.0_beta4-r1 241
diff --git a/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4 b/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4
index e6b627bd3667..e984a77c2c36 100644
--- a/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4
+++ b/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4
@@ -1 +1,3 @@
 MD5 8ac38fbbdc3064e902c87df0b3ef3b64 wmmixer-2.0b4.tar.gz 105985
+RMD160 cc9c5c9d1c9c1d4153a6cf390b9079db0938e809 wmmixer-2.0b4.tar.gz 105985
+SHA256 0bb350bb6fc0da5cade3426df7ff821b5ec40b0d3aba67ddfcb981c1141c6ecc wmmixer-2.0b4.tar.gz 105985
diff --git a/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4-r1 b/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4-r1
new file mode 100644
index 000000000000..e984a77c2c36
--- /dev/null
+++ b/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4-r1
@@ -0,0 +1,3 @@
+MD5 8ac38fbbdc3064e902c87df0b3ef3b64 wmmixer-2.0b4.tar.gz 105985
+RMD160 cc9c5c9d1c9c1d4153a6cf390b9079db0938e809 wmmixer-2.0b4.tar.gz 105985
+SHA256 0bb350bb6fc0da5cade3426df7ff821b5ec40b0d3aba67ddfcb981c1141c6ecc wmmixer-2.0b4.tar.gz 105985
diff --git a/x11-plugins/wmmixer/files/wmmixer-2.0_beta4.gcc.patch b/x11-plugins/wmmixer/files/wmmixer-2.0_beta4.gcc.patch
new file mode 100644
index 000000000000..590c2d1698e2
--- /dev/null
+++ b/x11-plugins/wmmixer/files/wmmixer-2.0_beta4.gcc.patch
@@ -0,0 +1,24 @@
+diff -Naur wmmixer-2.0b4/src/dockapp.cc wmmixer-2.0b4.new/src/dockapp.cc
+--- wmmixer-2.0b4/src/dockapp.cc	2003-03-12 21:54:16.000000000 +0100
++++ wmmixer-2.0b4.new/src/dockapp.cc	2006-09-12 14:36:27.000000000 +0200
+@@ -24,7 +24,7 @@
+   {
+     theme_ = new Theme(theme_file);
+     theme_->initImages(getXHandler());
+-    icons_ = new unsigned[theme_->icon_num_];
++    icons_ = new unsigned[mixer->getNumChannels()];
+   }
+   catch(InvalidThemeException& e)
+   {
+diff -Naur wmmixer-2.0b4/src/theme.cc wmmixer-2.0b4.new/src/theme.cc
+--- wmmixer-2.0b4/src/theme.cc	2003-03-12 21:48:20.000000000 +0100
++++ wmmixer-2.0b4.new/src/theme.cc	2006-09-12 14:33:35.000000000 +0200
+@@ -33,8 +33,6 @@
+   }
+ 
+ 
+-  delete config;
+-  config = NULL;
+ 
+ }
+ 
diff --git a/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild b/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..94c918d0263a
--- /dev/null
+++ b/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 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.1 2006/09/12 12:48:10 s4t4n Exp $
+
+inherit eutils
+
+IUSE="alsa oss"
+
+DESCRIPTION="The next generation of WMMixer with native ALSA and OSS support."
+SRC_URI="http://freakzone.net/gordon/src/${PN}-2.0b4.tar.gz"
+HOMEPAGE="http://freakzone.net/gordon/#wmmixer"
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )
+	alsa? ( media-libs/alsa-lib )
+	>=sys-apps/sed-4"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~mips"
+
+S="${WORKDIR}/${PN}-2.0b4"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	sed -i 's#/usr/local/share#/usr/share#g' src/wmmixer.h example/*
+
+	# Allow use of Gentoo CXXFLAGS
+	epatch ${FILESDIR}/${PN}-cflags.patch
+
+	# Fix compilation issues with recent gcc versions
+	epatch ${FILESDIR}/${P}.gcc.patch
+}
+
+src_compile() {
+
+	local myconf=""
+
+	if use alsa ; then
+		myconf="${myconf} --enable-alsa"
+	elif use oss ; then
+		myconf="${myconf} --disable-alsatest --enable-oss"
+	fi
+
+	econf "${myconf}" || die
+	emake || die
+}
+
+src_install() {
+
+	einstall || die
+	dodoc README AUTHORS example/home.wmmixerrc example/home.wmmixer
+
+	einfo
+	einfo "Two sample configuration files have been installed in /usr/share/doc/${PF}/."
+	einfo "You can copy one of them to ~/.wmmixerrc and adjust any settings you may need."
+	einfo
+}