Dropped ppc-macos keyword, see you in prefix

(Portage version: 2.1.2.2)

6 files changed, 16 insertions, 133 deletions

diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index 76c118a4ea8d..75ed7586b1cb 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/esound
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.94 2007/03/22 20:22:19 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.95 2007/05/10 08:08:16 grobian Exp $
+
+  10 May 2007; Fabian Groffen <grobian@gentoo.org>
+  -files/esound-0.2.36-ppc-macos.patch, esound-0.2.36-r1.ebuild,
+  esound-0.2.36-r2.ebuild, esound-0.2.37.ebuild, esound-0.2.37-r1.ebuild:
+  Dropped ppc-macos keyword, see you in prefix
 
   22 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
   +files/esound-0.2.37-cpu-drain.patch:
diff --git a/media-sound/esound/esound-0.2.36-r1.ebuild b/media-sound/esound/esound-0.2.36-r1.ebuild
index 68011b3fa69e..d30d187d2940 100644
--- a/media-sound/esound/esound-0.2.36-r1.ebuild
+++ b/media-sound/esound/esound-0.2.36-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.20 2006/09/24 19:49:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.21 2007/05/10 08:08:16 grobian Exp $
 
 WANT_AUTOMAKE=1.8
 inherit libtool gnome.org eutils autotools
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="alsa debug ipv6 static tcpd"
 
 # esound comes with arts support, but it hasn't been tested yet, feel free to
@@ -29,9 +29,6 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${PN}-0.2.32-amd64.patch
-	# please note, this is a conditional, version specific patch!!!
-	# when bumping avoid bugs like #103969
-	use ppc-macos && epatch ${FILESDIR}/${P}-ppc-macos.patch
 
 	epatch "${FILESDIR}/${P}-mode_t.patch"
 	epatch "${FILESDIR}/${P}-asneeded.patch"
diff --git a/media-sound/esound/esound-0.2.36-r2.ebuild b/media-sound/esound/esound-0.2.36-r2.ebuild
index 0d8b6bf66277..b4d57525a58d 100644
--- a/media-sound/esound/esound-0.2.36-r2.ebuild
+++ b/media-sound/esound/esound-0.2.36-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/media-sound/esound/esound-0.2.36-r2.ebuild,v 1.22 2006/11/13 21:58:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r2.ebuild,v 1.23 2007/05/10 08:08:16 grobian Exp $
 
 WANT_AUTOMAKE=1.8
 inherit libtool gnome.org eutils autotools flag-o-matic
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc-macos ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="alsa debug ipv6 tcpd"
 
 # esound comes with arts support, but it hasn't been tested yet, feel free to
@@ -29,9 +29,6 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-0.2.32-amd64.patch"
-	# please note, this is a conditional, version specific patch!!!
-	# when bumping avoid bugs like #103969
-	use ppc-macos && epatch "${FILESDIR}/${P}-ppc-macos.patch"
 
 	epatch "${FILESDIR}/${P}-mode_t.patch"
 	epatch "${FILESDIR}/${P}-asneeded.patch"
diff --git a/media-sound/esound/esound-0.2.37-r1.ebuild b/media-sound/esound/esound-0.2.37-r1.ebuild
index 7df5bd3b9018..24946d548902 100644
--- a/media-sound/esound/esound-0.2.37-r1.ebuild
+++ b/media-sound/esound/esound-0.2.37-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.37-r1.ebuild,v 1.1 2007/03/22 20:22:19 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.37-r1.ebuild,v 1.2 2007/05/10 08:08:16 grobian Exp $
 
 WANT_AUTOMAKE=1.10
 inherit libtool gnome.org eutils autotools flag-o-matic
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="alsa debug ipv6 tcpd"
 
 # esound comes with arts support, but it hasn't been tested yet, feel free to
@@ -29,9 +29,6 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-0.2.32-amd64.patch"
-	# please note, this is a conditional, version specific patch!!!
-	# when bumping avoid bugs like #103969
-	use ppc-macos && epatch "${FILESDIR}/${PN}-0.2.36-ppc-macos.patch"
 
 	epatch "${FILESDIR}/${PN}-0.2.36-mode_t.patch"
 	epatch "${FILESDIR}/${PN}-0.2.36-asneeded.patch"
diff --git a/media-sound/esound/esound-0.2.37.ebuild b/media-sound/esound/esound-0.2.37.ebuild
index 545791cd680d..8e582971444b 100644
--- a/media-sound/esound/esound-0.2.37.ebuild
+++ b/media-sound/esound/esound-0.2.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.37.ebuild,v 1.2 2007/03/19 18:53:21 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.37.ebuild,v 1.3 2007/05/10 08:08:16 grobian Exp $
 
 WANT_AUTOMAKE=1.10
 inherit libtool gnome.org eutils autotools flag-o-matic
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="alsa debug ipv6 tcpd"
 
 # esound comes with arts support, but it hasn't been tested yet, feel free to
@@ -29,9 +29,6 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-0.2.32-amd64.patch"
-	# please note, this is a conditional, version specific patch!!!
-	# when bumping avoid bugs like #103969
-	use ppc-macos && epatch "${FILESDIR}/${PN}-0.2.36-ppc-macos.patch"
 
 	epatch "${FILESDIR}/${PN}-0.2.36-mode_t.patch"
 	epatch "${FILESDIR}/${PN}-0.2.36-asneeded.patch"
diff --git a/media-sound/esound/files/esound-0.2.36-ppc-macos.patch b/media-sound/esound/files/esound-0.2.36-ppc-macos.patch
deleted file mode 100644
index de85af43a16a..000000000000
--- a/media-sound/esound/files/esound-0.2.36-ppc-macos.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ur esound-0.2.36/Makefile.in esound-0.2.36-patched/Makefile.in
---- esound-0.2.36/Makefile.in	2005-06-07 09:04:14.000000000 +0800
-+++ esound-0.2.36-patched/Makefile.in	2005-08-28 14:17:07.000000000 +0800
-@@ -93,37 +93,37 @@
- esd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- am_esdcat_OBJECTS = esdcat.$(OBJEXT)
- esdcat_OBJECTS = $(am_esdcat_OBJECTS)
--esdcat_LDADD = $(LDADD)
-+esdcat_LDADD = $(LDADD) $(SOUND_LIBS)
- esdcat_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
- am__esdctl_SOURCES_DIST = getopt.c getopt1.c esdctl.c
- am_esdctl_OBJECTS = $(am__objects_2) esdctl.$(OBJEXT)
- esdctl_OBJECTS = $(am_esdctl_OBJECTS)
--esdctl_LDADD = $(LDADD)
-+esdctl_LDADD = $(LDADD) $(SOUND_LIBS)
- esdctl_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
- am_esdfilt_OBJECTS = esdfilt.$(OBJEXT)
- esdfilt_OBJECTS = $(am_esdfilt_OBJECTS)
--esdfilt_LDADD = $(LDADD)
-+esdfilt_LDADD = $(LDADD) $(SOUND_LIBS)
- esdfilt_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
- am_esdloop_OBJECTS = esdloop.$(OBJEXT)
- esdloop_OBJECTS = $(am_esdloop_OBJECTS)
--esdloop_LDADD = $(LDADD)
-+esdloop_LDADD = $(LDADD) $(SOUND_LIBS)
- esdloop_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
- am_esdmon_OBJECTS = esdmon.$(OBJEXT)
- esdmon_OBJECTS = $(am_esdmon_OBJECTS)
--esdmon_LDADD = $(LDADD)
-+esdmon_LDADD = $(LDADD) $(SOUND_LIBS)
- esdmon_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
- am__esdplay_SOURCES_DIST = getopt.c getopt1.c esdplay.c
- am_esdplay_OBJECTS = $(am__objects_2) esdplay.$(OBJEXT)
- esdplay_OBJECTS = $(am_esdplay_OBJECTS)
--esdplay_LDADD = $(LDADD)
-+esdplay_LDADD = $(LDADD) $(SOUND_LIBS)
- esdplay_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
- am_esdrec_OBJECTS = esdrec.$(OBJEXT)
- esdrec_OBJECTS = $(am_esdrec_OBJECTS)
--esdrec_LDADD = $(LDADD)
-+esdrec_LDADD = $(LDADD) $(SOUND_LIBS)
- esdrec_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
- am_esdsample_OBJECTS = esdsample.$(OBJEXT)
- esdsample_OBJECTS = $(am_esdsample_OBJECTS)
--esdsample_LDADD = $(LDADD)
-+esdsample_LDADD = $(LDADD) $(SOUND_LIBS)
- esdsample_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(bin_SCRIPTS)
-@@ -422,7 +422,7 @@
- 	esdplay.c
- 
- LDADD = libesd.la $(AUDIOFILE_LIBS)
--esd_LDADD = $(WRAP_LIB) $(LDADD)
-+esd_LDADD = $(WRAP_LIB) $(LDADD) $(SOUND_LIBS)
- m4datadir = $(datadir)/aclocal
- m4data_DATA = esd.m4
- esdconfdir = $(sysconfdir)
-diff -ur esound-0.2.36/esd.c esound-0.2.36-patched/esd.c
---- esound-0.2.36/esd.c	2005-05-26 09:02:52.000000000 +0800
-+++ esound-0.2.36-patched/esd.c	2005-08-28 14:24:46.000000000 +0800
-@@ -8,6 +8,10 @@
- #include <errno.h>
- #include <signal.h>
- #include <time.h>
-+#include <mach/mach.h>
-+#include <mach/thread_policy.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
- 
- #ifndef HAVE_NANOSLEEP
- #include <sys/time.h>
-@@ -641,6 +645,25 @@
-     int default_format = ESD_BITS16 | ESD_STEREO;
-     /* end test scaffolding parameters */
- 
-+    {
-+	struct thread_time_constraint_policy ttcpolicy;
-+	int bus_speed, mib [2] = { CTL_HW, HW_BUS_FREQ };
-+	size_t len;
-+
-+	len = sizeof (bus_speed);
-+	sysctl (mib, 2, &bus_speed, &len, NULL, 0);
-+
-+	ttcpolicy.period = bus_speed / 120;
-+	ttcpolicy.computation = bus_speed / 2400;
-+	ttcpolicy.constraint = bus_speed / 1200;
-+	ttcpolicy.preemptible = 1;
-+
-+	thread_policy_set (mach_thread_self (),
-+		THREAD_TIME_CONSTRAINT_POLICY,
-+		(int*)&ttcpolicy,
-+		THREAD_TIME_CONSTRAINT_POLICY_COUNT);
-+    }
-+
-     programname = *argv;
- 
- #ifdef DRIVER_ARTS
-diff -ur esound-0.2.36/esd_config.c esound-0.2.36-patched/esd_config.c
---- esound-0.2.36/esd_config.c	2005-05-26 07:50:41.000000000 +0800
-+++ esound-0.2.36-patched/esd_config.c	2005-08-28 14:21:43.000000000 +0800
-@@ -9,7 +9,7 @@
- int esd_no_spawn=1; /* If we can't even find the system config file,
- 		       things are screwed up - don't try to make things
- 		       worse. */
--int esd_spawn_wait_ms=100; /* Time to wait trying to connect to an
-+int esd_spawn_wait_ms=999; /* Time to wait trying to connect to an
- 			      autospawned ESD, in milliseconds. */
- char esd_spawn_options[LINEBUF_SIZE] = "-terminate -nobeeps -as 2";
-