Version bump and general clean up. gcj doesn't support the

recently-added @Override annotations so strip these out for the
bootstrap stage. Creating a jar at the bootstrap stage is not
necessary. The new annotations mean that -source 1.6 is now needed
when building with ecj so use java-pkg_javac-args.

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

3 files changed, 127 insertions, 11 deletions

diff --git a/dev-java/ecj-gcj/ChangeLog b/dev-java/ecj-gcj/ChangeLog
index 5f20df999099..e4319715e765 100644
--- a/dev-java/ecj-gcj/ChangeLog
+++ b/dev-java/ecj-gcj/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/ecj-gcj
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ChangeLog,v 1.7 2014/07/14 18:10:59 sera Exp $
+# 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 $
+
+*ecj-gcj-4.4.2 (17 Mar 2015)
+
+  17 Mar 2015; James Le Cuirot <chewi@gentoo.org> +ecj-gcj-4.4.2.ebuild:
+  Version bump and general clean up. gcj doesn't support the recently-added
+  @Override annotations so strip these out for the bootstrap stage. Creating a
+  jar at the bootstrap stage is not necessary. The new annotations mean that
+  -source 1.6 is now needed when building with ecj so use java-pkg_javac-args.
 
 *ecj-gcj-4.2.1-r2 (14 Jul 2014)
 
diff --git a/dev-java/ecj-gcj/Manifest b/dev-java/ecj-gcj/Manifest
index 669ce3e97de7..e41093a4cdfb 100644
--- a/dev-java/ecj-gcj/Manifest
+++ b/dev-java/ecj-gcj/Manifest
@@ -5,19 +5,29 @@ AUX ecj-gcj.in 840 SHA256 da96a9d9ddfd1d62e05c34df073c5e9ca96a7950e3ce3f8e3a3fd2
 DIST ecjsrc-3.5.2.zip 1298691 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74 SHA512 5fb3a38358511c92c12dfebbb4beb91581de25e2a3e3b4593d0388531dea5bae469f677e5154b69d634ede7395375992ae9f043be36f6b5a0fcfa873dbc98558 WHIRLPOOL 54860dd40254521cecd38d6dff645443ce61edd4b5eba036ebc002401560b313d3db26eca24b601f66ff78e288246e76b6db219379a65a88c5e16728a4f31c1d
 DIST ecjsrc-3.6.zip 1310484 SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242 SHA512 23f5be36de85f8a95bf029e42df632aa417ffa58a84b50ab5f6c78dd1fa1882316c61165b4d0d7be2c2568226f1e1c352ea45e391759ca6c5c1fef97e8c5fada WHIRLPOOL d2ea8c0ad3eb34e0d0a09b06d87a5dc89b79b106d0d68bec9e19a627f7e1732348c559ff0b4dc1558eeebbb4822ad68b8f0b59b46db84b5c6a7162e7a12f06c3
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
+DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
 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
-MISC ChangeLog 2677 SHA256 f229f5b092b4023c02459ea344ee170408c74565a5180f5875525bf5f3309335 SHA512 a47c42de2e210736492ad96ebdc178353122ca23c082b89dd194462b954fda35a8f4eff3213dbeaf334d5c67d4c97963349945aa1ede56a7f6a65fc3c8968f8c WHIRLPOOL 18a3ea9150433818b3dca9810d34e4e587f09900b37e77931b474b0f8d4b313106eafb5d50fe08d13aadbfe28e78d302974428231dad4bd42a7950773bf6fe99
+EBUILD ecj-gcj-4.4.2.ebuild 2799 SHA256 f2dd8f50588e68452f4ce8896a0e55ca3104c7d8ddf21ef6a9da17cd7b453d5c SHA512 fe141244ae3fb1c903d6300e226a8eb398b017cc9075490065fdb0609b5c022cda6b08b00fcdcc7fa1710385ab49ae382c2e14a8ce532d69fbb92e061fb6a0ac WHIRLPOOL da7408681829934db5e34c91fe09871b37cc8600009e74db0e3681551799d18690c7e2548452ff92cdedbcc3352a1ee2f9da94aa8f12918d0a744fb5fdb99606
+MISC ChangeLog 3093 SHA256 dc383799583f60342424ad620a3bec43e8fa8e99c4b16828fbc2a1bcae525a42 SHA512 13370b0500baf8db3f1542befb25e2e053e895ac16b38831481d2b7a90b02e07180e35b43c859fe5eae73e278c34bf3eba1b83b289dff831173237ae842ebd3e WHIRLPOOL 9c7c1c8a02d3b73b98d44b9af9a904b6c2472fbb63324ad7f3edb3bfc9f47e421cb0a2587dab61e1795582c4159d55a78215a52ed3fabeba3c917a71b7968ba3
 MISC metadata.xml 328 SHA256 11219fb9b559b3e9737938e679434957b00c212473c71995cc4deeb734e60399 SHA512 03e7d5b09b8347761e6dfad2bd0b8ae74962468cee5d0d16323ecf255e6bd9cd77380bc93bbb42f2af80fd460b0ef9b9de24fe528bb034ad741eedbd29f97e89 WHIRLPOOL c155e5aa02f4b66d56533716a258c394df176ea59b0dc8ccac00283418a6ecf36ef5a3cf48e4384b7d2ee5bda5b63f8e43d3ece0d8176f8dc3bbdde4c4a220a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTxB0+AAoJELjwI6Q8XPdaPUwH/iXmxebLUa9TTihV1s96lD/6
-nphvg1pUTTBvSRPKJcLx1PqEmHrwNpm3c8BCdXqkYadAJf/eZqKK5cVMZAyExs93
-PztlxUguWZ9TYgLST6Y4ojJ5sS84/r0MDHJTtOaDOy59Kj4sUwH7DCzVVOt65Bei
-voiJkFbDKHZj0F+A2MHE6Qa1FJNAtoc5pND5joPLUoaLG9nXjbpdCXTYXLshZDjY
-5fyTXVEQQlG7+sXdedeYgQbuaD1SUBrxAozi/Odgi+JJRJhSgu+d0fT6JyZ8O70p
-VlHA9mfzJJItVw0NH8NjnL3Rgqtng/+6pRbn090asBGcE9LaZhxDbd+I4a8SET8=
-=yOc4
+iQJ8BAEBCABmBQJVCB5zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+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
 -----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
new file mode 100644
index 000000000000..64529d10b55d
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
@@ -0,0 +1,98 @@
+# 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 $
+
+EAPI=5
+
+inherit java-pkg-2 prefix toolchain-funcs
+
+MY_PN="ecj"
+DMF="R-${PV}-201502041700"
+
+DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+SLOT="4.4"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+native"
+
+RDEPEND="sys-devel/gcc:*[gcj]
+	|| ( app-admin/eselect-java >=app-admin/eselect-ecj-0.6 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	!dev-java/eclipse-ecj:3.5[gcj]"
+
+JAVA_PKG_WANT_SOURCE=1.6
+JAVA_PKG_WANT_TARGET=1.6
+
+MY_PS="${MY_PN}-${SLOT}"
+S="${WORKDIR}"
+
+java_prepare() {
+	# We don't need the ant adapter here
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	# upstream build.xml excludes this
+	rm META-INF/eclipse.inf || die
+
+	# 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"
+
+	einfo "bootstrapping ${MY_PN} with gcj ..."
+	cd bootstrap || die
+	"${gcj}" -w -C @../sources.lst || die
+	cd .. || 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
+	find org/ META-INF/ -type f ! -name "*.java" -exec "${gccbin}/gjar" cf ${MY_PN}.jar {} + || die
+
+	if use native; then
+		einfo "building native ${MY_PS} library, patience needed ..."
+		"${gcj}" ${CFLAGS} ${LDFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
+			-o ${MY_PS}.so ${MY_PN}.jar || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar ${MY_PN}.jar
+
+	sed -e "s|@SLOT@|${SLOT}|" \
+		"${FILESDIR}/${PN}.in" \
+		> "${T}"/${PN}-${SLOT} || die
+	eprefixify "${T}/${PN}-${SLOT}"
+	dobin  "${T}/${PN}-${SLOT}"
+
+	use native && dolib.so ${MY_PS}.so
+}
+
+pkg_postinst() {
+	if use native; then
+		local dbtool="$(gcc-config -B)/gcj-dbtool"
+
+		"${dbtool}" -a $("${dbtool}" -p) \
+			"${EROOT}usr/share/${PN}-${SLOT}/lib/ecj.jar" \
+			"${EROOT}usr/$(get_libdir)/${MY_PN}-${SLOT}.so"
+	fi
+
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ${PN}-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}