Consider cflags. Bug #437992

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x0145142D

4 files changed, 40 insertions, 18 deletions

diff --git a/games-action/geki2-KXL/ChangeLog b/games-action/geki2-KXL/ChangeLog
index 44ea01bed9e9..2a05c8a86357 100644
--- a/games-action/geki2-KXL/ChangeLog
+++ b/games-action/geki2-KXL/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/geki2-KXL
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/geki2-KXL/ChangeLog,v 1.9 2009/06/03 13:20:58 nyhm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/geki2-KXL/ChangeLog,v 1.10 2012/11/10 20:56:49 tupone Exp $
+
+  10 Nov 2012; Tupone Alfredo <tupone@gentoo.org> geki2-KXL-2.0.3-r2.ebuild,
+  +files/geki2-KXL-2.0.3-cflags.patch:
+  Consider cflags. Bug #437992 by Diego Elio Pettenò
 
   03 Jun 2009; Tristan Heaven <nyhm@gentoo.org> geki2-KXL-2.0.3-r2.ebuild:
   RDEPEND on media-fonts/font-adobe-100dpi
diff --git a/games-action/geki2-KXL/Manifest b/games-action/geki2-KXL/Manifest
index 4062eeea5ce4..6df4320bf0f7 100644
--- a/games-action/geki2-KXL/Manifest
+++ b/games-action/geki2-KXL/Manifest
@@ -1,6 +1,17 @@
-AUX geki2-KXL-2.0.3-paths.patch 1560 RMD160 0c8d9c4bc0bfd7cb9da6ca47383efb23b887f83f SHA1 2dcee2e4bba94be0ea101c0fed3168046fb02c20 SHA256 ac061631632a38cc070f7c94e0df96d8d8b1fead66c980122c2710fcb380d861
-DIST geki2-KXL-2.0.3.tar.gz 708419 RMD160 b1c743a0946f16c7934f55ff478d15b5c22e4e06 SHA1 ab529fc358de997d469d28f4b03e31219ad4fc43 SHA256 24338682c9a10d5d796ffad352983481c440ee625d713ef4cc9b51b9da0c5391
-DIST geki2-KXL.png 883 RMD160 79ccfc0ec6a89586c485badda77a5c2377574088 SHA1 50929bc48bece6822f5ba0b68f776f2b46972e92 SHA256 b4b314907aa0e563a60b25c4ab25d91dab872f4c2110a0ef3e487aa4855793fe
-EBUILD geki2-KXL-2.0.3-r2.ebuild 1119 RMD160 d269b97c4b3e61fae9a73874c2dc5bdb1747ce4c SHA1 6cef236d9775d671285112163125e8ce395d87e4 SHA256 914234eb83d818adb9c3cea9203e3e45b9bf3dc2a2df5132fc805492b42214bb
-MISC ChangeLog 1274 RMD160 0768f858700dfc541da6876795dc31eca4d5d9f4 SHA1 f3d6601e297f8289bc9a7432e86a5bf1eae8169b SHA256 28bd3aab06ebfd148f4e2c9cb431467c0caccb29ae427c024cfde8314faefc11
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX geki2-KXL-2.0.3-cflags.patch 343 SHA256 c430dd8c0fe7d2cfb7180c5c21f1d2dd9e1ffaa0eada50565633e2b5ab706d5f SHA512 75433499511cb67e915e5b80e5e226c2af8fd0584de0f48707f266a1288c5a7d84bffa492964c1318e2725676fbeab69890938288519783a58c74e7b8b2ac3e9 WHIRLPOOL afac0870f31279553a152d18da928041413104a6e20541ed72f3f164c00116c84c0c015639aad1a403f24701e465607a831c0203595f0c551453159a752e56d4
+AUX geki2-KXL-2.0.3-paths.patch 1560 SHA256 ac061631632a38cc070f7c94e0df96d8d8b1fead66c980122c2710fcb380d861 SHA512 4ae364f717515a01d4f348f27ccdd5d5698c03203d648ea6a1e439216171745cb3f79d7d37de7a310a5ad09eec68659946c31e3dbe9a12bebf749eee78564b51 WHIRLPOOL 4231b77db48fe5e19291f1d4fd7d0f5ad6a83c328d7f490b97b438d1829c9cecfd2c7c88e723f1fa1d38a1fa5f840463f1891675dc89ff0c00c22c688a0e27e4
+DIST geki2-KXL-2.0.3.tar.gz 708419 SHA256 24338682c9a10d5d796ffad352983481c440ee625d713ef4cc9b51b9da0c5391 SHA512 15d97e72f7490b0a1fa32f3ce002f99fe88183664cb3833bb6a2513de26a0dfb0cd2e723c59d0b6bdd9620b200da2e0e7612d44c02fd1be8721441417a9cb3e5 WHIRLPOOL 0b35053f535b4fd88f64bed805b8ef099071e7eed436a341a7ef64f19a7b8bb3e4b622852b3ce513c8909d488134d332720fed58279864ff7740d1490fcdafb1
+DIST geki2-KXL.png 883 SHA256 b4b314907aa0e563a60b25c4ab25d91dab872f4c2110a0ef3e487aa4855793fe SHA512 20d58e6cc3fd5b6283e6042f8660c73b5a938157ab871dd78e7a2ea2c1187ecae63bcfd46b885255181028531ebbba2c2bf93138e311adf7be10026497a85b74 WHIRLPOOL 654fc705a64a6eeacae285bcdfdac1e3e0e691ab3351209b3ce63d15cce9091b384667cbb1034280fb082215feff0675e3fca6884673a37201c74d6aa476d0c3
+EBUILD geki2-KXL-2.0.3-r2.ebuild 1037 SHA256 2fa86881a8336c959436b2b427eabd58306483167e39fc74c43b2b9eeb1776af SHA512 dcb0e43957f95d26f502ea09e395da2fb4c8901928cfea1ff13b6b77cb784d1d71259a20ccf52aa7ec14d82e49b337bb915fbfe67c1811c05b2748e3dddb1671 WHIRLPOOL 566d8f33676f75885a1d7435cf67c2aff60926041a5054c4470dc8375a64993383faae52a13006fae9da4dd6fd134d5cad33d8832bd350d9d6d49716966dceaa
+MISC ChangeLog 1448 SHA256 280d2ef9fcfb597753b306fec1b5b929a9ec1f6e45ee247a09eab70d7361d148 SHA512 7a056e44827f1cf85881a208c2dc9c2221012f4c7c1a74bf4de8b645565cbae4e3ebd240cdc8831d726f16abaa3360b02efef2c399d6434e5c33e61e1db74157 WHIRLPOOL 65ff45cdbc13d107ae207b23980edd9df93ff6f49174eb5779c232dd65069a8415641d5cc6415a32b7a0ea028a8da0feaf2ffc04b00538674e6ffe6773c188f1
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCev5kACgkQIY77eQFFFC0t1wCggx488IPfTEtCkXpRBeSYQlwN
+UrkAoJT/j44V9gcFSvj96rG/XBfFX8Ea
+=mz7w
+-----END PGP SIGNATURE-----
diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
new file mode 100644
index 000000000000..9812e6de30aa
--- /dev/null
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
@@ -0,0 +1,9 @@
+--- src/Makefile.am.old	2012-11-10 21:50:02.159117541 +0100
++++ src/Makefile.am	2012-11-10 21:50:20.658715770 +0100
+@@ -4,5 +4,5 @@
+ 	        boss.h extern.h ranking.h your.h game.h\
+ 	        geki2.h load.h opening.h my.h misc.h
+ 
+-CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
++AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
+ LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL
diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild b/games-action/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild
index 530a4b3be822..a5c37452cfae 100644
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild
+++ b/games-action/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild
@@ -1,7 +1,7 @@
-# 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/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild,v 1.4 2011/12/05 08:46:26 mr_bones_ Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-action/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild,v 1.5 2012/11/10 20:56:49 tupone Exp $
+EAPI=4
 inherit autotools eutils games
 
 DESCRIPTION="2D length scroll shooting game"
@@ -18,26 +18,24 @@ DEPEND="dev-games/KXL"
 RDEPEND="${DEPEND}
 	media-fonts/font-adobe-100dpi"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	rm -f missing
 	sed -i \
 		-e '1i #include <string.h>' \
 		-e "s:DATA_PATH \"/.score\":\"${GAMES_STATEDIR}/${PN}\":" \
 		src/ranking.c \
 		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-paths.patch
+	epatch "${FILESDIR}"/${P}-paths.patch \
+		"${FILESDIR}"/${P}-cflags.patch
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	insinto "${GAMES_STATEDIR}"
-	newins data/.score ${PN} || die "newins failed"
+	newins data/.score ${PN}
 	fperms g+w "${GAMES_STATEDIR}"/${PN}
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry geki2 Geki2
-	dodoc ChangeLog README
 	prepgamesdirs
 }