Replace patching of Makefile.am with patching of Makefile.in files, and run elibtoolize instead of eautoreconf because it fails. Thanks to WiLLiKiZu for reporting.

(Portage version: 2.1.5_rc6)

3 files changed, 56 insertions, 59 deletions

diff --git a/media-libs/libsoundtouch/ChangeLog b/media-libs/libsoundtouch/ChangeLog
index 7d67fb66dbc0..0878968572a8 100644
--- a/media-libs/libsoundtouch/ChangeLog
+++ b/media-libs/libsoundtouch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libsoundtouch
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.24 2008/04/13 21:14:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.25 2008/04/26 08:19:41 drac Exp $
+
+  26 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  files/libsoundtouch-1.3.1-Makefile.patch, libsoundtouch-1.3.1-r1.ebuild:
+  Replace patching of Makefile.am with patching of Makefile.in files, and
+  run elibtoolize instead of eautoreconf because it fails. Thanks to
+  WiLLiKiZu for reporting.
 
   13 Apr 2008; Alexis Ballier <aballier@gentoo.org>
   +files/libsoundtouch-1.3.1-gcc-4.3.patch, libsoundtouch-1.3.1-r1.ebuild:
diff --git a/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch b/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch
index 9e335761fd09..4bb92d188991 100644
--- a/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch
+++ b/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch
@@ -1,40 +1,38 @@
-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 -ur soundtouch-1.3.1.orig/source/example/bpm/Makefile.in soundtouch-1.3.1/source/example/bpm/Makefile.in
+--- soundtouch-1.3.1.orig/source/example/bpm/Makefile.in	2006-03-19 14:09:42.000000000 +0200
++++ soundtouch-1.3.1/source/example/bpm/Makefile.in	2008-04-26 10:07:12.000000000 +0300
+@@ -186,7 +186,7 @@
+ libBPM_la_SOURCES = BPMDetect.cpp PeakFinder.cpp
+ 
+ # other compiler flags to add
+-AM_CXXFLAGS = -O3 -I../../../include
++AM_CXXFLAGS = -I../../../include
+ all: all-am
+ 
+ .SUFFIXES:
+diff -ur soundtouch-1.3.1.orig/source/example/SoundStretch/Makefile.in soundtouch-1.3.1/source/example/SoundStretch/Makefile.in
+--- soundtouch-1.3.1.orig/source/example/SoundStretch/Makefile.in	2006-03-19 14:09:41.000000000 +0200
++++ soundtouch-1.3.1/source/example/SoundStretch/Makefile.in	2008-04-26 10:06:54.000000000 +0300
+@@ -182,8 +182,8 @@
+ EXTRA_DIST = soundstretch.dsp soundstretch.dsw
+ soundstretch_SOURCES = main.cpp RunParameters.cpp WavFile.cpp 
+ soundstretch_LDADD = ../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm
+-soundstretch_LDFLAGS = -s
+-soundstretch_CXXFLAGS = -O3 -I../bpm
++soundstretch_LDFLAGS =
++soundstretch_CXXFLAGS = -I../bpm
+ all: all-am
+ 
+ .SUFFIXES:
+diff -ur soundtouch-1.3.1.orig/source/SoundTouch/Makefile.in soundtouch-1.3.1/source/SoundTouch/Makefile.in
+--- soundtouch-1.3.1.orig/source/SoundTouch/Makefile.in	2006-03-19 14:09:39.000000000 +0200
++++ soundtouch-1.3.1/source/SoundTouch/Makefile.in	2008-04-26 10:07:51.000000000 +0300
+@@ -191,7 +191,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
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild
index 88187b041cb7..bd277eab7eca 100644
--- a/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2008 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.12 2008/04/13 21:14:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild,v 1.13 2008/04/26 08:19:41 drac Exp $
 
-inherit autotools flag-o-matic
+inherit libtool flag-o-matic
 
-IUSE="sse"
-
-MY_P="${P/lib}"
+MY_P=${P/lib}
 
 DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates."
 HOMEPAGE="http://www.surina.net/soundtouch/"
@@ -15,18 +13,16 @@ SRC_URI="http://www.surina.net/soundtouch/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
+IUSE="sse"
 
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	epatch "${FILESDIR}"/${P}-Makefile.patch
 	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-	eautoreconf
+	elibtoolize
 
 	# Bug #148695
 	if use sse; then
@@ -37,15 +33,12 @@ src_unpack() {
 }
 
 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"
+	econf --enable-shared --disable-integer-samples
+	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
+	emake DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}/html" install \
+		|| die "emake install failed."
+	rm -f "${D}"/usr/share/doc/${PF}/html/COPYING.TXT
 }