Mark 0.59s-r1 stable on x86 for bug 40631. Remove older ebuilds. Add this ebuild to the sound herd.

6 files changed, 24 insertions, 79 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index d1f8df775de2..b51191a65422 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.27 2004/02/15 19:43:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.28 2004/02/15 20:39:08 agriffis Exp $
+
+  15 Feb 2004; Aron Griffis <agriffis@gentoo.org> metadata.xml,
+  mpg123-0.59s-r1.ebuild, mpg123-0.59s.ebuild:
+  Mark 0.59s-r1 stable on x86 for bug 40631. Remove older ebuilds. Add this
+  ebuild to the sound herd.  Remove ~arm from KEYWORDS since there isn't even
+  a bugzilla account to get somebody to test.
 
   15 Feb 2004; Jason Wever <weeve@gentoo.org> mpg123-0.59s-r1.ebuild:
   Marked stable on sparc to fix bug #40631.
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index d86f15875fbb..f5c4ccf0ebb6 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,12 +1,11 @@
-MD5 bbfc58787ae97a30bb8f53d7554f0955 ChangeLog 5104
 MD5 f7a5849c9d0381f667738a7ad2820c2b mpg123-0.59r-r2.ebuild 1667
+MD5 e22ce32bb5fb348c0a9bc7112189439b mpg123-0.59s-r1.ebuild 1649
 MD5 3b0e492ea145f235680eaf01783adf87 mpg123-0.59r-r3.ebuild 1603
-MD5 a6dce900bfa4bb82c8d2abc40494df6a mpg123-0.59s-r1.ebuild 1592
-MD5 683e388878cc217eaa024902965e101f mpg123-0.59s.ebuild 1368
+MD5 e34587cf6241e0717cd2e131a1ead31f ChangeLog 5419
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+MD5 7d563752464873b664d7d242e9d06bbd files/mpg123-0.59s-amd64.patch 2680
 MD5 7c93b2634ad65c23562f86f6e0b051e2 files/0.59s-generic.patch 532
 MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r2 64
 MD5 1d1f7b49b09cb2394ef7a7dd893b1fea files/digest-mpg123-0.59r-r3 134
-MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s 67
 MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r1 67
-MD5 7d563752464873b664d7d242e9d06bbd files/mpg123-0.59s-amd64.patch 2680
 MD5 a80297615f6515bb5631c177511c989a files/mpg123-0.59s-security.diff 1075
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s b/media-sound/mpg123/files/digest-mpg123-0.59s
deleted file mode 100644
index 88b7f6bafc5b..000000000000
--- a/media-sound/mpg123/files/digest-mpg123-0.59s
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
diff --git a/media-sound/mpg123/metadata.xml b/media-sound/mpg123/metadata.xml
new file mode 100644
index 000000000000..78ec7f6984fe
--- /dev/null
+++ b/media-sound/mpg123/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound Team</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mpg123/mpg123-0.59s-r1.ebuild b/media-sound/mpg123/mpg123-0.59s-r1.ebuild
index dcc899a724ef..02f46e3f3475 100644
--- a/media-sound/mpg123/mpg123-0.59s-r1.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r1.ebuild,v 1.8 2004/02/15 19:43:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r1.ebuild,v 1.9 2004/02/15 20:39:08 agriffis Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ia64 ~amd64 ~ppc sparc alpha ~hppa ~mips ~arm"
+KEYWORDS="x86 ia64 ~amd64 ~ppc sparc alpha ~hppa ~mips"
 
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4"
@@ -33,6 +33,8 @@ src_unpack () {
 
 	# Don't force gcc since icc/ccc might be possible
 	sed -i -e "s|CC=gcc||" Makefile
+
+	# Fix a glitch in the ppc-related section of the Makefile
 	sed -i -e "s:-mcpu=ppc::" Makefile
 }
 
diff --git a/media-sound/mpg123/mpg123-0.59s.ebuild b/media-sound/mpg123/mpg123-0.59s.ebuild
deleted file mode 100644
index f4da01d06c82..000000000000
--- a/media-sound/mpg123/mpg123-0.59s.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s.ebuild,v 1.5 2003/11/05 01:03:23 wwoods Exp $
-
-S=${WORKDIR}/mpg123
-
-DESCRIPTION="Real Time mp3 player"
-SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz"
-HOMEPAGE="http://www.mpg123.de/"
-
-DEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~sparc"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -m486:${CFLAGS}:" \
-		-e "s:-O2 -mcpu=ppc:${CFLAGS}:g" Makefile.orig > Makefile
-}
-
-src_compile() {
-	local MAKEOPT=""
-	local MAKESTYLE=""
-
-	SYSTEM_ARCH=`echo $ARCH |\
-		sed -e s/[i]*.86/i386/ \
-			-e s/sun.*/sparc/ \
-			-e s/arm.*/arm/ \
-			-e s/sa110/arm/`
-
-	if [ -z "$SYSTEM_ARCH" ]
-	then
-		SYSTEM_ARCH=`uname -m |\
-		sed -e s/[i]*.86/i386/ -e s/arm.*/arm/ -e s/sa110/arm/`
-	fi
-
-	case $SYSTEM_ARCH in
-	  ppc)
-	   MAKESTYLE="-ppc";;
-	  i386)
-	   if [ -z "use mmx" ]
-	   then
-	    MAKESTYLE="-mmx"
-	   else
-	     MAKESTYLE="-i486"
-	   fi;;
-	  sparc64)
-	   MAKESTYLE="-sparc";;
-	  sparc)
-	   MAKESTYLE="-sparc";;
-	  alpha)
-	   MAKESTYLE="-alpha";;
-	  arm)
-	   ;;
-	esac
-
-	make linux${MAKESTYLE}${MAKEOPT} || die
-}
-
-src_install () {
-	into /usr
-	dobin mpg123
-	doman mpg123.1
-	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
-}
-