summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2012-07-29 20:49:21 +0000
committerJulian Ospald <hasufell@gentoo.org>2012-07-29 20:49:21 +0000
commit14e55b35b1e5095e7d79ac78c8c3a083db822f6b (patch)
tree068671998b8db3ebf3066dea3b4d3ba41c76c06f /games-puzzle/groundhog
parentold (diff)
downloadgentoo-2-14e55b35b1e5095e7d79ac78c8c3a083db822f6b.tar.gz
gentoo-2-14e55b35b1e5095e7d79ac78c8c3a083db822f6b.tar.bz2
gentoo-2-14e55b35b1e5095e7d79ac78c8c3a083db822f6b.zip
respect CFLAGS wrt #428538
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'games-puzzle/groundhog')
-rw-r--r--games-puzzle/groundhog/ChangeLog6
-rw-r--r--games-puzzle/groundhog/files/groundhog-1.4-flags.patch32
-rw-r--r--games-puzzle/groundhog/groundhog-1.4.ebuild4
3 files changed, 40 insertions, 2 deletions
diff --git a/games-puzzle/groundhog/ChangeLog b/games-puzzle/groundhog/ChangeLog
index 591cc8dc21c8..cd57c87ece1b 100644
--- a/games-puzzle/groundhog/ChangeLog
+++ b/games-puzzle/groundhog/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/groundhog
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/groundhog/ChangeLog,v 1.17 2012/05/04 04:45:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/groundhog/ChangeLog,v 1.18 2012/07/29 20:49:21 hasufell Exp $
+
+ 29 Jul 2012; Julian Ospald <hasufell@gentoo.org> groundhog-1.4.ebuild,
+ +files/groundhog-1.4-flags.patch:
+ respect CFLAGS wrt #428538
04 May 2012; Jeff Horelick <jdhore@gentoo.org> groundhog-1.4.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-puzzle/groundhog/files/groundhog-1.4-flags.patch b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
new file mode 100644
index 000000000000..48275a8c39b1
--- /dev/null
+++ b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
@@ -0,0 +1,32 @@
+respect flags
+
+applied on top of debian patches
+
+--- configure.in
++++ configure.in
+@@ -46,8 +46,6 @@
+ dnl Checks for libraries.
+ dnl AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR(Groundhog needs GTK 2.0))
+
+-CXXFLAGS="-O2 -Wall"
+-
+ dnl Checks for header files.
+ AC_CHECK_HEADERS(unistd.h)
+
+@@ -57,16 +55,6 @@
+
+ dnl Checks for library functions.
+
+-dnl Use -Wall if we have gcc.
+-changequote(,)dnl
+-if test "x$GCC" = "xyes"; then
+- case " $CFLAGS " in
+- *[\ \ ]-Wall[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -Wall" ;;
+- esac
+-fi
+-changequote([,])dnl
+-
+ AC_OUTPUT([ m4/Makefile intl/Makefile
+ Makefile
+ src/Makefile
diff --git a/games-puzzle/groundhog/groundhog-1.4.ebuild b/games-puzzle/groundhog/groundhog-1.4.ebuild
index 9fc05b066c3a..5f6376a84e6e 100644
--- a/games-puzzle/groundhog/groundhog-1.4.ebuild
+++ b/games-puzzle/groundhog/groundhog-1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/groundhog/groundhog-1.4.ebuild,v 1.24 2012/05/04 04:45:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/groundhog/groundhog-1.4.ebuild,v 1.25 2012/07/29 20:49:21 hasufell Exp $
EAPI=2
inherit eutils autotools games
@@ -30,6 +30,8 @@ src_prepare() {
debian/patches/sv.po.patch \
|| die "sed failed"
epatch $(sed -e 's:^:debian/patches/:' debian/patches/series)
+ epatch "${FILESDIR}"/${P}-flags.patch
+ mv configure.in configure.ac || die
AT_M4DIR="m4" eautoreconf
sed -i 's:$(localedir):/usr/share/locale:' \
$(find . -name 'Makefile.in*') \