Clean intermediate version now that 1.12.1 is going stable.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 19 insertions, 78 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 315b9ec0eeb6..e81249b4af01 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.228 2010/05/14 15:26:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.229 2010/06/08 14:54:30 chainsaw Exp $
+
+  08 Jun 2010; <chainsaw@gentoo.org> mpg123-1.9.2.ebuild,
+  -mpg123-1.10.1.ebuild:
+  Clean intermediate version now that 1.12.1 is going stable.
 
   14 May 2010; Jeroen Roovers <jer@gentoo.org> mpg123-1.12.1.ebuild:
   Stable for HPPA (bug #317125).
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 6b036a9d0ab1..f50716af1e39 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,9 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mpg123-1.9.2-libtool.patch 829 RMD160 7cd9a61b64703c76a33184b29c17cfff49e28de4 SHA1 fc07132a45f55bf3a4343afda4d949a7a765f6bf SHA256 743d0179923ec1d87da0620e25c470e978ed754b5ab425c13bf6e48d12209c66
-DIST mpg123-1.10.1.tar.bz2 747089 RMD160 14fdd743bf13cdb414f0b8882690ab3a2faf5a59 SHA1 81c67a63a8b698f27c80633c6f1eda179cf36f10 SHA256 6135804bb78ee1ee5956a40b6c82c9c5e496a0ea1213ca1ff0390c8fe879e82f
 DIST mpg123-1.12.1.tar.bz2 760847 RMD160 ebe438ce30a9129c099875203a40b5ce2ca94db7 SHA1 eaec53831298ce19f7246830f3058917dae9154d SHA256 f3cfe305832c4a6a56d105ec1b47e7963d5d809cb17447ee93ae2330f2365a72
 DIST mpg123-1.9.2.tar.bz2 736807 RMD160 a7a786d85f7fb7d019cfad26562f4c8b3cfb77e3 SHA1 89d80da4dde0dbed1f605650c06a49d70cabff4c SHA256 4bb866b9513562e3508037d8f0e4fd3df112970cc0bb8ffdb05bd06f76fa1dfb
-EBUILD mpg123-1.10.1.ebuild 1799 RMD160 c58d77099d04d2ab811eb68d355a64dfaaf19c7e SHA1 963ca015322f4013b5968653e255f9ffda79403b SHA256 f230d05ef1fce6d2119a2bf833855f2374d8e0bad4526dc7445b0a1f3c6067df
 EBUILD mpg123-1.12.1.ebuild 1691 RMD160 99508a2811010890e3b9d256ee54501c6b66f98c SHA1 0480987049a659d6a7a3499ee07a4353833e562c SHA256 3bb68d8f96e67a90cb5fc4c395a7ab32fd52fab8b0467dee0790b54abc0db028
-EBUILD mpg123-1.9.2.ebuild 1861 RMD160 2bb155b8c30efdb18da6b66809580bc1dd2bbd45 SHA1 5c3f58b95205d79de1b3c799f34b64a829e90978 SHA256 ea65a5b449234ccf5de63d947d0baef2dfe4909573f2fc8cdb162f553d175d4a
-MISC ChangeLog 31351 RMD160 6a0a4eeb828ff1a21be542963938802af1dd1929 SHA1 ce777bbe6b0e7f5cea8d83c19ba8e6a68c0da600 SHA256 128963de17e05b02690f8792d4071b2563c13bea81694c727ef3723e35c574fc
+EBUILD mpg123-1.9.2.ebuild 1821 RMD160 2f19490e621cad03a0c9ac595336bcde4e6db912 SHA1 87119bdc2594e4d69fbbe42003024985b2117c22 SHA256 07cc7216460e2746ca22a441c14de1475c7fce0ace96be19215c5f96f31037a0
+MISC ChangeLog 31502 RMD160 551989bcc8b8ba733dd0fce036e2e10164102aac SHA1 48c02bb6b7882a589c009f2d237904ed2730fe41 SHA256 a8f1c7990cd1316467ce493c3f11d9e549665f26251893bb7f846d51d501f83e
 MISC metadata.xml 462 RMD160 08133edf118c1067aad70dd14d2995049f153684 SHA1 4b33173e663a5599290d93130ff4125f8303b582 SHA256 a207e8f74e7c3e47f182f6d0567ce7f13aa8e4c4a9d4a56b710912d25a3121a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwOWbAACgkQp5vW4rUFj5oU4ACeJd9vs6rreZ5/L/vj+MBRlSRU
+6iIAmwSXrdgyZmjjHmfguj1yhnNLtlxX
+=bD12
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/mpg123-1.10.1.ebuild b/media-sound/mpg123/mpg123-1.10.1.ebuild
deleted file mode 100644
index ec977683ca4b..000000000000
--- a/media-sound/mpg123/mpg123-1.10.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.10.1.ebuild,v 1.1 2010/03/20 08:22:15 ssuominen Exp $
-
-EAPI=2
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="http://www.mpg123.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	http://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="3dnow 3dnowext alsa altivec ipv6 jack mmx nas +network oss portaudio pulseaudio sdl sse"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	sys-devel/libtool"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-	local _ipv6=disable
-
-	for flag in nas portaudio sdl oss jack alsa pulseaudio; do
-		if use ${flag}; then
-			_audio="${_audio} ${flag/pulseaudio/pulse}"
-			_output=${flag/pulseaudio/pulse}
-		fi
-	done
-
-	use altivec && _cpu=altivec
-
-	if [[ ${ABI} = amd64 ]] && use sse; then
-		_cpu=x86-64
-	fi
-
-	if [[ ${ABI} = x86 ]]; then
-		_cpu=i586
-		use mmx && _cpu=mmx
-		use 3dnow && _cpu=3dnow
-		use sse && _cpu=x86
-		use 3dnowext && _cpu=x86
-	fi
-
-	if use network && use ipv6; then
-		_ipv6=enable
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		--with-optimization=0 \
-		--with-audio="${_audio}" \
-		--with-default-audio=${_output} \
-		--with-cpu=${_cpu} \
-		$(use_enable network) \
-		--${_ipv6}-ipv6
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS* README
-}
diff --git a/media-sound/mpg123/mpg123-1.9.2.ebuild b/media-sound/mpg123/mpg123-1.9.2.ebuild
index 8fe5968c5ce5..8f4f144a7b68 100644
--- a/media-sound/mpg123/mpg123-1.9.2.ebuild
+++ b/media-sound/mpg123/mpg123-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.9.2.ebuild,v 1.8 2010/01/18 18:28:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.9.2.ebuild,v 1.9 2010/06/08 14:54:30 chainsaw Exp $
 
 EAPI=2
 inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha arm ia64 sparc"
 IUSE="3dnow 3dnowext alsa altivec ipv6 jack mmx nas +network oss portaudio pulseaudio sdl sse"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )