slight adjustments

11 files changed, 64 insertions, 112 deletions

diff --git a/media-sound/mpg321/ChangeLog b/media-sound/mpg321/ChangeLog
index b532c5b56b88..1676f98791a7 100644
--- a/media-sound/mpg321/ChangeLog
+++ b/media-sound/mpg321/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/mpg321
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.3 2002/03/30 13:21:05 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.4 2002/05/27 15:04:10 seemant Exp $
+
+*mpg321-0.2.10-r1 (27 May 2002)
+
+  27 May 2002; Seemant Kulleen <seemant@gentoo.org> mpg321-0.2.10-r1.ebuild
+  files/digest-mpg321-0.2.10-r1.ebuild :
+
+  The mpg123->mpg321 symlink is now only created if mpg123 doesn't own that
+  file.  This is done using the configure option, by the way.  Thanks to
+  Rachel Holmes for pointing that out.
 
 *mpg321-0.2.10 (30 Mar 2002)
   30 Mar 2002; Spider <spider@gentoo.org>
diff --git a/media-sound/mpg321/files/digest-mpg321-0.1.5 b/media-sound/mpg321/files/digest-mpg321-0.1.5
deleted file mode 100644
index b0754891f3a2..000000000000
--- a/media-sound/mpg321/files/digest-mpg321-0.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8632ea26959ae3057a6a6414e47fb486 mpg321_0.1.5.tar.gz 90822
diff --git a/media-sound/mpg321/files/digest-mpg321-0.2.10-r1 b/media-sound/mpg321/files/digest-mpg321-0.2.10-r1
new file mode 100644
index 000000000000..7332a87bdc5f
--- /dev/null
+++ b/media-sound/mpg321/files/digest-mpg321-0.2.10-r1
@@ -0,0 +1 @@
+MD5 bb403b35c2d25655d55f0f616b8f47bb mpg321-0.2.10.tar.gz 113449
diff --git a/media-sound/mpg321/files/digest-mpg321-0.2.2 b/media-sound/mpg321/files/digest-mpg321-0.2.2
deleted file mode 100644
index ca03a3205329..000000000000
--- a/media-sound/mpg321/files/digest-mpg321-0.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ad9c1fb9bbecefb2cbdda4cffd2b0df mpg321-0.2.2.tar.gz 118179
diff --git a/media-sound/mpg321/files/digest-mpg321-0.2.3 b/media-sound/mpg321/files/digest-mpg321-0.2.3
deleted file mode 100644
index 906601869dfe..000000000000
--- a/media-sound/mpg321/files/digest-mpg321-0.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d64bfd730d8b75fbd8cf231a2a033ba0 mpg321-0.2.3.tar.gz 106683
diff --git a/media-sound/mpg321/files/digest-mpg321-0.2.9 b/media-sound/mpg321/files/digest-mpg321-0.2.9
deleted file mode 100644
index ec26597d7474..000000000000
--- a/media-sound/mpg321/files/digest-mpg321-0.2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca9c02398f6bf7e5fb526ba999ea2ddc mpg321-0.2.9.tar.gz 110099
diff --git a/media-sound/mpg321/mpg321-0.1.5.ebuild b/media-sound/mpg321/mpg321-0.1.5.ebuild
deleted file mode 100644
index e29b358fe2e1..000000000000
--- a/media-sound/mpg321/mpg321-0.1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author David Rufino <daverufino@btinternet.com>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.1.5.ebuild,v 1.1 2001/09/18 23:00:47 woodchip Exp $
-
-A=${PN}_${PV}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Free mp3 player"
-SRC_URI="http://people.debian.org/~drew/${A}"
-HOMEPAGE="http://people.debian.org/~drew/"
-
-DEPEND="virtual/glibc
-        >=media-sound/mad-0.13.0b
-        >=media-libs/libao-0.8.0"
-
-src_unpack () {
-    unpack ${A}
-    patch -p0 < ${FILESDIR}/mpg321-0.1.5-ao.diff || die
-}
-
-src_compile() {
-    ./configure --prefix=/usr --host=${CHOST} || die
-    make || die
-}
-
-src_install () {
-    make DESTDIR=${D} install || die
-}
diff --git a/media-sound/mpg321/mpg321-0.2.10-r1.ebuild b/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
new file mode 100644
index 000000000000..542791fb4845
--- /dev/null
+++ b/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: David Rufino <daverufino@btinternet.com>
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r1.ebuild,v 1.1 2002/05/27 15:04:10 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/mpg321/"
+
+DEPEND="virtual/glibc
+	>=media-sound/mad-0.14.2b
+	>=media-libs/libao-0.8.0"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+MPG123="false"
+
+pkg_setup() {
+	
+	# test if mpg123 owns the /usr/bin/mpg123 file. If it does, then do not
+	# create a symlink.  If it is already a symlink or does not exist, then
+	# we create it
+	if [ -f /usr/bin/mpg123 ]
+	then
+		if [ -L /usr/bin/mpg123 ]
+		then
+			MPEG123="false"
+		else
+			MPEG123="true"
+		fi
+	else
+		MPEG123="false"
+	fi
+}
+
+src_compile() {
+	local myconf
+	if [ ${MPEG123} = "true" ]
+	then
+		myconf="--disable-mpg123-symlink"
+	else
+		myconf="--enable-mpg123-symlink"
+	fi
+	einfo ${myconf}
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install () {
+	einstall || die
+}
diff --git a/media-sound/mpg321/mpg321-0.2.2.ebuild b/media-sound/mpg321/mpg321-0.2.2.ebuild
deleted file mode 100644
index 4c20fbeef007..000000000000
--- a/media-sound/mpg321/mpg321-0.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author David Rufino <daverufino@btinternet.com>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.2.ebuild,v 1.1 2001/11/14 15:57:12 agriffis Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
-SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/${P}/"
-
-DEPEND="virtual/glibc
-		>=media-sound/mad-0.14.2b
-		>=media-libs/libao-0.8.0"
-
-src_compile() {
-	./configure --build=${CHOST} \
-		--prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	# don't create mpg123 symlink -- conflicts with media-sound/mpg123
-	rm -f ${D}/usr/bin/mpg123
-}
diff --git a/media-sound/mpg321/mpg321-0.2.3.ebuild b/media-sound/mpg321/mpg321-0.2.3.ebuild
deleted file mode 100644
index ebdfd680f305..000000000000
--- a/media-sound/mpg321/mpg321-0.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: David Rufino <daverufino@btinternet.com>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.3.ebuild,v 1.1 2002/01/13 14:54:23 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/${P}/"
-
-DEPEND="virtual/glibc
-	>=media-sound/mad-0.14.2b
-	>=media-libs/libao-0.8.0"
-
-src_compile() {
-	./configure --build=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	# don't create mpg123 symlink -- conflicts with media-sound/mpg123
-	rm -f ${D}/usr/bin/mpg123
-}
diff --git a/media-sound/mpg321/mpg321-0.2.9.ebuild b/media-sound/mpg321/mpg321-0.2.9.ebuild
deleted file mode 100644
index 5f70485ec3fd..000000000000
--- a/media-sound/mpg321/mpg321-0.2.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: David Rufino <daverufino@btinternet.com>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.9.ebuild,v 1.1 2002/03/17 02:40:42 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/${P}/"
-
-DEPEND="virtual/glibc
-	>=media-sound/mad-0.14.2b
-	>=media-libs/libao-0.8.0"
-
-src_compile() {
-	./configure --build=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	# don't create mpg123 symlink -- conflicts with media-sound/mpg123
-	rm -f ${D}/usr/bin/mpg123
-}