summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-01-03 21:18:38 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-01-03 21:18:38 +0000
commitd85c25bb60eb35fdc446cd1a36dfe536cf500c91 (patch)
treece334ad890dacbe2b99d7a293ab372ae39e9ac0f /games-action
parentAdd support for tools use flag (diff)
downloadgentoo-2-d85c25bb60eb35fdc446cd1a36dfe536cf500c91.tar.gz
gentoo-2-d85c25bb60eb35fdc446cd1a36dfe536cf500c91.tar.bz2
gentoo-2-d85c25bb60eb35fdc446cd1a36dfe536cf500c91.zip
fix build with automake-1.12 wrt #449864
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-action')
-rw-r--r--games-action/heroes/ChangeLog8
-rw-r--r--games-action/heroes/files/heroes-0.21-automake-1.12.patch11
-rw-r--r--games-action/heroes/heroes-0.21-r1.ebuild7
3 files changed, 21 insertions, 5 deletions
diff --git a/games-action/heroes/ChangeLog b/games-action/heroes/ChangeLog
index f752d081ad29..38e7699aa5a5 100644
--- a/games-action/heroes/ChangeLog
+++ b/games-action/heroes/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/heroes
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.17 2011/08/03 17:53:11 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.18 2013/01/03 21:18:38 hasufell Exp $
+
+ 03 Jan 2013; Julian Ospald <hasufell@gentoo.org> heroes-0.21-r1.ebuild,
+ +files/heroes-0.21-automake-1.12.patch:
+ fix build with automake-1.12 wrt #449864
03 Aug 2011; Michael Sterrett <mr_bones_@gentoo.org> heroes-0.21-r1.ebuild:
test is for testing installed package so turn it off for build (bug #377579)
diff --git a/games-action/heroes/files/heroes-0.21-automake-1.12.patch b/games-action/heroes/files/heroes-0.21-automake-1.12.patch
new file mode 100644
index 000000000000..1a645df91acb
--- /dev/null
+++ b/games-action/heroes/files/heroes-0.21-automake-1.12.patch
@@ -0,0 +1,11 @@
+--- heroes-0.21/configure.ac
++++ heroes-0.21/configure.ac
+@@ -112,7 +112,7 @@
+ # Checks for typedefs, structures, and compiler characteristics.
+ # ==============================================================
+
+-AM_C_PROTOTYPES
++AC_C_PROTOTYPES
+ AC_C_CONST
+ AC_TYPE_UID_T dnl This checks for gid_t too.
+ AC_CHECK_TYPES([ssize_t])
diff --git a/games-action/heroes/heroes-0.21-r1.ebuild b/games-action/heroes/heroes-0.21-r1.ebuild
index d5f2d6553d88..1d77a280f42a 100644
--- a/games-action/heroes/heroes-0.21-r1.ebuild
+++ b/games-action/heroes/heroes-0.21-r1.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/games-action/heroes/heroes-0.21-r1.ebuild,v 1.10 2011/08/03 17:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/heroes-0.21-r1.ebuild,v 1.11 2013/01/03 21:18:38 hasufell Exp $
EAPI=2
inherit eutils autotools games
@@ -33,7 +33,8 @@ src_prepare() {
#56118
epatch "${FILESDIR}"/${PV}-cvs-segfault-fix.patch \
"${FILESDIR}/${P}"-gcc4.patch \
- "${FILESDIR}/${P}"-underlink.patch
+ "${FILESDIR}/${P}"-underlink.patch \
+ "${FILESDIR}"/${P}-automake-1.12.patch
sed -i 's:$(localedir):/usr/share/locale:' \
$(find . -name 'Makefile.in*') \
|| die "sed failed"