old

(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)

6 files changed, 6 insertions, 235 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 78c9e5402ceb..685805e17a0f 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.135 2011/10/23 16:17:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.136 2011/10/23 16:35:24 ssuominen Exp $
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -sox-14.3.0.ebuild,
+  -sox-14.3.1.ebuild, -files/sox-14.3.1-libpng15.patch,
+  -files/sox-14.3.1-nomad.patch, -sox-14.3.2.ebuild:
+  old
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> sox-14.3.2-r1.ebuild:
   alpha/sparc stable wrt #386005
diff --git a/media-sound/sox/files/sox-14.3.1-libpng15.patch b/media-sound/sox/files/sox-14.3.1-libpng15.patch
deleted file mode 100644
index adebc115fee1..000000000000
--- a/media-sound/sox/files/sox-14.3.1-libpng15.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://sourceforge.net/tracker/?func=detail&aid=3184238&group_id=10706&atid=310706
-
-Index: sox-14.3.1/src/spectrogram.c
-===================================================================
---- sox-14.3.1.orig/src/spectrogram.c
-+++ sox-14.3.1/src/spectrogram.c
-@@ -25,6 +25,7 @@
- #include <assert.h>
- #include <math.h>
- #include <png.h>
-+#include <zlib.h>
- 
- #define MAX_FFT_SIZE 4096
- #define is_p2(x) !(x & (x - 1))
diff --git a/media-sound/sox/files/sox-14.3.1-nomad.patch b/media-sound/sox/files/sox-14.3.1-nomad.patch
deleted file mode 100644
index 7bcad4f4390d..000000000000
--- a/media-sound/sox/files/sox-14.3.1-nomad.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/317595
-
---- src/mp3.c
-+++ src/mp3.c
-@@ -56,8 +56,10 @@
-  * Sidestep the issue by defining our own mad_timer_zero. This is needed because
-  * mad_timer_zero is used in some of the mad.h macros.
-  */
-+#ifdef HAVE_MAD_H
- #define mad_timer_zero mad_timer_zero_stub
- static mad_timer_t const mad_timer_zero_stub = {0, 0};
-+#endif
- 
- #define MAXFRAMESIZE 2880
- #define ID3PADDING 128
diff --git a/media-sound/sox/sox-14.3.0.ebuild b/media-sound/sox/sox-14.3.0.ebuild
deleted file mode 100644
index 202896de89c2..000000000000
--- a/media-sound/sox/sox-14.3.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 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.13 2011/08/18 20:43:52 mattst88 Exp $
-
-inherit 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"
-
-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"
-IUSE="alsa ao debug encode ffmpeg flac id3tag ladspa mad ogg openmp oss png pulseaudio sndfile wavpack"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	encode? ( media-sound/lame )
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libmad )
-	sndfile? ( media-libs/libsndfile )
-	ogg? ( media-libs/libvorbis	media-libs/libogg )
-	ao? ( media-libs/libao )
-	ffmpeg? ( virtual/ffmpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	>=media-sound/gsm-1.0.12-r1
-	id3tag? ( media-libs/libid3tag )
-	png? ( media-libs/libpng )
-	pulseaudio? ( media-sound/pulseaudio )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile () {
-	# Fixes wav segfaults. See Bug #35745.
-	append-flags -fsigned-char
-
-	econf $(use_with alsa) \
-		$(use_enable debug) \
-		$(use_enable openmp gomp) \
-		$(use_with ao) \
-		$(use_with oss) \
-		$(use_with encode lame) \
-		$(use_with mad) \
-		$(use_with sndfile) \
-		$(use_with flac) \
-		$(use_with ogg oggvorbis) \
-		$(use_with ffmpeg) \
-		$(use_with ladspa) \
-		$(use_with id3tag) \
-		--without-amrwb \
-		--without-amrnb \
-		$(use_with png) \
-		$(use_with pulseaudio) \
-		$(use_with wavpack) \
-		--with-distro="Gentoo"
-
-	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.1.ebuild b/media-sound/sox/sox-14.3.1.ebuild
deleted file mode 100644
index 018c7ee110da..000000000000
--- a/media-sound/sox/sox-14.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild,v 1.5 2011/08/18 20:43:52 mattst88 Exp $
-
-EAPI=2
-inherit 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"
-
-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"
-IUSE="alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg openmp oss png pulseaudio sndfile wavpack"
-
-# libtool required for libltdl
-RDEPEND="sys-devel/libtool
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	encode? ( media-sound/lame )
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libmad )
-	sndfile? ( media-libs/libsndfile )
-	ogg? ( media-libs/libvorbis	media-libs/libogg )
-	ao? ( media-libs/libao )
-	ffmpeg? ( virtual/ffmpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	>=media-sound/gsm-1.0.12-r1
-	id3tag? ( media-libs/libid3tag )
-	png? ( media-libs/libpng sys-libs/zlib )
-	pulseaudio? ( media-sound/pulseaudio )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nomad.patch
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-	# Fixes wav segfaults. See Bug #35745.
-	append-flags -fsigned-char
-
-	econf \
-		$(use_with alsa) \
-		$(use_enable debug) \
-		$(use_enable openmp gomp) \
-		$(use_with ao) \
-		$(use_with oss) \
-		$(use_with encode lame) \
-		$(use_with mad) \
-		$(use_with sndfile) \
-		$(use_with flac) \
-		$(use_with ogg oggvorbis) \
-		$(use_with ffmpeg) \
-		$(use_with ladspa) \
-		$(use_with id3tag) \
-		$(use_with amr amrwb) \
-		$(use_with amr amrnb) \
-		$(use_with png) \
-		$(use_with pulseaudio) \
-		$(use_with wavpack) \
-		--with-distro="Gentoo"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS ChangeLog README AUTHORS
-}
diff --git a/media-sound/sox/sox-14.3.2.ebuild b/media-sound/sox/sox-14.3.2.ebuild
deleted file mode 100644
index e5750f00d601..000000000000
--- a/media-sound/sox/sox-14.3.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.2.ebuild,v 1.6 2011/08/18 20:43:52 mattst88 Exp $
-
-EAPI=2
-inherit 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"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg openmp oss png pulseaudio sndfile wavpack"
-
-# libtool required for libltdl
-RDEPEND="sys-devel/libtool
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	encode? ( media-sound/lame )
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libmad )
-	sndfile? ( media-libs/libsndfile )
-	ogg? ( media-libs/libvorbis	media-libs/libogg )
-	ao? ( media-libs/libao )
-	ffmpeg? ( virtual/ffmpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	>=media-sound/gsm-1.0.12-r1
-	id3tag? ( media-libs/libid3tag )
-	png? ( media-libs/libpng sys-libs/zlib )
-	pulseaudio? ( media-sound/pulseaudio )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uclibc.patch
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-}
-
-src_configure() {
-	# Fixes wav segfaults. See Bug #35745.
-	append-flags -fsigned-char
-
-	econf \
-		$(use_with alsa) \
-		$(use_enable debug) \
-		$(use_enable openmp gomp) \
-		$(use_with ao) \
-		$(use_with oss) \
-		$(use_with encode lame) \
-		$(use_with mad) \
-		$(use_with sndfile) \
-		$(use_with flac) \
-		$(use_with ogg oggvorbis) \
-		$(use_with ffmpeg) \
-		$(use_with ladspa) \
-		$(use_with id3tag) \
-		$(use_with amr amrwb) \
-		$(use_with amr amrnb) \
-		$(use_with png) \
-		$(use_with pulseaudio) \
-		$(use_with wavpack) \
-		--with-distro="Gentoo"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS ChangeLog README AUTHORS
-}