summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2013-05-12 12:32:27 +0000
committerAlfredo Tupone <tupone@gentoo.org>2013-05-12 12:32:27 +0000
commit459376aa24707037caf66be10b37872cc22274d1 (patch)
tree91d847c18f5b45f11f1feea40238374ecdabe410 /games-action/bzflag
parentUse vala.eclass (#467392) (diff)
downloadgentoo-2-459376aa24707037caf66be10b37872cc22274d1.tar.gz
gentoo-2-459376aa24707037caf66be10b37872cc22274d1.tar.bz2
gentoo-2-459376aa24707037caf66be10b37872cc22274d1.zip
Works with automake-1.13 Bug #469496
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0145142D)
Diffstat (limited to 'games-action/bzflag')
-rw-r--r--games-action/bzflag/ChangeLog6
-rw-r--r--games-action/bzflag/files/bzflag-2.4.2-nocxxflags.patch35
2 files changed, 38 insertions, 3 deletions
diff --git a/games-action/bzflag/ChangeLog b/games-action/bzflag/ChangeLog
index 84f9c8ce7bbb..85646470d38d 100644
--- a/games-action/bzflag/ChangeLog
+++ b/games-action/bzflag/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/bzflag
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/ChangeLog,v 1.63 2013/01/02 22:41:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/ChangeLog,v 1.64 2013/05/12 12:32:27 tupone Exp $
+
+ 12 May 2013; Alfredo Tupone <tupone@gentoo.org>
+ files/bzflag-2.4.2-nocxxflags.patch:
+ Works with automake-1.13 Bug #469496 by Kobboi
02 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> -bzflag-2.0.16.ebuild,
-bzflag-2.4.0.ebuild:
diff --git a/games-action/bzflag/files/bzflag-2.4.2-nocxxflags.patch b/games-action/bzflag/files/bzflag-2.4.2-nocxxflags.patch
index aab1aba77e4b..0b74d57bc41e 100644
--- a/games-action/bzflag/files/bzflag-2.4.2-nocxxflags.patch
+++ b/games-action/bzflag/files/bzflag-2.4.2-nocxxflags.patch
@@ -1,5 +1,14 @@
---- configure.ac.old 2012-10-22 13:58:27.000000000 +0200
-+++ configure.ac 2012-10-22 14:01:37.000000000 +0200
+--- configure.ac.old 2013-05-12 13:33:05.738250140 +0200
++++ configure.ac 2013-05-12 13:33:24.732927312 +0200
+@@ -89,7 +89,7 @@
+ AM_INIT_AUTOMAKE([1.6 dist-zip dist-bzip2])
+
+ dnl all configured definitions get written here
+-AM_CONFIG_HEADER([include/config.h])
++AC_CONFIG_HEADER([include/config.h])
+
+ AC_SUBST(MAJOR_VERSION)
+ AC_SUBST(MINOR_VERSION)
@@ -689,13 +689,9 @@
else
FLAGS="$FLAGS=$host_cpu"
@@ -23,3 +32,25 @@
fi
AC_DEFINE(NDEBUG, 1, [Debugging disabled])
fi
+--- src/other/ares/configure.ac.old 2013-05-12 13:44:25.147676903 +0200
++++ src/other/ares/configure.ac 2013-05-12 13:44:39.353684194 +0200
+@@ -7,7 +7,7 @@
+ CARES_OVERRIDE_AUTOCONF
+
+ AC_CONFIG_SRCDIR([ares_ipv6.h])
+-AM_CONFIG_HEADER([ares_config.h ares_build.h])
++AC_CONFIG_HEADER([ares_config.h ares_build.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_MAINTAINER_MODE
+
+--- src/other/curl/configure.ac.old 2013-05-12 13:49:00.814352825 +0200
++++ src/other/curl/configure.ac 2013-05-12 13:49:15.216341340 +0200
+@@ -34,7 +34,7 @@
+ terms of the curl license; see COPYING for more details])
+
+ AC_CONFIG_SRCDIR([lib/urldata.h])
+-AM_CONFIG_HEADER(lib/curl_config.h src/curl_config.h include/curl/curlbuild.h)
++AC_CONFIG_HEADER(lib/curl_config.h src/curl_config.h include/curl/curlbuild.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_MAINTAINER_MODE
+