version bump, fixes #81968

(Portage version: 2.0.51.16)

10 files changed, 190 insertions, 33 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index e8385fec3298..27b44b567c32 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,9 @@
 # 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.40 2004/12/31 23:11:54 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.41 2005/02/18 16:51:57 luckyduck Exp $
+
+  18 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> :
+  version bump, fixes #81968
 
   31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   sox-12.17.6-r1.ebuild:
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index c34889546cb7..01d9d986d500 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,27 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6143de81425fa3b93812bacb3ae9e1e3 ChangeLog 5202
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 bed3d88f07d84824e45c7baf1231fc5d sox-12.17.3-r3.ebuild 1042
-MD5 cee6945888ca075bc242cf5d9bc636ff sox-12.17.5-r1.ebuild 2037
-MD5 58d48629a7a079e4b351cf17c1cf7ebf sox-12.17.4-r2.ebuild 1586
 MD5 eb4891dba9f383c5ae21e3813e275490 sox-12.17.6.ebuild 1891
+MD5 bed3d88f07d84824e45c7baf1231fc5d sox-12.17.3-r3.ebuild 1042
 MD5 20ba512afe489bd181bacabb2554f7e7 sox-12.17.6-r1.ebuild 1520
-MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r3 63
+MD5 58d48629a7a079e4b351cf17c1cf7ebf sox-12.17.4-r2.ebuild 1586
+MD5 cee6945888ca075bc242cf5d9bc636ff sox-12.17.5-r1.ebuild 2037
+MD5 20ba512afe489bd181bacabb2554f7e7 sox-12.17.7.ebuild 1520
+MD5 6143de81425fa3b93812bacb3ae9e1e3 ChangeLog 5202
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 55b945c4cad98947d37be88cf3c5ef7e files/sox-soundcard.patch 275
-MD5 64aef0b430e70836aae794f8e91ea8dc files/digest-sox-12.17.4-r2 63
+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 8a1b39117b61aeb3d136106f13347185 files/sox-wave-overflow.patch 736
-MD5 923124d7fbe0a70712b4991ae52a968b files/sox-wav-segfault.patch 255
-MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
+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 63
 MD5 d489ca9068a273a4a383094d2336edff files/digest-sox-12.17.6-r1 63
-MD5 a4a1bf246929c73d663a66a97acfd5cc files/sox-12.17.6-destdir.patch 4327
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB1dzGArHZZzCEUG0RAuvZAJ9SOGn7ooLZXRAX39uEMpysUvwLpACffIss
-TIXcayutjdzb1tVQfIdoVeQ=
-=aK2F
------END PGP SIGNATURE-----
+MD5 923124d7fbe0a70712b4991ae52a968b files/sox-wav-segfault.patch 255
+MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
diff --git a/media-sound/sox/files/digest-sox-12.17.7 b/media-sound/sox/files/digest-sox-12.17.7
new file mode 100644
index 000000000000..6f7c73e5a2e6
--- /dev/null
+++ b/media-sound/sox/files/digest-sox-12.17.7
@@ -0,0 +1 @@
+MD5 a6876289602c1f2896b39e6a88e2a574 sox-12.17.7.tar.gz 466570
diff --git a/media-sound/sox/files/sox-12.17.7-destdir.patch b/media-sound/sox/files/sox-12.17.7-destdir.patch
new file mode 100644
index 000000000000..da843c69c199
--- /dev/null
+++ b/media-sound/sox/files/sox-12.17.7-destdir.patch
@@ -0,0 +1,101 @@
+diff -uprN sox-12.17.7.orig/Makefile.in sox-12.17.7/Makefile.in
+--- sox-12.17.7.orig/Makefile.in	2005-02-18 17:42:00.437529456 +0100
++++ sox-12.17.7/Makefile.in	2005-02-18 17:46:40.584940576 +0100
+@@ -32,22 +32,22 @@ PLAY_INSTALL_1  = install-play
+ 
+ install: $(PLAY_INSTALL_$(PLAY_SUPPORT))
+ 	cd src && $(MAKE) $@
+-	$(srcdir)/mkinstalldirs $(mandir)/man1
+-	$(INSTALL) -c -m 644 $(srcdir)/sox.1 $(mandir)/man1
+-	if [ -f $(mandir)/man1/soxmix.1 ] ; then $(RM) $(mandir)/man1/soxmix.1; fi
+-	cd $(mandir)/man1 && $(LN_S) sox.1 soxmix.1
+-	$(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(mandir)/man1
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -c -m 644 $(srcdir)/sox.1 $(DESTDIR)$(mandir)/man1
++	if [ -f $(DESTDIR)$(mandir)/man1/soxmix.1 ] ; then $(RM) $(DESTDIR)$(mandir)/man1/soxmix.1; fi
++	cd $(DESTDIR)$(mandir)/man1 && $(LN_S) sox.1 soxmix.1
++	$(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(DESTDIR)$(mandir)/man1
+ 
+ install-play:
+-	if [ -f $(mandir)/man1/rec.1 ]; then $(RM) $(mandir)/man1/rec.1; fi
+-	$(srcdir)/mkinstalldirs $(mandir)/man1
+-	$(INSTALL) -c -m 644 $(srcdir)/play.1 $(mandir)/man1
+-	cd $(mandir)/man1 && $(LN_S) play.1 rec.1
++	if [ -f $(DESTDIR)$(mandir)/man1/rec.1 ]; then $(RM) $(DESTDIR)$(mandir)/man1/rec.1; fi
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -c -m 644 $(srcdir)/play.1 $(DESTDIR)$(mandir)/man1
++	cd $(DESTDIR)$(mandir)/man1 && $(LN_S) play.1 rec.1
+ 
+ install-lib:
+ 	cd src && $(MAKE) $@
+-	$(srcdir)/mkinstalldirs $(mandir)/man3
+-	$(INSTALL) -c -m 644 $(srcdir)/libst.3 $(mandir)/man3
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3
++	$(INSTALL) -c -m 644 $(srcdir)/libst.3 $(DESTDIR)$(mandir)/man3
+ 
+ 
+ PLAY_UNINSTALL_0    =
+diff -uprN sox-12.17.7.orig/src/gsm/Makefile.in sox-12.17.7/src/gsm/Makefile.in
+--- sox-12.17.7.orig/src/gsm/Makefile.in	2005-02-18 17:42:00.406534168 +0100
++++ sox-12.17.7/src/gsm/Makefile.in	2005-02-18 17:49:41.294468552 +0100
+@@ -77,12 +77,12 @@ libgsm.a: $(LIBOBJS)
+ 	$(RANLIB) libgsm.a
+ 
+ install-lib: libgsm.a
+-	$(top_srcdir)/mkinstalldirs $(libdir)
+-	$(top_srcdir)/mkinstalldirs $(mandir)/man3
+-	$(INSTALL) -c -m 644 libgsm.a $(libdir)
+-	$(RANLIB) $(libdir)/libgsm.a
+-	$(INSTALL) -c -m 644 gsm.3 $(mandir)/man3
+-	$(INSTALL) -c -m 644 gsm_option.3 $(mandir)/man3
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3
++	$(INSTALL) -c -m 644 libgsm.a $(DESTDIR)$(libdir)
++	$(RANLIB) $(DESTDIR)$(libdir)/libgsm.a
++	$(INSTALL) -c -m 644 gsm.3 $(DESTDIR)$(mandir)/man3
++	$(INSTALL) -c -m 644 gsm_option.3 $(DESTDIR)$(mandir)/man3
+ 
+ uninstall-lib:
+ 	$(RM) $(libdir)/libgsm.a
+diff -uprN sox-12.17.7.orig/src/Makefile.in sox-12.17.7/src/Makefile.in
+--- sox-12.17.7.orig/src/Makefile.in	2005-02-18 17:42:00.430530520 +0100
++++ sox-12.17.7/src/Makefile.in	2005-02-18 17:48:52.486888432 +0100
+@@ -103,24 +103,24 @@ PLAY_INSTALL_0    =
+ PLAY_INSTALL_1    = install-play
+ 
+ install: sox soxmix $(PLAY_INSTALL_$(PLAY_SUPPORT))
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL) -c -m 755 sox $(bindir)
+-	$(INSTALL) -c -m 755 soxmix $(bindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 755 sox $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 755 soxmix $(DESTDIR)$(bindir)
+ 
+ install-play:
+-	if [ -f $(bindir)/rec ] ; then $(RM) $(bindir)/rec; fi
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL) -c -m 755 play $(bindir)
+-	cd $(bindir) && $(LN_S) play rec
++	if [ -f $(DESTDIR)$(bindir)/rec ] ; then $(RM) $(DESTDIR)$(bindir)/rec; fi
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 755 play $(DESTDIR)$(bindir)
++	cd $(DESTDIR)$(bindir) && $(LN_S) play rec
+ 
+ install-lib: libst.a
+-	$(top_srcdir)/mkinstalldirs $(libdir)
+-	$(top_srcdir)/mkinstalldirs $(includedir)
+-	$(INSTALL) -c -m 755 libst-config $(bindir)
+-	$(INSTALL) -c -m 644 libst.a $(libdir)
+-	$(RANLIB) $(libdir)/libst.a
+-	$(INSTALL) -c -m 644 $(srcdir)/st.h $(includedir)
+-	$(INSTALL) -c -m 644 ststdint.h $(includedir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
++	$(INSTALL) -c -m 755 libst-config $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 644 libst.a $(DESTDIR)$(libdir)
++	$(RANLIB) $(DESTDIR)$(libdir)/libst.a
++	$(INSTALL) -c -m 644 $(srcdir)/st.h $(DESTDIR)$(includedir)
++	$(INSTALL) -c -m 644 ststdint.h $(DESTDIR)$(includedir)
+ 
+ PLAY_UNINSTALL_0    =
+ PLAY_UNINSTALL_1    = uninstall-play
diff --git a/media-sound/sox/sox-12.17.3-r3.ebuild b/media-sound/sox/sox-12.17.3-r3.ebuild
index fc9ef01d06e5..5334c3049a47 100644
--- a/media-sound/sox/sox-12.17.3-r3.ebuild
+++ b/media-sound/sox/sox-12.17.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.11 2004/07/01 07:59:16 eradicator Exp $
+# $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=""
 
diff --git a/media-sound/sox/sox-12.17.4-r2.ebuild b/media-sound/sox/sox-12.17.4-r2.ebuild
index f6fa75293f8b..04af2aeacbc7 100644
--- a/media-sound/sox/sox-12.17.4-r2.ebuild
+++ b/media-sound/sox/sox-12.17.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.4 2004/10/17 23:43:09 josejx Exp $
+# $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
 
diff --git a/media-sound/sox/sox-12.17.5-r1.ebuild b/media-sound/sox/sox-12.17.5-r1.ebuild
index 078ef3ec80dd..76a5c1765b63 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
+# 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.5 2004/11/11 23:32:10 kloeri Exp $
+# $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 $
 
 inherit gnuconfig eutils flag-o-matic
 
diff --git a/media-sound/sox/sox-12.17.6-r1.ebuild b/media-sound/sox/sox-12.17.6-r1.ebuild
index 30ae9164ba4b..4081aa5268e4 100644
--- a/media-sound/sox/sox-12.17.6-r1.ebuild
+++ b/media-sound/sox/sox-12.17.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2 2004/12/31 23:11:54 eradicator Exp $
+# $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 $
 
 IUSE="oggvorbis mad encode alsa"
 
diff --git a/media-sound/sox/sox-12.17.6.ebuild b/media-sound/sox/sox-12.17.6.ebuild
index 78cf8c038872..b4700e86ba49 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-2004 Gentoo Foundation
+# 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.2 2004/12/10 11:22:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.6.ebuild,v 1.3 2005/02/18 16:51:57 luckyduck Exp $
 
 inherit gnuconfig flag-o-matic
 
diff --git a/media-sound/sox/sox-12.17.7.ebuild b/media-sound/sox/sox-12.17.7.ebuild
new file mode 100644
index 000000000000..d4ec12e4814f
--- /dev/null
+++ b/media-sound/sox/sox-12.17.7.ebuild
@@ -0,0 +1,60 @@
+# 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.1 2005/02/18 16:51:57 luckyduck 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"
+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
+}