respect flags wrt #427788

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

5 files changed, 51 insertions, 23 deletions

diff --git a/games-simulation/cannonsmash/ChangeLog b/games-simulation/cannonsmash/ChangeLog
index d15374ccef30..d56ef3b7b77f 100644
--- a/games-simulation/cannonsmash/ChangeLog
+++ b/games-simulation/cannonsmash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/cannonsmash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.21 2012/05/02 21:16:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.22 2012/09/03 19:30:21 hasufell Exp $
+
+  03 Sep 2012; Julian Ospald <hasufell@gentoo.org> cannonsmash-0.6.6.ebuild,
+  +files/cannonsmash-0.6.6-flags.patch, -files/cannonsmash-0.6.6-ldflags.patch:
+  respect flags wrt #427788
 
   02 May 2012; Jeff Horelick <jdhore@gentoo.org> cannonsmash-0.6.6.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest
index 0afaf780ec4d..5e45ad219d32 100644
--- a/games-simulation/cannonsmash/Manifest
+++ b/games-simulation/cannonsmash/Manifest
@@ -1,9 +1,23 @@
-AUX cannonsmash-0.6.6-gcc41.patch 586 RMD160 b32e17b299d5ee16f42132fe0561c0c6d658bc5a SHA1 3b9ad2bce7399b3ecc4c4d7e9f2f4f5a211b17e8 SHA256 8f8f53f8eb715984fd65409d178bc586e9610842a4f2a2a9249e3bf6adeacf62
-AUX cannonsmash-0.6.6-ldflags.patch 296 RMD160 a613b5404871a46cd414f219f9c0b8c17c10f408 SHA1 143ff9729da18966f517e2467678d803cc6aa94a SHA256 768a862268623641d0576370e083cb2bda3e3ab46cedee9b972b1b3c5eff052e
-AUX cannonsmash-0.6.6-sizeof-cast.patch 358 RMD160 e9d53d5d83ad316aacd1a826b229cd54d7824b45 SHA1 47d3c0ea0aa0a5228162456dbd8a53eba0dc52e1 SHA256 a896a7f05317080500663aa49a6f61642c41e690b5889095f1f193a82cd4cbe6
-AUX cannonsmash-0.6.6-x-inc.patch 305 RMD160 41d3ba81a7b74ddd493b1c0a7ca78931ac9ff897 SHA1 b9c28b35c2f87e9c2d8204b3157496d1efe371c0 SHA256 29a261f5a92764061870fcafc84d4517f6d80249453a4daa2cfdb898833a2b7b
-DIST csmash-0.6.6.tar.gz 1989943 RMD160 8378b7e95ab179f67ebb90423a7c2b45144e226b SHA1 1e6bc2bf6f01b9c1d6dbbd40b17a2d95dff3a3e5 SHA256 1be0b27dac46ba891b955bf8f122151baea6ee05b3c29616a09423250cfd9d3d
-DIST danslatristesse2-48.ogg 1070787 RMD160 77782fd73b575f0b25b575c0f9c6baa4c9c21872 SHA1 79e25e6999f3dccc90871330f1d992f84d6127a1 SHA256 aab5b276bc55ecad65c4b2e17f11daa6d173fc077e982e42997f10695f070bfe
-EBUILD cannonsmash-0.6.6.ebuild 1687 RMD160 72433371448863cdc823bc2eed871d29ca7d1541 SHA1 35cfbfd0578bcb103280a9d752b5013171d8528e SHA256 2567912e49b21fa2b1f439eda2b18e48fdfeb7d5500896e376343e1092226006
-MISC ChangeLog 3229 RMD160 7a7d30db09d3de075c4dfb79dee33aa8215e68e7 SHA1 b3a7e279c7d7623be5acba27de47177b6e55fb26 SHA256 38c95c8f4e0c100719f7be60fcffa0089bef5ce6f409d2dfa54c357f202a4f7e
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cannonsmash-0.6.6-flags.patch 520 SHA256 a63c6d3ebb8407899e19f624a9e5c41b6a8a3f2b22270d8b10c910eaf9e3a115 SHA512 017f3117755e907438b923813e7df9864f8f6c8f5c917afde9f67ca87262402ca6b643551541374e8389f133993d51d4819fec2bd3d70a11cc4a2c0b2301b5a6 WHIRLPOOL 60f44d332ae510fcc13b01a4862c33b1cf00fa07b7bbf5d3d9f8aca6ff8104d01f8cfb893e3c7eb4e67a769d3d9dde5995c971edc6d5aeac56f6c6e125bd1a6a
+AUX cannonsmash-0.6.6-gcc41.patch 586 SHA256 8f8f53f8eb715984fd65409d178bc586e9610842a4f2a2a9249e3bf6adeacf62 SHA512 b93042c728ce93a515fd43e0b1fb9306ca83da697fde932da7c1c0536bc560fd8bcb17d7a306f51ef20a058690354b2bd19cfc62ca413398e318e0a39f6c26b9 WHIRLPOOL 3c46bf3e590f54b56c0ddbee1dfcd57d05a29ba7e937693a15f870a74a8ecda43c71733c6b53d6942f8d2f999cf78ff9d361ce9198798eff4be5639b7ea939f0
+AUX cannonsmash-0.6.6-sizeof-cast.patch 358 SHA256 a896a7f05317080500663aa49a6f61642c41e690b5889095f1f193a82cd4cbe6 SHA512 23d8764c900e78a6c3205b4fa444bd94a4a50990edfb45ef2dc764871b1d9f2359a8ee38da25ba8c392ef0000fd2da1340ce41093b4e4b8bdb818a1363941b90 WHIRLPOOL 38c79db58da57010a823d211d10f08443d5b1435daa28e1ca61b5f4cfd466e11ca547ee2423a8123b0dd63c00d4e05dc04b3970bee90a4a32591347c8a71e8df
+AUX cannonsmash-0.6.6-x-inc.patch 305 SHA256 29a261f5a92764061870fcafc84d4517f6d80249453a4daa2cfdb898833a2b7b SHA512 b7dcd8415a7f5ad773141a7b9fe048121e4f93862d8354bfde9637137858948d6791a87a3f44d53f69246fb3d539a9f5f6bd3fb667b48be8c147dcccb810d692 WHIRLPOOL 3b10c3a453d2106ca6d3d77848bd24a40aa4e332250df08fb15de1bca402c3ec13ea2c0cfa920df086a4f0ffecd088a62899ee9e9e57b9fdc6506c51a7996705
+DIST csmash-0.6.6.tar.gz 1989943 SHA256 1be0b27dac46ba891b955bf8f122151baea6ee05b3c29616a09423250cfd9d3d SHA512 e8406eb17adf6c6cc4454b7d0a432ad1b071e1f72d9867fd46e458ade2d1dc1e927a7f2a336c80988b97051b9d188c3027dd8207f89f7e1fa60e1d0a6a5e8916 WHIRLPOOL 0b0af9343bdf47fdca52b3f91b7cd137c5731c41ee00b077e86efcfc13057cdc66bfc5601124bc983813ad9cfc3fbe3e0da101cc62de6b2cb3a0428cb8a535ba
+DIST danslatristesse2-48.ogg 1070787 SHA256 aab5b276bc55ecad65c4b2e17f11daa6d173fc077e982e42997f10695f070bfe SHA512 5cbc457d511bdc736f3b359a8ddd3a514bd0d14418f2dbd68409394baadfcd9fd7630b228e4e9654b14b513e158e9a46b67bc58c5c04bfe382ee6e624dd16834 WHIRLPOOL dc87627a79900c9747ae620d3339a809cc72d7fc3b8a9fa05ab6b2423c02531600a4761c966b29bda5f531de96a68f58978d269f96c9603aae82ed87a0f52924
+EBUILD cannonsmash-0.6.6.ebuild 1687 SHA256 132a8cca4d2b82d3f7b5341bb326f2f5fdee0c1ebaa08f72ff0b2787528b7bb8 SHA512 9f337d949ced782d8727bd491d684c10f728457118627a4e4b49bacda4b8ff6c4ab2a24ca86069ae79884be82a0bed43207e71b80c5220ff7b126913bf0a49cf WHIRLPOOL 98eb034dd9ac6870a5b0d63c5cd130d3d42fecc98ee06e5da9dd4d1d8e9d68d2ab006a6fc2c08841832759b8d287a0d3d11d5506e974a916ea652abd42f616a8
+MISC ChangeLog 3417 SHA256 6cea7dd87961100f366b371871cdc5f037facaf2c45e540064d3a034608ffda2 SHA512 c456ae2019cadb58edca74463a49e0f0586c3e69add972805e24dd326f0beb9a7db5fe24078ab895080c0af3e615da30e1ff6d12855c9768eba51730d477f1ad WHIRLPOOL 0740e2a9379d4139a356caef33afe159ef6db925eec7b510397ae2a6ed636433622e1cf18f4440f0ed985719a2dbe70e4bf45d3d4a501768f14edfcc224234f7
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQRQVSAAoJEFpvPKfnPDWzUdAH/iXsROZD+u8rLFD0MFjiK+M9
+3CFays2U3A2Jyax3rkeelxHf9K/hGDhJLtR+PZc/+pxA/bJh1OnfUA1AlBRb2D+M
+7jPr5ybvHUheZz9oQg2kvDtXq6HOFhYhZwg3AE3CJ5CSCvt9FnuzBDdXn7Bsi2rg
+98l/9uXzmXDOgDQIXYW0bNYYmGF/hhMux3EMhl3zJOM1VzT22ho68cGq/K/dNyqK
+MdQupPEJU/j0IQ/s9E8wx+PyJz406+dSxQtm4/Y3YB7RjwC+g/j5xBe2MXDucGWC
+jda+25/1HE22MMknTe9OZ9cvg97ZKroQehPDC3cQAi9t5uIaa3VEmPMh5YjJx0Q=
+=2W22
+-----END PGP SIGNATURE-----
diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
index 63ad0757779c..0191a3785488 100644
--- a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
+++ b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.17 2012/05/02 21:16:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.18 2012/09/03 19:30:21 hasufell Exp $
 
 EAPI=2
 inherit eutils games
@@ -38,7 +38,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-x-inc.patch \
 		"${FILESDIR}"/${P}-sizeof-cast.patch \
 		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
+		"${FILESDIR}"/${P}-flags.patch
 	if use vorbis ; then
 		sed -i \
 			-e "s:${MY_OGG}:${GAMES_DATADIR}/csmash/${MY_OGG}:" ttinc.h \
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
new file mode 100644
index 000000000000..85612b929c59
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
@@ -0,0 +1,21 @@
+--- configure.old	2010-10-18 15:05:02.000000000 +0200
++++ configure	2010-10-18 15:05:31.000000000 +0200
+@@ -5516,12 +5516,12 @@
+ 
+ 
+ if test "x$x_includes" != "x"; then
+-  CFLAGS="-I $x_includes"
+-else
+-  CFLAGS=""
+-fi
+-LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+-CXXFLAGS="$CFLAGS -Wall"
++  CFLAGS="${CFLAGS} -I $x_includes"
++else
++  CFLAGS="${CFLAGS}"
++fi
++LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir"
++CXXFLAGS="${CXXFLAGS} -Wall"
+ 
+ 
+ echo "$as_me:$LINENO: checking for main in -lXmu" >&5
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-ldflags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-ldflags.patch
deleted file mode 100644
index ad6168a463ed..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2010-10-18 15:05:02.000000000 +0200
-+++ configure	2010-10-18 15:05:31.000000000 +0200
-@@ -5520,7 +5520,7 @@
- else
-   CFLAGS=""
- fi
--LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
-+LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir"
- CXXFLAGS="$CFLAGS -Wall"
- 
-