*** empty log message ***import-1.1.1

6 files changed, 68 insertions, 19 deletions

diff --git a/x11-plugins/wmxmms/ChangeLog b/x11-plugins/wmxmms/ChangeLog
index 543b847249e1..8cf09b3164d5 100644
--- a/x11-plugins/wmxmms/ChangeLog
+++ b/x11-plugins/wmxmms/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for x11-plugins/wmxmms
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.1 2003/09/15 12:27:35 seemant Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
+
+  19 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  wmxmms-0.1.4-r1.ebuild:
+  Stable on hppa.
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> wmxmms-0.1.4-r1.ebuild:
+  Mark 0.1.4-r1 stable on alpha
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wmxmms-0.1.4-r1.ebuild:
+  Stable on ppc.
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmxmms-0.1.4-r1.ebuild:
+  Stable for x86.
+
+  10 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmxmms-0.1.4-r1.ebuild:
+  Updating middle-click patch, following feedback on bug #88280.
+
+*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:
+  Masked wmxmms-0.1.4.ebuild stable for ppc
+
+  12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> wmxmms-0.1.4.ebuild:
+  Fix bug #44407 by doing a make clean first.  Stable on x86.
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> wmxmms-0.1.4.ebuild:
+  Marking stable on hppa
 
 *wmxmms-0.1.4 (15 Sep 2003)
 
diff --git a/x11-plugins/wmxmms/Manifest b/x11-plugins/wmxmms/Manifest
index 6a1fbfcfcac2..53c38794bb2f 100644
--- a/x11-plugins/wmxmms/Manifest
+++ b/x11-plugins/wmxmms/Manifest
@@ -1,2 +1,7 @@
-MD5 52fff9cd5c726c7068af194d30b4d248 wmxmms-0.1.4.ebuild 596
+MD5 ace61d8e88ef94031a60eca1cdf799be ChangeLog 1492
+MD5 9162353667ec0175ad70c2ebd19dfd68 metadata.xml 373
+MD5 f2e9568ea8c859c3e87bbe9794ecafe6 wmxmms-0.1.4-r1.ebuild 866
+MD5 39afe28034765f9235b0932a69b6702b wmxmms-0.1.4.ebuild 778
 MD5 2dd715c79fa48ffa17ea698557aa7644 files/digest-wmxmms-0.1.4 64
+MD5 2dd715c79fa48ffa17ea698557aa7644 files/digest-wmxmms-0.1.4-r1 64
+MD5 c3b76c61cc652d22913743beced8b89b files/wmxmms-middle-click.patch 1354
diff --git a/x11-plugins/wmxmms/files/wmxmms-middle-click.patch b/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
index ef452a49a6cd..5365e5de9c92 100644
--- a/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
+++ b/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
@@ -1,7 +1,8 @@
+Common subdirectories: ../WMxmms-0.1.4.orig/src/.xvpics and src/.xvpics
 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 @@
+--- ../WMxmms-0.1.4.orig/src/xmms_func.c	2003-03-31 10:40:23.000000000 -0700
++++ src/xmms_func.c	2005-04-28 15:55:08.000000000 -0600
+@@ -110,17 +110,39 @@
  {
         char *command;
         int status;
@@ -24,12 +25,20 @@ diff -u ../WMxmms-0.1.4.orig/src/xmms_func.c src/xmms_func.c
 -        }
 -       while (!xmms_remote_is_running(xmms_session))
 +
-+       while (!xmms_remote_is_running(xmms_session) && count < 30) {
++       while (!xmms_remote_is_running(xmms_session) && count < 1800) {
         		usleep(10000L);
 +		count++;
++		if( (count % 60) == 0 )
++		  {
++		    fprintf(stderr,
++			    "There may be a problem starting XMMS, or the "
++			    "XMMS remote is not running. Sleeping for 5 "
++			    "seconds and checking for the remote again.\n");
++		    sleep(5);
++		  }
 +       }
 +
-+       if( (count == 30) && status){
++       if( (count == 1800) && status){
 +      		fprintf(stderr, 
 +			"status(%d) XMMS can't be launched, exiting...\n",
 +			status);
@@ -39,6 +48,3 @@ diff -u ../WMxmms-0.1.4.orig/src/xmms_func.c src/xmms_func.c
         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/metadata.xml b/x11-plugins/wmxmms/metadata.xml
index 17bae13e535f..d24caa34a2f2 100644
--- a/x11-plugins/wmxmms/metadata.xml
+++ b/x11-plugins/wmxmms/metadata.xml
@@ -1,5 +1,3 @@
- * Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild b/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
index 1cd1a8246f7d..43c82fbaeea9 100644
--- a/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
+++ b/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="alpha ~amd64 hppa ppc ~sparc x86"
 
 DEPEND="virtual/x11
 	media-sound/xmms"
diff --git a/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild b/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
index d6ac3f3efc6d..bc2a1763473b 100644
--- a/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
+++ b/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/09/15 12:27:35 seemant Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/wm/WM}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="WMaker DockApp: XMMS Control App"
@@ -11,11 +11,19 @@ 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 ~mips ~arm"
+KEYWORDS="x86 ppc ~sparc ~alpha hppa amd64"
 
 DEPEND="virtual/x11
 	media-sound/xmms"
 
+src_unpack() {
+	unpack ${A}
+
+	# Fix bug #44407
+	cd ${S}
+	make clean
+}
+
 src_compile() {
 	econf || die
 	emake OPT="${CFLAGS}" || die