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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 6 insertions, 149 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/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 )