Kick archs that haven't satisfied PDEPEND.

Package-Manager: portage-2.0.51-r15

5 files changed, 30 insertions, 164 deletions

diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 442447e334e3..1f6c9288e082 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 01f2a46fd3f3d31235e082d49f141706 ChangeLog 28364
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
 MD5 33b564ef94a980547348ae5478c6fd24 xmms-1.2.10-r5.ebuild 5545
-MD5 bd2c29d7bc96c9f8c558e0fdcccd941a xmms-1.2.10-r9.ebuild 3402
 MD5 1f4aab1f3653bb6e5fb441d038160e52 xmms-1.2.8-r4.ebuild 5246
-MD5 d841f556aeb0307ce43404c20aa96ec5 xmms-1.2.10-r10.ebuild 4067
+MD5 53363eb1ee2a7fbbd2ad1ea3ccdf9e02 xmms-1.2.10-r10.ebuild 4236
+MD5 01f2a46fd3f3d31235e082d49f141706 ChangeLog 28364
 MD5 aa46b23a1cf0655c7f09adbdd623d49f files/digest-xmms-1.2.10-r5 219
-MD5 07a3ee1ff0ac863b041b89319a01bf32 files/digest-xmms-1.2.10-r9 277
 MD5 f52f09b25da87c876de70b6177292f2e files/digest-xmms-1.2.8-r4 216
 MD5 7d2f3807ebbff435b909ecf0539cbf4f files/xmms.desktop 722
-MD5 964b9054ef6250cdbff148b3f56ea9bc files/digest-xmms-1.2.10-r10 277
+MD5 1b2710ba8cf8fb008cc9f3aa40d021ae files/digest-xmms-1.2.10-r10 277
 MD5 4190322696afc5e46dac14804b8aef70 files/po-update.pl 10510
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB8vcdArHZZzCEUG0RAibGAJ93mlFGckY6dM6MdYoaRxRTtdc0iACfTfsO
-udJUe73k+Eem1A/u4NF0iRw=
-=/dlh
+iD8DBQFB+YJDArHZZzCEUG0RAniGAJ0Q6WbZMvY+lNStGjIWrUObRapj8ACfQ+bB
+IVeUhH31+C/cf02Qx5Ng0xE=
+=kk1G
 -----END PGP SIGNATURE-----
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r10 b/media-sound/xmms/files/digest-xmms-1.2.10-r10
index e82f9c3dbaed..bdfd24dc8bbf 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r10
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r10
@@ -1,4 +1,4 @@
 MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 9204e71b49492031aa69838584caacd8 xmms-1.2.10-gentoo-patches-2.1.6.tar.bz2 534534
+MD5 71df70d2815115b1cc3262fcdeb3b4d4 xmms-1.2.10-gentoo-patches-2.1.7.tar.bz2 561430
 MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r9 b/media-sound/xmms/files/digest-xmms-1.2.10-r9
deleted file mode 100644
index 36d94f3a4204..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r9
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 342266116afd8263750533fb7d45ff2f xmms-1.2.10-gentoo-patches-2.1.5.tar.bz2 353602
-MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
diff --git a/media-sound/xmms/xmms-1.2.10-r10.ebuild b/media-sound/xmms/xmms-1.2.10-r10.ebuild
index 9f65a39494fa..4d802defa1e5 100644
--- a/media-sound/xmms/xmms-1.2.10-r10.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r10.ebuild,v 1.1 2005/01/23 00:55:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r10.ebuild,v 1.2 2005/01/28 00:07:18 eradicator Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
-PATCHVER="2.1.6"
+PATCHVER="2.1.7"
 
 PATCHDIR="${WORKDIR}/patches"
 
@@ -17,10 +17,9 @@ SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-# Notice to arch maintainers:
-# Please test out the plugins listed below in PDEPEND.  They should
-# work on most of your archs, but haven't been marked yet.
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+# alpha and mips were removed because they don't satisfy DEPEND.  See bug #66572.
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 alsa oss arts jack sndfile lirc flac mad"
 
 DEPEND="=x11-libs/gtk+-1.2*
@@ -45,12 +44,12 @@ DEPEND="${DEPEND}
 	       sys-devel/gettext )"
 
 # USE flags pull in xmms plugins
-PDEPEND="!alpha? ( !mips? ( !ppc64? ( jack? ( media-plugins/xmms-jack ) ) ) )
-	!alpha? ( !ppc64? ( lirc? ( media-plugins/xmms-lirc ) ) )
-	!ppc64? ( arts? ( media-plugins/xmms-arts ) )
-	!alpha? ( !mips? ( !ppc64? ( sndfile? ( media-plugins/xmms-sndfile ) ) ) )
-	!alpha? ( !mips? ( mad? ( >=media-plugins/xmms-mad-0.7 ) ) )
-	flac? ( media-libs/flac )"
+PDEPEND="jack? ( media-plugins/xmms-jack )
+	 lirc? ( media-plugins/xmms-lirc )
+	 arts? ( media-plugins/xmms-arts )
+	 sndfile? ( media-plugins/xmms-sndfile )
+	 mad? ( >=media-plugins/xmms-mad-0.7 )
+	 flac? ( media-libs/flac )"
 
 src_unpack() {
 	unpack ${A}
@@ -63,19 +62,19 @@ src_unpack() {
 	export WANT_AUTOCONF=2.5
 
 	cd ${S}
-	libtoolize --force --copy
-	aclocal
-	autoheader
-	automake --gnu --add-missing --include-deps --force-missing --copy
-	autoconf
+	libtoolize --force --copy || die "libtoolize --force --copy failed"
+	aclocal || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
+	autoconf || die "autoconf failed"
 
 	cd ${S}/libxmms
-	libtoolize --force --copy
-	ln -s ../ltmain.sh
-	aclocal
-	autoheader
-	automake --gnu --add-missing --include-deps --force-missing --copy
-	autoconf
+	libtoolize --force --copy || die "libtoolize --force --copy failed"
+	[ ! -f ltmain.sh ] && ln -s ../ltmain.sh
+	aclocal || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
+	autoconf || die "autoconf failed"
 
 	if use nls; then
 		cd ${S}/po
@@ -88,6 +87,7 @@ src_unpack() {
 }
 
 src_compile() {
+	export EGREP="grep -E"
 	filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 
 	local myconf=""
@@ -125,7 +125,6 @@ src_compile() {
 		|| die
 
 	# For some reason, gmake doesn't export this for libtool's consumption
-	export EGREP="grep -E"
 	emake -j1 || die
 }
 
diff --git a/media-sound/xmms/xmms-1.2.10-r9.ebuild b/media-sound/xmms/xmms-1.2.10-r9.ebuild
deleted file mode 100644
index 5df42b4225cd..000000000000
--- a/media-sound/xmms/xmms-1.2.10-r9.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r9.ebuild,v 1.7 2005/01/04 15:03:50 corsair Exp $
-
-inherit flag-o-matic eutils libtool gnuconfig
-
-PATCHVER="2.1.5"
-
-PATCHDIR="${WORKDIR}/patches"
-
-DESCRIPTION="X MultiMedia System"
-HOMEPAGE="http://www.xmms.org/"
-SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.bz2
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-	http://dev.gentoo.org/~eradicator/xmms/${P}-gentoo-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~eradicator/xmms/gnomexmms.xpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Notice to arch maintainers:
-# Please test out the plugins listed below in PDEPEND.  They should
-# work on most of your archs, but haven't been marked yet.
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 alsa oss arts jack sndfile lirc flac mad"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	opengl? ( virtual/opengl )
-	alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-
-RDEPEND="${DEPEND}
-	directfb? ( dev-libs/DirectFB )
-	app-arch/unzip"
-
-#We want these things in DEPEND only
-DEPEND="${DEPEND}
-	nls? ( dev-util/intltool
-	       sys-devel/gettext )"
-
-# USE flags pull in xmms plugins
-PDEPEND="!alpha? ( !mips? ( !ppc64? ( jack? ( media-plugins/xmms-jack ) ) ) )
-	!alpha? ( !ppc64? ( lirc? ( media-plugins/xmms-lirc ) ) )
-	!ppc64? ( arts? ( media-plugins/xmms-arts ) )
-	!alpha? ( !mips? ( !ppc64? ( sndfile? ( media-plugins/xmms-sndfile ) ) ) )
-	!alpha? ( !mips? ( mad? ( >=media-plugins/xmms-mad-0.7 ) ) )
-	flac? ( media-libs/flac )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}
-
-	elibtoolize
-	gnuconfig_update
-}
-
-src_compile() {
-	filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-
-	local myconf=""
-
-	if use amd64; then
-		myconf="${myconf} --disable-simd"
-	else
-	  	if use 3dnow || use mmx; then
-			myconf="${myconf} --enable-simd"
-		else
-			myconf="${myconf} --disable-simd"
-		fi
-	fi
-
-	use xml || myconf="${myconf} --disable-cdindex"
-
-	if [ -e /dev/sound ]; then
-		myconf="${myconf} \
-			--with-dev-dsp=/dev/sound/dsp \
-			--with-dev-mixer=/dev/sound/mixer"
-	fi
-
-	# Please see Bug 58092 for details
-	use ppc64 && replace-flags "-O[2-9]" "-O1"
-
-	econf	`use_enable oggvorbis vorbis` \
-		`use_enable esd` \
-		`use_enable mikmod` \
-		`use_with mikmod libmikmod` \
-		`use_enable opengl` \
-		`use_enable nls` \
-		`use_enable ipv6` \
-		`use_enable oss oss` \
-		${myconf} \
-		|| die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
-	newdoc ${PATCHDIR}/README README.patches
-	newdoc ${PATCHDIR}/ChangeLog ChangeLog.patches
-
-	keepdir /usr/share/xmms/Skins
-	insinto /usr/share/pixmaps/
-	newins ${DISTDIR}/gnomexmms.xpm xmms.xpm
-	doins xmms/xmms_logo.xpm
-	insinto /usr/share/pixmaps/mini
-	doins xmms/xmms_mini.xpm
-
-	insinto /etc/X11/wmconfig
-	donewins xmms/xmms.wmconfig xmms
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/xmms.desktop
-
-	# Add the sexy Gentoo Ice skin
-	insinto /usr/share/xmms/Skins/gentoo_ice
-	doins ${WORKDIR}/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc ${WORKDIR}/README
-}