Version bump, resolves bug #119624.

(Portage version: 2.1_pre3-r1)

6 files changed, 193 insertions, 10 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 868dfbd14751..d03441ed72dd 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.50 2005/08/27 17:55:24 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.51 2006/01/22 13:19:30 chainsaw Exp $
+
+*sox-12.17.9 (22 Jan 2006)
+
+  22 Jan 2006; <chainsaw@gentoo.org> +files/sox-12.17.9-destdir.patch,
+  +files/sox-12.17.9-largefile.patch, +sox-12.17.9.ebuild:
+  Version bump, resolves bug #119624.
 
   27 Aug 2005; Markus Rothe <corsair@gentoo.org> sox-12.17.7-r1.ebuild:
   Stable on ppc64
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 5cbe8590f77a..ccdeef339721 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,19 +1,23 @@
 MD5 3b143a2b33d0aefe3a0fdcaedb73ace0 ChangeLog 6597
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 8f0b4d1c78a6982a316874b6b3a0cca6 sox-12.17.5-r1.ebuild 2022
-MD5 33bdd939d4c9c9e11357c14f48ab72fb sox-12.17.6-r1.ebuild 1501
-MD5 6b0ba2acfa0396856c328217f286b00f sox-12.17.6.ebuild 1596
-MD5 f8ec3d3502188796332362bc6ca772c8 sox-12.17.7-r1.ebuild 1276
-MD5 5bf814ebb228201d44ec4e4283a15da8 sox-12.17.7-r2.ebuild 1400
 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 078b05843747731261bbb166597697f0 files/digest-sox-12.17.7-r1 63
+MD5 078b05843747731261bbb166597697f0 files/digest-sox-12.17.7-r2 63
+MD5 4d72f875af3337745c870c5bb4a47ec6 files/digest-sox-12.17.9 63
 MD5 a4a1bf246929c73d663a66a97acfd5cc files/sox-12.17.6-destdir.patch 4327
 MD5 7911475898fe2541a80f439e938b1d0d files/sox-12.17.7-destdir.patch 4395
+MD5 42f6be2a6de49e8fe6324d947c34a347 files/sox-12.17.7-largefile.patch 297
+MD5 7911475898fe2541a80f439e938b1d0d files/sox-12.17.9-destdir.patch 4395
+MD5 42f6be2a6de49e8fe6324d947c34a347 files/sox-12.17.9-largefile.patch 297
 MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
 MD5 55b945c4cad98947d37be88cf3c5ef7e files/sox-soundcard.patch 275
 MD5 923124d7fbe0a70712b4991ae52a968b files/sox-wav-segfault.patch 255
 MD5 8a1b39117b61aeb3d136106f13347185 files/sox-wave-overflow.patch 736
-MD5 078b05843747731261bbb166597697f0 files/digest-sox-12.17.7-r2 63
-MD5 42f6be2a6de49e8fe6324d947c34a347 files/sox-12.17.7-largefile.patch 297
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 8f0b4d1c78a6982a316874b6b3a0cca6 sox-12.17.5-r1.ebuild 2022
+MD5 33bdd939d4c9c9e11357c14f48ab72fb sox-12.17.6-r1.ebuild 1501
+MD5 6b0ba2acfa0396856c328217f286b00f sox-12.17.6.ebuild 1596
+MD5 f8ec3d3502188796332362bc6ca772c8 sox-12.17.7-r1.ebuild 1276
+MD5 5bf814ebb228201d44ec4e4283a15da8 sox-12.17.7-r2.ebuild 1400
+MD5 7a58f79c3fedf22653040591edeea9e5 sox-12.17.9.ebuild 1399
diff --git a/media-sound/sox/files/digest-sox-12.17.9 b/media-sound/sox/files/digest-sox-12.17.9
new file mode 100644
index 000000000000..ffe2d6dc5e9e
--- /dev/null
+++ b/media-sound/sox/files/digest-sox-12.17.9
@@ -0,0 +1 @@
+MD5 a463ef9ff2ec00007a3a42ced9572b03 sox-12.17.9.tar.gz 468174
diff --git a/media-sound/sox/files/sox-12.17.9-destdir.patch b/media-sound/sox/files/sox-12.17.9-destdir.patch
new file mode 100644
index 000000000000..da843c69c199
--- /dev/null
+++ b/media-sound/sox/files/sox-12.17.9-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/files/sox-12.17.9-largefile.patch b/media-sound/sox/files/sox-12.17.9-largefile.patch
new file mode 100644
index 000000000000..03d707c9db41
--- /dev/null
+++ b/media-sound/sox/files/sox-12.17.9-largefile.patch
@@ -0,0 +1,12 @@
+Index: sox-12.17.7/configure.in
+===================================================================
+--- sox-12.17.7.orig/configure.in
++++ sox-12.17.7/configure.in
+@@ -88,6 +88,7 @@ AC_C_BIGENDIAN
+ AC_C_CONST
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
++AC_SYS_LARGEFILE
+ 
+ if test "$enable_old_rate" = yes
+ then
diff --git a/media-sound/sox/sox-12.17.9.ebuild b/media-sound/sox/sox-12.17.9.ebuild
new file mode 100644
index 000000000000..e9f6d6d14be6
--- /dev/null
+++ b/media-sound/sox/sox-12.17.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.9.ebuild,v 1.1 2006/01/22 13:19:30 chainsaw Exp $
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa encode mad ogg"
+
+DEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )
+	encode? ( media-sound/lame )
+	mad? ( media-libs/libmad )
+	ogg? ( media-libs/libvorbis )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Needed on mips and probably others
+	gnuconfig_update
+
+	epatch ${FILESDIR}/${P}-destdir.patch
+	epatch ${FILESDIR}/${P}-largefile.patch
+
+	autoheader || die "autoheader failed"
+	autoconf || die "autoconf failed"
+}
+
+src_compile () {
+	# Fixes wav segfaults. See Bug #35745.
+	append-flags -fsigned-char
+
+	econf ${myconf} \
+		$(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"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	prepallman
+
+	dodoc Changelog README TODO *.txt
+}