summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-04-27 23:10:20 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-04-27 23:10:20 +0000
commit811ce573754c4d0db6988f5d1678e36d3f8c0645 (patch)
tree160773025e9540a5bb865cf9a0552797fa51c425 /dev-games/guichan
parentadjust subslot and subslot deps properly (diff)
downloadgentoo-2-811ce573754c4d0db6988f5d1678e36d3f8c0645.tar.gz
gentoo-2-811ce573754c4d0db6988f5d1678e36d3f8c0645.tar.bz2
gentoo-2-811ce573754c4d0db6988f5d1678e36d3f8c0645.zip
fix build with automake-1.13
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'dev-games/guichan')
-rw-r--r--dev-games/guichan/ChangeLog8
-rw-r--r--dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch11
-rw-r--r--dev-games/guichan/guichan-0.8.2.ebuild8
3 files changed, 22 insertions, 5 deletions
diff --git a/dev-games/guichan/ChangeLog b/dev-games/guichan/ChangeLog
index 404512e91c6a..25ba4ae7197b 100644
--- a/dev-games/guichan/ChangeLog
+++ b/dev-games/guichan/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/guichan
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/guichan/ChangeLog,v 1.25 2011/03/26 17:22:47 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/guichan/ChangeLog,v 1.26 2013/04/27 23:10:19 hasufell Exp $
+
+ 27 Apr 2013; Julian Ospald <hasufell@gentoo.org> guichan-0.8.2.ebuild,
+ +files/guichan-0.8.2-automake-1.13.patch:
+ fix build with automake-1.13
26 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> guichan-0.8.2.ebuild:
Pin media-libs/allegro to old version.
diff --git a/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch
new file mode 100644
index 000000000000..e2f46097b82a
--- /dev/null
+++ b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- guichan-0.8.2/configure.in
++++ guichan-0.8.2/configure.in
+@@ -38,7 +38,7 @@
+ AC_SUBST(LT_AGE)
+
+ AM_INIT_AUTOMAKE(guichan, $GUICHAN_VERSION)
+-AM_CONFIG_HEADER([include/config.hpp])
++AC_CONFIG_HEADERS([include/config.hpp])
+
+ AC_CONFIG_SRCDIR([src/gui.cpp])
+
diff --git a/dev-games/guichan/guichan-0.8.2.ebuild b/dev-games/guichan/guichan-0.8.2.ebuild
index df35a9a4a261..09bf462b253a 100644
--- a/dev-games/guichan/guichan-0.8.2.ebuild
+++ b/dev-games/guichan/guichan-0.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/guichan/guichan-0.8.2.ebuild,v 1.6 2011/03/26 17:22:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/guichan/guichan-0.8.2.ebuild,v 1.7 2013/04/27 23:10:19 hasufell Exp $
EAPI=2
inherit eutils autotools
@@ -22,7 +22,9 @@ DEPEND="allegro? ( <media-libs/allegro-5 )
)"
src_prepare() {
- epatch "${FILESDIR}"/${P}-as-needed.patch
+ epatch "${FILESDIR}"/${P}-as-needed.patch \
+ "${FILESDIR}"/${P}-automake-1.13.patch
+ mv configure.in configure.ac || die
eautoreconf
}