Fix build failure with automake-1.13 (bug #467126, thanks to Alexandre et al.)

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 70 insertions, 4 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index f77845e27a60..ddadf3c289ba 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.371 2013/03/28 22:20:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.372 2013/04/30 14:04:19 tetromino Exp $
+
+  30 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org> pango-1.30.1.ebuild,
+  pango-1.32.5.ebuild, +files/pango-1.30.1-AM_CONFIG_HEADER.patch,
+  +files/pango-1.32.5-AM_CONFIG_HEADER.patch:
+  Fix build failure with automake-1.13 (bug #467126, thanks to Alexandre et
+  al.)
 
 *pango-1.34.0 (28 Mar 2013)
 
diff --git a/x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch b/x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch
new file mode 100644
index 000000000000..0858f1032696
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch
@@ -0,0 +1,29 @@
+From 51f952a6e018049d4b52bbd419653745cf1aaab3 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Sun, 6 Jan 2013 23:15:44 -0600
+Subject: [PATCH] Bug 691263 - Build with automake-1.13 broken
+
+Replace long obsolete AM_CONFIG_HEADER with proper AC_CONFIG_HEADERS.
+automake-1.13 errors out upon seeing former.
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 8362280..dcd115e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -54,7 +54,7 @@ dnl -Wno-portability tells automake to stop complaining about the
+ dnl usage of GNU Make specific features.
+ AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability)
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ 
+ PANGO_VERSION_MAJOR=pango_version_major()
+-- 
+1.8.2.1
+
diff --git a/x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch b/x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch
new file mode 100644
index 000000000000..634c9ab4ab38
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch
@@ -0,0 +1,29 @@
+From f45cdd9a4fef1096b071e6bad4cc40e06f48ba46 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Sun, 6 Jan 2013 23:15:44 -0600
+Subject: [PATCH] Bug 691263 - Build with automake-1.13 broken
+
+Replace long obsolete AM_CONFIG_HEADER with proper AC_CONFIG_HEADERS.
+automake-1.13 errors out upon seeing former.
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bb37a60..7ed2832 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ dnl -Wno-portability tells automake to stop complaining about the
+ dnl usage of GNU Make specific features.
+ AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability)
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ 
+ PANGO_VERSION_MAJOR=pango_version_major()
+-- 
+1.8.2.1
+
diff --git a/x11-libs/pango/pango-1.30.1.ebuild b/x11-libs/pango/pango-1.30.1.ebuild
index ce08679ab229..6a923563ce7f 100644
--- a/x11-libs/pango/pango-1.30.1.ebuild
+++ b/x11-libs/pango/pango-1.30.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.1.ebuild,v 1.12 2012/11/17 13:31:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.1.ebuild,v 1.13 2013/04/30 14:04:19 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -57,6 +57,7 @@ src_prepare() {
 	# emul-linux-x86-gtklibs
 	if multilib_enabled ; then
 		epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch"
+		epatch "${FILESDIR}/${P}-AM_CONFIG_HEADER.patch" # fixed in 1.34
 		eautoreconf
 	fi
 
diff --git a/x11-libs/pango/pango-1.32.5.ebuild b/x11-libs/pango/pango-1.32.5.ebuild
index cc7770536935..7cbfb92d677d 100644
--- a/x11-libs/pango/pango-1.32.5.ebuild
+++ b/x11-libs/pango/pango-1.32.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.32.5.ebuild,v 1.10 2013/02/22 19:27:48 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.32.5.ebuild,v 1.11 2013/04/30 14:04:19 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -44,6 +44,7 @@ src_prepare() {
 		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")
 
 	epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
+	epatch "${FILESDIR}/${P}-AM_CONFIG_HEADER.patch" # fixed in 1.34
 	eautoreconf
 
 	gnome2_src_prepare