Work around autotools.eclass eautopoint change (bug #416789, thanks to Markus Oehme and Rafał Mużyło).

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

5 files changed, 23 insertions, 15 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 15d6bd25bc83..4cb844468f26 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.283 2012/05/20 00:09:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.284 2012/05/20 21:39:27 tetromino Exp $
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> yelp-3.2.1.ebuild,
+  yelp-3.4.1.ebuild, yelp-3.4.2.ebuild:
+  Work around autotools.eclass eautopoint change (bug #416789, thanks to Markus
+  Oehme and Rafał Mużyło).
 
 *yelp-3.4.2 (20 May 2012)
 
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index ab778ab61ca9..b22817dce7c3 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -19,19 +19,19 @@ DIST yelp-3.4.1.tar.xz 847976 RMD160 5505efffd98b6776e0ab28ad70f2e2ed3ab665fc SH
 DIST yelp-3.4.2.tar.xz 846168 RMD160 f01375c3df4b5abbd5333fb0beac1bc32089734b SHA1 94cb2d26fe7f3b13618795ddaa7b9a2acc2c3344 SHA256 33f573da4d0b766aba7ebfab14470694e3245dffb2b63153f34bf8240b13c3a3
 EBUILD yelp-2.30.2-r5.ebuild 2393 RMD160 841c656f2b5cf879cfe081c8b8965d7aef333787 SHA1 914c9acdbdcfa89868c6f9bc50d774994aa5d0fb SHA256 7ff7e65f50e2c62a1113b206562f1a6e83c044d4dc7d0aa6981b0e25764c9a75
 EBUILD yelp-2.30.2-r6.ebuild 2507 RMD160 1f9cf21f22aafd65d3420277f909b9825f8dc2df SHA1 e79a3bea5a00771943b5d632a5091b45f2f11ebd SHA256 38c77a11c4254087833a3e6c7af2c85faf15a61be6a15f91541e84d8676f3a9c
-EBUILD yelp-3.2.1.ebuild 1494 RMD160 3514f0e8b866567bc231a996900f7367151ddf6a SHA1 bf108d59feab2b7269ed6e653cf5e5d122a6fb5c SHA256 68aaf085632821f56b7dccbca05d3b2d33e295e597a2a40498c4f0b5032c3d1a
-EBUILD yelp-3.4.1.ebuild 1515 RMD160 a1b2ced3ddbeb3fc36ca131d1363208ca77bc55e SHA1 7d3870c84484cc427f776533232dce3e91359edb SHA256 a20445ddaefdfc68fc56c3f276ccd7ec1c36cffa8b47347752ea44c76b908c46
-EBUILD yelp-3.4.2.ebuild 1515 RMD160 04d8b6df8fdd418a74e0e89f9fb99b85b690ed16 SHA1 f910f09e45b38b5f0e3e4d77b9bc21e52117b903 SHA256 0e8399923f82eb54cb2aef2a0f4c54d34b2d4fa18d95a2737636e85ff37055b9
-MISC ChangeLog 36364 RMD160 ef9e72d445f47998be9e1f93fd3d0f5b5c2494f5 SHA1 fc8581c513213adacef98eb862d3ba413f592d79 SHA256 5b437243802f9e4dfae6cc76f3611348b0e84212aaec773165ddaba140f9e04f
+EBUILD yelp-3.2.1.ebuild 1564 RMD160 b52f8df9411292b4cd0ae1264defdd269ff8a40e SHA1 9bbeb8cf6b57af7ff2875edbc1ac1927a3f5f78e SHA256 42080f0503e4e6cfdc446ce364a4cb992ece5b9ed5d874a4e9fc4c00001a8b38
+EBUILD yelp-3.4.1.ebuild 1582 RMD160 7b12f6d95a5e1d21cb634800023ab16b5d64a77d SHA1 4af8915b8ee4f4b29839e9ed630421b7f9a841fb SHA256 c493a3bd57b5df82ad35793130d5bba02018c7a677a6b7f531a29765d4d39b70
+EBUILD yelp-3.4.2.ebuild 1582 RMD160 1b953762a18ce09422799530a3c613e7fac7497b SHA1 670bce0f511d4f3ed46d6a9cc56756759f1d1910 SHA256 82042377a590996c467feeed77789a0a262036ebb1257cb6fd2afd709b87fcfa
+MISC ChangeLog 36593 RMD160 5a9bd58054a775ff533ec43e51209f3f73229304 SHA1 32132cfef3e4e7e0d69329f4fbe2fabfb017a173 SHA256 d30c7f3ff5ac1c07335aa0c61aa409a420bca48c906143d307a568cb969bf2b2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPuDYtAAoJEJ0WA1zPCt1hId0H/2j3H2MXJWrRumUgr3Yde+UE
-oa43n3XtQRCp9uOQN70/V9rPmWpCBfGdEIupBX6y6o9DdqaTiXyljQuYwSnYKysw
-JcdPdrSlr3RpJCg30JNs7QjYrX9uSdPSkG6GqGVP3hNGNtQZMSYPflZvrye8PRMo
-PIXsM22u+Lk0zIwTInr/Yjxi0VeSJB0YGnSz83pFKy7xz+GadpVzhIDx71/+Thsc
-No90z4KMpiIfJl3tkJHgNPffhQHAVDmAGbrIaEWUXU3QcvbjzZycrFWk2y0j0Ydf
-vuCfIgDXrP+mWq+FlzVlQc/NBbMqy2OBxlPaSp52qaGHRAKKLeO/euKXCmmyih4=
-=jgdD
+iQEcBAEBAgAGBQJPuWSUAAoJEJ0WA1zPCt1hFV8H/2bgH3cbYhAC//HHm9wpD0ZC
+7vhXH5qgh4Xfijuj6q75X8YOySPlevtT83AwwsRFWBGAj+PQ+k+N0mowKFduQu4u
+zQ+kRekvSlhrRXbn+mkuZBwjlEF11SczbMGgVqwoScyMXaXmwSuj1z5FPPnpzqg8
+tZd14rURWdkj71yQFKFuGYDY1bDFD3B33kTynWPoj5hyGnYzrhS5lFD4Z9ToKX29
+pzVCP+zf5X91LnMMuLHcvVicGUvwry+qEStgOIIONaT+gL0ZKxmIyI5idNAJo3MX
+Ne6bnPXLqlvaw1zsotJEmQlvUorhmTG3D0VgX7xlREKneh4XgZxp3FWftAgA8WQ=
+=doaF
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/yelp-3.2.1.ebuild b/gnome-extra/yelp/yelp-3.2.1.ebuild
index 1cf2750ce686..8aa9108559b4 100644
--- a/gnome-extra/yelp/yelp-3.2.1.ebuild
+++ b/gnome-extra/yelp/yelp-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.2.1.ebuild,v 1.3 2012/05/05 06:25:20 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.2.1.ebuild,v 1.4 2012/05/20 21:39:27 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -55,6 +55,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
 
 	eautoreconf
+	intltoolize --automake --copy --force || die "intltoolize failed"
 
 	gnome2_src_prepare
 }
diff --git a/gnome-extra/yelp/yelp-3.4.1.ebuild b/gnome-extra/yelp/yelp-3.4.1.ebuild
index 9ba91fda71f6..63b87880d534 100644
--- a/gnome-extra/yelp/yelp-3.4.1.ebuild
+++ b/gnome-extra/yelp/yelp-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.4.1.ebuild,v 1.1 2012/05/06 08:19:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.4.1.ebuild,v 1.2 2012/05/20 21:39:27 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -56,6 +56,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
 
 	eautoreconf
+	intltoolize --automake --copy --force || die "intltoolize failed"
 
 	gnome2_src_prepare
 }
diff --git a/gnome-extra/yelp/yelp-3.4.2.ebuild b/gnome-extra/yelp/yelp-3.4.2.ebuild
index bf5b38d30149..0315264b66a7 100644
--- a/gnome-extra/yelp/yelp-3.4.2.ebuild
+++ b/gnome-extra/yelp/yelp-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.4.2.ebuild,v 1.1 2012/05/20 00:09:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.4.2.ebuild,v 1.2 2012/05/20 21:39:27 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -56,6 +56,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
 
 	eautoreconf
+	intltoolize --automake --copy --force || die "intltoolize failed"
 
 	gnome2_src_prepare
 }