Revision bump, adding patch to fix bug #88280

(Portage version: 2.0.51.19)

6 files changed, 99 insertions, 5 deletions

diff --git a/x11-plugins/wmxmms/ChangeLog b/x11-plugins/wmxmms/ChangeLog
index 38267c235ba0..9a015556c429 100644
--- a/x11-plugins/wmxmms/ChangeLog
+++ b/x11-plugins/wmxmms/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmxmms
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.5 2004/09/02 18:22:41 pvdabeel Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.6 2005/04/11 08:52:04 s4t4n Exp $
+
+*wmxmms-0.1.4-r1 (11 Apr 2005)
+
+  11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmxmms-0.1.4-r1.ebuild:
+  Revision, bump, adding patch to fix #88280.
 
   02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   wmxmms-0.1.4.ebuild:
diff --git a/x11-plugins/wmxmms/Manifest b/x11-plugins/wmxmms/Manifest
index 5dcaf84f66d9..59af93e7874a 100644
--- a/x11-plugins/wmxmms/Manifest
+++ b/x11-plugins/wmxmms/Manifest
@@ -1,4 +1,7 @@
+MD5 40627acaf8c7b482c601f1e59612df8a wmxmms-0.1.4-r1.ebuild 764
+MD5 738c00001a0357ed739f7c79113b9320 wmxmms-0.1.4.ebuild 781
 MD5 30b99e53594a87a4fdbde38dee764a55 ChangeLog 794
 MD5 9162353667ec0175ad70c2ebd19dfd68 metadata.xml 373
-MD5 97ca2afac68bb485954069ba02573490 wmxmms-0.1.4.ebuild 781
+MD5 2dd715c79fa48ffa17ea698557aa7644 files/digest-wmxmms-0.1.4-r1 64
+MD5 ce26cc20af2386f5279b50df9aea2a26 files/wmxmms-middle-click.patch 1183
 MD5 2dd715c79fa48ffa17ea698557aa7644 files/digest-wmxmms-0.1.4 64
diff --git a/x11-plugins/wmxmms/files/digest-wmxmms-0.1.4-r1 b/x11-plugins/wmxmms/files/digest-wmxmms-0.1.4-r1
new file mode 100644
index 000000000000..7fd4fb2b3dac
--- /dev/null
+++ b/x11-plugins/wmxmms/files/digest-wmxmms-0.1.4-r1
@@ -0,0 +1 @@
+MD5 b7fc2b01340f267b7f29b608d3f63a98 WMxmms-0.1.4.tar.gz 269610
diff --git a/x11-plugins/wmxmms/files/wmxmms-middle-click.patch b/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
new file mode 100644
index 000000000000..ef452a49a6cd
--- /dev/null
+++ b/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
@@ -0,0 +1,44 @@
+diff -u ../WMxmms-0.1.4.orig/src/xmms_func.c src/xmms_func.c
+--- ../WMxmms-0.1.4.orig/src/xmms_func.c	2005-03-21 11:51:47.375860272 -0700
++++ src/xmms_func.c	2005-03-21 11:42:37.106513928 -0700
+@@ -113,17 +113,31 @@
+ {
+        char *command;
+        int status;
++       int count = 0;
++
++       if( xmms_remote_is_running(xmms_session) ) 
++	 {
++	   fprintf(stderr, "XMMS is already running...");
++	   return;
++	 }
+ 
+        command=malloc(strlen(xmms_cmd)+5);
+        sprintf(command, "%s &", xmms_cmd);
++
+        status = system(command);
+-       if (status)
+-        {
+-      		fprintf(stderr, "XMMS can't be launched, exiting...");
+-      		exit(1);
+-        }
+-       while (!xmms_remote_is_running(xmms_session))
++
++       while (!xmms_remote_is_running(xmms_session) && count < 30) {
+        		usleep(10000L);
++		count++;
++       }
++
++       if( (count == 30) && status){
++      		fprintf(stderr, 
++			"status(%d) XMMS can't be launched, exiting...\n",
++			status);
++      		exit(1);
++       }
++
+        free(command);
+ }
+ 
+Only in ../WMxmms-0.1.4.orig/src: xmms_func.c.orig
+Only in src: .xmms_func.c.swp
+Common subdirectories: ../WMxmms-0.1.4.orig/src/.xvpics and src/.xvpics
diff --git a/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild b/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..1cd1a8246f7d
--- /dev/null
+++ b/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild,v 1.1 2005/04/11 08:52:04 s4t4n Exp $
+
+inherit eutils
+
+IUSE=""
+MY_P=${P/wm/WM}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="WMaker DockApp: XMMS Control App"
+HOMEPAGE="http://www.dockapps.com/file.php/id/172/"
+SRC_URI="http://www.dockapps.com/download.php/id/252/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+
+DEPEND="virtual/x11
+	media-sound/xmms"
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix bug #44407
+	cd ${S}
+	make clean
+
+	# Fix bug #88280
+	epatch ${FILESDIR}/wmxmms-middle-click.patch
+}
+
+src_compile() {
+	econf || die
+	emake OPT="${CFLAGS}" || die
+}
+
+src_install() {
+	dobin src/WMxmms
+	dodoc AUTHORS ChangeLog README THANKS TODO
+	doman doc/WMxmms.1
+}
diff --git a/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild b/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
index c8ca85651b8f..109d977dd38a 100644
--- a/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
+++ b/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild,v 1.8 2004/09/02 18:22:41 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild,v 1.9 2005/04/11 08:52:04 s4t4n Exp $
 
 IUSE=""
 MY_P=${P/wm/WM}