Respect CFLAGS. Bug #430792

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 49 insertions, 5 deletions

diff --git a/games-board/cgoban/ChangeLog b/games-board/cgoban/ChangeLog
index 5b17d8935cc2..0c6b277e1aef 100644
--- a/games-board/cgoban/ChangeLog
+++ b/games-board/cgoban/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/cgoban
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban/ChangeLog,v 1.11 2010/02/28 01:30:41 mr_bones_ Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban/ChangeLog,v 1.12 2012/09/03 18:28:30 tupone Exp $
+
+  03 Sep 2012; Alfredo Tupone <tupone@gentoo.org> cgoban-1.9.14.ebuild,
+  +files/cgoban-1.9.14-cflags.patch:
+  Respect CFLAGS. Bug #430792 by Diego Elio Pettenò
 
   28 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org> cgoban-1.9.14.ebuild:
   EAPI=2; allow media-gfx/graphicsmagick to provide image conversion
diff --git a/games-board/cgoban/cgoban-1.9.14.ebuild b/games-board/cgoban/cgoban-1.9.14.ebuild
index 8b2f77bba739..28d36e3ae1d5 100644
--- a/games-board/cgoban/cgoban-1.9.14.ebuild
+++ b/games-board/cgoban/cgoban-1.9.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban/cgoban-1.9.14.ebuild,v 1.9 2010/02/28 01:30:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban/cgoban-1.9.14.ebuild,v 1.10 2012/09/03 18:28:30 tupone Exp $
 
 EAPI=2
-inherit eutils games
+inherit eutils autotools games
 
 DESCRIPTION="A Go-frontend"
 HOMEPAGE="http://cgoban1.sourceforge.net/"
@@ -26,6 +26,11 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	cp cgoban_icon.png ${PN}.png || die "cp failed"
+	mv configure.{in,ac} || dir "mv configure failed"
+	epatch "${FILESDIR}"/${P}-cflags.patch
+#	sed -i -e "/^WMS_GET_CFLAGS/d" \
+#		configure.ac || die "sed failed"
+	eautoreconf
 }
 
 src_install() {
diff --git a/games-board/cgoban/files/cgoban-1.9.14-cflags.patch b/games-board/cgoban/files/cgoban-1.9.14-cflags.patch
new file mode 100644
index 000000000000..7228b4803c95
--- /dev/null
+++ b/games-board/cgoban/files/cgoban-1.9.14-cflags.patch
@@ -0,0 +1,35 @@
+--- configure.ac.old	2012-09-03 18:34:15.358122626 +0200
++++ configure.ac	2012-09-03 18:35:30.279156534 +0200
+@@ -1,8 +1,9 @@
+ #for autoconf 2.1x start configure script with next three lines
+ 
+ AC_PREREQ(2.13)
+-AC_INIT(src/cgoban.c)
+-AM_INIT_AUTOMAKE(cgoban, 1.9.14)
++AC_INIT([cgoban], [1.9.14])
++AC_CONFIG_SRCDIR([src/cgoban.c])
++AM_INIT_AUTOMAKE([no-define])
+ 
+ #for autoconf 2.5x start configure script with next four lines
+ # AC_PREREQ(2.50)
+--- configure.ac.old	2012-09-03 20:17:48.037549487 +0200
++++ configure.ac	2012-09-03 20:18:00.267371203 +0200
+@@ -146,7 +146,7 @@
+ ######################################################################
+ 
+ export VERSION
+-AC_DEFINE_UNQUOTED(VERSION,$VERSION)
++AC_DEFINE_UNQUOTED(VERSION,["$VERSION"])
+ AC_PREFIX_DEFAULT(/usr/games)
+ 
+ dayNum=`echo $date | awk '{ print $1 }'`
+--- configure.ac.old	2012-09-03 20:23:29.174470309 +0200
++++ configure.ac	2012-09-03 20:23:51.895996955 +0200
+@@ -169,7 +169,6 @@
+ AC_MINIX
+ AC_PROG_CPP
+ AC_EXEEXT
+-WMS_GET_CFLAGS
+ 
+ AM_CONFIG_HEADER(configure.h)
+ AC_SUBST(LIBS)dnl