Revision bump, with patch for bug #301800.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 60 insertions, 13 deletions

diff --git a/x11-plugins/wmix/ChangeLog b/x11-plugins/wmix/ChangeLog
index d193794d2a1c..eb759ae70fd7 100644
--- a/x11-plugins/wmix/ChangeLog
+++ b/x11-plugins/wmix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmix
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.19 2009/06/04 00:19:01 tcunha Exp $
+# Copyright 2002-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.20 2010/02/23 11:01:31 s4t4n Exp $
+
+*wmix-3.1-r1 (19 Jul 2004)
+
+  23 Feb 2010; Michele Noberasco <s4t4n@gentoo.org> wmix-3.1-r2.ebuild:
+  Revision bump, with patch for bug #301800.
 
   04 Jun 2009; Tiago Cunha <tcunha@gentoo.org> wmix-3.1-r1.ebuild:
   stable sparc, bug 215651
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index dab5158d18cb..2a2e02f4f101 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fix-wmix-3.1-version-number.patch 277 RMD160 8ed862fc0bf1f5211021afd19a69adca5092678b SHA1 f3be24ee99cbde54a22f83b2370382eb84c986bd SHA256 4a011d63764512bad61cf372a4e5294ba0b7e1e88ac90ca90a60c4597dbddcd4
+AUX wmix-fix-free.patch 363 RMD160 ae378989b0a78f093fd664500835654780ccdc1b SHA1 c530f16aa0c8d0cf2602ba9e4fcd416fdfeb9250 SHA256 3737b60bbc024e40f7a4f0682d41e4da6133f6abbfddaf461b5f979fe2fa5645
 AUX wmix.1 1969 RMD160 df8d323459a9e74d19aef5b3cbf016aa49f2c7fd SHA1 2d3a685f6b776c68281113d5f6f6970570c54ef1 SHA256 5eb8f9031618a26a28357a3c9721199127fcc3297fd0b591c40553d4404cfc6f
 DIST wmix-3.1.tar.gz 21344 RMD160 377eab8e3816d0f625f8599428a99a7f3adc0c26 SHA1 99a1222fa18abe54a04bf88817f6afdec7891799 SHA256 4b2a042768a685ed8d30e6a7ed6bd4e13022665c9d772545654c89ec1437e322
 EBUILD wmix-3.1-r1.ebuild 913 RMD160 c0514651c22276e644ca6bc164c52e97aef15918 SHA1 860db2b8000030662089e88ea2e5b29b7ed25892 SHA256 3ffce698d5c1def3c9c4dac6b1a74cbbbb5c907cc297350429cbe82b025c1a25
-MISC ChangeLog 2331 RMD160 feada5cf30d29e56797066cd1fc4e02c47829317 SHA1 98bf1f0d1767ea2ed26fb48d9a6d62db32b06f8c SHA256 c1a3ae4dde92a72e11ea08cad6501808cd09c6d4adc9797fd2d4e3933102d00c
+EBUILD wmix-3.1-r2.ebuild 957 RMD160 5ddaa64bbf0d26de5569c0a75008fe09df5e221d SHA1 a14413c82ca16558a996bffc1ba8143bfa89c69d SHA256 ac9561f4a972f06f1381388040caa421d17001e92d0a73a5a4e04852f5e10a7a
+MISC ChangeLog 2476 RMD160 aefbb424f001aa595621fa015b6511569c4c2602 SHA1 b841140b441de1128a67ca4f1549305418dcb711 SHA256 91be1e66eae16cb12fcfc65ec705046d87d3f128c4f334eb35fc085545eae1e7
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkonEvwACgkQAgIglOz4paAeOACglNl6IVtf5ASdn4H8wex7bazZ
-hFoAn1lMznAnOEiPYQsDPj0NBzHilrqA
-=zB3o
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmix/files/wmix-fix-free.patch b/x11-plugins/wmix/files/wmix-fix-free.patch
new file mode 100644
index 000000000000..340f91771fa7
--- /dev/null
+++ b/x11-plugins/wmix/files/wmix-fix-free.patch
@@ -0,0 +1,11 @@
+--- wmix.c.orig	2004-05-12 21:30:53.000000000 -0300
++++ wmix.c	2009-07-08 00:20:28.000000000 -0300
+@@ -134,7 +134,7 @@
+     }
+ 
+     /* handle writing PID file, silently ignore if we can't do it */
+-    pid = calloc(1, strlen(home) + 10);
++    pid = calloc(1, strlen(home) + 11);
+     sprintf(pid, "%s/.wmix.pid", home);
+     fp = fopen(pid, "w");
+     if (fp) {
diff --git a/x11-plugins/wmix/wmix-3.1-r2.ebuild b/x11-plugins/wmix/wmix-3.1-r2.ebuild
new file mode 100644
index 000000000000..4227b35e31e5
--- /dev/null
+++ b/x11-plugins/wmix/wmix-3.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/wmix-3.1-r2.ebuild,v 1.1 2010/02/23 11:01:31 s4t4n Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Dockapp mixer for OSS or ALSA"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/fix-wmix-3.1-version-number.patch
+	epatch "${FILESDIR}"/wmix-fix-free.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+	doman "${FILESDIR}"/${PN}.1
+	dodoc AUTHORS BUGS NEWS README sample.wmixrc
+}