Remove old version and leave one ebuild behind for mips wrt #200106

Package-Manager: portage-2.1.4_rc14

7 files changed, 18 insertions, 133 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index af4a863f9ae3..0f962e7e96a8 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpg123
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.131 2007/12/30 14:32:53 drac Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.132 2008/01/07 14:15:59 drac Exp $
+
+  07 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  -files/1.0_rc2-no-faltivec.patch, -files/1.0_rc2-pkgconfig.patch,
+  mpg123-0.59s-r11.ebuild, -mpg123-1.0_rc2.ebuild:
+  Remove old version and leave one ebuild behind for mips wrt #200106
 
 *mpg123-1.0.1 (30 Dec 2007)
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 4d98822acc60..9cfe85d62c01 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -6,14 +6,6 @@ AUX 0.67-no-faltivec.patch 424 RMD160 347c74b29a83a20b950a1c0c6e7e00fa0f1492b0 S
 MD5 ce969d9d187eaabd20c3c66e89f52743 files/0.67-no-faltivec.patch 424
 RMD160 347c74b29a83a20b950a1c0c6e7e00fa0f1492b0 files/0.67-no-faltivec.patch 424
 SHA256 66afa6aa654f38abb114c67f69ae23842d8e41d5936dacc55d81034c38050d45 files/0.67-no-faltivec.patch 424
-AUX 1.0_rc2-no-faltivec.patch 463 RMD160 e5ea83e094bd92acdba301e004cb92e9d9399670 SHA1 936ab9b715c67a5edd57aab4ec2a06d40e4c9788 SHA256 6564eb4d64a317feacf1b745a772988061c490ab0f3d01c00d270a2918d6c31e
-MD5 e140d1ae61b260ae577ffec1bb40196a files/1.0_rc2-no-faltivec.patch 463
-RMD160 e5ea83e094bd92acdba301e004cb92e9d9399670 files/1.0_rc2-no-faltivec.patch 463
-SHA256 6564eb4d64a317feacf1b745a772988061c490ab0f3d01c00d270a2918d6c31e files/1.0_rc2-no-faltivec.patch 463
-AUX 1.0_rc2-pkgconfig.patch 547 RMD160 5c38910fadae88ce9e7effdba615365b28c19f52 SHA1 6a0d69c240b1a033cc4b57bcb6b39a5de681fbd2 SHA256 884fdbcba9c193e105d9620eb9a6ef5bd9d163f52e34902e5ba707c6420cf865
-MD5 b15f5ed3ecc14d84f5e5df885ea20c60 files/1.0_rc2-pkgconfig.patch 547
-RMD160 5c38910fadae88ce9e7effdba615365b28c19f52 files/1.0_rc2-pkgconfig.patch 547
-SHA256 884fdbcba9c193e105d9620eb9a6ef5bd9d163f52e34902e5ba707c6420cf865 files/1.0_rc2-pkgconfig.patch 547
 AUX mpg123-0.59s-gmake-3.81.patch 7489 RMD160 698ffe24b926ffb6de7afe50b0e2ba8d7928f4d8 SHA1 e3e6604a85202bf572d317332ad8c3f8071d064d SHA256 cadb1ad75b36efd853ad0e1637db3d88ec37b6bb4e1726e025e21676c7507438
 MD5 1afa21b956e382825339b141255014eb files/mpg123-0.59s-gmake-3.81.patch 7489
 RMD160 698ffe24b926ffb6de7afe50b0e2ba8d7928f4d8 files/mpg123-0.59s-gmake-3.81.patch 7489
@@ -33,12 +25,11 @@ SHA256 4d5fc7650687f3c7aeb3e82622bde477f24412d914e5ceb30000725d654185dd files/mp
 DIST mpg123-0.59s-gentoo-1.6.tar.bz2 7311 RMD160 393f10020bb15a813cc53570926be279d0e9b798 SHA1 9c74d4fac54be92c74faddcc7a8c52c9a8818291 SHA256 5ecbe31774b6fc83c3a73c06da8e75d419486b57339f41ac8e7848c5ede268e5
 DIST mpg123-0.67.tar.bz2 559725 RMD160 29a8343a08d01ed5ff5462b4a90e95f13db29b89 SHA1 caf70343893a83cf8d9233b50ee67e8bc35cbd96 SHA256 af19eeb8898639491e9d8ebfc14e79cf0dd7f3776d20b4baa03685626882fd54
 DIST mpg123-1.0.1.tar.bz2 969331 RMD160 8c4992b741809c329d1f851ced72e8403a31250d SHA1 68bde6dcd05eac9bde63f77f5a6fe27d5bed3d2f SHA256 0c0f82281b60960ae226a210fda1d3a1d088686a79fd0bee79fd5ae40c6f66f3
-DIST mpg123-1.0rc2.tar.bz2 966599 RMD160 89bad349f8d55c1f5dc3c14cf4322ae138e3dca7 SHA1 38e4906e0185d250ed2477f7e0c44711416e3a5f SHA256 97d2183851edd2e97afd8ba88586c019310471153bd4456fd0a1179c4c23470e
 DIST mpg123-pre0.59s.tar.gz 244899 RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f SHA1 7e521785dc3a9015f4228f0a118bf36856884b67 SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a
-EBUILD mpg123-0.59s-r11.ebuild 3571 RMD160 37c54519b30aeb05f6bf740d43393c3aede7c6f5 SHA1 b2db14bca004e9b391e30f2c843202430f209e30 SHA256 c0f264ca1b34ab9291f2a2f4e877cca6f9ed2b401cf9bcb179e8bc62c8871e9a
-MD5 a8c38ef49c81da268c4546f2cbc6fbe7 mpg123-0.59s-r11.ebuild 3571
-RMD160 37c54519b30aeb05f6bf740d43393c3aede7c6f5 mpg123-0.59s-r11.ebuild 3571
-SHA256 c0f264ca1b34ab9291f2a2f4e877cca6f9ed2b401cf9bcb179e8bc62c8871e9a mpg123-0.59s-r11.ebuild 3571
+EBUILD mpg123-0.59s-r11.ebuild 3525 RMD160 b1b6acda09c262d0ad17df5c5c5cfe12fe269fb4 SHA1 fa036af121b62c7c15aa36c031d3516559908dbc SHA256 368a3e2498b7b7197ad42ef697746203434e5f6198e1f22fabb5621b956a0529
+MD5 04781833bd0a31a9b1d4cf4163cef143 mpg123-0.59s-r11.ebuild 3525
+RMD160 b1b6acda09c262d0ad17df5c5c5cfe12fe269fb4 mpg123-0.59s-r11.ebuild 3525
+SHA256 368a3e2498b7b7197ad42ef697746203434e5f6198e1f22fabb5621b956a0529 mpg123-0.59s-r11.ebuild 3525
 EBUILD mpg123-0.67.ebuild 2162 RMD160 55aeb21e50d0944c99cde0cb649b6577adb3ed0f SHA1 ea5b41b6dba50e96491529cebc7a71949b87f002 SHA256 a3fac3a7c355855a6d6d559d38487bdc11722987a9135ee382ec6c8ee935d719
 MD5 0daa64d2c7de05d9be71debcb676da52 mpg123-0.67.ebuild 2162
 RMD160 55aeb21e50d0944c99cde0cb649b6577adb3ed0f mpg123-0.67.ebuild 2162
@@ -47,14 +38,10 @@ EBUILD mpg123-1.0.1.ebuild 1798 RMD160 3c12b7d028a926f1dd77624f9fdf4f64d40d8d4d
 MD5 002c984982fc114923664c326972c4a7 mpg123-1.0.1.ebuild 1798
 RMD160 3c12b7d028a926f1dd77624f9fdf4f64d40d8d4d mpg123-1.0.1.ebuild 1798
 SHA256 c3d2047b79aaa345b8922d84d6ca27b43fb1aa67ac9f01c827d168e8c0b8b53a mpg123-1.0.1.ebuild 1798
-EBUILD mpg123-1.0_rc2.ebuild 1886 RMD160 b117b4381f7fa209d10b5563bc9f44d52fcbe6ab SHA1 32b7d521ad231f27f229c78315ca5e333f579340 SHA256 5c8c1b739a5de41d9af0c83ec457837dd0678d748c8a800b82f3b03c5236cdef
-MD5 920214e418cc2959f7f27d5da4594131 mpg123-1.0_rc2.ebuild 1886
-RMD160 b117b4381f7fa209d10b5563bc9f44d52fcbe6ab mpg123-1.0_rc2.ebuild 1886
-SHA256 5c8c1b739a5de41d9af0c83ec457837dd0678d748c8a800b82f3b03c5236cdef mpg123-1.0_rc2.ebuild 1886
-MISC ChangeLog 19724 RMD160 3cf9c187aa958f89a0dd119dfc4b118f356ccabd SHA1 a6de06b7ec68a4b6e03c6e7c485af750cebdd0d2 SHA256 bd3b81cfe0069922d2fbe2cc16fbb6d42399cc1be8f194d76211a646d8a02866
-MD5 b723f78b18e83726c9516655cfcf410e ChangeLog 19724
-RMD160 3cf9c187aa958f89a0dd119dfc4b118f356ccabd ChangeLog 19724
-SHA256 bd3b81cfe0069922d2fbe2cc16fbb6d42399cc1be8f194d76211a646d8a02866 ChangeLog 19724
+MISC ChangeLog 19963 RMD160 b4a19321b3b1714039bca5bee8ce708231ae04bb SHA1 cf7456f43a5fb88711a5d8878e8b93a1b8335374 SHA256 d8212cb4c3273350d7e3797402ff350194877b856fa74f808e3b44518e809fe9
+MD5 cfafbea8e184505bb38932956f85e9a6 ChangeLog 19963
+RMD160 b4a19321b3b1714039bca5bee8ce708231ae04bb ChangeLog 19963
+SHA256 d8212cb4c3273350d7e3797402ff350194877b856fa74f808e3b44518e809fe9 ChangeLog 19963
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -68,6 +55,3 @@ SHA256 6d82d90f276538969333828b14e687fb41daedb27ab84fd3b7b0aa723aef2c37 files/di
 MD5 32a88ab153e360565b9b7593f69539f6 files/digest-mpg123-1.0.1 241
 RMD160 330d347c9674b08a6e2440f4f36bf4bcf40e7cdf files/digest-mpg123-1.0.1 241
 SHA256 6d1fa4d6e2d66ce2f6e431b74d890ca8876b6fe3cbed35bbd9cab3e0b263e8ee files/digest-mpg123-1.0.1 241
-MD5 52e4a00da22320d361eda9f05f34da2b files/digest-mpg123-1.0_rc2 244
-RMD160 d64d1b0423e03303af716374e2e418a01ea80bfe files/digest-mpg123-1.0_rc2 244
-SHA256 83a02b84e04704cb98c870bbdc50ca1b7620e4da6a78226c0ec26a731cbbb9d8 files/digest-mpg123-1.0_rc2 244
diff --git a/media-sound/mpg123/files/1.0_rc2-no-faltivec.patch b/media-sound/mpg123/files/1.0_rc2-no-faltivec.patch
deleted file mode 100644
index 60f91b7ed019..000000000000
--- a/media-sound/mpg123/files/1.0_rc2-no-faltivec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mpg123-1.0rc2.orig/configure.ac mpg123-1.0rc2/configure.ac
---- mpg123-1.0rc2.orig/configure.ac	2007-12-09 17:13:26.000000000 +0200
-+++ mpg123-1.0rc2/configure.ac	2007-12-10 20:24:16.000000000 +0200
-@@ -577,7 +577,7 @@
-     more_sources="$s_gen"
-   ;;
-   altivec)
--    ADD_CFLAGS="$ADD_CFLAGS -maltivec -faltivec"
-+    ADD_CFLAGS="$ADD_CFLAGS -maltivec"
-     ADD_CPPFLAGS="$ADD_CPPFLAGS -DREAL_IS_FLOAT -DOPT_ALTIVEC"
-     more_sources="$s_altivec"
-   ;;
diff --git a/media-sound/mpg123/files/1.0_rc2-pkgconfig.patch b/media-sound/mpg123/files/1.0_rc2-pkgconfig.patch
deleted file mode 100644
index 5230724a3720..000000000000
--- a/media-sound/mpg123/files/1.0_rc2-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mpg123-1.0rc2.orig/configure.ac mpg123-1.0rc2/configure.ac
---- mpg123-1.0rc2.orig/configure.ac	2007-12-09 17:13:26.000000000 +0200
-+++ mpg123-1.0rc2/configure.ac	2007-12-10 22:35:12.000000000 +0200
-@@ -23,6 +23,8 @@
- AM_INIT_AUTOMAKE( 1.7 )
- AM_CONFIG_HEADER(src/config.h)
- 
-+dnl Check for pkgconfig.
-+PKG_PROG_PKG_CONFIG([0.20])
- 
- # You get strange symptoms like jack module build failing because the AC_C_CONST failed to detect the working const support.
- # In that case, the test failed because -Werror, not because no const there...
diff --git a/media-sound/mpg123/files/digest-mpg123-1.0_rc2 b/media-sound/mpg123/files/digest-mpg123-1.0_rc2
deleted file mode 100644
index 260d72003f13..000000000000
--- a/media-sound/mpg123/files/digest-mpg123-1.0_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9d2af48224bfb88654d7496ccd39d9e1 mpg123-1.0rc2.tar.bz2 966599
-RMD160 89bad349f8d55c1f5dc3c14cf4322ae138e3dca7 mpg123-1.0rc2.tar.bz2 966599
-SHA256 97d2183851edd2e97afd8ba88586c019310471153bd4456fd0a1179c4c23470e mpg123-1.0rc2.tar.bz2 966599
diff --git a/media-sound/mpg123/mpg123-0.59s-r11.ebuild b/media-sound/mpg123/mpg123-0.59s-r11.ebuild
index 092e3616f9a8..3c796fbef121 100644
--- a/media-sound/mpg123/mpg123-0.59s-r11.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r11.ebuild,v 1.13 2007/10/21 15:27:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r11.ebuild,v 1.14 2008/01/07 14:15:59 drac Exp $
 
 inherit eutils toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="mips"
 IUSE="mmx 3dnow esd nas oss"
 
 RDEPEND="esd? ( media-sound/esound )
diff --git a/media-sound/mpg123/mpg123-1.0_rc2.ebuild b/media-sound/mpg123/mpg123-1.0_rc2.ebuild
deleted file mode 100644
index 1315095e0e46..000000000000
--- a/media-sound/mpg123/mpg123-1.0_rc2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.0_rc2.ebuild,v 1.5 2007/12/10 21:34:00 drac Exp $
-
-WANT_AUTOMAKE=1.9
-
-inherit eutils autotools
-
-MY_P=${P/_/}
-
-DESCRIPTION="Real Time mp3 player"
-HOMEPAGE="http://www.mpg123.de"
-SRC_URI="http://www.${PN}.de/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="3dnow 3dnowext alsa altivec esd jack mmx nas oss portaudio pulseaudio sdl sse"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	sdl? ( media-libs/libsdl )
-	esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
-	jack? ( media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PROVIDE="virtual/mpg123"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-no-faltivec.patch
-	epatch "${FILESDIR}"/${PV}-pkgconfig.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myaudio
-
-	use alsa && myaudio="${myaudio} alsa"
-	use esd && myaudio="${myaudio} esd"
-	use jack && myaudio="${myaudio} jack"
-	use nas && myaudio="${myaudio} nas"
-	use oss && myaudio="${myaudio} oss"
-	use pulseaudio && myaudio="${myaudio} pulse"
-	use sdl && myaudio="${myaudio} sdl"
-
-	local mycpu
-
-	if use altivec; then
-		mycpu="--with-cpu=altivec"
-	elif use 3dnowext; then
-		mycpu="--with-cpu=3dnowext"
-	elif use 3dnow; then
-		mycpu="--with-cpu=3dnow"
-	elif use sse; then
-		mycpu="--with-cpu=sse"
-	elif use mmx; then
-		mycpu="--with-cpu=mmx"
-	fi
-
-	econf --with-optimization=0 \
-		--with-audio="${myaudio}" \
-		${mycpu} || die "econf failed."
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README
-}