Fix building with --params flag wrt #276433, thanks to Andrew Savchenko, Arttu Valo and Robert Cernansky.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 59 insertions, 5 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 4543eb140b68..69063202c37a 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.122 2009/07/24 08:14:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.123 2009/07/24 08:38:23 ssuominen Exp $
+
+  24 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  timidity++-2.13.2-r11.ebuild, +files/timidity++-2.13.2-params.patch:
+  Fix building with --params flag wrt #276433, thanks to Andrew Savchenko,
+  Arttu Valo and Robert Cernansky.
 
 *timidity++-2.13.2-r11 (24 Jul 2009)
 
diff --git a/media-sound/timidity++/files/timidity++-2.13.2-params.patch b/media-sound/timidity++/files/timidity++-2.13.2-params.patch
new file mode 100644
index 000000000000..6ff396ecce13
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.13.2-params.patch
@@ -0,0 +1,46 @@
+diff -ur TiMidity++-2.13.2.orig/autoconf/arts.m4 TiMidity++-2.13.2/autoconf/arts.m4
+--- TiMidity++-2.13.2.orig/autoconf/arts.m4	2002-10-05 06:16:37.000000000 +0300
++++ TiMidity++-2.13.2/autoconf/arts.m4	2009-07-24 11:35:57.000000000 +0300
+@@ -9,7 +9,7 @@
+ dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for aRts, and define ARTS_CFLAGS and ARTS_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_ARTS,
++AC_DEFUN([AM_PATH_ARTS],
+ 	[dnl 
+ dnl Get the cflags and libraries from the arts-config script
+ dnl
+@@ -156,4 +156,4 @@
+   AC_SUBST(ARTS_LIBS)
+   rm -f conf.artstest
+ ])
+-dnl End of aRts
+\ No newline at end of file
++dnl End of aRts
+diff -ur TiMidity++-2.13.2.orig/autoconf/vorbis.m4 TiMidity++-2.13.2/autoconf/vorbis.m4
+--- TiMidity++-2.13.2.orig/autoconf/vorbis.m4	2002-07-06 17:38:06.000000000 +0300
++++ TiMidity++-2.13.2/autoconf/vorbis.m4	2009-07-24 11:32:13.000000000 +0300
+@@ -5,7 +5,7 @@
+ dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+ dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_VORBIS,
++AC_DEFUN([AM_PATH_VORBIS],
+ [dnl 
+ dnl Get the cflags and libraries
+ dnl
+diff -ur TiMidity++-2.13.2.orig/configure.in TiMidity++-2.13.2/configure.in
+--- TiMidity++-2.13.2.orig/configure.in	2004-10-03 15:39:52.000000000 +0300
++++ TiMidity++-2.13.2/configure.in	2009-07-24 11:31:44.000000000 +0300
+@@ -1925,11 +1925,6 @@
+ 
+ AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes")
+ 
+-SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
+-SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
+-SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
+-SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
+-
+ if test "x$oss_device" != x; then
+   AC_DEFINE_UNQUOTED(OSS_DEVICE,"$oss_device", oss device name)
+ fi
diff --git a/media-sound/timidity++/timidity++-2.13.2-r11.ebuild b/media-sound/timidity++/timidity++-2.13.2-r11.ebuild
index 57295d374bf6..03b09badf396 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r11.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r11.ebuild,v 1.1 2009/07/24 08:14:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r11.ebuild,v 1.2 2009/07/24 08:38:23 ssuominen Exp $
 
 EAPI=2
-inherit eutils elisp-common
+inherit autotools eutils elisp-common
 
 MY_PV=${PV/_/-}
 MY_P=TiMidity++-${MY_PV}
@@ -52,11 +52,14 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-flac.patch \
 		"${FILESDIR}"/${P}-flac113.patch \
-		"${FILESDIR}"/${P}-protos.patch
+		"${FILESDIR}"/${P}-protos.patch \
+		"${FILESDIR}"/${P}-params.patch
 
 	# fix header location of speex
 	sed -i -e "s:#include <speex:#include <speex/speex:g" \
-		configure timidity/speex_a.c || die "sed failed"
+		configure.in timidity/speex_a.c || die "sed failed"
+
+	eautoreconf
 }
 
 src_configure() {