Run autopoint to that gettext macros get updated and it doesn't fail anymore with libtool 2.2, bug #231767

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

4 files changed, 33 insertions, 12 deletions

diff --git a/media-plugins/swh-plugins/ChangeLog b/media-plugins/swh-plugins/ChangeLog
index 4afbb19c38cd..fc2d78c3d5c4 100644
--- a/media-plugins/swh-plugins/ChangeLog
+++ b/media-plugins/swh-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/swh-plugins
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.36 2008/04/18 22:08:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.37 2008/07/22 08:42:41 aballier Exp $
+
+  22 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/swh-plugins-0.4.15-gettext.patch, swh-plugins-0.4.15.ebuild:
+  Run autopoint to that gettext macros get updated and it doesn't fail
+  anymore with libtool 2.2, bug #231767
 
   18 Apr 2008; Markus Meier <maekke@gentoo.org> -swh-plugins-0.4.14.ebuild,
   swh-plugins-0.4.15.ebuild:
diff --git a/media-plugins/swh-plugins/Manifest b/media-plugins/swh-plugins/Manifest
index 2ceef59f5f14..34f551b1f621 100644
--- a/media-plugins/swh-plugins/Manifest
+++ b/media-plugins/swh-plugins/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX swh-plugins-0.4.15-gettext.patch 346 RMD160 e000a1d116835db12be70d2218f8de017eac9a82 SHA1 5b735d07bd1490cdd0e7646da136de25eab0a899 SHA256 dd90abf14c3dcfba1742f102f1e567cbe950b512682aa6ee2d15cbc8b7c9a8c1
 AUX swh-plugins-0.4.15-pic.patch 5377 RMD160 c742de5874450c12560d8f2975754ca139dab453 SHA1 1230c4dd8125e587eb8717bd9dedf7bf93ebc5de SHA256 502e82c78e4011df78321106a26b925ef3c4fd11361a9beaf4ae8c828450c4f9
 AUX swh-plugins-0.4.15-plugindir.patch 647 RMD160 753cd8d9b825f52ab94ae819f45302ca058e0d9b SHA1 e32abae28884840e5702de06721444d2484e71cb SHA256 11a38b7811565a11930e33cd8c6c3c6dc765146dab9adff6f43b9f73c05c4d92
 AUX swh-plugins-0.4.15-riceitdown.patch 1157 RMD160 f47b061d4baffc72197a76ae50dd5f451ae35d03 SHA1 af2bf463803dd087dcb4df6aa4662b701b965f9b SHA256 9bab8b8e2ea112bb5b021f5b98bb9c6ebc36774cd037f29280c4cf9b9ec1b8e3
 DIST swh-plugins-0.4.15.tar.gz 1051623 RMD160 7b84a6b6269227a8c9b7091b3f3f08b5df3cb60d SHA1 a9aa0b1b71a95fe91ffcda60146559b3ad40ae90 SHA256 d05ee8a4f4d92e828412bce3449a034f6ef16bb630eaf60f8fe4e15a89168640
-EBUILD swh-plugins-0.4.15.ebuild 1615 RMD160 e3f43f32974ecd74d67831a041a9abf5825d547e SHA1 dd492cc756ac288b0977f29e7b1fba46ed3b58b7 SHA256 14ccc4e299b7f3fcf4556c7335917942ee15eff139a3d34ece433f3cda9fc764
-MISC ChangeLog 6409 RMD160 6a90e0b94225319fadd3829d05461094f80e8bdc SHA1 ffebf2086458099948c94d3a935cfc209f46de15 SHA256 e5cfc451c5593cbdbb5e047600d1e7fa18f03cf7d18a4c3e65165de44d594df6
+EBUILD swh-plugins-0.4.15.ebuild 1662 RMD160 0c8c111fc3e5bb06063acbcccf3912a9605fab64 SHA1 73a2a755b703df916a2e9247bdbcf9964538467e SHA256 bb583a659438774e6575286db189115ffe05d1a826f6a12e66ba4f2b7d162ee6
+MISC ChangeLog 6645 RMD160 5fe8fa447c91747c3d157065b3f83f801abb8f57 SHA1 aa19c7fd076b18707f0e764f8e37918adf6a24b8 SHA256 cdf219645a1df9ce1e7843974e60561b040d63a5b2fde9f8f71361a3604a6a89
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgJG/IACgkQkKaRLQcq0GJP6QCeOZc4UE0AIbJHn8v7MMeG2Pq1
-TeIAn3AIzqhE2ArezXKus4j7NjthGI+x
-=tyfc
+iEYEARECAAYFAkiFnYwACgkQvFcC4BYPU0rz+ACeJUVx9c+znlmdRPfR+0AICIoA
+qwMAnjtRebB21qzfrR2lYdUY2G/EHzS+
+=3/RU
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch
new file mode 100644
index 000000000000..917898356e11
--- /dev/null
+++ b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch
@@ -0,0 +1,12 @@
+Index: swh-plugins-0.4.15/configure.in
+===================================================================
+--- swh-plugins-0.4.15.orig/configure.in
++++ swh-plugins-0.4.15/configure.in
+@@ -52,6 +52,7 @@ AC_PROG_CC
+ AC_REQUIRE_CPP
+ ALL_LINGUAS="en_GB"
+ AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.13])
+ AC_C_BIGENDIAN
+ 
+ LIBS="$LIBS -lm"
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild
index 33ec825e56ef..9eaabb8c3576 100644
--- a/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild,v 1.4 2008/04/18 22:08:08 maekke Exp $
-
-WANT_AUTOMAKE="1.8"
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild,v 1.5 2008/07/22 08:42:41 aballier Exp $
 
 inherit eutils autotools
 
@@ -18,6 +16,7 @@ IUSE="3dnow nls sse"
 RDEPEND="media-libs/ladspa-sdk
 	>=sci-libs/fftw-3"
 DEPEND="${RDEPEND}
+	sys-devel/gettext
 	dev-util/pkgconfig"
 
 src_unpack() {
@@ -27,10 +26,14 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-pic.patch"
 	epatch "${FILESDIR}/${P}-plugindir.patch"
 	epatch "${FILESDIR}/${P}-riceitdown.patch"
+	epatch "${FILESDIR}/${P}-gettext.patch"
+
+	# This is to update gettext macros, otherwise they are incompatible with
+	# recent libtools, bug #231767
+	autopoint -f || die
 
-	# This is needed to run autoreconf with newer autotools
-	sed -i -e 's:@MKINSTALLDIRS@:$(top_srcdir)/mkinstalldirs:' \
-		po/Makefile.in.in || die "mkinstalldirs sed failed"
+	# it doesn't get updated otherwise
+	rm -f missing
 
 	eautoreconf
 	elibtoolize