From: James Le Cuirot <chewi@gentoo.org>
Date: Tue, 17 Mar 2015 22:21:56 +0000 (+0000)
Subject: Turns out gcj does support @Override annotations if you specify
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e7073cca333fbf79481855f20a57dd7e432406ab;p=gentoo.git

Turns out gcj does support @Override annotations if you specify
-fsource=1.6. Why don't we install the gcj man page? :(

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4
---

diff --git a/dev-java/ecj-gcj/ChangeLog b/dev-java/ecj-gcj/ChangeLog
index e4319715e765..f47d381a7760 100644
--- a/dev-java/ecj-gcj/ChangeLog
+++ b/dev-java/ecj-gcj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ecj-gcj
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ChangeLog,v 1.8 2015/03/17 12:30:29 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ChangeLog,v 1.9 2015/03/17 22:21:32 chewi Exp $
+
+  17 Mar 2015; James Le Cuirot <chewi@gentoo.org> ecj-gcj-4.4.2.ebuild:
+  Turns out gcj does support @Override annotations if you specify -fsource=1.6.
+  Why don't we install the gcj man page? :(
 
 *ecj-gcj-4.4.2 (17 Mar 2015)
 
diff --git a/dev-java/ecj-gcj/Manifest b/dev-java/ecj-gcj/Manifest
index e41093a4cdfb..af978dce4bc6 100644
--- a/dev-java/ecj-gcj/Manifest
+++ b/dev-java/ecj-gcj/Manifest
@@ -9,25 +9,25 @@ DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b42321
 EBUILD ecj-gcj-3.5.2-r3.ebuild 2980 SHA256 190901af868726db45868eeb7bbe618cee32331f093ce35846feb6dd43481b8e SHA512 caf92ef6567df07e3775d144652ae1fbd2d0071ad9429338f1d0986c1ad3a8b77528d7d37767e690dbe5be0241330e07a665ba7fa5a87fb674d2d3f1c05a40df WHIRLPOOL 652bb84e9d71720039a904d9175116a561daec97eaeea5d18e1ce2ac3d0a5f6a0be2ea3009213e4e20e1d69976c62d4c94379da13ddf547271219f692b73aff4
 EBUILD ecj-gcj-3.6-r1.ebuild 2983 SHA256 76dbd7e1e7a3c8c98d4b96631e835c8993d3d2be5e2243df80b2c7f2736ef8f7 SHA512 956a9039da573653ff3ad1f4523d4bb0935758babbaeab7f2425f62a4504a5eae522cbd1a82e288736242f99e770ff686e4959c1c3443d0756853017c6cb2af0 WHIRLPOOL 62111508bc2111ee4db922ab71c9fccf13e01553381381902cb5c86d79924fe0dd4d1acc7db136744f8a510c9a6edf9e9c696b485b4fd2bdf3ade2289ab6000e
 EBUILD ecj-gcj-4.2.1-r2.ebuild 3058 SHA256 aefb1f1dcc458fa5c190bcf4d9b4f245720815eb90b932e9bc64ec209ba39190 SHA512 0605657bbc97bc11a67dc665e3470bfb2d89af832303701f72d4466b336637a2fd32417fe5d1c9cb6b2e62a782237e236923f00c02173c92eb429a8be5f0409e WHIRLPOOL 31cb308e39810a42507c0ca92d44fa86f5a88a9177d29406772dfdf55ce3651f43b701f0a17db3d24a2a16fd2f7cf449e8936360e099fbec57f254a6aeabc9fb
-EBUILD ecj-gcj-4.4.2.ebuild 2799 SHA256 f2dd8f50588e68452f4ce8896a0e55ca3104c7d8ddf21ef6a9da17cd7b453d5c SHA512 fe141244ae3fb1c903d6300e226a8eb398b017cc9075490065fdb0609b5c022cda6b08b00fcdcc7fa1710385ab49ae382c2e14a8ce532d69fbb92e061fb6a0ac WHIRLPOOL da7408681829934db5e34c91fe09871b37cc8600009e74db0e3681551799d18690c7e2548452ff92cdedbcc3352a1ee2f9da94aa8f12918d0a744fb5fdb99606
-MISC ChangeLog 3093 SHA256 dc383799583f60342424ad620a3bec43e8fa8e99c4b16828fbc2a1bcae525a42 SHA512 13370b0500baf8db3f1542befb25e2e053e895ac16b38831481d2b7a90b02e07180e35b43c859fe5eae73e278c34bf3eba1b83b289dff831173237ae842ebd3e WHIRLPOOL 9c7c1c8a02d3b73b98d44b9af9a904b6c2472fbb63324ad7f3edb3bfc9f47e421cb0a2587dab61e1795582c4159d55a78215a52ed3fabeba3c917a71b7968ba3
+EBUILD ecj-gcj-4.4.2.ebuild 2583 SHA256 3176f7819acf9e67f50d01bcf81436a4bab4242b53d13019e39b03a2061f08c1 SHA512 f295899807766b0e615992f10138594ee04d57e29b27092568634b54e090097a6d4e87455aa090c860a397b5adc3fec1541078a237dee3f3921a092338080589 WHIRLPOOL b8df6c833856e2348fb9e5c152dfe0dcd474c55f354f6c44dd3a6842a768cd2cba5ae03f7a8d4d6d9ce6de640aabb74addfbd4a3b383526359ccc04aed319fa7
+MISC ChangeLog 3290 SHA256 dcfe58121574de364d6b5ddd28fbcb30c87b8dc45527472e39fa38f826917682 SHA512 82073ec54c0ce6a2ab77a54800934e655def4171b08d5fae32e7ac26a6a08b9f503e96308f5a5e6589feb910c85f645d90ba24d5671179e72cab38880e165e13 WHIRLPOOL 4c9fa50ecd053bb3a9104a5fb5b268b6efc862d9f318eb3db230098bd20403b55a0e184a0dfb700b061aab3de6d9c8b0e9b6cbe53ae111d7786f41715a24d8d6
 MISC metadata.xml 328 SHA256 11219fb9b559b3e9737938e679434957b00c212473c71995cc4deeb734e60399 SHA512 03e7d5b09b8347761e6dfad2bd0b8ae74962468cee5d0d16323ecf255e6bd9cd77380bc93bbb42f2af80fd460b0ef9b9de24fe528bb034ad741eedbd29f97e89 WHIRLPOOL c155e5aa02f4b66d56533716a258c394df176ea59b0dc8ccac00283418a6ecf36ef5a3cf48e4384b7d2ee5bda5b63f8e43d3ece0d8176f8dc3bbdde4c4a220a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVCB5zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVCKj/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kb90P/1Ko/XYwobDKJWHVvRS5Bjp/
-ikzcBRxvyxo8uWjcYuyydC/z4UkEvU+rVXVvkSCgKOkLz/dLx7jTaz609Klp/+9b
-HJCucmW+JB1cViUpwewljm1bnD/T3MkqA2OJpPzH6iXd9a+P+SqBUJJK2iTPSNM5
-PyaA74AbVlTqRi2q6B2xD2/PPJ31BsM4fXxEeLOCKKR5ZsWm1sfOe4oIFR0i7t7X
-18Uq00z9YrPL7fR2yhu2x8yCxbgtfe7AYIS7oHogop2hp5dXrHLCztBjBIwBX70F
-RqiNeRCOYLWV75zc+9ZB8mRzZKyRHflaPAe/5W2XksXGH0jLZDQhXn6LYJCI77jR
-9LB8u0A4kb0OWZG2YTEOQlt+w8Epfpa11LlWjnIiDHiwk2fbh1c0j71JL84n8Nd9
-NX9rHVQSen1dTbjiiiKBdZtlryF0pUx2nHxPrE4ce8RLibr92vOnrXfuY/wUUNEp
-BWbQ/zay7rJp/ucxxRXv8fcNz225jgDtlrr0cXGpl6WZcwwSMqYKbBlqLt7Ty+Wj
-mQDGTOxZ82NSGkAqWAqUHyCgpIvJQGXsT8aHtBcS2KJ9n/9s1n+BAR6WJhE4wo0G
-vnKGusQp2bmepixQRgE65cIExcxrzSeVIwDf3Q05qUMXBXU+A182RuF5jbTx7dHv
-ao37XlASORppu/Sw6ppK
-=zmLc
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kIhgQAKGTJhasDF1S6HD4awbG2lwP
+tfFOyaXSY9sINwJBKzgcEVNQmZDPrZos5cBdSI3sR6gzocVQvAySYi0XHWtqGKTm
+HIstf5pZE2wMxU3ouipx+MPHGJgepeCFVtHP8t+n659K9APA6H2loy3L4o8113v4
+bdRdSw8iunm9AHTX/+Rj+5ub9bf2N8ziKR/5vo4QFBL4leSUBDiJp5xRNvIyB4Ck
+bvNLrEOCLCYZ2g5IwrlhIvdMVUcMdAs8CNiWw12DgwpUnAqx+xZ49REUcpBgQe/5
+lZOFkdiwNGPBpMjyEUGgxsNhPmsqbsCsybDWvd32YuWgvyWGg70OHNn7skVb10H7
+wZyAcljLrv9Z9aBhurflKa/wafRz63rrVtbC6T78/QqfBNBwtORHx4NeG623TSeZ
+8ZGRwdaMN6m0lFKR4J3DaBfYuqmrjUPK3jZ0vdj2qVaTbMaUbZ/4W6FhPqMj/Vjs
+aaG8mEwYm3+cULUWoiB538ZEBgQGOOEZcRnOiRNHGvo4XFlDNKk7qfwrD3FofIYB
+Wg3DKuQOnsnCtJBkrIhXAlbdyZEZQ7VrB73nFTQ6QiUmA9XNBCZ6MPc5Lkbvu2oU
+AhfUxDzueh1ypg8Vv4McJHihXFCW1FExIAOILwL+bqOwPcPza8cqjscwc6BUwi65
+VanzhXMdU9E0ZT8Nq3dD
+=0SaU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
index 64529d10b55d..54d3fa0ba008 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild,v 1.1 2015/03/17 12:30:29 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild,v 1.2 2015/03/17 22:21:32 chewi Exp $
 
 EAPI=5
 
@@ -40,20 +40,16 @@ java_prepare() {
 
 	# these java6 specific classes cannot compile with gcj
 	rm -r org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
-
-	# Strip Java 6 annotations that gcj doesn't support
-	# Put these modifications in bootstrap and build a sources list
-	find org/ -name "*.java" -print -exec sh -c "mkdir -p \$(dirname bootstrap/{}) && sed '/^\s*@Override\s*$/d' {} > bootstrap/{}" \; > sources.lst || die
 }
 
 src_compile() {
 	local gccbin=$(gcc-config -B)
 	local gcj="${gccbin}/gcj"
 
+	find org/ -name "*.java" > sources.lst || die
+
 	einfo "bootstrapping ${MY_PN} with gcj ..."
-	cd bootstrap || die
-	"${gcj}" -w -C @../sources.lst || die
-	cd .. || die
+	"${gcj}" -w -C -fsource=${JAVA_PKG_WANT_SOURCE} -d bootstrap @sources.lst || die
 
 	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
 	"${gccbin}/gij" -cp bootstrap:. org.eclipse.jdt.internal.compiler.batch.Main -nowarn $(java-pkg_javac-args) @sources.lst || die