Fix build with GCC 4.7 #421501

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

7 files changed, 34 insertions, 14 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index ed59cae35c9c..299579d6ac0c 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jffi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.22 2012/05/28 19:33:58 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.23 2012/08/25 19:09:47 thev00d00 Exp $
+
+  25 Aug 2012; <iwhyman@gentoo.org> jffi-0.6.0.2.ebuild,
+  jffi-0.6.0.2-r1.ebuild, jffi-0.7_pre20100131.ebuild, jffi-1.0.0.ebuild,
+  jffi-1.0.11.ebuild:
+  Fix build with GCC 4.7 #421501
 
   28 May 2012; Ralph Sennhauser <sera@gentoo.org> jffi-1.2.2.ebuild:
   use https for HOMEPAGE. Reported by Arfrever.
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 3ca58b6d85b3..4ff96ec30d97 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -13,11 +13,11 @@ DIST jffi-1.0.0.tar.gz 1627422 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54
 DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512 0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa WHIRLPOOL aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
 DIST jffi-1.2.2.tar.gz 1759433 SHA256 c4afe6e3c67f600f9f838c8526a711c5c7859d3d05f7ccb6e7926ef5e484edbd SHA512 d62e2de80703fad6fdf4ca758d7813389cdb1d7e0e8316f790d440a421df95f7a6a301c7b2f49f81ed76b17abde3031f755f6c69fa5cd3a6339b378ccf8c4a55 WHIRLPOOL 69fbf8c88f5ad60ef1a6f7ace917c3245c1eaed6e4cc0c0950f933635e31d8480b53286c5b7f8c8bf3aed9b87ce61e75ecc8a3b0af1288bee448206db3e2cdaf
 DIST jffi-git-0.7_pre20100131.tgz 1484965 SHA256 b2256550a38cd120cd61bebd61a76dd373994b62a1c31191c74aec3a0970e30a SHA512 772ca01f187245f524ab7f2b1ac712ed4d44d87237b222e6bc0357721ecb7a1cc2ec93e1556136db3b5dffa85d2bd4eb935e5610dddd8d03d84629afcce84c1e WHIRLPOOL 746557adee3a96ef82d8a459bc9d6bc5c9508b88bee539dfe07a9defdd40c8a55da8945493fbfe44a2125a92039f3754dd9da5fcf55d145176a67e7f44a93b9d
-EBUILD jffi-0.6.0.2-r1.ebuild 2141 SHA256 e6fa781e9156c8e8466af23430281863bc6107fe6a0dbbd647e031030b530084 SHA512 42045682c24b87b41f9ecb7b186fe6db1ba52ca079d84ac65bb82a82ec233b28cf47313e1daa1713d9a9965a100470da59a8f6d3f35d49588ec8e3cd2192bf29 WHIRLPOOL e717262a2ea90a8cec34b295aa956de69274c3e1c88a4a146a97df560c1d2d6554727e843cb184ffab2ecfc0bc06b553010bcad51195ac29e51e2cc838e9c146
-EBUILD jffi-0.6.0.2.ebuild 2001 SHA256 df3c5514815568d8a62b2107cca68ed859b490469ec1d37573040fb6a62d0646 SHA512 0ebbf9488f51e8da7101bdde25ba1186a1e503c9e5848246ee59382ab0b409e08323c3f3cefa7de7fe2409f4108955ddeb73a09b6794e18ae33e5aab382f5131 WHIRLPOOL 2faa75c9f9ae424007ad315cb9e1ae5ade2a3cc2ac2649fa401ede06f3155984c98dca658f7848982a6aa1e1b5ff9c4072b29582a23b6b7622938f0298f1596f
-EBUILD jffi-0.7_pre20100131.ebuild 2518 SHA256 cfeb96732184fe01425a6206f0f59438e20136d8e9dfed111d2582c76f5da702 SHA512 d5531f6ec2389c8b06ad8d0df50ea522105fac06806827fab8b53fcb1e4e9d54781adc6d29d2b6e4fbad29b3d4e953e56574375f575c8e084bcf07156ce9ef36 WHIRLPOOL 225b59ec4c0e660763de38fb7a44bda54cb5d58e954670f70cc2f800c99ed075ce2d06d97b96bb7064351212001a0f483e6a75a3f537951f6fe7554c3cb86e48
-EBUILD jffi-1.0.0.ebuild 2181 SHA256 898cf1ff8a0f672556e154f6e5bdb1493c26c84bb7701e45c88025de9d6a9c58 SHA512 06ca3ab814beefff2551c1cafe317a6c4511806f2d55a272bab48a370ea44c4d0e6536c33247f227278fad8ecd526e5986a620b27138d753e05fc222ce21f3dc WHIRLPOOL 318358266b78f9a081a000e8387c618815b31e4d92489d41cdc8a220bd779ccfde9803687bd0a19f06d1a419b079335dc62818c2adcde74bf1e66edaabf8f100
-EBUILD jffi-1.0.11.ebuild 2404 SHA256 771e941cf8b81cdad4eb64ebc75b49587b687bed5745a61022af65fbef2b4cfd SHA512 205e53a472f80489ddf64d81d21b8e438c34c362cbf77480db179eddeebf0f55b080d9d4454b1e20ec2b868fa3448094d68b5fae06961b85cc202a99c13f1a25 WHIRLPOOL 642c3749a52f5c60b0916d280c87d1270a3d93bcce6c5c5a57a8a5605fbe4407b13b00a1bd2e42dbb28ec6c6c3665629aa0746b4cbf4a3fccb97a24adc7d6b3f
+EBUILD jffi-0.6.0.2-r1.ebuild 2230 SHA256 d641164d207c6cf6c76f2a0756a75b778229a7034d74603fd04318fdb547ee5c SHA512 45f8341d2b7dfe34f3895e778e33b6c3fb982bf70a55b885ae238c03a62f75f754decfc37de769a53a0c5ac3a3df8330d71ce5d39bdf1c3cbc14d62ac23247ae WHIRLPOOL 317ced716d87bc4a6adc4691a10c7693b88a26e590cfd7e990c266c8f6663c0a8ca64f55f1726cbd2f757faada08282c7c26d4d8c710a6c3a74b440da0eeadeb
+EBUILD jffi-0.6.0.2.ebuild 2092 SHA256 bc871ead6b4881d8a050d2aefa4031aeccdf6b65a7e4d4f82c0f24b6e2ffdcc3 SHA512 6b94f8e445c3a3c7eda60264541e44bade8618b1c091a56fd92ade040f8ad71e1791afd7b7dde204ac99eba32b9ba831997fbd378b742beeb068c67d17da405e WHIRLPOOL c863e7b1f445c4a2f93c2fd591f994a12c8010723ede46009b207f21d8f5ca0421a0f38789c0b27a7cde0244c3cae768f81ce4b2f23c09781dde67761837b491
+EBUILD jffi-0.7_pre20100131.ebuild 2611 SHA256 edeef1882353285c5d42a2bc19b1ee323a061f6f8a01562a202fdd3f935bad67 SHA512 0f96d16e0cadd4f50b97158d013adaf1b617c09d7978bc2774afc6ee8ac0a00079104cc073cdc9c260c89cead5855f6504b83bc124529bff641bb6b3a0b411e1 WHIRLPOOL 8184f494145ec5bb40cddaf9b48a42f0dbb790341287d6553df5f93553b7c4052e596a831d5c8f16518915318c6e7b0897dab811435738cfece96f3f2dfb6e3d
+EBUILD jffi-1.0.0.ebuild 2274 SHA256 a5fe1144dacf4f666105ef56cec8a8bf7b246a68dbde639ec4a0c9c867a2d4b1 SHA512 35894dc27f8b0d0f672d1d39548af68057f79e252663cf2c9ec8802e7dabb6d721afd3e1d030b37f7c7c37e395c39cbf5cda2a5b4b97f95d17fa3aa9b4d642cc WHIRLPOOL 986db534860b62f5dce5a12667410dfeb7c120a0a3f9e4fc5c57dca37d694204a4ac2b4b3d2b76bc7a961d15a88c7868c2290eab253a46f0f1b64a32d48191b8
+EBUILD jffi-1.0.11.ebuild 2493 SHA256 affcd6d55af34b30b83074a675ccea2cc571df0eaf1b837e6c5e484f80acc021 SHA512 2a3e8ceeeb6dfd7bafe7bc1d53a12ec35b204cc10bb833412076b219fd506275f5e5d8cba8608de2cf80730d6bef1438f184a241dbda50290066420f7646240a WHIRLPOOL 0e5000088b97a8e6e5d1a42a819f80219f6837170a9534115cfe0203cf6706eb5a1d37fcf6fd2e7cab04904452edafda6c4a9254cf07e7de8b4ee917257b5744
 EBUILD jffi-1.2.2.ebuild 2358 SHA256 602ea19a322ce6a1977dc9fa757e8a4037814e7980fa67b12078e8da0ac0d4e5 SHA512 b4b0fae935671963573ad62056fc418b46195f342fb86e58b24bfd8a74f5d7fa232d584abe134f88ef3f11e4e3fd9451b84e81093f6d91faf67b119eb30225e7 WHIRLPOOL 19a5bd2614c4e7711ff29c6263c49c538706a78630c7bb72c222a89f5ff78d22c4a64da13cbb217a2ad5b27a154806c5feb7af44f35f7733038ddda29c148902
-MISC ChangeLog 3852 SHA256 7e00384243dfb54b90bd1d9b4cddaa2bce76922a8460eff5fdb64e27679b0b76 SHA512 abea65ee3555f31578b5074a15d36869deacfc74c98ee9a1c336741007734da66c307441a2fb242a331ceb3a4c33012ffb65d5cd8fe766983251a50713f63890 WHIRLPOOL 0740b07aa1e57932f158dbc84aaba7639dd00a9a1b1f0adf86717a40e2fd624e069a59ee81a04870f59c4c044e820216d09f21c0ce266bd29e24a29430fa74f4
+MISC ChangeLog 4044 SHA256 ad159965288ecf0aa82e2dddfc9de90544c7d14153ba859f590490ffdb40c62e SHA512 d6be8f67bae308922c1387b2448a92cc41e9acfa70e0c78a17cbdc7352ad6ef45558b9efb002bca72bff8d2e78f3e9134ea40e253a193b85cce7190d878a4126 WHIRLPOOL 74b970113d85f475be8b51272e5c6e0ec917915d3759293eb735c2f421b8b5cfc3bc457319c7d21c559fb96bc98c78e2458cf3e8d573f1313e7087a073f167a4
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
diff --git a/dev-java/jffi/jffi-0.6.0.2-r1.ebuild b/dev-java/jffi/jffi-0.6.0.2-r1.ebuild
index 393f86131f8b..6e66f46e9563 100644
--- a/dev-java/jffi/jffi-0.6.0.2-r1.ebuild
+++ b/dev-java/jffi/jffi-0.6.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.6.0.2-r1.ebuild,v 1.2 2010/01/24 20:56:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.6.0.2-r1.ebuild,v 1.3 2012/08/25 19:09:47 thev00d00 Exp $
 
 # Probably best to leave the CFLAGS as they are here. See...
 # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
@@ -56,6 +56,9 @@ java_prepare() {
 	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
 	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
 	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
+
+	# Fix build with GCC 4.7 #421501
+	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
 }
 
 src_install() {
diff --git a/dev-java/jffi/jffi-0.6.0.2.ebuild b/dev-java/jffi/jffi-0.6.0.2.ebuild
index 286883d98a83..964b8d2a83ca 100644
--- a/dev-java/jffi/jffi-0.6.0.2.ebuild
+++ b/dev-java/jffi/jffi-0.6.0.2.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/dev-java/jffi/jffi-0.6.0.2.ebuild,v 1.1 2009/12/30 06:36:19 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.6.0.2.ebuild,v 1.2 2012/08/25 19:09:47 thev00d00 Exp $
 
 # Probably best to leave the CFLAGS as they are here. See...
 # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
@@ -55,6 +55,9 @@ java_prepare() {
 	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
 	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
 	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
+
+	# Fix build with GCC 4.7 #421501
+	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
 }
 
 src_install() {
diff --git a/dev-java/jffi/jffi-0.7_pre20100131.ebuild b/dev-java/jffi/jffi-0.7_pre20100131.ebuild
index cfca57a4c3a2..f2d44debcbe6 100644
--- a/dev-java/jffi/jffi-0.7_pre20100131.ebuild
+++ b/dev-java/jffi/jffi-0.7_pre20100131.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/dev-java/jffi/jffi-0.7_pre20100131.ebuild,v 1.2 2012/05/03 07:42:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.7_pre20100131.ebuild,v 1.3 2012/08/25 19:09:47 thev00d00 Exp $
 
 # Probably best to leave the CFLAGS as they are here. See...
 # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
@@ -61,6 +61,9 @@ java_prepare() {
 	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
 	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
 	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
+
+	# Fix build with GCC 4.7 #421501
+	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
 }
 
 src_install() {
diff --git a/dev-java/jffi/jffi-1.0.0.ebuild b/dev-java/jffi/jffi-1.0.0.ebuild
index 9938b0afa3e7..3a19a3452de6 100644
--- a/dev-java/jffi/jffi-1.0.0.ebuild
+++ b/dev-java/jffi/jffi-1.0.0.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/dev-java/jffi/jffi-1.0.0.ebuild,v 1.7 2012/05/03 07:42:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.0.ebuild,v 1.8 2012/08/25 19:09:47 thev00d00 Exp $
 
 # Probably best to leave the CFLAGS as they are here. See...
 # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
@@ -50,6 +50,9 @@ java_prepare() {
 	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
 	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
 	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
+
+	# Fix build with GCC 4.7 #421501
+	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
 }
 
 EANT_EXTRA_ARGS="-Duse.system.libffi=1"
diff --git a/dev-java/jffi/jffi-1.0.11.ebuild b/dev-java/jffi/jffi-1.0.11.ebuild
index 7c0fc514035e..532c6d5551cf 100644
--- a/dev-java/jffi/jffi-1.0.11.ebuild
+++ b/dev-java/jffi/jffi-1.0.11.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/dev-java/jffi/jffi-1.0.11.ebuild,v 1.4 2012/05/09 17:10:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.11.ebuild,v 1.5 2012/08/25 19:09:47 thev00d00 Exp $
 
 EAPI="4"
 
@@ -39,6 +39,9 @@ java_prepare() {
 	epatch "${FILESDIR}"/${P}_no-werror.patch
 
 	find "${WORKDIR}" -iname '*.jar' -delete
+
+	# Fix build with GCC 4.7 #421501
+	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"