- enable building shared libraries and get rid of broken static USE flag

  Bug #165774 by Jakub
- stop forcing --with-pic
- fixed a couple places where CXXFLAGS="-O3 -msse" were still being forced
- keep linker from prestripping soundstretch binary
- fix building on x86 subarchs that don't have SSE instructions
  Bug #148695 by Salah Coronya and Sok Ann Yap
- removed unnecessary dependencies
- danced the night away
(Portage version: 2.1.2-r11)

9 files changed, 108 insertions, 89 deletions

diff --git a/media-libs/libsoundtouch/ChangeLog b/media-libs/libsoundtouch/ChangeLog
index 27b54d512636..37dd57281a51 100644
--- a/media-libs/libsoundtouch/ChangeLog
+++ b/media-libs/libsoundtouch/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-libs/libsoundtouch
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.12 2007/02/22 02:01:04 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.13 2007/02/24 19:14:50 dirtyepic Exp $
+
+*libsoundtouch-1.3.1-r1 (24 Feb 2007)
+
+  24 Feb 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/libsoundtouch-1.3.1-Makefile.patch, metadata.xml,
+  -libsoundtouch-1.2.1.ebuild, -libsoundtouch-1.3.0.ebuild,
+  +libsoundtouch-1.3.1-r1.ebuild:
+  - enable building shared libraries and get rid of broken static USE flag
+    Bug #165774 by Jakub
+  - stop forcing --with-pic
+  - fixed a couple places where CXXFLAGS="-O3 -msse" were still being forced
+  - keep linker from prestripping soundstretch binary
+  - fix building on x86 subarchs that don't have SSE instructions
+    Bug #148695 by Salah Coronya and Sok Ann Yap
+  - removed unnecessary dependencies
+  - danced the night away
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.2.1 b/media-libs/libsoundtouch/files/digest-libsoundtouch-1.2.1
deleted file mode 100644
index 42bd57fde37a..000000000000
--- a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95bf7e05bcf2842d007f6e1f7580ded0 soundtouch_v1.2.1.zip 338788
-RMD160 de794845ae1c3ec1032d17d92c427d0f005d7967 soundtouch_v1.2.1.zip 338788
-SHA256 f19749aae6dff8ecb2f5cb09cfbc091e63aa27bef642a1115bac6d24dd9b2e09 soundtouch_v1.2.1.zip 338788
diff --git a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.0 b/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.0
deleted file mode 100644
index eb9d5998442d..000000000000
--- a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5c2d3f54320e5197885b3462f5f35a15 soundtouch_v1.3.0.zip 436780
-RMD160 ecb7e5ff722590eee845c2366e52ec41ac22a227 soundtouch_v1.3.0.zip 436780
-SHA256 14b3ebb416fb7edf4cafe680aa4a84d5548c9b2fc0174a00996282d3e29fa09d soundtouch_v1.3.0.zip 436780
diff --git a/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.1-r1 b/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.1-r1
new file mode 100644
index 000000000000..4cc1082213e1
--- /dev/null
+++ b/media-libs/libsoundtouch/files/digest-libsoundtouch-1.3.1-r1
@@ -0,0 +1,3 @@
+MD5 5e0185e81dbba2f2eed8581b7664ab04 soundtouch-1.3.1.tar.gz 314641
+RMD160 713526a201e8ba3e3180718ebf2cccdb285a9e1e soundtouch-1.3.1.tar.gz 314641
+SHA256 f268fb05200fc55e50e88772765a822628f1a0157a4a57cc9545ac50a0d4fd9c soundtouch-1.3.1.tar.gz 314641
diff --git a/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch b/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch
new file mode 100644
index 000000000000..9e335761fd09
--- /dev/null
+++ b/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch
@@ -0,0 +1,40 @@
+diff -Naur soundtouch-1.3.1-orig/source/example/bpm/Makefile.am soundtouch-1.3.1/source/example/bpm/Makefile.am
+--- soundtouch-1.3.1-orig/source/example/bpm/Makefile.am	2006-03-19 06:08:36.000000000 -0600
++++ soundtouch-1.3.1/source/example/bpm/Makefile.am	2007-02-24 11:52:13.000000000 -0600
+@@ -33,7 +33,7 @@
+ 

+ 

+ # other compiler flags to add

+-AM_CXXFLAGS=-O3 -I../../../include

++AM_CXXFLAGS=-I../../../include

+ 

+ # other linking flags to add

+ #libBPM_la_LIBADD=

+diff -Naur soundtouch-1.3.1-orig/source/example/SoundStretch/Makefile.am soundtouch-1.3.1/source/example/SoundStretch/Makefile.am
+--- soundtouch-1.3.1-orig/source/example/SoundStretch/Makefile.am	2006-03-19 06:08:36.000000000 -0600
++++ soundtouch-1.3.1/source/example/SoundStretch/Makefile.am	2007-02-24 11:51:52.000000000 -0600
+@@ -44,10 +44,10 @@
+ soundstretch_LDADD=../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm

+ 

+ ## linker flags

+-soundstretch_LDFLAGS=-s

++soundstretch_LDFLAGS=

+ 

+ ## additional compiler flags

+-soundstretch_CXXFLAGS=-O3 -I../bpm

++soundstretch_CXXFLAGS=-I../bpm

+ 

+ #clean-local: 

+ #	-rm -f additional-files-to-remove-on-make-clean

+diff -Naur soundtouch-1.3.1-orig/source/SoundTouch/Makefile.am soundtouch-1.3.1/source/SoundTouch/Makefile.am
+--- soundtouch-1.3.1-orig/source/SoundTouch/Makefile.am	2006-03-19 06:08:36.000000000 -0600
++++ soundtouch-1.3.1/source/SoundTouch/Makefile.am	2007-02-24 11:50:21.000000000 -0600
+@@ -35,7 +35,7 @@
+ 

+ # ??? test for -fcheck-new in configure.ac

+ # other compiler flags to add

+-AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include

++AM_CXXFLAGS=-fcheck-new -I../../include

+ 

+ # other linking flags to add

+ #libSoundTouch_la_LIBADD=

diff --git a/media-libs/libsoundtouch/libsoundtouch-1.2.1.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.2.1.ebuild
deleted file mode 100644
index 60b7c0eeef30..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.2.1.ebuild,v 1.6 2004/11/17 06:31:00 eradicator Exp $
-
-IUSE=""
-
-S="${WORKDIR}/SoundTouch-${PV}"
-
-DESCRIPTION="Audio processing library for changing the tempo, pitch and playback rates."
-HOMEPAGE="http://sky.prohosting.com/oparviai/soundtouch/"
-SRC_URI="http://sky.prohosting.com/oparviai/soundtouch/soundtouch_v${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
-
-RDEPEND="virtual/libc"
-DEPEND="app-arch/unzip"
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S}
-
-	# change sample type from integer to float (more accurate)
-	sed -i -e "s|#define INTEGER_SAMPLES|//#define INTEGER_SAMPLES|g" \
-		-e "s|//#define FLOAT_SAMPLES|#define FLOAT_SAMPLES|g" include/STTypes.h
-}
-
-src_compile() {
-	econf $myconf || die "./configure failed"
-	# fixes C(XX)FLAGS from configure, so we can use *ours*
-	emake CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install || die
-	rm -f ${D}/usr/share/doc/${PF}/COPYING.TXT  # remove obsolete LICENCE file
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.3.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.3.0.ebuild
deleted file mode 100644
index e5e9f11aab81..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-1.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.3.0.ebuild,v 1.1 2005/05/19 02:47:17 kito Exp $
-
-IUSE="static"
-
-S="${WORKDIR}/SoundTouch-${PV}"
-
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates."
-HOMEPAGE="http://sky.prohosting.com/oparviai/soundtouch/"
-SRC_URI="http://sky.prohosting.com/oparviai/soundtouch/soundtouch_v${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
-
-RDEPEND="virtual/libc"
-DEPEND="app-arch/unzip"
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S}
-
-	# change sample type from integer to float (more accurate)
-	sed -i -e "s|#define INTEGER_SAMPLES|//#define INTEGER_SAMPLES|g" \
-		-e "s|//#define FLOAT_SAMPLES|#define FLOAT_SAMPLES|g" include/STTypes.h
-}
-
-src_compile() {
-	econf $myconf \
-		$(use_enable static) \
-		--with-pic || die "./configure failed"
-	# fixes C(XX)FLAGS from configure, so we can use *ours*
-	emake CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install || die
-	rm -f ${D}/usr/share/doc/${PF}/COPYING.TXT  # remove obsolete LICENCE file
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..f9a7e36c0bee
--- /dev/null
+++ b/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild,v 1.1 2007/02/24 19:14:50 dirtyepic Exp $
+
+inherit autotools
+
+IUSE="sse"
+
+MY_P="${P/lib}"
+
+DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates."
+HOMEPAGE="http://www.surina.net/soundtouch/"
+SRC_URI="http://www.surina.net/soundtouch/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
+
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	eautoreconf
+
+	# Bug #148695
+	use sse \
+		|| sed -i -e '/^.*#define ALLOW_OPTIMIZATIONS.*$/d' "${S}"/include/STTypes.h
+}
+
+src_compile() {
+	econf $myconf \
+		--enable-shared \
+		--disable-integer-samples \
+		|| die "./configure failed"
+	# fixes C(XX)FLAGS from configure, so we can use *ours*
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install || die
+	rm -f ${D}/usr/share/doc/${PF}/COPYING.TXT	# remove obsolete LICENCE file
+}
diff --git a/media-libs/libsoundtouch/metadata.xml b/media-libs/libsoundtouch/metadata.xml
index d8913263a79e..ae573a60407f 100644
--- a/media-libs/libsoundtouch/metadata.xml
+++ b/media-libs/libsoundtouch/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<maintainer>
-<email>sound@gentoo.org</email>
-</maintainer>
+	<herd>sound</herd>
 </pkgmetadata>