Removing sox-12.17.5 as it installs exactly the same thing as -r1. -r1 should NOT have been added to portage. If you already have sox-12.17.5 installed, you will gain nothing by emerging sox-12.17.5-r1.

4 files changed, 8 insertions, 55 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 2fbe9d47983c..876cedd3b59a 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.31 2004/09/11 17:17:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.32 2004/09/14 07:43:30 eradicator Exp $
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Removing sox-12.17.5 as it installs exactly the same thing as -r1. -r1 should
+  NOT have been added to portage. If you already have sox-12.17.5 installed, you
+  will gain nothing by emerging sox-12.17.5-r1.
 
 *sox-12.17.5-r1 (11 Sep 2004)
 
diff --git a/media-sound/sox/files/digest-sox-12.17.5 b/media-sound/sox/files/digest-sox-12.17.5
deleted file mode 100644
index 8395fd9564b1..000000000000
--- a/media-sound/sox/files/digest-sox-12.17.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 53a3ebe3da0f5845770fd99e2ff0a965 sox-12.17.5.tar.gz 429726
diff --git a/media-sound/sox/sox-12.17.5-r1.ebuild b/media-sound/sox/sox-12.17.5-r1.ebuild
index 210d35049f98..1c19297f301e 100644
--- a/media-sound/sox/sox-12.17.5-r1.ebuild
+++ b/media-sound/sox/sox-12.17.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5-r1.ebuild,v 1.1 2004/09/11 17:17:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5-r1.ebuild,v 1.2 2004/09/14 07:43:30 eradicator Exp $
 
 inherit gnuconfig eutils
 
@@ -15,9 +15,9 @@ LICENSE="LGPL-2.1"
 
 DEPEND="virtual/libc
 	encode? ( media-sound/lame )
-	alsa? ( media-libs/alsa-lib )
 	oggvorbis? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay )"
+#	alsa? ( media-libs/alsa-lib )
 
 src_compile () {
 	# Needed on mips and probablly others
diff --git a/media-sound/sox/sox-12.17.5.ebuild b/media-sound/sox/sox-12.17.5.ebuild
deleted file mode 100644
index 30cc8bba73b3..000000000000
--- a/media-sound/sox/sox-12.17.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5.ebuild,v 1.3 2004/09/11 17:17:32 cardoe Exp $
-
-inherit gnuconfig eutils
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-IUSE="oggvorbis mad encode" # alsa oss
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
-LICENSE="LGPL-2.1"
-
-DEPEND="virtual/libc
-	encode? ( media-sound/lame )
-	alsa? ( media-libs/alsa-lib )
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/madplay )"
-
-src_compile () {
-	# Needed on mips and probablly others
-	gnuconfig_update
-
-	# from version 12.17.4 sox has mp3 encoding/decoding if you have madlibs 
-	# and lame using alsa by default
-	local myconf
-
-	epatch ${FILESDIR}/${PN}-soundcard.patch
-	epatch ${FILESDIR}/${PN}-install.patch
-
-	myconf="${myconf} `use_enable oggvorbis ogg-vorbis`"
-	myconf="${myconf} `use_enable mad`"
-	myconf="${myconf} `use_enable encode lame`"
-	myconf="${myconf} --enable-oss-dsp"
-#	myconf="${myconf} `use_enable oss oss-dsp`"
-#	myconf="${myconf} `use_enable alsa alsa-dsp`"
-
-	econf ${myconf} \
-		--enable-fast-ulaw \
-		--enable-fast-alaw || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-	prepallman
-
-	dodoc Changelog README TODO *.txt
-}