Simple version bump. Tested with ecj 4.4 to build icedtea 7.

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

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 154a87afb4b29932f2c80b6625d4bb2117f3b53b..45dd6e71c8e93822a9a0563a96b36098c7a5fe23 100644 (file)
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.16 2014/07/14 18:45:53 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.17 2015/03/17 12:34:45 chewi Exp $
+
+*gcj-jdk-4.9.2 (17 Mar 2015)
+
+  17 Mar 2015; James Le Cuirot <chewi@gentoo.org> +gcj-jdk-4.9.2.ebuild:
+  Simple version bump. Tested with ecj 4.4 to build icedtea 7.
 
 *gcj-jdk-4.8.3 (14 Jul 2014)
 *gcj-jdk-4.8.2 (14 Jul 2014)

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 670f6d82a9c1d3f1d212139ba601890b558fbb13..1e4a1c4507099485630aed879c389a17a30d4390 100644 (file)
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -8,16 +8,25 @@ EBUILD gcj-jdk-4.7.3.ebuild 3457 SHA256 a0ce2126e4b2bc8d403fe16fa4d5a19ec612588a
 EBUILD gcj-jdk-4.7.4.ebuild 3882 SHA256 1b10b7841091dfd197bda4623128f7e93dca4caaeb6b15c324869d279a5cbfda SHA512 bd465de6478047c8d17f465a9be60ff482e7eef6b92710904ca1ee035b77c5868effe96a89ba96691eaab761d7f66b09c408c57e980969608f39fba70e61f577 WHIRLPOOL 20548d84eeb40daf9486bbb46005cd99c780992c526bfc721d8a4fc38d27c5e3b3f8d146538b98bacd48e2112dc45e1d1e8e510d66e025dbf4e08dafbdf61ab2
 EBUILD gcj-jdk-4.8.2.ebuild 3864 SHA256 13064360c8f47fb751cbc136344a6651dac86c3318947365f38a5c158b781069 SHA512 59465c04124a005548cf3c3e3c9847f2f6f92ddbe0d9a7cd180acb8aaa5ddfd8fa221878724f84995440a28cc1d7cb6e5dead541e1eae4993c1b285ea8983d41 WHIRLPOOL df6eb78fe0822eec12996bdfbfed6f824a98d910307b8ff911b3774b89bc578b2e5d168b345477ff6433838e3a5063ea58e8f21881d6bb6430b9cbdbf8264f1b
 EBUILD gcj-jdk-4.8.3.ebuild 3864 SHA256 a70e3b9ea5b638c8e58c8923d3c3ed9c9d1905dd3e025b76ad8204e743dd7be1 SHA512 1421fb3b19ffebb5cdaba9ba05d497e68feef4127c1aa6c72bd47c9e1a936d6daa223689277a0a86bfd4daeb4a5d29db73fd97b2312d3563f67177a5a4f07388 WHIRLPOOL 8ac408c20601f4046bd2d00e42d97b18a0a564c996a3bc180cd3011ff46157b80c7fe13faf7995feecc60044aa23100b70f276e32e708c55e2a0a4fd51af92a4
-MISC ChangeLog 5017 SHA256 bbd1fe781cdab976f2b2f352fb104b01c0fd935bd9cc730ee7ec80f613d0cf30 SHA512 1551566e7320e34aaad1a0e816642b05c5ff0160162e606c2fd2583c8dfa8a9e63479de4fff7811f15f16e5d77882bfe8dc99da2b12a3fd7e133207817124a81 WHIRLPOOL 6cc3075f2f6f3f65eeadce9be6124cf978ef5341f9119db5fda3f7c327f461d60aa58dd0bd941e06844fc5c25c7141498cd59519075b801c65f105957be0969d
+EBUILD gcj-jdk-4.9.2.ebuild 3865 SHA256 ea68de512e69c1bcc980c7e00cbe402972d64fc3e104349afe3607839577d310 SHA512 a3fa2f799a49224c08ee5852569818450a9ec0ff957c22f48f793e8a7a27288df0c3cdf407aa192590821bedaff6e077cad290a1f3a4430e15656d0c40b3088c WHIRLPOOL 7ca182bbea1f2608dec3b234c148750cd015421602f2ed2263247d5d1817b8f61089598805688583ff455431e4c62573539d31e0512382a0d8486545e6c58287
+MISC ChangeLog 5185 SHA256 5fc59456c8377aa3a0b9e72a885449aabdb588ad4ae5b1fc65a85e262ad9ddd4 SHA512 355c62e6f13945e752570ded0874634d1805b86d5cb157ffaa7047741cecd531d06a68047f3dada1e01e0e0f0d6bcef70198a7df1eac627f0d7f63cc29fab761 WHIRLPOOL 56defc25efe38808e1515497e0ce18cf23ea669a16459362c014bb5462e366f597ad1c1e0c8b263ea2e8a66746ef2aa02138faa6c00badbf132b93b8fb56f022
 MISC metadata.xml 420 SHA256 b939a23db890e627c3f9435964b7d4b9d9ecb0896af86b288a81d41e825c25b9 SHA512 6a9921186f1cc07e32515e9837c41a7ec1c802809b30ce8c28520d64ee3d7123c57b58c7ec57f556f7f991792b87b8605514681c4cdf5843628daa0d12b082f2 WHIRLPOOL 526bd3b1a989e90dea71b50e80cbc7c3bf899efbd1f3d8825b920ce0c572daa32c58bd6b5458345d0681feb906862f9a80873d888f744f7d7b0a1aeae6f23d1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTxCVrAAoJELjwI6Q8XPdamkoIAKKfY2mkkLpD5GGZbk9du2Ox
-8tJMm0plJUB+VE1MsIV+MML6+w4hF3GcjotwlA7jOTNHzU5PG4C6kW2dtUHzlumN
-57848rDcsePIHsjuMLciP5CKrc4zHwgt4MlEyBSWzxAlIg+EOXU4tk+x/ZmE0a0I
-uAYpwnEjyjdKM1T+NYQDCrbzuJv2UEjNsOo/23ts+hcY3NRNEgk74RziOAgb+EhD
-lIcxMedGVrWUygsVIw5QAPDUDZG7m+cgtsAGhc2F1Iao70V4/lOxPbMmrB8ojhHt
-8UBDYm4jbYGMpChFW5yqOwlZ62Fb9F/AJj9Cas+A97vqZIkPzubjWmk2W5kID7c=
-=pJhG
+iQJ7BAEBCABmBQJVCB9wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kUZsP93qww8o6kSjNoZzluP6qgQrT
+h/pYZA7MpyKJj2Iu9itCebWszRESNptQV3JVAOpBC3waSBAqRQ+VYG2oEDzxjKQs
++PLUpj1Vc7/jFY68ysqsW5HH0H4Zdvx0ixO1SqAg5EOz9gLh+HbjKpWm6e+vKWJD
++yMyBAPd6C+ve4frMrtqs5B8xNfNBntyzlmvQMgqeoghagffW6JHC/OyIT4dWWVu
+kFlWx/s/yJ9yK16K7ns60axLYXgQq3Wpt/nyNU0oiQL/9qxx8kHev0eIvdktOWzt
+YCFYGNBKAzrkt8hMLDlfhGdswsS6uzzJfv0LLhhpCH/g3DWu6KPBN3FmTPO85uzS
+UsXsgaBq+bhvCUWzsHEM/juuN8XwgtdhtqN/lXWJywoPr7sNYeJz3xe62nCpSS/G
+WaTsNbSVWHOyx0NpXFvqXFOg6uYiEkZTNmTAzDKUScwY/gA/gcEhsqD62LedLaFo
+u8Y1TNySvJmNotba4OKBHie3ulBquZ2TyvAv6FoZ4nH6Pi3RIOiMY0bgvm68H9Na
+ODxTSDdb0DOGK3LbiQIHHMTV7LhvWW940rKoAjInb0YY+6dnMAoafmfymU1umewo
+GlgFLPHCr174dVqlv1hu4ZQbGfB7Lt3YDRS68OCR5YBQvn0QsKPZzpEmVZonqzjT
+c3AKoThcUg07hVbC9jo=
+=DCOS
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
new file mode 100644 (file)
index 0000000..00548b9
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild,v 1.1 2015/03/17 12:34:45 chewi Exp $
+
+EAPI="5"
+
+inherit java-vm-2 multilib
+
+DESCRIPTION="Java wrappers around GCJ"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
+SLOT="0"
+IUSE="X"
+
+ECJ_GCJ_SLOT="4.4"
+API_DIFF_PV="4.9.2"
+
+# perl is needed for javac wrapper
+RDEPEND="
+       dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+       dev-lang/perl
+       ~sys-devel/gcc-${PV}[gcj]
+       X? ( ~sys-devel/gcc-${PV}[awt] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_install() {
+       # jre lib paths ...
+       local libarch="$(get_system_arch)"
+       local gcc_version=${PV}
+       local gccbin=$(gcc-config -B ${gcc_version})
+       gccbin=${gccbin#"${EPREFIX}"}
+       local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
+       gcclib=${gcclib#"${EPREFIX}"}
+       local gcjhome="/usr/$(get_libdir)/${P}"
+       local gccchost="${CHOST}"
+       local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
+       gcjlibdir=${gcjlibdir#"${EPREFIX}"}
+
+       # links
+       dodir ${gcjhome}/bin
+       dodir ${gcjhome}/jre/bin
+       dosym ${gccbin}/gij ${gcjhome}/bin/java
+       dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
+       dosym ${gccbin}/gjar ${gcjhome}/bin/jar
+       dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
+       dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
+       dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
+       dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
+       dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
+       dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
+       dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
+       dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
+       dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
+       dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
+       dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
+       dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
+       dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
+       dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
+       dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
+       dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
+       dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
+       dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
+
+       dodir ${gcjhome}/jre/lib/${libarch}/client
+       dodir ${gcjhome}/jre/lib/${libarch}/server
+       dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
+       dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
+       use X && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
+
+       dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
+               ${gcjhome}/jre/lib/rt.jar
+       dodir ${gcjhome}/lib
+       dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
+               ${gcjhome}/lib/tools.jar
+       dosym ${gcclib}/include ${gcjhome}/include
+
+       local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+       exeinto ${gcjhome}/bin
+       sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+               -e "s#@ECJ_JAR@#${ecj_jar}#" \
+               -e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+               -e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+               "${FILESDIR}"/javac.in \
+       | newexe - javac
+       assert
+
+       set_java_env
+}
+
+pkg_postinst() {
+       # Do not set as system VM (see below)
+       # java-vm-2_pkg_postinst
+
+       ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+       ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+       ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
+       ewarn "Check for existing bugs relating to missing APIs and file"
+       ewarn "new ones at http://gcc.gnu.org/bugzilla/"
+       ewarn
+       ewarn "Due to this and limited manpower, we currently cannot support"
+       ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
+       ewarn "IcedTea without prior binary VM installation. To do that, execute:"
+       ewarn
+       ewarn "emerge -o icedtea && emerge icedtea"
+}