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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 62 insertions, 7 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++/Manifest b/media-sound/timidity++/Manifest
index 50c024dd586f..6015453e1608 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -6,6 +6,7 @@ AUX timidity++-2.13.2-flac.patch 735 RMD160 65abbbc330b0ae486af3686cea8329a4f9a1
 AUX timidity++-2.13.2-flac113.patch 11509 RMD160 709a31cc664a9686f1ac22974459e0c932511418 SHA1 173cc8f2ec5ecfc834d5a0027aa3cdecd3f9f14d SHA256 2ed4abfb75d225f6bd295ba4ffbc63f47c6caab57cb09e670df508c5d7447424
 AUX timidity++-2.13.2-gcc4.patch 1325 RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 SHA1 8d50618a2379c078b07e8d0fc59457855c16106c SHA256 20ca5deb95ccbb527c0212f4ad002a5a8df1a9c005e210494abe7bc240cef3ee
 AUX timidity++-2.13.2-gtk26.patch 588 RMD160 588eefcb0727af0162b24b17970df300ea5fdd64 SHA1 ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4 SHA256 fdb95708e353425fbc8f141d45f5b876fa85636f953200cdbc147834b4a31f56
+AUX timidity++-2.13.2-params.patch 1729 RMD160 bc44ea792dcad5508bdfaa2b7b8f3b9f97309a0b SHA1 fe0db50b27bafe7a60779718e68a54ef251537d9 SHA256 10ca32a16bc4f8bfc011614a2771c25f111412c3ba2715fbcbb8b8d0f73df466
 AUX timidity++-2.13.2-polling.patch 960 RMD160 404beaffd1d1618ad6579ef952567f514e82da5d SHA1 6c4f62c045380a6d27c44002c72352943af0fa2b SHA256 933afdd0a6f4dfc98b25818c8c07ea7e2ba8a10a422f23953143d0ae09e39845
 AUX timidity++-2.13.2-protos.patch 231 RMD160 4ae219704a9da1dfc792bde1a9ebc991eac168a1 SHA1 26ce16fa02127896fe3d919a758a067c63b6b8bd SHA256 14ae61bc72897cbbe817227f5dbda68c388c80531bd1659b0a595884747de78e
 AUX timidity.cfg-r1 669 RMD160 856294ef64ab459a03375cb86e5f0fbcdef88ab3 SHA1 a1aec57e46d953082d1e59cf80eb1cb15627bb4c SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce
@@ -15,6 +16,6 @@ AUX timidity.xpm 1522 RMD160 2b64234979909343fc2775e5eedfe8960a3190d1 SHA1 18155
 DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85084fd8 SHA1 8e603146e1164335303a5ac5dff291f369241b4e SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260
 DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142440a4f3760a9 SHA1 7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60 SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77
 EBUILD timidity++-2.13.2-r10.ebuild 4643 RMD160 bae6efcb54f17c9c2317b3b40fb9337bf8465f35 SHA1 cd35b0b384267e61daac445da4038bca0776a93c SHA256 1590af2e29263c5329a2fe1327fe91c5bb438e97504e11c856e75a5cda491ddc
-EBUILD timidity++-2.13.2-r11.ebuild 5271 RMD160 60d2a849809e0420ffd3a6a594d83f189ff25a60 SHA1 662f05949d322f01ad263e085a6756cb76384238 SHA256 a6fa1bc6897db331af96cd24bdc8be7ade70483454cb2282abcc003b05bbc723
-MISC ChangeLog 19322 RMD160 be69a6f81d9c52a08773b2b5dfc1f6c9735d7127 SHA1 cfa27144671907286989049fbebb5f89ebdd22d0 SHA256 629f74893261f729e247ac46af08da31038d5303d79457c5bb55e8b2f6c66a6b
+EBUILD timidity++-2.13.2-r11.ebuild 5334 RMD160 f1266f5f455b1f8ec306831b615029d553fd5ecd SHA1 f6c417c159f8947a7dedf03ad388591112db568d SHA256 11f83353e8af5964fbe54e3375689b32e49e03bb127e4548e1e18af6072acbd8
+MISC ChangeLog 19558 RMD160 0ba8a89e31d917e8be71e71701914d80be84c408 SHA1 5de45dff6ed079e3422fe4b6ce00c1a515aef6eb SHA256 067f142551886919c28509a34fdc1d8f54994151c87c988d93a1d11b86694aad
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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() {