Respect CFLAGS. Bug #430792

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 64 insertions, 9 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/Manifest b/games-board/cgoban/Manifest
index e9ff79ec63c7..3e74b3e04f5c 100644
--- a/games-board/cgoban/Manifest
+++ b/games-board/cgoban/Manifest
@@ -1,4 +1,15 @@
-DIST cgoban-1.9.14.tar.gz 417691 RMD160 c5c3abd6ea422cc9192db48972d584fbfd2fca06 SHA1 90bd53499c9f410caddaae601e7f00350d520a32 SHA256 3b8a6fc0e989bf977fcd9a65a367aa18e34c6e25800e78dd8f0063fa549c9b62
-EBUILD cgoban-1.9.14.ebuild 847 RMD160 0e7bc2d320a6e1e438a0ac9c8cb1158064de84cd SHA1 31f05560b93f7b945fdc772bc83ab7bf3dad5ee9 SHA256 1f19f317bed56550571765d856147c5278e6be1c1ba5cffa4fc891b71b60fb16
-MISC ChangeLog 1928 RMD160 aa297ccabf38fb23a7b252b5e4e941b914d73377 SHA1 b650d83a609007a1844c50982e5bc4cbbf7daae5 SHA256 c729319ecd4158fdb743a2e462845284bc713b32726856a7120b40f8a3b97683
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cgoban-1.9.14-cflags.patch 1053 SHA256 cab464d9a8b6eca4d64e5bf9b9f3bb2676fe1e4db36bf7bfe77321c19a42bb30 SHA512 975c6942214b7523240fa90e12647d2dbb23a41024decee3656a1ae55454d179182a1264e24243edee87153259c1c6fd79bf78bcaa98e3f2abe75a164199103d WHIRLPOOL 6ce60a2aea37f6a0acc72045107e455b427b5b1ed0230ae294d3bd708131c1346a0dd4a15117374e7e1b26ef801c1ae2a632db5b8b6165b1573b4423bd0f2697
+DIST cgoban-1.9.14.tar.gz 417691 SHA256 3b8a6fc0e989bf977fcd9a65a367aa18e34c6e25800e78dd8f0063fa549c9b62
+EBUILD cgoban-1.9.14.ebuild 1030 SHA256 1ec89a1061f624b73bc165aa91408a24a5c6f40d930d52cce8de43b341c6d4f3 SHA512 0b26bc24a982dd37c503123cce8ac2adc989932dcde23b4e6591e3bc322c3910be219adcd1ad2d7e78d45b53f7c7aa8817cede5135f89904c8e6d0aa774542d2 WHIRLPOOL 164c509494f0edd46099696eed40a979767381ef5fd9088d9622b6beccc9080c40b766584eef0751a28bb3213f6b743f09356198e215e3171a7cd25dee2ac2cd
+MISC ChangeLog 2088 SHA256 890e46f10a7ec803a63bff727534f3642b48e20b641640ea6902d97063fbc8a3 SHA512 de0b1b8d894610af7a40c00e460ae4b8e0f08fdbaddc6f587f653459f95e1fd8926f153ff824a6443f906e5acff323c6a1f1721158e49987faa95780ce45c14f WHIRLPOOL 8f3ed5b8754a4004506739c7f0a8b803e2e82e9e99c73c12d2ca42ae1aca097509a34768a16ff677f97cca6a7223b6a9aeed238f5082ad3cfa5d9d758ea48a59
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBE9tgACgkQIY77eQFFFC27zQCfdJBehDGGebV7WlNwymtOnNab
+3LkAn06hWibklrIev1R5oRqy5h30LYvZ
+=+2NR
+-----END PGP SIGNATURE-----
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