Run edos2unix Makefile.am wrt #219243, thanks to Christian Lerrahn. Revert last commit and run full eautoreconf wrt #220301, thanks to Andrew John Hughes.

Package-Manager: portage-2.1.5_rc6

4 files changed, 54 insertions, 45 deletions

diff --git a/media-libs/libsoundtouch/ChangeLog b/media-libs/libsoundtouch/ChangeLog
index 0878968572a8..43db04374b13 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.25 2008/04/26 08:19:41 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.26 2008/05/05 22:17:19 drac Exp $
+
+  05 May 2008; Samuli Suominen <drac@gentoo.org>
+  files/libsoundtouch-1.3.1-Makefile.patch, libsoundtouch-1.3.1-r1.ebuild:
+  Run edos2unix Makefile.am wrt #219243, thanks to Christian Lerrahn. Revert
+  last commit and run full eautoreconf wrt #220301, thanks to Andrew John
+  Hughes.
 
   26 Apr 2008; Samuli Suominen <drac@gentoo.org>
   files/libsoundtouch-1.3.1-Makefile.patch, libsoundtouch-1.3.1-r1.ebuild:
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 520278eb65b6..7fefda6e5f95 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,6 +1,6 @@
-AUX libsoundtouch-1.3.1-Makefile.patch 1686 RMD160 6b4caecf2e119e08876bf7a1f4e5b1ab5334d4e6 SHA1 3e18cd7833c6790f8019d3d2ce8ac9995463f272 SHA256 4f18efcf71333aeb998aa10b553107b640aff5c9d02e75bd777765383226cd9f
+AUX libsoundtouch-1.3.1-Makefile.patch 1689 RMD160 07fba1196a080c0a6db64f56017e31a7852c68df SHA1 7ebc59901c404821b86ca62b97ea0ec86cffdd10 SHA256 984a1e91d09b370ea65ea568f2ef04b5a9eed11e10fccceef36119ea8fd8891b
 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 1162 RMD160 1fad7a1bf858196370dce9b6fdb39c12e170f77b SHA1 4cf7a70296f511088d636d0f00f015b3740dc0d1 SHA256 9738caf1f3e79f90ac235dae49d7bfb4c0f368a1606cff910ec9cd691c3be11d
-MISC ChangeLog 4116 RMD160 e3aec8859e33c5bbff599293f22267fb8305745e SHA1 6c8ddaf9fb1359a11b72bc607d3b7bff4c55bf1c SHA256 ae6f43f4b64e0cb109cbad8a25f4103f39c4c149c5a291316d09fee0bcf0d623
+EBUILD libsoundtouch-1.3.1-r1.ebuild 1202 RMD160 b4bc1cbef32aad113c045fd48038594510bbb516 SHA1 55608bed860ddc587ab05841ea9233ea314d51e9 SHA256 12fc95f8c960c6ac064b9a4624c6c034adf347c47a546c43cd5fb110f2a78a00
+MISC ChangeLog 4402 RMD160 732bc677ca09dfe6170e17b7c294be2ade2fba79 SHA1 f284b80b29d085ebf9ef42e3d8419c8d6dcc74c8 SHA256 d9a94ea6ccadc8e7ac149d5c472f60c4fd481004a457c625df51a6141712b4bb
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
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 4bb92d188991..9e335761fd09 100644
--- a/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch
+++ b/media-libs/libsoundtouch/files/libsoundtouch-1.3.1-Makefile.patch
@@ -1,38 +1,40 @@
-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 -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.3.1-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild
index 51819a608a30..17e3d04754a6 100644
--- a/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.14 2008/04/26 08:27:32 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.3.1-r1.ebuild,v 1.15 2008/05/05 22:17:19 drac Exp $
 
-inherit libtool flag-o-matic
+inherit autotools eutils flag-o-matic libtool
 
 MY_P=${P/lib}
 
@@ -22,7 +22,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-Makefile.patch \
 		"${FILESDIR}"/${P}-gcc-4.3.patch
-	elibtoolize
+	edos2unix Makefile.am
+	eautoreconf
 
 	# Bug #148695
 	if use sse; then