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.

Package-Manager: portage-2.1.5_rc6

4 files changed, 59 insertions, 72 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/Manifest b/media-libs/libsoundtouch/Manifest
index dd62da70ca3f..9ae5d427e1d2 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX libsoundtouch-1.3.1-Makefile.patch 1689 RMD160 07fba1196a080c0a6db64f56017e31a7852c68df SHA1 7ebc59901c404821b86ca62b97ea0ec86cffdd10 SHA256 984a1e91d09b370ea65ea568f2ef04b5a9eed11e10fccceef36119ea8fd8891b
+AUX libsoundtouch-1.3.1-Makefile.patch 1686 RMD160 6b4caecf2e119e08876bf7a1f4e5b1ab5334d4e6 SHA1 3e18cd7833c6790f8019d3d2ce8ac9995463f272 SHA256 4f18efcf71333aeb998aa10b553107b640aff5c9d02e75bd777765383226cd9f
 AUX libsoundtouch-1.3.1-gcc-4.3.patch 290 RMD160 354d8854a27f60a54b73fd12f9a7ebd4c68d00c0 SHA1 8cc098a7b08525e9b2bcafe1ceac2577171897fc SHA256 a08ec491b736783e6176b157ff0cf5caa3a03f84e53726dbd62100aeca4fe0ff
 DIST soundtouch-1.3.1.tar.gz 314641 RMD160 713526a201e8ba3e3180718ebf2cccdb285a9e1e SHA1 0b63e71dc94c917ce9f48431789a001063884cc8 SHA256 f268fb05200fc55e50e88772765a822628f1a0157a4a57cc9545ac50a0d4fd9c
-EBUILD libsoundtouch-1.3.1-r1.ebuild 1285 RMD160 d0e87ecbcc73c55d041f7636ba0d177ab15d7d24 SHA1 ed034a4deecfcc5fc299c64b3827d572ecdc4883 SHA256 1b9e82a27e2a6a3279badb9fafb00ca910381121feb4f00c6e30ab37d49715a1
-MISC ChangeLog 3825 RMD160 18a1a8d217c3f7ae33d0dbc9bb6fb99fd98a59ac SHA1 005d44ab1fde1f2812af65f481e0b7bd0d5d2128 SHA256 c6feff64de0c154a998d98f896c5fe0f3e53ff5d0b49f39a3808659f5181f9d8
+EBUILD libsoundtouch-1.3.1-r1.ebuild 1166 RMD160 6798ce2c767821d617258aad6790eb501405a8e9 SHA1 4568cb4215932db76f767d3b4b185dcfd9aa315e SHA256 cd15ac617039e832d23dc1fca2a2a4f50bcf374c69f4740873bbc17a46a803ae
+MISC ChangeLog 4116 RMD160 e3aec8859e33c5bbff599293f22267fb8305745e SHA1 6c8ddaf9fb1359a11b72bc607d3b7bff4c55bf1c SHA256 ae6f43f4b64e0cb109cbad8a25f4103f39c4c149c5a291316d09fee0bcf0d623
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgCd7wACgkQvFcC4BYPU0oxzwCgzkml+qywWgpIPnetJOYGT3+x
-4HAAniyp8tiF0gtxTlVSHOcXVGFJSMt6
-=+Y1z
------END PGP SIGNATURE-----
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
 }