Let's just keep versions for the latest stable and unstable gcc in

each SLOT.

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 45dd6e71c8e93822a9a0563a96b36098c7a5fe23..04f5030cbb18a117a2c273aa970a1dafb9a82f0b 100644 (file)
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/gcj-jdk
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.18 2015/05/03 20:33:18 chewi Exp $
+
+*gcj-jdk-4.8.4 (03 May 2015)
+
+  03 May 2015; James Le Cuirot <chewi@gentoo.org> +gcj-jdk-4.8.4.ebuild,
+  -gcj-jdk-4.7.3.ebuild, -gcj-jdk-4.8.2.ebuild, gcj-jdk-4.9.2.ebuild:
+  Let's just keep versions for the latest stable and unstable gcc in each SLOT.
 
 *gcj-jdk-4.9.2 (17 Mar 2015)
 

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 1e4a1c4507099485630aed879c389a17a30d4390..2a0e6fbda93fc51884b58fefa583f9b6c7565446 100644 (file)
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -4,29 +4,28 @@ Hash: SHA256
 AUX gcj-jdk.env 676 SHA256 d8c8aab55aebe15dd783e273b857da4042d5041f32d31277180b619a9715be68 SHA512 b843774ee68f82f2379fb01a7f5b482993d13cd01cefefee7dcd50292555ff2b459c81ae0c30a5837a145ed559adb62c57811790cfed6c245c37ed395ca1579a WHIRLPOOL 414b00a70a95d13a8b733c0168bb18c95487c553b76c5dff7056883e1e6d9bc23bb3dd84330504805b01930a60e05ef85a63141491203667299f0f9e268e3134
 AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
 EBUILD gcj-jdk-4.7.3-r1.ebuild 3885 SHA256 601caa195678e1e6cca98d763b66a64f8f55712067e335c98fdbf75a0e0f8acb SHA512 61cf6d97d9fccd6b3435669aaa9eb1763044055d54b27f75810046af9f90aed0f1d7d231e2ab1300dff08bdfeaf52721c56617f10b4a308682ba05bb969a048d WHIRLPOOL d3283e3bccbd44e0a44c718fd2e786a3bb3d99f9fc622ca64f25c46b2809366ecb83c2c3cd1893812e02723c7347414d3d361b040f9d624e2c9ca3b96d8906d9
-EBUILD gcj-jdk-4.7.3.ebuild 3457 SHA256 a0ce2126e4b2bc8d403fe16fa4d5a19ec612588ae072aa185f6ea2e4c9ce325a SHA512 22d347a8efdc2a6347f2fcab662cd811bdab1b095482ef17bed67637c9215a106ded02c4bad93c7de14dace8a626711d067379fe8cb4fe4c298a692ada613ed4 WHIRLPOOL cd7c933e5ac02c2fde9dcd4984bb4f67dec49be6a6c5f9703dfc285ebd192fc4f88c955cf7d093284047c4902a9c9f1b8d1c30de3df502581214384bc0901654
 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
-EBUILD gcj-jdk-4.9.2.ebuild 3865 SHA256 ea68de512e69c1bcc980c7e00cbe402972d64fc3e104349afe3607839577d310 SHA512 a3fa2f799a49224c08ee5852569818450a9ec0ff957c22f48f793e8a7a27288df0c3cdf407aa192590821bedaff6e077cad290a1f3a4430e15656d0c40b3088c WHIRLPOOL 7ca182bbea1f2608dec3b234c148750cd015421602f2ed2263247d5d1817b8f61089598805688583ff455431e4c62573539d31e0512382a0d8486545e6c58287
-MISC ChangeLog 5185 SHA256 5fc59456c8377aa3a0b9e72a885449aabdb588ad4ae5b1fc65a85e262ad9ddd4 SHA512 355c62e6f13945e752570ded0874634d1805b86d5cb157ffaa7047741cecd531d06a68047f3dada1e01e0e0f0d6bcef70198a7df1eac627f0d7f63cc29fab761 WHIRLPOOL 56defc25efe38808e1515497e0ce18cf23ea669a16459362c014bb5462e366f597ad1c1e0c8b263ea2e8a66746ef2aa02138faa6c00badbf132b93b8fb56f022
+EBUILD gcj-jdk-4.8.4.ebuild 3865 SHA256 8c22953e524f90a4ca08eacff10e3bc966025b9bb7ef02af6dba1f7d14011ac3 SHA512 0de32bb5d909953ffa97a5f4ef81c7a0b9141bd7a1e8789c260c3af447d07421f57282d5b35a139a39eacc97b609bf30dce95019ffe776ecf27c0c57875a09de WHIRLPOOL 52db0f4bc643426e8ed3b274240f8476c8bf7b36d49d276ad60d71a9521587746271e74ce6c4a8ca0e4a316455f682cad52c6b54d5e83dd78082bb60e899392b
+EBUILD gcj-jdk-4.9.2.ebuild 3865 SHA256 a2192428ecf8a3ed84caccfbccaced8e539e0e9d554e9ac7c87f685650515def SHA512 02c266b3972bb95a4b0588406bc3a767552d4b23fe604810a54b21c46d6863a6a2525c16ce0b9927074a98d55a4c0124598b394fef1297332a360c6674b655ea WHIRLPOOL 1818ee480ec246532ad9b8f3fd95c7d8f3ee93bd6df027d4c49d5b653185d36ea5a4d10add66eabbf98a27f5bac6eb2f4c42faba3abdf2573ad11e1a35dddd48
+MISC ChangeLog 5439 SHA256 689a56e4bf8677a9ba5c3e6191b4145d8059707b7cf466c903cecaf1389f7f38 SHA512 96d6f238c879d85ed67d8fdd9cea6b1318a2511e503936d8bfebbb434ad609895ea2e68fef677a4944123550a129023569965af43c82f7fbccdc94136ccf5b3c WHIRLPOOL c9ce113c823b49fe52a7da488e18c43c03505c452e47ff9334295a49d88edc4d9a87b29250e0109e6ebe02af4e491341d7adac286ffef728cd47a190e1ddf0ad
 MISC metadata.xml 420 SHA256 b939a23db890e627c3f9435964b7d4b9d9ecb0896af86b288a81d41e825c25b9 SHA512 6a9921186f1cc07e32515e9837c41a7ec1c802809b30ce8c28520d64ee3d7123c57b58c7ec57f556f7f991792b87b8605514681c4cdf5843628daa0d12b082f2 WHIRLPOOL 526bd3b1a989e90dea71b50e80cbc7c3bf899efbd1f3d8825b920ce0c572daa32c58bd6b5458345d0681feb906862f9a80873d888f744f7d7b0a1aeae6f23d1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ7BAEBCABmBQJVCB9wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVRoYUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kZ+QQAIqcbfdz1UWkYhAlxUPJZChP
+B+s5SVzAroXk5kg6Vrv05ZPyl1mxHb2D5IJSgNQ0QYVdMJptQX0nPV1M9DpzLZwv
+Zyf3ZLYnFg8cLVtvScWthr+G1whemG/tSKgPsrYi5FKbCaw2w6adkwjHfr6LlAs6
+D/zyy6prb8tzCRdugDRQvmrbXsVOVPdYC/EQ7qtE9FUwzcXxYRIkz0cPlZohFWQv
+tTzBOQiSLwKYs0nBHfVkMKgTOcKuS8RpBJghsi9aJx2ysiuTky26i1b4V0Hbqcgp
+tFi7HlIa3pn5qIVLkAkjzGuCEB2pLXkT/dQCdFvOE4eb/29FpfZcZSirGAVnD4fz
+UHPEpAeh3AtJfq3yH7uPGJVHaX3HNLP9/n8n94mMaO6qRUvwWlYpx7SQ8NBFLRpy
+RhuyUBVjugjodzFJCg8hmJAyRvIuFhtzGxxP1X6DFFvzGEBnHkkjX4cBMVe3fe9B
+AmRN6i4fF0hZDRBg/bh3HLQR2EL8VpkVIb47e79Ebc5bUp7WsfL02vV6NK5I8+GF
+A/Lpe6TaR+B7+3IT853Y5+falvSpFePcPtYSZcK7Lg6jFrXj80VFU9Yv8CfaHWD3
+ycQvLl9HW02IATrngdVXlbZIQkWse27b8mierxrdE/TKNiBTHJ94uRG189Gk7HEH
+HjnTvjlIdceCZzpzsjVS
+=5QCF
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild
deleted file mode 100644 (file)
index d0e4440..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 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.7.3.ebuild,v 1.2 2013/12/24 02:08:43 tomwij 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 ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE="X"
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="
-       ~sys-devel/gcc-${PV}[gcj]
-       X? ( ~sys-devel/gcc-${PV}[awt] )
-       dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-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}
-
-       dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
-
-       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 APIs."
-       ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.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"
-}

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.4.ebuild
similarity index 97%
rename from dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-4.8.4.ebuild
index 303d33b779e04e5423628cca03b5ed969cca6c80..b6ed976891cbb6b736b0224f293ce558ea829bf9 100644 (file)
--- a/dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.8.2.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.8.4.ebuild,v 1.1 2015/05/03 20:33:18 chewi Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="X"
 
 ECJ_GCJ_SLOT="4.2"
-API_DIFF_PV="${PV}"
+API_DIFF_PV="4.8.2"
 
 # perl is needed for javac wrapper
 RDEPEND="

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
index 00548b94f86d5ba9885f8407a9bb6ce420a82423..a2a82c675843acd5558abb79a36718f0d1ede22e 100644 (file)
--- a/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.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/gcj-jdk/gcj-jdk-4.9.2.ebuild,v 1.1 2015/03/17 12:34:45 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild,v 1.2 2015/05/03 20:33:18 chewi Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="X"
 
 ECJ_GCJ_SLOT="4.4"
-API_DIFF_PV="4.9.2"
+API_DIFF_PV="4.8.2"
 
 # perl is needed for javac wrapper
 RDEPEND="