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

(Portage version: 2.1.5_rc6)

3 files changed, 51 insertions, 42 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/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