respect CFLAGS wrt bug #429422

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

4 files changed, 23 insertions, 5 deletions

diff --git a/games-action/spacearyarya-kxl/ChangeLog b/games-action/spacearyarya-kxl/ChangeLog
index 9a0fc2c3a0e4..787d4470a032 100644
--- a/games-action/spacearyarya-kxl/ChangeLog
+++ b/games-action/spacearyarya-kxl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/spacearyarya-kxl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/spacearyarya-kxl/ChangeLog,v 1.10 2009/06/03 13:21:33 nyhm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/spacearyarya-kxl/ChangeLog,v 1.11 2012/08/04 15:38:54 hasufell Exp $
+
+  04 Aug 2012; Julian Ospald <hasufell@gentoo.org>
+  -files/1.0.2-gentoo-paths.patch, spacearyarya-kxl-1.0.2-r1.ebuild,
+  +files/spacearyarya-kxl-1.0.2-flags.patch,
+  +files/spacearyarya-kxl-1.0.2-gentoo-paths.patch:
+  respect CFLAGS wrt bug #429422
 
   03 Jun 2009; Tristan Heaven <nyhm@gentoo.org>
   spacearyarya-kxl-1.0.2-r1.ebuild:
diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch
new file mode 100644
index 000000000000..2239858be998
--- /dev/null
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch
@@ -0,0 +1,11 @@
+respect CFLAGS
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,5 +5,5 @@ spacearyarya_SOURCES = extern.h \
+                your.c your.h ranking.c ranking.h \
+                boss.c boss.h
+
+-CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
++AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
+ LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL
diff --git a/games-action/spacearyarya-kxl/files/1.0.2-gentoo-paths.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
index 197dae5e926f..197dae5e926f 100644
--- a/games-action/spacearyarya-kxl/files/1.0.2-gentoo-paths.patch
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
diff --git a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild
index 1a164a2faa64..039055fdeb16 100644
--- a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild
+++ b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild,v 1.7 2011/12/05 08:46:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild,v 1.8 2012/08/04 15:38:54 hasufell Exp $
 
 inherit autotools eutils games
 
@@ -24,7 +24,8 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-gentoo-paths.patch
+	epatch "${FILESDIR}"/${P}-gentoo-paths.patch \
+		"${FILESDIR}"/${P}-flags.patch
 	eautoreconf
 }