12 files changed, 59 insertions, 217 deletions
diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index c0347246ed49..d09e15afdfa3 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/sox
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.43 2005/03/10 14:33:30 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.44 2005/05/28 16:08:31 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -sox-12.17.3-r3.ebuild,
+  -sox-12.17.4-r2.ebuild, sox-12.17.5-r1.ebuild, sox-12.17.6.ebuild,
+  sox-12.17.6-r1.ebuild, -sox-12.17.7.ebuild, sox-12.17.7-r1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  Marked 12.17.7-r1 stable on amd64 and x86.
 
 *sox-12.17.7-r1 (10 Mar 2005)
 
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index ca94c6630da4..16b5ff529a2f 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,23 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fd3fcfb2058c3eb57e81f644a6b40125 sox-12.17.7-r1.ebuild 1269
-MD5 3a5144581cd868a5716be8fff7965f6b sox-12.17.6.ebuild 1894
-MD5 23c907b369a876a621393b1cc32f3d15 sox-12.17.3-r3.ebuild 1041
-MD5 f7a074c82761997af3c4d5fa63d8d234 sox-12.17.6-r1.ebuild 1519
-MD5 7962c57afc5225a3698a3b82bccd125a sox-12.17.4-r2.ebuild 1589
-MD5 588d2f0f84a616139dd1eeb280352d27 sox-12.17.5-r1.ebuild 2040
-MD5 52b045d47f67040e855fc51b81d79323 sox-12.17.7.ebuild 1512
-MD5 cc0907b02edea8cfd9b1c13564fd3a95 ChangeLog 5606
+MD5 8132ff9343a870346b5f9a28f88441d9 sox-12.17.7-r1.ebuild 1275
+MD5 6b0ba2acfa0396856c328217f286b00f sox-12.17.6.ebuild 1596
+MD5 33bdd939d4c9c9e11357c14f48ab72fb sox-12.17.6-r1.ebuild 1501
+MD5 8f0b4d1c78a6982a316874b6b3a0cca6 sox-12.17.5-r1.ebuild 2022
+MD5 8701a2bbb34d1937ab71cfb7464aab40 ChangeLog 5942
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 55b945c4cad98947d37be88cf3c5ef7e files/sox-soundcard.patch 275
 MD5 a4a1bf246929c73d663a66a97acfd5cc files/sox-12.17.6-destdir.patch 4327
 MD5 d489ca9068a273a4a383094d2336edff files/digest-sox-12.17.6 63
-MD5 078b05843747731261bbb166597697f0 files/digest-sox-12.17.7 63
 MD5 7911475898fe2541a80f439e938b1d0d files/sox-12.17.7-destdir.patch 4395
 MD5 8a1b39117b61aeb3d136106f13347185 files/sox-wave-overflow.patch 736
-MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r3 63
-MD5 64aef0b430e70836aae794f8e91ea8dc files/digest-sox-12.17.4-r2 63
 MD5 12cd6316db89eaf0efe7f5f33b5be707 files/digest-sox-12.17.5-r1 63
 MD5 d489ca9068a273a4a383094d2336edff files/digest-sox-12.17.6-r1 63
 MD5 078b05843747731261bbb166597697f0 files/digest-sox-12.17.7-r1 63
@@ -26,7 +20,7 @@ MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCMFrD06ebR+OMO78RAkZlAJ9RCINyBURsahTDAByaUjW/Cxi78wCfYLzS
-FmqangleGd7+RZZDFDvolAY=
-=XdK7
+iD8DBQFCmJeY06ebR+OMO78RAlQeAJ9pIaQjPb7TRjGfTzSVCY3CNOHXwACfWLj9
+HPA7p+g0Sp50sKgibIAcqtE=
+=E2+4
 -----END PGP SIGNATURE-----
diff --git a/media-sound/sox/files/digest-sox-12.17.3-r3 b/media-sound/sox/files/digest-sox-12.17.3-r3
deleted file mode 100644
index 32e2ece0bd4f..000000000000
--- a/media-sound/sox/files/digest-sox-12.17.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b9998387616ce0638c8edd1145f9932 sox-12.17.3.tar.gz 405660
diff --git a/media-sound/sox/files/digest-sox-12.17.4-r2 b/media-sound/sox/files/digest-sox-12.17.4-r2
deleted file mode 100644
index 3d925bc031be..000000000000
--- a/media-sound/sox/files/digest-sox-12.17.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39bdb64e06a8c456057e87eff7d0b339 sox-12.17.4.tar.gz 417497
diff --git a/media-sound/sox/files/digest-sox-12.17.7 b/media-sound/sox/files/digest-sox-12.17.7
deleted file mode 100644
index 6f7c73e5a2e6..000000000000
--- a/media-sound/sox/files/digest-sox-12.17.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6876289602c1f2896b39e6a88e2a574 sox-12.17.7.tar.gz 466570
diff --git a/media-sound/sox/sox-12.17.3-r3.ebuild b/media-sound/sox/sox-12.17.3-r3.ebuild
deleted file mode 100644
index 5334c3049a47..000000000000
--- a/media-sound/sox/sox-12.17.3-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.3-r3.ebuild,v 1.12 2005/02/18 16:51:57 luckyduck Exp $
-
-IUSE=""
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-KEYWORDS="x86 ppc alpha sparc "
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-DEPEND="virtual/libc"
-
-src_compile () {
-	# Looks like support for alsa09's dsp is broken in sox;
-	# disabling it for now.  Note that even when this is fixed,
-	# then we should check for USE=alsa and set --without-alsa-dsp
-	# appropriately.
-	econf --enable-fast-ulaw --enable-fast-alaw --without-alsa-dsp || die
-	emake || die
-}
-
-src_install () {
-	into /usr
-	dobin sox play soxeffect soxmix
-	doman sox.1 play.1 soxexam.1
-	dodoc Changelog Copyright README TODO *.txt
-}
-
-pkg_postinst () {
-	# the rec binary doesnt exist anymore
-	if([ ! -e /usr/bin/rec ]) then
-		ln -s /usr/bin/play /usr/bin/rec
-	fi
-}
diff --git a/media-sound/sox/sox-12.17.4-r2.ebuild b/media-sound/sox/sox-12.17.4-r2.ebuild
deleted file mode 100644
index 04af2aeacbc7..000000000000
--- a/media-sound/sox/sox-12.17.4-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.4-r2.ebuild,v 1.5 2005/02/18 16:51:57 luckyduck Exp $
-
-inherit gnuconfig eutils flag-o-matic
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-IUSE="alsa oss oggvorbis mad encode"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 ~mips alpha"
-LICENSE="LGPL-2.1"
-
-DEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/madplay )"
-
-src_compile () {
-	# Needed on mips and probablly others
-	gnuconfig_update
-
-	# 12.17.4 has mp3 encoding/decoding if you have madlibs and lame
-	# using alsa by default
-	local myconf
-
-	# Wave buffer overflow fix.  Adresses Bug #57962
-	epatch ${FILESDIR}/sox-wave-overflow.patch
-	# Wave segfault fix.  Adresses Bug #35745
-	append-flags -fsigned-char
-
-	use oggvorbis || myconf="${myconf} --disable-ogg-vorbis"
-	use mad || myconf="${myconf} --disable-mad"
-	use encode || myconf="${myconf} --disable-lame"
-	use alsa || myconf="${myconf} --disable-alsa-dsp"
-	use oss || myconf="${myconf} --disable-oss-dsp"
-
-	econf ${myconf} --enable-fast-ulaw --enable-fast-alaw || die
-	emake || die
-}
-
-src_install() {
-	dobin sox play soxeffect soxmix || die
-	doman sox.1 play.1 soxexam.1
-	dodoc Changelog README TODO *.txt
-}
-
-pkg_postinst() {
-	# the rec binary doesnt exist anymore
-	if [ ! -e ${ROOT}/usr/bin/rec ] ; then
-		ln -s /usr/bin/play ${ROOT}/usr/bin/rec
-	fi
-}
diff --git a/media-sound/sox/sox-12.17.5-r1.ebuild b/media-sound/sox/sox-12.17.5-r1.ebuild
index 76a5c1765b63..8423fc54d989 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-2005 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.6 2005/02/18 16:51:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5-r1.ebuild,v 1.7 2005/05/28 16:08:31 luckyduck Exp $
 
 inherit gnuconfig eutils flag-o-matic
 
@@ -8,14 +8,14 @@ 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
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc amd64 ~mips alpha"
-LICENSE="LGPL-2.1"
+IUSE="ogg mad encode" # alsa oss
 
 DEPEND="virtual/libc
 	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay )"
 #	alsa? ( media-libs/alsa-lib )
 
@@ -34,7 +34,7 @@ src_compile () {
 	append-flags -fsigned-char
 	use ppc && epatch ${FILESDIR}/${PN}-wav-segfault.patch
 
-	myconf="${myconf} `use_enable oggvorbis ogg-vorbis`"
+	myconf="${myconf} `use_enable ogg ogg-vorbis`"
 	myconf="${myconf} `use_enable mad`"
 	myconf="${myconf} `use_enable encode lame`"
 	myconf="${myconf} --enable-oss-dsp"
diff --git a/media-sound/sox/sox-12.17.6-r1.ebuild b/media-sound/sox/sox-12.17.6-r1.ebuild
index 4081aa5268e4..836bdf717273 100644
--- a/media-sound/sox/sox-12.17.6-r1.ebuild
+++ b/media-sound/sox/sox-12.17.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.6-r1.ebuild,v 1.3 2005/02/18 16:51:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.6-r1.ebuild,v 1.4 2005/05/28 16:08:31 luckyduck Exp $
 
-IUSE="oggvorbis mad encode alsa"
+IUSE="ogg mad encode alsa"
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1"
 
 DEPEND="virtual/libc
 	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay )
 	alsa? ( media-libs/alsa-lib )"
 
@@ -39,7 +39,7 @@ src_compile () {
 	# Fixes wav segfaults. See Bug #35745.
 	append-flags -fsigned-char
 
-	myconf="${myconf} `use_enable oggvorbis ogg-vorbis`"
+	myconf="${myconf} `use_enable ogg ogg-vorbis`"
 	myconf="${myconf} `use_enable mad`"
 	myconf="${myconf} `use_enable encode lame`"
 #	myconf="${myconf} `use_enable oss oss-dsp`"
diff --git a/media-sound/sox/sox-12.17.6.ebuild b/media-sound/sox/sox-12.17.6.ebuild
index b4700e86ba49..62e348b03107 100644
--- a/media-sound/sox/sox-12.17.6.ebuild
+++ b/media-sound/sox/sox-12.17.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.6.ebuild,v 1.3 2005/02/18 16:51:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.6.ebuild,v 1.4 2005/05/28 16:08:31 luckyduck Exp $
 
 inherit gnuconfig flag-o-matic
 
@@ -8,14 +8,14 @@ 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
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86 ppc ~sparc ~amd64 ~mips ~alpha"
-LICENSE="LGPL-2.1"
+IUSE="ogg mad encode" # alsa oss
 
 DEPEND="virtual/libc
 	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay )"
 #	alsa? ( media-libs/alsa-lib )
 
@@ -23,31 +23,28 @@ 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
-
 	# Fixes wav segfaults. See Bug #35745.
 	append-flags -fsigned-char
 
-	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`"
-
-#	SoX currently targets the ALSA kernel API and not alsa-lib. This is a problem because the interface changes.
-#	see bug #63531 for more details
-# 	The build will automatically disable ALSA support even if it's in USE
-	myconf="${myconf} --disable-alsa-dsp"
-	einfo "Notice.. ALSA support is currently broken in sox. ALSA support has been disabled."
-	einfo "sox will automatically use OSS, if you have ALSA then it'll work through the"
-	einfo "compatiblity layer."
-
-	econf ${myconf} \
+	# SoX currently targets the ALSA kernel API and not alsa-lib. This is
+	# a problem because the interface changes. see bug #63531 for more 
+	# details. The build will automatically disable ALSA support even if
+	# it's in USE
+	einfo "Notice.. ALSA support is currently broken in sox. ALSA support"
+	einfo "has been disabled. Sox will automatically use OSS, if you have"
+	einfo "ALSA then it'll work through the compatiblity layer."
+
+	econf \
+		$(use_enable encode lame) \
+		$(use_enable mad) \
+		$(use_enable ogg ogg-vorbis) \
+		${myconf} \
 		--enable-fast-ulaw \
-		--enable-fast-alaw || die "configure failed"
+		--enable-fast-alaw \
+		--enable-oss-dsp \
+		--disable-alsa-dsp \
+		|| die "configure failed"
+
 	emake || die "make failed"
 }
 
diff --git a/media-sound/sox/sox-12.17.7-r1.ebuild b/media-sound/sox/sox-12.17.7-r1.ebuild
index b6adb587b60e..651926d3c655 100644
--- a/media-sound/sox/sox-12.17.7-r1.ebuild
+++ b/media-sound/sox/sox-12.17.7-r1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.7-r1.ebuild,v 1.1 2005/03/10 14:33:30 luckyduck Exp $
-
-IUSE="alsa encode mad oggvorbis"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.7-r1.ebuild,v 1.2 2005/05/28 16:08:31 luckyduck Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -10,15 +8,16 @@ DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
 SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~hppa"
 LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc x86 ~hppa"
+IUSE="alsa encode mad ogg"
 
 DEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )
 	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis )
 	mad? ( media-libs/libmad )
-	alsa? ( media-libs/alsa-lib )"
+	ogg? ( media-libs/libvorbis )"
 
 src_unpack() {
 	unpack ${A}
@@ -36,18 +35,20 @@ src_compile () {
 	append-flags -fsigned-char
 
 	econf ${myconf} \
-		$(use_enable oggvorbis ogg-vorbis) \
-		$(use_enable mad) \
-		$(use_enable encode lame) \
 		$(use_enable alsa alsa-dsp) \
+		$(use_enable encode lame) \
+		$(use_enable mad) \
+		$(use_enable ogg ogg-vorbis) \
 		--enable-oss-dsp \
 		--enable-fast-ulaw \
-		--enable-fast-alaw || die "configure failed"
+		--enable-fast-alaw \
+		|| die "configure failed"
+
 	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	prepallman
 
 	dodoc Changelog README TODO *.txt
diff --git a/media-sound/sox/sox-12.17.7.ebuild b/media-sound/sox/sox-12.17.7.ebuild
deleted file mode 100644
index 9ebb977d9df3..000000000000
--- a/media-sound/sox/sox-12.17.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.7.ebuild,v 1.2 2005/02/20 18:45:00 gmsoft Exp $
-
-IUSE="oggvorbis mad encode alsa"
-
-inherit gnuconfig flag-o-matic eutils
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~hppa"
-LICENSE="LGPL-2.1"
-
-DEPEND="virtual/libc
-	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/madplay )
-	alsa? ( media-libs/alsa-lib )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	# Needed on mips and probablly others
-	gnuconfig_update
-
-	epatch ${FILESDIR}/${P}-destdir.patch
-}
-
-src_compile () {
-	# from version 12.17.4 sox has mp3 encoding/decoding if you have madlibs 
-	# and lame using alsa by default
-	local myconf
-
-	# Fixes wav segfaults. See Bug #35745.
-	append-flags -fsigned-char
-
-	myconf="${myconf} `use_enable oggvorbis ogg-vorbis`"
-	myconf="${myconf} `use_enable mad`"
-	myconf="${myconf} `use_enable encode lame`"
-#	myconf="${myconf} `use_enable oss oss-dsp`"
-	myconf="${myconf} --enable-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() {
-	make DESTDIR="${D}" install || die
-	prepallman
-
-	dodoc Changelog README TODO *.txt
-}