add patch for automake-1.13 compatibility, bug 467626

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

4 files changed, 34 insertions, 3 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 08df0384db83..6295a2117412 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xournal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.44 2013/03/17 12:25:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.45 2013/04/30 20:35:56 dilfridge Exp $
+
+  30 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> xournal-0.4.7.ebuild,
+  +files/xournal-0.4.7-am113.patch, xournal-9999.ebuild:
+  add patch for automake-1.13 compatibility, bug 467626
 
   17 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> xournal-0.4.7.ebuild,
   xournal-9999.ebuild:
diff --git a/app-text/xournal/files/xournal-0.4.7-am113.patch b/app-text/xournal/files/xournal-0.4.7-am113.patch
new file mode 100644
index 000000000000..242d00f476ba
--- /dev/null
+++ b/app-text/xournal/files/xournal-0.4.7-am113.patch
@@ -0,0 +1,25 @@
+From ae2821f664b0615779638cdd1eca414e500e7f92 Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
+Date: Tue, 30 Apr 2013 22:29:32 +0200
+Subject: [PATCH] replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 52a07df..ba827c7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(xournal, 0.4.7)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+ AC_ISC_POSIX
+-- 
+1.8.2.1
+
diff --git a/app-text/xournal/xournal-0.4.7.ebuild b/app-text/xournal/xournal-0.4.7.ebuild
index c9f5c252a224..41c9385c964e 100644
--- a/app-text/xournal/xournal-0.4.7.ebuild
+++ b/app-text/xournal/xournal-0.4.7.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/app-text/xournal/xournal-0.4.7.ebuild,v 1.5 2013/03/17 12:25:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.7.ebuild,v 1.6 2013/04/30 20:35:56 dilfridge Exp $
 
 EAPI=5
 
@@ -58,6 +58,7 @@ src_prepare() {
 	if ! use vanilla; then
 		sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
 	fi
+	epatch "${FILESDIR}/${PN}-0.4.7-am113.patch"
 	eautoreconf
 }
 
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index 13c68c6133b6..81824d9da2e6 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.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/app-text/xournal/xournal-9999.ebuild,v 1.4 2013/03/17 12:25:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-9999.ebuild,v 1.5 2013/04/30 20:35:56 dilfridge Exp $
 
 EAPI=5
 
@@ -58,6 +58,7 @@ src_prepare() {
 	if ! use vanilla; then
 		sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
 	fi
+	epatch "${FILESDIR}/${PN}-0.4.7-am113.patch"
 	eautoreconf
 }