respect CFLAGS wrt bug #429422

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 43 insertions, 10 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/Manifest b/games-action/spacearyarya-kxl/Manifest
index bbea615261fe..022737a9c147 100644
--- a/games-action/spacearyarya-kxl/Manifest
+++ b/games-action/spacearyarya-kxl/Manifest
@@ -1,5 +1,20 @@
-AUX 1.0.2-gentoo-paths.patch 2364 RMD160 d46c4b8e512f86c2863eae6df765826e1f730f2e SHA1 640147e2fb38ee06cfa48c0785be0d4a0208ce9e SHA256 e902d6430458be4c68475f5f1a44cb18e54b07b283530e6ef0b3b1f39fabb5d2
-DIST SpaceAryarya-KXL-1.0.2.tar.gz 279894 RMD160 455516145a9d606d72e4545008e31225200b9557 SHA1 970b42c4d3de03199ecd980eb3077a909416bbee SHA256 54cdcbd299fc5cc618ed88d7729db1a64dd48edefbfe569d5352289a9f11ce63
-EBUILD spacearyarya-kxl-1.0.2-r1.ebuild 969 RMD160 41303d68bd2d3d08974892b84c989a153ebbbf46 SHA1 582ac2062348b881065602f473f0b35e96f192b6 SHA256 088cc8b487dec4eee4c0b176418495099a69ae6ec128ef1d4c1323eb00d62f50
-MISC ChangeLog 1335 RMD160 39eb06941269a8b942a0dd275bac1cb325ebac44 SHA1 ddf9c037f5b01deeaa5e756cb19d1af279762717 SHA256 4afbf6dabe01300ef87e06477cf4ef54261ef27e13ee55ab7cd74cc310e465ed
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX spacearyarya-kxl-1.0.2-flags.patch 304 SHA256 b2a81707187e302f0773ba0e3a53a6fa044eb75930401efd1b9ad6d78a58350e SHA512 bc341e05daed7c4f2d0009dec73f068bc2d4bca3d627a3eed040360c41d96967211f4bd186f203aa41a713c31191e4a16c4754c4b22a7607ae2eebba3ddb3394 WHIRLPOOL b5b29833417ad3af7514d8ea3a70c0d29ce1cfbed33e0522fe6657dbab719b3543c79cc2812fd3e13b9944e353da2a10779834d690e280bfcea5b7a92893d37f
+AUX spacearyarya-kxl-1.0.2-gentoo-paths.patch 2364 SHA256 e902d6430458be4c68475f5f1a44cb18e54b07b283530e6ef0b3b1f39fabb5d2 SHA512 19d7206ca4703d0a79df7acf96c637b0663fb430b0f63aa46538242efcedf26a13e4f351c77607e03d2245bf52bb50b7b7a5e22d61040b324e044b9a6f53b8a7 WHIRLPOOL ffeb1ac30a9ac4671e441df568bade1fe0768925b4b5227beb55488e290b342fc4465156f5f9b86c1c51de89d1b50c1168e175cc2c5561046ee6b59bf4e2fc01
+DIST SpaceAryarya-KXL-1.0.2.tar.gz 279894 SHA256 54cdcbd299fc5cc618ed88d7729db1a64dd48edefbfe569d5352289a9f11ce63 SHA512 1109606741bab6c290395cdfd8d19cf12e68cfef41f50164586c316fc425a32232e0f8dd822207d969c27c3f7a8478d1a65f36fe5468f3cfa8932c99ab3cb125 WHIRLPOOL d26f387bb70610cfe84b9c45d464035b4e6c9b30d9d26690484e90b1dfd68f24397203bf16f3a10940547d45f8ec3eea139ded584c1fffd8dde6aaec448011d4
+EBUILD spacearyarya-kxl-1.0.2-r1.ebuild 1002 SHA256 9c817af94407a852107b9d169b20c60277163050dec720695d3d4e1a69bfad8a SHA512 a4cf74b6e23e84a313576838804089d60745b38698ae3e59cd49bc59569663f3e2701eea99fae8a0a5837c382aa28c8d13ec213ea7839b8226a17432deae7413 WHIRLPOOL 4c277123636d3f0b138ca39a09cb47a8e51ff04d651558e7013c4d383f2236d1c04d9c7d9f30c3ac5b5286e45ab2b881a43b4b2ffe3450deda412c8d4a4a540e
+MISC ChangeLog 1590 SHA256 d5bcad4f50423b81a0b53c4760b82b440e4f1ac8a65d4ddc45c25b43380a7e1a SHA512 78c6df3ef15677e88bc0507af048518a444f98efcb0bbb667ae2909b42a59cbf526fd774aff9a5631c437ee24366853feea1fe1e40b26a2dacf05b6fbc893cae WHIRLPOOL ef2a1f6bd11c71c672d6056bde14973018bf3ae1e36598acb93e539d1bf30e1d945505f916de57b83411283715ef5aa34bd7db32562e7d1f6cf25dc235362c3c
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQHUECAAoJEFpvPKfnPDWzSaEH/AgO9ocg/X89r78ldQP8Cznf
+d1bJCvvfi7M1KuA2uPJBDaVFoRcOzk66ssKTYXAE0QToLjGEQfckllmsx4X4rQ0O
+3ucWKikZbKpojbLfvi0Uw+YKWtQxnQV1VGSdY60kqKFfEiU+oSQTemwDMejyPmQA
+QIeQKmb0aG6GbWyHK5hmVn3WSoJkAuCFh0TtQXpNPprRw5EVEK5jA4akKUiw2meh
+YE/C7mc0EHcPNnVr14psxQWsXPqwjjKDxF+FsZsnCZrB15F90liGFE2++MKPq/3R
+C67NiE3prCSyO8m+D2cpSb181bFu+q3byaI6GcQY3x5wK2+eKuPIi5oon6s9WaE=
+=eMTB
+-----END PGP SIGNATURE-----
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
 }