sci-visualization/xd3d: Respect CFLAGS, #430032

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

4 files changed, 61 insertions, 14 deletions

diff --git a/sci-visualization/xd3d/ChangeLog b/sci-visualization/xd3d/ChangeLog
index 0e10c118bc4e..e5583db0dce5 100644
--- a/sci-visualization/xd3d/ChangeLog
+++ b/sci-visualization/xd3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/xd3d
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/ChangeLog,v 1.17 2012/06/21 14:50:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/ChangeLog,v 1.18 2012/08/05 16:26:45 jlec Exp $
+
+  05 Aug 2012; Justin Lecher <jlec@gentoo.org> xd3d-8.3.1.ebuild,
+  +files/xd3d-8.3.1-cflags.patch:
+  Respect CFLAGS, #430032
 
   21 Jun 2012; Justin Lecher <jlec@gentoo.org> xd3d-8.3.1.ebuild:
   Add missing multilib.eclass
diff --git a/sci-visualization/xd3d/Manifest b/sci-visualization/xd3d/Manifest
index 4a65b58b8ce0..337f653d75df 100644
--- a/sci-visualization/xd3d/Manifest
+++ b/sci-visualization/xd3d/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX xd3d-8.3.1-gentoo.diff 1768 RMD160 b889b98a0899a0739e1321d5b26d5b187acf0ab0 SHA1 6acebc8eedcda12de44f1539121a4a83c49eaa67 SHA256 cd2833152b1be3f40ec69b72a20ab655fc068be35f6c71ac4f4a74a3bed4b04d
-AUX xd3d-8.3.1-parallel.patch 2209 RMD160 cd4efded9c245614c8b8c5aad08f5217931dc0b6 SHA1 684bd4adca83c8e2fa301c38e2ccf7a94f3f757e SHA256 e338c1e5966fca00b6308cbd20926c4a3f5840082803bbc6ecbc1853c98ad0dd
-AUX xd3d-8.3.1-rotated.patch 242 RMD160 78849d46a6e6442689f84c00cf4fdc24674d871c SHA1 398ff4e6e1f78dd67e164b3c2373cccf8d0b0105 SHA256 14fca665afe5a226223e9efac7e8f707e67b759105feeec954f9ad7108946234
-DIST xd3d-8.3.1.tar.gz 2188216 RMD160 78b3d6b457bce69e3525a1c654d7241df2f8d5c8 SHA1 9ab3c1c14e63434714e7e8022b6c1ab2366ede3d SHA256 f363cabec88fb5055fe86fb9973d7122e93dfd4a803517b9f90be18131ef8816
-EBUILD xd3d-8.3.1.ebuild 1220 RMD160 31b304379a00bb5730f252fc336fddd6a6bdee9e SHA1 fd1c5906ab00a806fad209ce2c90ba69725c64a5 SHA256 f72f7976ba13c2d35edddd523495c557c508df9f840e4fb86e7032b0d2a0a16e
-MISC ChangeLog 3148 RMD160 27fd6c9cc756a05943ed53e73b42a86dbfd582ef SHA1 b7e5eeb4265ece1b665204f76b6c94b37adfb44e SHA256 73f09ab8f7e0b76e20089d18248f9c7d79d08068a9d0b130529b2b6f9b3e8927
-MISC metadata.xml 616 RMD160 ca385cb92c37bcdbd2acaee143e2608bff2ac698 SHA1 771a5b0e74486196ec98931110fb562073f41c36 SHA256 80d41bc7d28216b8c877e86929f0d0d61e7181983b5ae9643a9939adebb78df3
+AUX xd3d-8.3.1-cflags.patch 1950 SHA256 86797f593fb4a976dc6ba02aa7db521a39dce328520ccd1942e21f19fb3a0692 SHA512 d89639bca626f59f5b5281b64082ee268f2a576b222d0a2a52fa73de993b82c4700d3f2e60b540c4f2c99b8b4e4fcde53e1db05a416cf1229f5a95d336a2a517 WHIRLPOOL 995a0d5253d9d419cd653b4188d4a89d00dd555c4065b56e8434fcd538ce030c2cce33c5ffa1a6115a311d6dee274053e9cf8fa49ad0875e7ea51fdca749ace6
+AUX xd3d-8.3.1-gentoo.diff 1768 SHA256 cd2833152b1be3f40ec69b72a20ab655fc068be35f6c71ac4f4a74a3bed4b04d SHA512 6867247d81881ecc5d6ba8302b6099a758a5e7d565cae25afd175c08e36f3f6c0e550b20e41144c40ea651d3bad3f6493b8a8ab9ab4394023654c1172352478e WHIRLPOOL dec6372aa0494e381e1ec797d745a12193f4e777a465dae503e227296b3238e9a79425e4e82646bfc5e7e810c83bf85403f307b36b30804efa3874babeaac359
+AUX xd3d-8.3.1-parallel.patch 2209 SHA256 e338c1e5966fca00b6308cbd20926c4a3f5840082803bbc6ecbc1853c98ad0dd SHA512 ecac2925aed0df9fbc330acc7626530761b473f9b3631b387e9cc8a03bfcd77e0e4f27da8fa5cf00895f7be9b8cc8add2965cc248947b0dbc0264d85745deabe WHIRLPOOL 66cbe18d43290da0d522ec3109346a446e7ed09d78d3d48b452d9297174b9c1a49eec59e1578570f8eef04e7479842adf7cef0653e154121d2f052be60f71af2
+AUX xd3d-8.3.1-rotated.patch 242 SHA256 14fca665afe5a226223e9efac7e8f707e67b759105feeec954f9ad7108946234 SHA512 491bdc6406262ba2e6991d9ae86002453bdb1628a783c3e9efc731c63bbf37de95895bb5f8a3c7639b85db9a2c55355807fd2bfce009fca8ec0c2439e3d574c4 WHIRLPOOL 38468f0090e99a64c44196048f364737096b3526108eb5dccff6523ee0437676d62bf9e22c974f9a15d91c0b76e2bcf664d97bb15463483ec9aea40721ce932d
+DIST xd3d-8.3.1.tar.gz 2188216 SHA256 f363cabec88fb5055fe86fb9973d7122e93dfd4a803517b9f90be18131ef8816 SHA512 a02e1b53b1d393c8184866b0693394f596bb3c1eb5f49d00a41dd7bb972f08ba8d1621e7a1f197b015551d9483c9c76c07dac5e199961de775b9ff63c898c89e WHIRLPOOL de1ffd61ee99bc12474a37e37049ceec0d7f36a4d0095f556f2cbffb407cc90f98540052bb7a31666387d310ee169fd06cba68b18dd633583148e46664e74419
+EBUILD xd3d-8.3.1.ebuild 1256 SHA256 0eba798c843d82ce36eb68062fd2ca75d69f0fc0d74ed59c254848cc9e1974e7 SHA512 04f9a4d3c1a86dc9694eaf596e66dc7a346fa3451bb4d434f7ee43697c74bf7f0b1ec655fa6078334734e2d260c0e8462741c7be3cd55b216694e0dbb75e005e WHIRLPOOL 6090766c41a33ba37853008979333d1ac3e31d61de18ccf28d9d315e330c21d1c4a2f7072445e8829b3154c5ca106dad6f1a17d480ca2f15cb0064d9696f233a
+MISC ChangeLog 3275 SHA256 169955d4d8205c58a2fde84b87c686f50ef530377106565423a31e0a299b8e26 SHA512 86fe4e1688abce57f579df86ff8a46ff242c3c6b332efc4f880168c430dbb947fab63df6edf8848be43484d6458a8e83e314c718393fa6a1990f2ecea73906ea WHIRLPOOL da4064123902de5ef8f885f93207947a91d4c31bd398e70540f5d680f3e483f5bb4ee85158e3d43b85fdecb876ae9f45b9bfe533d0548183aa73f86a87fb143a
+MISC metadata.xml 616 SHA256 80d41bc7d28216b8c877e86929f0d0d61e7181983b5ae9643a9939adebb78df3 SHA512 764255289f0d9a0cb62bff915480546a8dfaec80e702dbe8e143696ccf1ec02b85ab3b9ecf5319ed26182497769470e53bd1f9e24137a28bc0bb6a082518e516 WHIRLPOOL 0dc7ca78effce8ad8b274344cbe587d41984c6eec87f0c910cf921aa7b4b24629f9ed493889bfb86c33c8eee96ed5be47061b22a75824b851277d3561d73135b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/jNNAACgkQgAnW8HDreRYrAgCeLBeyQdz+nLRZUZ+kgoP8YBUG
-C7IAnieEjtc1A3QsheorjddGUGoVNNyD
-=v0o7
+iEYEAREIAAYFAlAenssACgkQgAnW8HDreRYBggCfQdYMK0zIujZlBIMHEroQsx2k
+NsQAn1OoexRe8DDVnh3KlpbMavuRUjBd
+=R9es
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch b/sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch
new file mode 100644
index 000000000000..b62129b41bf4
--- /dev/null
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch
@@ -0,0 +1,41 @@
+ src/various/Makefile |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/various/Makefile b/src/various/Makefile
+index 7188b2a..80f47ec 100644
+--- a/src/various/Makefile
++++ b/src/various/Makefile
+@@ -3,25 +3,25 @@ include ../../RULES
+ all :; make clair clairc3d create_c3d obscur obscurc3d tradavoir translation txt2avoir
+ 
+ clair : clair.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/clair $(INCF) clair.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/clair $(FCFLAGS) $(INCF) clair.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ clairc3d : clairc3d.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/clairc3d $(INCF) clairc3d.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/clairc3d $(FCFLAGS) $(INCF) clairc3d.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ create_c3d : create_c3d.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/create_c3d $(INCF) create_c3d.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/create_c3d $(FCFLAGS) $(INCF) create_c3d.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ obscur : obscur.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/obscur $(INCF) obscur.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/obscur $(FCFLAGS) $(INCF) obscur.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ obscurc3d : obscurc3d.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/obscurc3d $(INCF) obscurc3d.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/obscurc3d $(FCFLAGS) $(INCF) obscurc3d.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ tradavoir : tradavoir.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/tradavoir $(INCF) tradavoir.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/tradavoir $(FCFLAGS) $(INCF) tradavoir.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ translation : translation.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/translation $(INCF) translation.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/translation $(FCFLAGS) $(INCF) translation.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ txt2avoir : txt2avoir.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/txt2avoir $(INCF) txt2avoir.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/txt2avoir $(FCFLAGS) $(INCF) txt2avoir.f $(LIBRAIRIE) $(LINKOPTX)
diff --git a/sci-visualization/xd3d/xd3d-8.3.1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1.ebuild
index 819fe97a8a33..03e39fbdca19 100644
--- a/sci-visualization/xd3d/xd3d-8.3.1.ebuild
+++ b/sci-visualization/xd3d/xd3d-8.3.1.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/sci-visualization/xd3d/xd3d-8.3.1.ebuild,v 1.11 2012/06/21 14:50:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/xd3d-8.3.1.ebuild,v 1.12 2012/08/05 16:26:45 jlec Exp $
 
 EAPI=4
 
@@ -25,7 +25,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gentoo.diff \
 		"${FILESDIR}"/${P}-parallel.patch \
-		"${FILESDIR}"/${P}-rotated.patch
+		"${FILESDIR}"/${P}-rotated.patch \
+		"${FILESDIR}"/${P}-cflags.patch
 	sed \
 		-e 's:"zutil.h":<zlib.h>:g' \
 		-i src/qlib/timestuff.c || die