Fix commit that was made 29 Dec 2009 to stabilize sox-14.3.0 for sparc.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 8 insertions, 154 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 2b40d7f72966..23fbb5a9e970 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/sox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.119 2010/04/29 11:46:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.120 2010/04/29 12:02:15 ssuominen Exp $
+
+  29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> sox-14.3.0.ebuild:
+  Fix commit that was made 29 Dec 2009 to stabilize sox-14.3.0 for sparc.
 
   29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> sox-14.3.1.ebuild,
   +files/sox-14.3.1-nomad.patch:
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index f0799154fb9e..6b12d05ce21c 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,12 +1,9 @@
 AUX sox-14.2.0-distro.patch 1245 RMD160 a0ea4f0ab40113d8ffd4f6e5be7b1f2189c6aa76 SHA1 4aba29093e30720e785bac8e51e2a661ad2d9716 SHA256 6bee373206b67fe9040ca34e98d08b32ac45330ec48f68ac665398baab97a9f6
 AUX sox-14.2.0-file-5.0.patch 580 RMD160 8a6c0de5d55b3986bb343de02e96f4f155eee91c SHA1 6eded5629a863e88e9b96a08eff3e24224ae2413 SHA256 5fa17a034348bd9b5301b7df9c4b8b6603902404103a9d145d5e7084a39bd622
 AUX sox-14.3.1-nomad.patch 401 RMD160 ebd569e1fe54521cce9acf22f5c10a039deae27b SHA1 8eda98ea9ff97cca42007d6964d8139f111bf70f SHA256 d8a8ffd166becd9acf39b1b55dc49f1dabeebdcc3965cfb5e6985f4b571dc033
-DIST sox-14.2.0.tar.gz 964800 RMD160 7c76a2db5c5838fc3d9f8b5402e47d548fd094d5 SHA1 1b60e5af43f44a51247fb978f2423f0de7e27363 SHA256 8d1b8eb33a72a181369475c9da5fdcbe5f6820e6af3d86a0e84f6939e61a9dc1
 DIST sox-14.3.0.tar.gz 1007679 RMD160 9302e00d76c972c4916979d147468f640e04acaa SHA1 34b8e991ba8511fa9683e9e9d356fb7f4179d03c SHA256 9abf411c949366d75c884b368284690b6c8c7d5fb5df0deaf599539b704b2397
 DIST sox-14.3.1.tar.gz 1044595 RMD160 d5c44ccb3acbe686af4bd434ce8cb9a7bf3e2dc7 SHA1 ef1773e08322ad9d9deb0a9f8e37a7ba4b9ca384 SHA256 c4be9ebdb1e77a3bc9f3ee1f3fd274a1fe7b162a174fcc74874b231f3f1ace54
-EBUILD sox-14.2.0-r1.ebuild 2015 RMD160 361584fa9d897e7489644329d11919a2f520378d SHA1 653f013e44716c26c24d09686add8dc1a228122c SHA256 883d83e81999b05fd91c44ff3bbe59bf2d00ee0e97c15e74458714945e122b8c
-EBUILD sox-14.2.0.ebuild 1949 RMD160 8a8cac1f38a41976b9fdd218808f5c5ecd9a2bd8 SHA1 af0359ed2a50c3539c2636ae6ddd676b873d9dda SHA256 e39e20697474f2e1098be7640c3bcf7894bd25d1b9e0cea771d3fea5c1dddad2
-EBUILD sox-14.3.0.ebuild 1806 RMD160 77f82d7b67911d127bc12fd1a31e594cec95e32e SHA1 47010c97bc9e4f4f444577c8b0e5d42a6f1117a0 SHA256 ac59a247debff2e959c1615240b2129632aa8454e378881c78e14436c1fae1e1
+EBUILD sox-14.3.0.ebuild 1809 RMD160 2fae5f05d1646bd668106c6625d3ff573db4e48a SHA1 4969b55aae0d2cdd7fd41a3acdda8e194613aa13 SHA256 11b18ea2f7285e0cb64af2f6007a16ae9a0722bd343dd65a0cc9d817e261afce
 EBUILD sox-14.3.1.ebuild 1938 RMD160 a314dbae801dd21bfea4bdf83599baf89179f9de SHA1 1efb76465ff24782b9ede46be786477cc8a27329 SHA256 9a5a6978d167f5a800e830cef35089e6b6f2c2a92c11ace495b0c41176f907dc
-MISC ChangeLog 15700 RMD160 dc12269324282c2fe03b15afd2fdec69c7743210 SHA1 d6ae1aae53ef1d98d79d6e5aebf926a7fff101cd SHA256 57d7265de6e043d9f374a83efdeec2dc75f5642c4807a52e5e64cd485ddbcc1d
+MISC ChangeLog 15848 RMD160 3c7e2a716492dd7b3a2ae47ab4c211fb0a0b7fda SHA1 3a14cc15fb92f2a13761ca3ba4445b843ab3ac15 SHA256 6807bd561db73e09941e63b87c9d14a328302bfd81fd0d3cc5e220b96e753b27
 MISC metadata.xml 318 RMD160 9ed7f56a243d795af858a8269ef4aa6c0b12de10 SHA1 77351e7231619c84672be1f9407a91268c728043 SHA256 cbacb312c7d857414aacc7c5c44d7f0c6c617cc8475feb8371c7174ee5b04f5c
diff --git a/media-sound/sox/sox-14.2.0-r1.ebuild b/media-sound/sox/sox-14.2.0-r1.ebuild
deleted file mode 100644
index ec3401a8c8a6..000000000000
--- a/media-sound/sox/sox-14.2.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.2.0-r1.ebuild,v 1.3 2009/10/20 16:18:02 ssuominen Exp $
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa ao debug encode ffmpeg flac id3tag ladspa mad libsamplerate ogg oss png sndfile wavpack"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	encode? ( media-sound/lame )
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libmad )
-	sndfile? ( media-libs/libsndfile )
-	libsamplerate? ( media-libs/libsamplerate )
-	ogg? ( media-libs/libvorbis	media-libs/libogg )
-	ao? ( media-libs/libao )
-	ffmpeg? ( media-video/ffmpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	>=media-sound/gsm-1.0.12-r1
-	id3tag? ( media-libs/libid3tag )
-	png? ( media-libs/libpng )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-distro.patch"
-	# bug 259652
-	epatch "${FILESDIR}/${P}-file-5.0.patch"
-	eautoreconf
-}
-
-src_compile () {
-	# Fixes wav segfaults. See Bug #35745.
-	append-flags -fsigned-char
-
-	econf $(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable ao libao) \
-		$(use_enable oss) \
-		$(use_with encode lame) \
-		$(use_with mad) \
-		$(use_with sndfile) \
-		$(use_with flac) \
-		$(use_with ogg) \
-		$(use_with libsamplerate samplerate) \
-		$(use_with ffmpeg) \
-		$(use_with ladspa) \
-		$(use_with id3tag) \
-		--without-amr-wb \
-		--without-amr-nb \
-		$(use_with png) \
-		$(use_with wavpack) \
-		--with-distro="Gentoo" \
-		--enable-fast-ulaw \
-		--enable-fast-alaw \
-		|| die "configure failed"
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc NEWS ChangeLog README AUTHORS
-}
diff --git a/media-sound/sox/sox-14.2.0.ebuild b/media-sound/sox/sox-14.2.0.ebuild
deleted file mode 100644
index f0bf4fc46b8e..000000000000
--- a/media-sound/sox/sox-14.2.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.2.0.ebuild,v 1.9 2009/10/20 16:18:02 ssuominen Exp $
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa ao debug encode ffmpeg flac id3tag ladspa mad libsamplerate ogg oss png sndfile wavpack"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	encode? ( media-sound/lame )
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libmad )
-	sndfile? ( media-libs/libsndfile )
-	libsamplerate? ( media-libs/libsamplerate )
-	ogg? ( media-libs/libvorbis	media-libs/libogg )
-	ao? ( media-libs/libao )
-	ffmpeg? ( media-video/ffmpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	>=media-sound/gsm-1.0.12-r1
-	id3tag? ( media-libs/libid3tag )
-	png? ( media-libs/libpng )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-distro.patch"
-	eautoreconf
-}
-
-src_compile () {
-	# Fixes wav segfaults. See Bug #35745.
-	append-flags -fsigned-char
-
-	econf $(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable ao libao) \
-		$(use_enable oss) \
-		$(use_with encode lame) \
-		$(use_with mad) \
-		$(use_with sndfile) \
-		$(use_with flac) \
-		$(use_with ogg) \
-		$(use_with libsamplerate samplerate) \
-		$(use_with ffmpeg) \
-		$(use_with ladspa) \
-		$(use_with id3tag) \
-		--without-amr-wb \
-		--without-amr-nb \
-		$(use_with png) \
-		$(use_with wavpack) \
-		--with-distro="Gentoo" \
-		--enable-fast-ulaw \
-		--enable-fast-alaw \
-		|| die "configure failed"
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc NEWS ChangeLog README AUTHORS
-}
diff --git a/media-sound/sox/sox-14.3.0.ebuild b/media-sound/sox/sox-14.3.0.ebuild
index 5f5a1775d0be..a7ab408f259e 100644
--- a/media-sound/sox/sox-14.3.0.ebuild
+++ b/media-sound/sox/sox-14.3.0.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/sox/sox-14.3.0.ebuild,v 1.10 2010/01/07 14:49:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.0.ebuild,v 1.11 2010/04/29 12:02:15 ssuominen Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="alsa ao debug encode ffmpeg flac id3tag ladspa mad ogg oss png pulseaudio sndfile wavpack"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )