* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/, dev-java/gcj-jdk/files/
@ 2013-09-19 19:20 Andrew John Hughes
0 siblings, 0 replies; 5+ messages in thread
From: Andrew John Hughes @ 2013-09-19 19:20 UTC (permalink / raw
To: gentoo-commits
commit: baa2adbd7c7c7eb61948a3740c7e969fa39c2688
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Thu Sep 19 19:20:01 2013 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Thu Sep 19 19:20:01 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=baa2adbd
Wrap ecj so that it defaults to 1.5 and handles some javac options.
Package-Manager: portage-2.2.6
Manifest-Sign-Key: 248BDC07
---
dev-java/gcj-jdk/ChangeLog | 7 +++
dev-java/gcj-jdk/Manifest | 32 ++++++------
dev-java/gcj-jdk/files/javac.in | 57 ++++++++++++++++++++++
...cj-jdk-4.8.1.ebuild => gcj-jdk-4.7.3-r1.ebuild} | 19 +++++---
...cj-jdk-4.8.1.ebuild => gcj-jdk-4.8.1-r1.ebuild} | 8 ++-
5 files changed, 100 insertions(+), 23 deletions(-)
diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 88dba2e..864b85a 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*gcj-jdk-4.7.3-r1 (19 Sep 2013)
+*gcj-jdk-4.8.1-r1 (19 Sep 2013)
+
+ 19 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org> +files/javac.in,
+ +gcj-jdk-4.7.3-r1.ebuild, +gcj-jdk-4.8.1-r1.ebuild, -gcj-jdk-4.8.1.ebuild:
+ Wrap ecj so that it defaults to 1.5 and handles some javac options.
+
04 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
gcj-jdk-4.8.1.ebuild:
Update JAPI URLs now an up-to-date 1.5 comparison is available. Use full path
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 7d772cb..2366f5e 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -2,6 +2,7 @@
Hash: SHA256
AUX gcj-jdk.env 676 SHA256 d8c8aab55aebe15dd783e273b857da4042d5041f32d31277180b619a9715be68 SHA512 b843774ee68f82f2379fb01a7f5b482993d13cd01cefefee7dcd50292555ff2b459c81ae0c30a5837a145ed559adb62c57811790cfed6c245c37ed395ca1579a WHIRLPOOL 414b00a70a95d13a8b733c0168bb18c95487c553b76c5dff7056883e1e6d9bc23bb3dd84330504805b01930a60e05ef85a63141491203667299f0f9e268e3134
+AUX javac.in 1720 SHA256 50f9d139250c2dc8f67fc70d995bbf09379de5a00b186266e2df4c72cae11dfa SHA512 6a72c3ba0a7cc368d359cbf84a722dc2cccc70d7464578590cdfd77906bff86983ce7a9411af04831341df3134e0254fd2f8f645e70fa5618f5676ffb215b3f0 WHIRLPOOL b24af38f2da9c2ddc682e18d2c50f0bb46c2bbab58dd2098f351685a5a9b5980398ea7de83d6e20627ff1dbdc84caa1894ded2e0b720c032359cdb0942cfde37
EBUILD gcj-jdk-4.6.0.ebuild 3630 SHA256 152d92cadd32b75d2dc76a0a9f0b55a9a40ecaed802ceff8080be93f457f7a69 SHA512 efb8d824b3aaafcc11a774fd6094cb444aff8bf3d07d5e9596b8cee9a71b4c541bbfa1e9e1d39a63c1430317eaadba76f2f793bebdf09a06404d4ad4f80f23da WHIRLPOOL ccda10d3d6d0088b54b6c4ec5a8c5e0466c7c0485e50ca58dbfff3831531e79b48cd38c63a9ee1bcbf290e9344ae0e5fffe88c837fb30672bbce5c8ab27aa1a5
EBUILD gcj-jdk-4.6.1.ebuild 3630 SHA256 ef4096e3990c7cdabd44d40deccff7388d87dd4bf8a353a28d21507ceb293733 SHA512 0bbd17a0bffb24b1ee4bdd202f7d22cd7a14adbd2d64bedbbca58dbf8632bbaa755b1e15751fbd1565ce329ccaff1bcf741a1876bd5927ca197102fef2fd3483 WHIRLPOOL f5c0adde67978c8b39636db603da65df23e113168fd6ce08ba7ee534f84a9ad59be3f2022aa4acab1fdc9866026f7f87baf4942b0425a6a0acef2d92c6bc335f
EBUILD gcj-jdk-4.6.2-r1.ebuild 3715 SHA256 c871d49bb81b908d4e94c71c74f91b7365a370200b6369111e7f6b122e54dba5 SHA512 15cf2973b693d398ea1a690fd9a50349bb0f4c086e7cdfa001f96a73fbcd03900eb0994b1d378d9f818f058a581cf48ae15f7b9c48431a24c04b366906d3923c WHIRLPOOL abbb13cea3f93dcbc057e5083005b2f1e95afe4279393542038401413368481ced158a42ad5112699b07dda362551a2f9f621e20627ba70f4599adfb4727be66
@@ -12,24 +13,25 @@ EBUILD gcj-jdk-4.7.1-r1.ebuild 3662 SHA256 a342c8ec5bfbdbe18c17394927828a509c5ae
EBUILD gcj-jdk-4.7.1.ebuild 3714 SHA256 044093f56781f04a16a1ffbd86d796537ddbaee44b0805c6cfb07ea043e04978 SHA512 12832986e3a1c303d2bf5f910019378a0af09a13342a5a1069008c4e7b96bd11e586436537dff4d7227143ed46d28a4c40ccced31affab69dac32b1e5c994ef0 WHIRLPOOL 320ddbc1830b57ea6d61c4f08ab5eff7b5a83de0e5c4aeebf555371e96266edbc8a1508a0fa6255d75d0627bde21f348ad7eda64b5aef5025394f1b6ee92f423
EBUILD gcj-jdk-4.7.2-r1.ebuild 3455 SHA256 ad6323aba4b90dfaafbb8543b4939e920927c688e7127671a04dafecb2b8ef3e SHA512 a9248eae1ea293748e11f4a38834c98418e0be876247b31bb4a02c2663faac1d559f365dce1560c0299957487df47ca2e3f1d9cee34134f281d0dc2c53a11be4 WHIRLPOOL 759757dd96b93074dbf418743a93254842cc7a0d7130e4dd67de44c9aa698296611ddc27e08834a4d50ac817a28e74ac5e3511c64516e634ebfc6f869fbacf5b
EBUILD gcj-jdk-4.7.2.ebuild 3392 SHA256 3a83eb1075f001f21d03149a24eb984a4a6dea8b45e588994398b17b6bfb9aa4 SHA512 de07db229b7042b8b3d527343cad70ac20058dbb0b8c08514be5c625d38546836eae18f837fcf9af25e01f64e8f78fee187a07c0652eec936c34caf202ad440a WHIRLPOOL 17462bef47a255c85b60fd5961ba7778b5acbaa33fbe87401d59e75c3d97167a0e07b0cebeeb575b1788b38a420b6a22662e07d537c60e339d2b7e8f62d276e2
+EBUILD gcj-jdk-4.7.3-r1.ebuild 3718 SHA256 7ab52cc20176d48ce4b5c633e7ae0149842dd7c27a2b9c0a6143b5d00696c78d SHA512 dd5eb9346472f789234e10916369ab69087853595ace5d0a398d468e043fa2d6cc264264e8ae2a38e47e6ec63715301bb0313df287cf44243d27b785430ec367 WHIRLPOOL b2207a1888877134f9ecda2db86b841b65b2fbbf8dfce734e896fc4279c0c195fc89ea1da8947f2fbd2d3c15e255984cc4a5d13d81897f69a329bfccd3f71a98
EBUILD gcj-jdk-4.8.0-r1.ebuild 3410 SHA256 3d74b788a2199f88b0238f39ac4656f16dda23de0400fb3c253c93f493007738 SHA512 a75c1be4f890945c00edcdb41e427a143401c7e3aacdff9ddf79054071287f9a1563bc8a683e4fc8e3da5984023eeb5d73e9d2397108121a3431eff4b32e1918 WHIRLPOOL ed2cbeb89613468bb4e3effae440b81086a4807707dc2dd3d8fb7d751c09b80596f746479b4d42e32f751f2a45c21e3680b98b82becccef2adf9e9ce53e9d46e
-EBUILD gcj-jdk-4.8.1.ebuild 3490 SHA256 7678476af7d3aee17e8e0334687c19f8e48e46569f60a1c518ff282e59fda2c2 SHA512 dc5ef2155d9be9ead93b634d02c077d697b995fd1447edb9fb1c82ef8d07625a4858831a6d3056ae759c421f33cf6a0013e0dfbe629b41b8cd1d8f428dafa901 WHIRLPOOL 632a8bb533112d1975c3fc990ed81dfefbf6c78ca34c00f10c236bba8b57f2de1ca8535f6f91e9287bd8af066e48c974377a9aaa9a8a6c8aad19f841bc885954
-MISC ChangeLog 8974 SHA256 640ab140b2fffcab018eea2888eb818a616dd7c88ada88873bd0d6374ed51e44 SHA512 ce9c6248adb364993a22a01fc61cd65395b8a0e04fec45ebee71e3ee509f7d1660cec1e19723c974cfab9a58525a54dcb9c95ea17f1ac7b992194c48b21854a4 WHIRLPOOL 060b35fc6469886f8d7c44d587aa7d9f6849738a61928dfa699498b5fefb0f20a574dbc2a1c033125714615efa32e85fc6decf7833c975e715a56c2f998c60cf
+EBUILD gcj-jdk-4.8.1-r1.ebuild 3743 SHA256 09915020bfa260e21d167c62f465d8c8d7c71443c45168a086aad9f94d7cd7f4 SHA512 1c1225538d02e9c1b54338150ffcc05fe350334f137a2506c5b17bf07cac73d3813d09a708333e92afd4a873821557bbd648eba322eb2012895a3b344dc7971a WHIRLPOOL 78f4ba9e27a8defe933dec351c13f513eaf1382211ea5cddf09174df82080edfdf0200cb9526843e9c6ec78c4b16aecc12e3ee2a55a9cb98081d2df383d5fec5
+MISC ChangeLog 9266 SHA256 5bc8a903e9cf06fc2c9966a5df402a8ae72bd777d7fd24f3826847bf54b48f7c SHA512 1729bccf179dac939027fbbbea33fdcfe10334bc60b4bce10184c6940d7fd3df51dd98eea18a031b72f1c54df1a2e6cadd9bdcf507bc572af5ccf5d10a3e9558 WHIRLPOOL 932aa21699054ee5209f61f85d8ef19e1d7da72a59f2bbe0b10cdab8bfcb251123a6642cf119bc95cf31b38ccbd7f07d1e569d7bc96993e458d420fd8f655836
MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCAAGBQJSJ8HmAAoJEDuWpXgki9wHIQoP/13ftj1/IcZmf4UsqQPjtvtH
-f6iS6clTa7ZR+7XXIhJvCA/NMyGtbVjLde08i6l9NYjRX1Q47K108e05RGkT68Y9
-2Oa2lOVe6ubOPmXNculWOVKY1sg1vOn/lAJbzk7/Rqyc8P6SytZi0KRm2DO2OV8e
-s6bugF6bsGtQEgAVcuU6MzdTd72Sbp4sjTdY0sI8P5pyQtjhmkTKI2ZOLHRrGp5p
-MzA4z/tW50y1/u0nFVXQfmGV0AVchADyfzZE3yJPWlqPdn7LAwEye8Hdu0G7l0uv
-oZPfCj6kyTW8Q+JhDBjClDhgbbaqb+VZVZvbqZPH1JO/U5Y2g2xdGwI6oMdIS1uU
-O+ad/jyUTPSjEfvc0rojVkTGIXcGkL2lzj9zx0KaXcKO99T7aDgziDxv8r7puSUp
-3I0jVz706B5HyyXYTcei/PFDr1p3GaRzCJHaJnNi2wtX1uemDtGF9vWIgZVt1fhW
-MoadXgu84uB78ePg3XgLWWaH9ak2gU92Y/3CIJK7B5GzA4R6mN4hAAc7dhziBr+V
-tW4Ce+LdrGmsBZcOOWkxnurjB9aAg6KQ94N4/56ZeMBnLKvNwACmh6+/3iGVUP2s
-R8JU1v3kM7mN+JhcdxAjbAE3odHtbUrGkzUwvkfWrGQTQraesStQbpw8Nu2Wm4bF
-f7MWOfekO0P2D1OuH4Ki
-=qNGt
+iQIcBAEBCAAGBQJSO05gAAoJEDuWpXgki9wHm6QP/05gDdGiudEHYzm9RvecXUXM
+4HHjLFKqUYb0zc5TsaWgKJcPQkENSM3xUd0Q/gwis/J/A88sxHBKc9Vw41gnB0BG
+uj/5OmsqgW5kdRq43IO1gZoGarBkZnFlPgXF+kNifuTgyJC6q4/qJzd3NxisHMSe
+o6iWPW2D8cHtdS7pLs6IYmR71jp4Y+17bQUB9QKZoSwuOqvaR80t8Fybb4SlxYAy
+zF0Uf/C9zffOy2Jzof4EIsrvBbkTxg1gA8vs9+Elw97CjTuzzDqlvO6rJ20e4Jgy
+VgnUZ0Wfwrji9I8B9nIJlnddDGoGYhtg1nU2lUgHg5GOnohgZ5ImfQX+duDtieyK
+9ZXBLTDnuGENNpqPhw3AFCTW9ORN1tjtzmqw8yyV5vD8DocaUfqdY5DlrqTvtBxn
+951cYPyWoA5v1DK7dlMeqvp1DqV1yTHV158RjTGek2cjNfkDz1NhTfcD8FUV/oFL
+09/OKD+yLtyIOVVGuGDMXb6/HJt3kMAru7/4Y/BSK2GFpFrkpYiKMUgz1dXq5swU
+Wk7rnCQOeU+fg3CnuNm70AMh9zWAP1zfnEQmAKBpO8cJfk/PJ9lW87QSXapJ4vvH
+S1UKSrCIVc7Zl9GM3WhGHs6soEE7kOld/026DT4ob1Cn37MqTSXwVME/HZqK3la4
+hbqodZorxGCSL5Mcbgu9
+=fkBl
-----END PGP SIGNATURE-----
diff --git a/dev-java/gcj-jdk/files/javac.in b/dev-java/gcj-jdk/files/javac.in
new file mode 100644
index 0000000..a8e7d64
--- /dev/null
+++ b/dev-java/gcj-jdk/files/javac.in
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -w
+use strict;
+use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
+use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
+
+my $ECJ_WARNINGS="-nowarn";
+
+my ( @bcoption, @source15, @target15, @cp );
+push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
+ unless grep {$_ eq '-bootclasspath'} @ARGV;
+push @source15, '-source', '1.5'
+ unless grep {$_ eq '-source'} @ARGV;
+push @target15, '-target', '1.5'
+ unless grep {$_ eq '-target'} @ARGV;
+push @cp, '-cp', '.'
+ unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV;
+my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
+
+# Work around ecj's inability to handle duplicate command-line
+# options and unknown javac options.
+sub gen_ecj_opts
+{
+ my @new_args = @{$_[0]};
+
+ for my $opt (NO_DUP_ARGS)
+ {
+ my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+ if (@indices > 1) {
+ shift @indices; # keep last instance only
+ splice @new_args, $_, 2 for @indices;
+ }
+ }
+
+ for my $opt (STRIP_ARGS)
+ {
+ my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+ splice @new_args, $_, 1 for @indices;
+ }
+
+ return \@new_args;
+}
+
+sub split_vm_args
+{
+ my @new_args = @{$_[0]};
+
+ my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
+ my @javac_args = grep $_ !~ /^-J/, @new_args;
+
+ return (\@vm_args, \@javac_args);
+}
+
+my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
+my @CLASSPATH = ('@ECJ_JAR@');
+push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
similarity index 84%
copy from dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild
copy to dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
index 211ed61..e679bf4 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
@@ -1,6 +1,6 @@
# 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.2.ebuild,v 1.1 2013/01/23 10:30:56 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild,v 1.1 2013/06/27 10:52:04 tomwij Exp $
EAPI="5"
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.gentoo.org/"
SRC_URI=""
LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
SLOT="0"
IUSE="X"
-ECJ_GCJ_SLOT="4.2"
+ECJ_GCJ_SLOT="3.6"
RDEPEND="
~sys-devel/gcc-${PV}[gcj]
@@ -76,7 +76,13 @@ src_install() {
${gcjhome}/lib/tools.jar
dosym ${gcclib}/include ${gcjhome}/include
- dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+ local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+ exeinto ${gcjhome}/bin
+ cat "${FILESDIR}"/javac.in | 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#" \
+ | newexe - javac
set_java_env
}
@@ -85,9 +91,8 @@ 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-${PV}.html"
- ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${PV}.html"
+ 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
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.1-r1.ebuild
similarity index 91%
rename from dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-4.8.1-r1.ebuild
index 211ed61..7a04f5e 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.8.1-r1.ebuild
@@ -76,7 +76,13 @@ src_install() {
${gcjhome}/lib/tools.jar
dosym ${gcclib}/include ${gcjhome}/include
- dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+ local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+ exeinto ${gcjhome}/bin
+ cat "${FILESDIR}"/javac.in | 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#" \
+ | newexe - javac
set_java_env
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/, dev-java/gcj-jdk/files/
@ 2013-09-20 3:19 Andrew John Hughes
0 siblings, 0 replies; 5+ messages in thread
From: Andrew John Hughes @ 2013-09-20 3:19 UTC (permalink / raw
To: gentoo-commits
commit: ed94be0b36f2f4a10dfc66489d4986e7020a2f6c
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Sep 20 03:17:06 2013 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Sep 20 03:17:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=ed94be0b
Don't set classpath if $CLASSPATH is set.
Package-Manager: portage-2.2.6
Manifest-Sign-Key: 248BDC07
---
dev-java/gcj-jdk/ChangeLog | 8 +++++
dev-java/gcj-jdk/Manifest | 34 +++++++++++-----------
dev-java/gcj-jdk/files/javac.in | 2 +-
...jdk-4.7.3-r1.ebuild => gcj-jdk-4.7.3-r2.ebuild} | 0
...jdk-4.8.1-r1.ebuild => gcj-jdk-4.8.1-r2.ebuild} | 0
5 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 864b85a..96af223 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*gcj-jdk-4.7.3-r2 (20 Sep 2013)
+*gcj-jdk-4.8.1-r2 (20 Sep 2013)
+
+ 20 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +gcj-jdk-4.7.3-r2.ebuild, +gcj-jdk-4.8.1-r2.ebuild, -gcj-jdk-4.7.3-r1.ebuild,
+ -gcj-jdk-4.8.1-r1.ebuild, files/javac.in:
+ Don't set classpath if $CLASSPATH is set.
+
*gcj-jdk-4.7.3-r1 (19 Sep 2013)
*gcj-jdk-4.8.1-r1 (19 Sep 2013)
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 2366f5e..fe4035e 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -2,7 +2,7 @@
Hash: SHA256
AUX gcj-jdk.env 676 SHA256 d8c8aab55aebe15dd783e273b857da4042d5041f32d31277180b619a9715be68 SHA512 b843774ee68f82f2379fb01a7f5b482993d13cd01cefefee7dcd50292555ff2b459c81ae0c30a5837a145ed559adb62c57811790cfed6c245c37ed395ca1579a WHIRLPOOL 414b00a70a95d13a8b733c0168bb18c95487c553b76c5dff7056883e1e6d9bc23bb3dd84330504805b01930a60e05ef85a63141491203667299f0f9e268e3134
-AUX javac.in 1720 SHA256 50f9d139250c2dc8f67fc70d995bbf09379de5a00b186266e2df4c72cae11dfa SHA512 6a72c3ba0a7cc368d359cbf84a722dc2cccc70d7464578590cdfd77906bff86983ce7a9411af04831341df3134e0254fd2f8f645e70fa5618f5676ffb215b3f0 WHIRLPOOL b24af38f2da9c2ddc682e18d2c50f0bb46c2bbab58dd2098f351685a5a9b5980398ea7de83d6e20627ff1dbdc84caa1894ded2e0b720c032359cdb0942cfde37
+AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
EBUILD gcj-jdk-4.6.0.ebuild 3630 SHA256 152d92cadd32b75d2dc76a0a9f0b55a9a40ecaed802ceff8080be93f457f7a69 SHA512 efb8d824b3aaafcc11a774fd6094cb444aff8bf3d07d5e9596b8cee9a71b4c541bbfa1e9e1d39a63c1430317eaadba76f2f793bebdf09a06404d4ad4f80f23da WHIRLPOOL ccda10d3d6d0088b54b6c4ec5a8c5e0466c7c0485e50ca58dbfff3831531e79b48cd38c63a9ee1bcbf290e9344ae0e5fffe88c837fb30672bbce5c8ab27aa1a5
EBUILD gcj-jdk-4.6.1.ebuild 3630 SHA256 ef4096e3990c7cdabd44d40deccff7388d87dd4bf8a353a28d21507ceb293733 SHA512 0bbd17a0bffb24b1ee4bdd202f7d22cd7a14adbd2d64bedbbca58dbf8632bbaa755b1e15751fbd1565ce329ccaff1bcf741a1876bd5927ca197102fef2fd3483 WHIRLPOOL f5c0adde67978c8b39636db603da65df23e113168fd6ce08ba7ee534f84a9ad59be3f2022aa4acab1fdc9866026f7f87baf4942b0425a6a0acef2d92c6bc335f
EBUILD gcj-jdk-4.6.2-r1.ebuild 3715 SHA256 c871d49bb81b908d4e94c71c74f91b7365a370200b6369111e7f6b122e54dba5 SHA512 15cf2973b693d398ea1a690fd9a50349bb0f4c086e7cdfa001f96a73fbcd03900eb0994b1d378d9f818f058a581cf48ae15f7b9c48431a24c04b366906d3923c WHIRLPOOL abbb13cea3f93dcbc057e5083005b2f1e95afe4279393542038401413368481ced158a42ad5112699b07dda362551a2f9f621e20627ba70f4599adfb4727be66
@@ -13,25 +13,25 @@ EBUILD gcj-jdk-4.7.1-r1.ebuild 3662 SHA256 a342c8ec5bfbdbe18c17394927828a509c5ae
EBUILD gcj-jdk-4.7.1.ebuild 3714 SHA256 044093f56781f04a16a1ffbd86d796537ddbaee44b0805c6cfb07ea043e04978 SHA512 12832986e3a1c303d2bf5f910019378a0af09a13342a5a1069008c4e7b96bd11e586436537dff4d7227143ed46d28a4c40ccced31affab69dac32b1e5c994ef0 WHIRLPOOL 320ddbc1830b57ea6d61c4f08ab5eff7b5a83de0e5c4aeebf555371e96266edbc8a1508a0fa6255d75d0627bde21f348ad7eda64b5aef5025394f1b6ee92f423
EBUILD gcj-jdk-4.7.2-r1.ebuild 3455 SHA256 ad6323aba4b90dfaafbb8543b4939e920927c688e7127671a04dafecb2b8ef3e SHA512 a9248eae1ea293748e11f4a38834c98418e0be876247b31bb4a02c2663faac1d559f365dce1560c0299957487df47ca2e3f1d9cee34134f281d0dc2c53a11be4 WHIRLPOOL 759757dd96b93074dbf418743a93254842cc7a0d7130e4dd67de44c9aa698296611ddc27e08834a4d50ac817a28e74ac5e3511c64516e634ebfc6f869fbacf5b
EBUILD gcj-jdk-4.7.2.ebuild 3392 SHA256 3a83eb1075f001f21d03149a24eb984a4a6dea8b45e588994398b17b6bfb9aa4 SHA512 de07db229b7042b8b3d527343cad70ac20058dbb0b8c08514be5c625d38546836eae18f837fcf9af25e01f64e8f78fee187a07c0652eec936c34caf202ad440a WHIRLPOOL 17462bef47a255c85b60fd5961ba7778b5acbaa33fbe87401d59e75c3d97167a0e07b0cebeeb575b1788b38a420b6a22662e07d537c60e339d2b7e8f62d276e2
-EBUILD gcj-jdk-4.7.3-r1.ebuild 3718 SHA256 7ab52cc20176d48ce4b5c633e7ae0149842dd7c27a2b9c0a6143b5d00696c78d SHA512 dd5eb9346472f789234e10916369ab69087853595ace5d0a398d468e043fa2d6cc264264e8ae2a38e47e6ec63715301bb0313df287cf44243d27b785430ec367 WHIRLPOOL b2207a1888877134f9ecda2db86b841b65b2fbbf8dfce734e896fc4279c0c195fc89ea1da8947f2fbd2d3c15e255984cc4a5d13d81897f69a329bfccd3f71a98
+EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 7ab52cc20176d48ce4b5c633e7ae0149842dd7c27a2b9c0a6143b5d00696c78d SHA512 dd5eb9346472f789234e10916369ab69087853595ace5d0a398d468e043fa2d6cc264264e8ae2a38e47e6ec63715301bb0313df287cf44243d27b785430ec367 WHIRLPOOL b2207a1888877134f9ecda2db86b841b65b2fbbf8dfce734e896fc4279c0c195fc89ea1da8947f2fbd2d3c15e255984cc4a5d13d81897f69a329bfccd3f71a98
EBUILD gcj-jdk-4.8.0-r1.ebuild 3410 SHA256 3d74b788a2199f88b0238f39ac4656f16dda23de0400fb3c253c93f493007738 SHA512 a75c1be4f890945c00edcdb41e427a143401c7e3aacdff9ddf79054071287f9a1563bc8a683e4fc8e3da5984023eeb5d73e9d2397108121a3431eff4b32e1918 WHIRLPOOL ed2cbeb89613468bb4e3effae440b81086a4807707dc2dd3d8fb7d751c09b80596f746479b4d42e32f751f2a45c21e3680b98b82becccef2adf9e9ce53e9d46e
-EBUILD gcj-jdk-4.8.1-r1.ebuild 3743 SHA256 09915020bfa260e21d167c62f465d8c8d7c71443c45168a086aad9f94d7cd7f4 SHA512 1c1225538d02e9c1b54338150ffcc05fe350334f137a2506c5b17bf07cac73d3813d09a708333e92afd4a873821557bbd648eba322eb2012895a3b344dc7971a WHIRLPOOL 78f4ba9e27a8defe933dec351c13f513eaf1382211ea5cddf09174df82080edfdf0200cb9526843e9c6ec78c4b16aecc12e3ee2a55a9cb98081d2df383d5fec5
-MISC ChangeLog 9266 SHA256 5bc8a903e9cf06fc2c9966a5df402a8ae72bd777d7fd24f3826847bf54b48f7c SHA512 1729bccf179dac939027fbbbea33fdcfe10334bc60b4bce10184c6940d7fd3df51dd98eea18a031b72f1c54df1a2e6cadd9bdcf507bc572af5ccf5d10a3e9558 WHIRLPOOL 932aa21699054ee5209f61f85d8ef19e1d7da72a59f2bbe0b10cdab8bfcb251123a6642cf119bc95cf31b38ccbd7f07d1e569d7bc96993e458d420fd8f655836
+EBUILD gcj-jdk-4.8.1-r2.ebuild 3743 SHA256 09915020bfa260e21d167c62f465d8c8d7c71443c45168a086aad9f94d7cd7f4 SHA512 1c1225538d02e9c1b54338150ffcc05fe350334f137a2506c5b17bf07cac73d3813d09a708333e92afd4a873821557bbd648eba322eb2012895a3b344dc7971a WHIRLPOOL 78f4ba9e27a8defe933dec351c13f513eaf1382211ea5cddf09174df82080edfdf0200cb9526843e9c6ec78c4b16aecc12e3ee2a55a9cb98081d2df383d5fec5
+MISC ChangeLog 9562 SHA256 ca4bff66d7430c1572cd97ce7d2ec06396cd7a9d4325a0ce192b862f452c6a43 SHA512 cc944534e680b86bcc3d5ef0a9b14948d6e7cc4734aa6de14ef3c77317990daaebe43b35367f0cacbb63c07f70e7ac8e260b4b99c439d930e78a7f519ee4e7ee WHIRLPOOL 5427a829ff60a55293624fdaf2c0382f8ef8d5a0c0dbb2a76d03a232b80410e8aaaee4f0222bda773d688e8d2dc216061580f86f630fb559a65a5f355157d331
MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCAAGBQJSO05gAAoJEDuWpXgki9wHm6QP/05gDdGiudEHYzm9RvecXUXM
-4HHjLFKqUYb0zc5TsaWgKJcPQkENSM3xUd0Q/gwis/J/A88sxHBKc9Vw41gnB0BG
-uj/5OmsqgW5kdRq43IO1gZoGarBkZnFlPgXF+kNifuTgyJC6q4/qJzd3NxisHMSe
-o6iWPW2D8cHtdS7pLs6IYmR71jp4Y+17bQUB9QKZoSwuOqvaR80t8Fybb4SlxYAy
-zF0Uf/C9zffOy2Jzof4EIsrvBbkTxg1gA8vs9+Elw97CjTuzzDqlvO6rJ20e4Jgy
-VgnUZ0Wfwrji9I8B9nIJlnddDGoGYhtg1nU2lUgHg5GOnohgZ5ImfQX+duDtieyK
-9ZXBLTDnuGENNpqPhw3AFCTW9ORN1tjtzmqw8yyV5vD8DocaUfqdY5DlrqTvtBxn
-951cYPyWoA5v1DK7dlMeqvp1DqV1yTHV158RjTGek2cjNfkDz1NhTfcD8FUV/oFL
-09/OKD+yLtyIOVVGuGDMXb6/HJt3kMAru7/4Y/BSK2GFpFrkpYiKMUgz1dXq5swU
-Wk7rnCQOeU+fg3CnuNm70AMh9zWAP1zfnEQmAKBpO8cJfk/PJ9lW87QSXapJ4vvH
-S1UKSrCIVc7Zl9GM3WhGHs6soEE7kOld/026DT4ob1Cn37MqTSXwVME/HZqK3la4
-hbqodZorxGCSL5Mcbgu9
-=fkBl
+iQIcBAEBCAAGBQJSO74yAAoJEDuWpXgki9wHOPoP/0pPi2wVEEPrXfGcpKRpr7WB
+b7hXsW6tC4AlaqpNaj/9QUoLjvT/AoIp0fj9RVFlAg0vHUDplz35FpO+RaKc93xV
+VgBy8ax5W0+VWDTzkm7D+cnntEK8J6a1TSUFy3vDjMUWhqUAWZuW2ugAJuf82Ooj
+z2S5LKeML+oo4jLvc6cRGO4ar45wA91dpcaaQA+UeXDrcytauqFMpplFU4PG3LY4
+tr6/jL3MJgu5K9GW4lkZxRiEhDNKGQOPXaY66GQsZOAAt1YA9oigC/FmUWaG3NG9
+UM2yT5hEIkUu1OMwkjy5gb3Tv8jtGngGPI8rd5b6xNB8okr/lY56Eo0PI8Dus/KG
+8DBRaEioGLICiBlH1RdwxNwy00GV3O9C9Dn052Tay3TEMApMvTXh3kGwa+zExZvX
+0C8L2p4nAFGYsy0mQa/11ZMmTiTJI8pxXWUMSV0NIhveNBPDzrRe/ctBcO3D1SNl
+d23uT8+nwA93vayI+T3DZG4v4v5IdTPg+STgdnYtAguaZUlJJOitpVnPwL+GV7Ru
+62UL6oX5jsEy0ACHAixeB5za6aPo8HszRU/VH5y2Bfg4r3iyofxwfleBfQ9rQ6fB
++gKspBjT12GcXldYujEpaTmcTsvizSPzIwK7/OOWYtWXaOf6sGz4VwETwLRU2SD1
+mhUjc0UIGpqqkaXpV0fI
+=Wpqu
-----END PGP SIGNATURE-----
diff --git a/dev-java/gcj-jdk/files/javac.in b/dev-java/gcj-jdk/files/javac.in
index a8e7d64..8eeda68 100644
--- a/dev-java/gcj-jdk/files/javac.in
+++ b/dev-java/gcj-jdk/files/javac.in
@@ -13,7 +13,7 @@ push @source15, '-source', '1.5'
push @target15, '-target', '1.5'
unless grep {$_ eq '-target'} @ARGV;
push @cp, '-cp', '.'
- unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV;
+ unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
# Work around ecj's inability to handle duplicate command-line
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild
similarity index 100%
rename from dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.8.1-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.1-r2.ebuild
similarity index 100%
rename from dev-java/gcj-jdk/gcj-jdk-4.8.1-r1.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-4.8.1-r2.ebuild
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/, dev-java/gcj-jdk/files/
@ 2015-03-20 23:18 Andrew John Hughes
0 siblings, 0 replies; 5+ messages in thread
From: Andrew John Hughes @ 2015-03-20 23:18 UTC (permalink / raw
To: gentoo-commits
commit: 5a7f98105488ca14c7f65b726df13b3bb76c4771
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Mar 20 23:17:46 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Mar 20 23:17:46 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=5a7f9810
Remove local gcj-jdk ebuilds; all in main tree.
dev-java/gcj-jdk/ChangeLog | 290 -------------------------------
dev-java/gcj-jdk/Manifest | 20 ---
dev-java/gcj-jdk/files/gcj-jdk.env | 18 --
dev-java/gcj-jdk/files/javac.in | 57 ------
dev-java/gcj-jdk/gcj-jdk-4.6.4.ebuild | 110 ------------
dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild | 104 -----------
dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild | 105 -----------
dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild | 105 -----------
dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild | 105 -----------
dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild | 105 -----------
dev-java/gcj-jdk/metadata.xml | 10 --
11 files changed, 1029 deletions(-)
diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
deleted file mode 100644
index aaafcb5..0000000
--- a/dev-java/gcj-jdk/ChangeLog
+++ /dev/null
@@ -1,290 +0,0 @@
-# ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*gcj-jdk-4.9.2 (18 Mar 2015)
-
- 18 Mar 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +gcj-jdk-4.9.2.ebuild:
- Support GCC 4.9.2.
-
-*gcj-jdk-4.9.1 (28 Aug 2014)
-
- 28 Aug 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +gcj-jdk-4.9.1.ebuild:
- Support gcc 4.9.1.
-
-*gcj-jdk-4.9.0 (07 Aug 2014)
-
- 07 Aug 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +gcj-jdk-4.9.0.ebuild:
- Support gcc 4.9.0.
-
-*gcj-jdk-4.6.4 (26 Dec 2013)
-
- 26 Dec 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +gcj-jdk-4.6.4.ebuild, -gcj-jdk-4.6.0.ebuild, -gcj-jdk-4.6.1.ebuild,
- -gcj-jdk-4.6.2-r1.ebuild, -gcj-jdk-4.6.2.ebuild, -gcj-jdk-4.7.0-r1.ebuild,
- -gcj-jdk-4.7.0.ebuild, -gcj-jdk-4.7.1-r1.ebuild, -gcj-jdk-4.7.1.ebuild,
- -gcj-jdk-4.7.2-r1.ebuild, -gcj-jdk-4.7.2.ebuild, -gcj-jdk-4.8.0-r1.ebuild:
- Support only latest of each major gcc release.
-
-*gcj-jdk-4.8.2 (26 Dec 2013)
-
- 26 Dec 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +gcj-jdk-4.8.2.ebuild, -gcj-jdk-4.8.1-r2.ebuild, gcj-jdk-4.6.2-r1.ebuild,
- gcj-jdk-4.7.0-r1.ebuild, gcj-jdk-4.7.1-r1.ebuild, gcj-jdk-4.7.1.ebuild,
- gcj-jdk-4.7.2-r1.ebuild, gcj-jdk-4.7.2.ebuild, gcj-jdk-4.7.3-r2.ebuild,
- gcj-jdk-4.8.0-r1.ebuild:
- Add support for gcc 4.8.2. Change USE flag dependency from gtk to awt.
-
-*gcj-jdk-4.7.3-r2 (20 Sep 2013)
-*gcj-jdk-4.8.1-r2 (20 Sep 2013)
-
- 20 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +gcj-jdk-4.7.3-r2.ebuild, +gcj-jdk-4.8.1-r2.ebuild, -gcj-jdk-4.7.3-r1.ebuild,
- -gcj-jdk-4.8.1-r1.ebuild, files/javac.in:
- Don't set classpath if $CLASSPATH is set.
-
-*gcj-jdk-4.7.3-r1 (19 Sep 2013)
-*gcj-jdk-4.8.1-r1 (19 Sep 2013)
-
- 19 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org> +files/javac.in,
- +gcj-jdk-4.7.3-r1.ebuild, +gcj-jdk-4.8.1-r1.ebuild, -gcj-jdk-4.8.1.ebuild:
- Wrap ecj so that it defaults to 1.5 and handles some javac options.
-
- 04 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
- gcj-jdk-4.8.1.ebuild:
- Update JAPI URLs now an up-to-date 1.5 comparison is available. Use full path
- for include target.
-
-*gcj-jdk-4.8.1 (02 Sep 2013)
-
- 02 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +gcj-jdk-4.8.1.ebuild:
- Support 4.8.1 and update JAPI URLs.
-
-*gcj-jdk-4.8.0-r1 (22 Apr 2013)
-
- 22 Apr 2013; Andrew John Hughes <andrew@gentoo.org> -gcj-jdk-4.8.0.ebuild,
- +gcj-jdk-4.8.0-r1.ebuild:
- Upgrade gcj-jdk to ecj 4.2 as used on Fedora & Debian.
-
- 15 Apr 2013; Andrew John Hughes <andrew@gentoo.org> gcj-jdk-4.8.0.ebuild:
- Update 4.8.0 ebuild now that the ebuild is in the main tree.
-
-*gcj-jdk-4.8.0 (11 Mar 2013)
-
- 11 Mar 2013; Andrew John Hughes <andrew@gentoo.org> +gcj-jdk-4.8.0.ebuild:
- Support the pre-release build of gcc 4.8.0.
-
-*gcj-jdk-4.7.2-r1 (24 Jan 2013)
-
- 24 Jan 2013; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.7.2-r1.ebuild,
- files/gcj-jdk.env:
- Import from maintree, gcc-config and prefix fixes, make gcc[gtk] dep
- optional.
-
- 23 Oct 2012; Ralph Sennhauser <sera@gentoo.org> gcj-jdk-4.7.2.ebuild:
- Don't require corresponding gcc to be active. #439228
-
-*gcj-jdk-4.7.2 (11 Oct 2012)
-
- 11 Oct 2012; Andrew John Hughes <andrew@gentoo.org> +gcj-jdk-4.7.2.ebuild:
- Support gcc 4.7.2.
-
-*gcj-jdk-4.7.1-r1 (28 Sep 2012)
-
- 28 Sep 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.7.1-r1.ebuild:
- No longer install symlinks in /usr/bin to work with recent gcc-config.
- #431930
- Add missing dodir for server vm.
- Use get_libdir for vm home.
-
-*gcj-jdk-4.7.1 (04 Jul 2012)
-
- 04 Jul 2012; Andrew John Hughes <andrew@gentoo.org> +gcj-jdk-4.7.1.ebuild:
- Support gcc 4.7.1.
-
-*gcj-jdk-4.7.0-r1 (05 Jun 2012)
-
- 05 Jun 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.7.0-r1.ebuild:
- Replicate lost fixes from 4.6.2-r1.
-
-*gcj-jdk-4.7.0 (31 May 2012)
-
- 31 May 2012; Andrew John Hughes <andrew@gentoo.org> +gcj-jdk-4.7.0.ebuild:
- Support gcc 4.7.
- Link to gij in the arch-specific binary directory.
- Catch rt/tools.jar when there is a version suffix.
-
-*gcj-jdk-4.6.2-r1 (21 May 2012)
-
- 21 May 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.6.2-r1.ebuild:
- Add Prefix support and missing use dep, thanks to XU Benda
- <heroxbd@gentoo.org>. #416367
- Import ~ia64 keyword from main tree.
- Remove JAVA_PROVIDE, old style virtuals are gone.
-
-*gcj-jdk-4.6.2 (29 Mar 2012)
-
- 29 Mar 2012; Andrew John Hughes <andrew@gentoo.org> +gcj-jdk-4.6.2.ebuild:
- Support gcc 4.6.2.
-
- 20 Sep 2011; Vlastimil Babka <caster@gentoo.org> -gcj-jdk-4.4.3-r2.ebuild,
- -gcj-jdk-4.4.4-r1.ebuild, -gcj-jdk-4.4.5-r1.ebuild,
- -gcj-jdk-4.5.1-r1.ebuild, -gcj-jdk-4.5.2-r1.ebuild:
- Remove versions that are in main tree.
-
-*gcj-jdk-4.6.0 (04 Apr 2011)
-
- 04 Apr 2011; Andrew John Hughes <andrew@gentoo.org> +gcj-jdk-4.6.0.ebuild:
- Support gcc 4.6.0.
-
-*gcj-jdk-4.5.2-r1 (22 Feb 2011)
-*gcj-jdk-4.5.1-r1 (22 Feb 2011)
-*gcj-jdk-4.4.5-r1 (22 Feb 2011)
-*gcj-jdk-4.4.4-r1 (22 Feb 2011)
-*gcj-jdk-4.4.3-r2 (22 Feb 2011)
-
- 22 Feb 2011; Andrew John Hughes <andrew@gentoo.org> -gcj-jdk-4.4.3-r1.ebuild,
- +gcj-jdk-4.4.3-r2.ebuild, -gcj-jdk-4.4.4.ebuild, +gcj-jdk-4.4.4-r1.ebuild,
- -gcj-jdk-4.4.5.ebuild, +gcj-jdk-4.4.5-r1.ebuild, -gcj-jdk-4.5.1.ebuild,
- +gcj-jdk-4.5.1-r1.ebuild, -gcj-jdk-4.5.2.ebuild, +gcj-jdk-4.5.2-r1.ebuild:
- Add support for native2ascii, orbd, rmid, serialver and tnameserv.
-
-*gcj-jdk-4.5.2 (31 Dec 2010)
-
- 31 Dec 2010; Andrew John Hughes <andrew@gentoo.org> +gcj-jdk-4.5.2.ebuild:
- Support gcc 4.5.2.
-
- 14 Nov 2010; Vlastimil Babka <caster@gentoo.org> gcj-jdk-4.4.3-r1.ebuild,
- gcj-jdk-4.4.4.ebuild, gcj-jdk-4.4.5.ebuild, gcj-jdk-4.5.1.ebuild:
- Don't set as system VM, include explanation and how to emerge icedtea.
-
- 14 Nov 2010; Vlastimil Babka <caster@gentoo.org> -gcj-jdk-4.3-r5.ebuild,
- -gcj-jdk-4.5.0.ebuild:
- Remove 4.3 which is fragile to gcc updates anyway, and 4.5.0 whose gcc
- version was removed.
-
- 21 Oct 2010; Andrew John Hughes <andrew@gentoo.org> gcj-jdk-4.5.1.ebuild:
- Enable keywords on gcj-jdk-4.5.1 now gcc-4.5.1 is keyworded.
-
- 18 Oct 2010; Vlastimil Babka <caster@gentoo.org> +gcj-jdk-4.4.5.ebuild:
- Bump 4.4 series.
-
-*gcj-jdk-4.5.1 (22 Aug 2010)
-
- 22 Aug 2010; Andrew John Hughes <andrew@gentoo.org> +gcj-jdk-4.5.1.ebuild:
- Support gcc 4.5.1
-
-*gcj-jdk-4.4.4 (15 Jun 2010)
-
- 15 Jun 2010; Vlastimil Babka <caster@gentoo.org> +gcj-jdk-4.4.4.ebuild:
- Bump 4.4 to latest version.
-
- 27 Apr 2010; Andrew John Hughes <andrew@gentoo.org> gcj-jdk-4.5.0.ebuild:
- Remove keywords from gcj-jdk-4.5.0 until it is available in the main tree.
-
-*gcj-jdk-4.5.0 (27 Apr 2010)
-
- 27 Apr 2010; Andrew John Hughes <andrew@gentoo.org> +gcj-jdk-4.5.0.ebuild:
- Add gcj-jdk variant for gcc 4.5.0.
-
- 01 Apr 2010; Vlastimil Babka <caster@gentoo.org> -gcj-jdk-4.3-r4.ebuild,
- +gcj-jdk-4.3-r5.ebuild, -gcj-jdk-4.4.3.ebuild, +gcj-jdk-4.4.3-r1.ebuild:
- Update to ecj-gcj:3.5
-
- 22 Mar 2010; Vlastimil Babka <caster@gentoo.org> +gcj-jdk-4.4.3.ebuild:
- Version bump - match exact gcc version, as the symlinks get broken on each
- gcc update anyway. Use the new ecj-gcj package as javac to remove dependency
- on user-managed ecj symlink. Use gjdoc in gcc-4.4 as javadoc.
-
- 11 Jan 2009; Petteri Räty <betelgeuse@gentoo.org> gcj-jdk-4.3-r4.ebuild:
- Migrate to EAPI 2
-
-* gcj-jdk-4.3.1-r4 (01 Dec 2008)
-
- 01 Dec 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3-r4.ebuild:
- Bump to revision 4. Remove geki's cruft which breaks jar->lib mapping. Add gcj-dbtool
- and gij to /usr/bin. Make gcj-jdk API warning more accurate.
-
- 24 Nov 2008; Petteri Räty <betelgeuse@gentoo.org> gcj-jdk-4.3-r3.ebuild:
- Don't try to set permissions on the javac symlink to ecj.
-
- 19 Nov 2008; Petteri Räty <betelgeuse@gentoo.org> gcj-jdk-4.3-r3.ebuild:
- Change instructions to set gcj-jdk as system vm to a link to Gentoo Java
- Guide and warn about missing 1.5 apis.
-
-* gcj-jdk-4.3.1-r3 (07 Nov 2008)
-
- 07 Nov 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3-r3.ebuild:
- Add missing server directory and bump to revision 3.
-
- 29 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3-r2.ebuild:
- Depend on eclipse-ecj-3.3.0-r7 and bump to revision 2.
-
- 29 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3-r1.ebuild:
- Add include directory symlink and bump to revision 1.
-
- 09 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.ebuild:
- Clean up detritus from old slotting.
-
- 06 Oct 2008; Petteri Räty <betelgeuse@gentoo.org> gcj-jdk-4.3.ebuild:
- No need to instruct to emerge gjdoc as we have a PDEPEND on it.
-
- 26 Sep 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.ebuild:
- Fully support later versions of gcc.
-
- 23 Sep 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Allow later versions of gcc.
-
- 14 Jul 2008; James Le Cuirot <chewi@aura-online.co.uk> gcj-jdk-4.3.1.ebuild:
- Don't depend on a specific version of ecj anymore. Let eselect worry about the
- /usr/bin/ecj symlink.
-
- 08 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Move creation of jre/bin up to come before the java symlink.
-
- 08 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Add explicit dir creation.
-
- 08 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Remove references to gcj-config.
-
- 08 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Correct bindir so javac is installed.
-
- 07 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Correct ecj symlink to use /usr/bin/ecj or latest of ecj-3*
-
- 22 Jun 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Fix use of gcj-config.
-
- 22 Jun 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.1.ebuild:
- Fix paths to tools.jar and rt.jar, variable substitution and use of gcj-config.
-
-*gcj-jdk-4.3.1 (16 Jun 2008)
-
- 16 Jun 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.1.ebuild:
- Convert to use gcc 4.3.1 and include USE flag warning.
-
- 26 May 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Fix quoting issue.
-
- 23 Apr 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Symlink against versioned ecj.
-
- 22 Apr 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Disable gcjwebplugin.
-
- 15 Apr 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Use jcf-dump to provide javap.
-
- 12 Apr 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Use ecj to provide javac.
-
-*gcj-jdk-4.3.0 (07 Apr 2008)
-
- 07 Apr 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gcj-jdk-4.3.0.ebuild:
- Initial import.
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
deleted file mode 100644
index 4beae08..0000000
--- a/dev-java/gcj-jdk/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.6.4.ebuild 3680 SHA256 8c63f2ab224a7b39c73658cd92871ad012fcd91037dd5c9b8dc925774ab2f631 SHA512 6b5c62363400b2ed762de56e0a0921b6d90677ab21d35e3c59e8f83eeef0ebe8f069df37bb5399b92028c35d79336fe691a56d9c6b39395e2d57932c2f2b77d6 WHIRLPOOL da0f414ad5c1be2eb47b9e57697477d9de42119ea51b77e42b65fba8a0c0eb732af1465e82e6cc725b9dad52f0b34023c541750dc5968c5a0da98fafcae7cefd
-EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb71375602d68bb1110d9493c47c09721 SHA512 bbd6ddd58d17fec3cc67e39396f1922ae52ae49240c6effd1021d58e06c2c53499f034134894080eedb1f2ec7657bfbde05aeb945993b01de54cac2417fbe5cd WHIRLPOOL 5b94a0c0bf7e779fbc1fda00f1bfb01c1294a0b7b287787c404eaf682452c99e5f51525e3fa77a197ff29686e5ad2fc02e0a9510e485609d45b0e88471cc5798
-EBUILD gcj-jdk-4.8.2.ebuild 3743 SHA256 9fd0d79e3df75a6dd28aa05fbc17cebc9845b9f7d7f20443c0563cb918c7d2b5 SHA512 ad8b039e2dcd091304e03abc7a2e9117b6c78faa05fa82041ff4229019622fbdd895f60f7ae2cd7a24090e7440dff5588736ea5d44c26e51572a99f14634465b WHIRLPOOL 0b1437ceae94f01bdf0b8c54695e8d541f18f733863513b0874be3cd39445d0da1246094b4fa2701ffcfc55dd924488beb1d8a110acc884183bb588557f23aef
-EBUILD gcj-jdk-4.9.0.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
-EBUILD gcj-jdk-4.9.1.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
-EBUILD gcj-jdk-4.9.2.ebuild 3743 SHA256 40ee19687c3c76971b78f964875ee1899bef7e34c8ca949a1507f4ed0c53ca3f SHA512 7f0ed8a57f1d2dfc0e4a9658b4b84675484b22a8070fba90a14b94e177231120dbf25a5c7138ce77eeaa68506ad22ac2681f9dae459e3f172cf1859dc3a07afc WHIRLPOOL ff26f01e0ad45883e51d10154f5febc19be068ffdb93d44f85e37ef132c7499d0801485c1ff708e8f5c63061444284ab9c76c3f07fe36a4f0d3b850c92715cae
-MISC ChangeLog 10838 SHA256 eb1f68195d9241af1413e19c7d21a6853f3179f220f78c7947d2815a3fb87b74 SHA512 75a85d4a768e194c784d4773ce81f2253cf0c5f4d77e15613f9b8f9f1af54f1a61df3170c40d2576bafb7b15e19b02008835c88cdda7c8f9c6125ec2eb4a006c WHIRLPOOL 433e1593edbe22c32744eed7f8746044a55071ed518e51cfd7f2c2b3adc20f4eaa11261a9078f7b60b0857782c495a4621f8d6dfbd49fdca20ada85e65313572
-MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EARYIAAYFAlUJmlwACgkQz9oPmzWWQiJK5gEAelLpI3ClvkZ32n4WcMZ4xvxC
-sRm7KEZcufdtiz0fZX4BAODJMMQT3PUQ8YL0NbGv4rPBwfjnZ39ZfRpCzTe8CX0I
-=OM5e
------END PGP SIGNATURE-----
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env b/dev-java/gcj-jdk/files/gcj-jdk.env
deleted file mode 100644
index e8dfec7..0000000
--- a/dev-java/gcj-jdk/files/gcj-jdk.env
+++ /dev/null
@@ -1,18 +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/files/gcj-jdk.env,v 1.2 2013/01/13 16:53:02 sera Exp $
-
-VERSION="GCJ @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin"
-ROOTPATH="${JAVA_HOME}/bin"
-LDPATH="${JAVA_HOME}/lib"
-INFOPATH="${JAVA_HOME}/info"
-MANPATH="${JAVA_HOME}/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH INFOPATH MANPATH"
diff --git a/dev-java/gcj-jdk/files/javac.in b/dev-java/gcj-jdk/files/javac.in
deleted file mode 100644
index 8eeda68..0000000
--- a/dev-java/gcj-jdk/files/javac.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
-use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
-
-my $ECJ_WARNINGS="-nowarn";
-
-my ( @bcoption, @source15, @target15, @cp );
-push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
- unless grep {$_ eq '-bootclasspath'} @ARGV;
-push @source15, '-source', '1.5'
- unless grep {$_ eq '-source'} @ARGV;
-push @target15, '-target', '1.5'
- unless grep {$_ eq '-target'} @ARGV;
-push @cp, '-cp', '.'
- unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
-my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
-
-# Work around ecj's inability to handle duplicate command-line
-# options and unknown javac options.
-sub gen_ecj_opts
-{
- my @new_args = @{$_[0]};
-
- for my $opt (NO_DUP_ARGS)
- {
- my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
- if (@indices > 1) {
- shift @indices; # keep last instance only
- splice @new_args, $_, 2 for @indices;
- }
- }
-
- for my $opt (STRIP_ARGS)
- {
- my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
- splice @new_args, $_, 1 for @indices;
- }
-
- return \@new_args;
-}
-
-sub split_vm_args
-{
- my @new_args = @{$_[0]};
-
- my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
- my @javac_args = grep $_ !~ /^-J/, @new_args;
-
- return (\@vm_args, \@javac_args);
-}
-
-my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
-my @CLASSPATH = ('@ECJ_JAR@');
-push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
-$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
-exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.4.ebuild
deleted file mode 100644
index 409084d..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
- dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
- if [[ $(gcc-fullversion) != ${PV} ]]; then
- eerror "Your current GCC version is not set to ${PV} via gcc-config"
- eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
- echo "$(gcc-fullversion) != ${PV}"
- die "gcc ${PV} must be selected via gcc-config"
- fi
-
- java-vm-2_pkg_setup
-}
-
-src_install() {
- # jre lib paths ...
- local libarch="$(get_system_arch)"
- local gccbin=$(gcc-config -B)
- gccbin=${gccbin#"${EPREFIX}"}
- local gcclib=$(gcc-config -L|cut -d':' -f1)
- gcclib=${gcclib#"${EPREFIX}"}
- local gcjhome="/usr/lib/${P}"
- local gcc_version=$(gcc-fullversion)
- local gccchost="${CHOST}"
- local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
- gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
- # correctly install gcj
- dosym ${gccbin}/gij /usr/bin/gij
- dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
- # links
- dodir ${gcjhome}/bin
- dodir ${gcjhome}/jre/bin
- dosym ${gcjhome}/bin/java ${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
- dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
- dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
- 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;
- dosym /usr/bin/gij ${gcjhome}/bin/java;
-
- 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.7.3-r2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild
deleted file mode 100644
index 1d162d3..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild
+++ /dev/null
@@ -1,104 +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.1 2013/06/27 10:52:04 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}/include
-
- local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
- exeinto ${gcjhome}/bin
- cat "${FILESDIR}"/javac.in | 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#" \
- | newexe - 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.2.ebuild
deleted file mode 100644
index fdbfcf0..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild
+++ /dev/null
@@ -1,105 +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.2.ebuild,v 1.1 2013/01/23 10:30:56 sera Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="0"
-IUSE="X"
-
-ECJ_GCJ_SLOT="4.2"
-
-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}/include
-
- local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
- exeinto ${gcjhome}/bin
- cat "${FILESDIR}"/javac.in | 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#" \
- | newexe - 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 or 1.6 APIs."
- ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.html"
- ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${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"
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild
deleted file mode 100644
index 7b06370..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 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.2.ebuild,v 1.1 2013/01/23 10:30:56 sera Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="0"
-IUSE="X"
-
-ECJ_GCJ_SLOT="4.2"
-
-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}/include
-
- local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
- exeinto ${gcjhome}/bin
- cat "${FILESDIR}"/javac.in | 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#" \
- | newexe - 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 or 1.6 APIs."
- ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.html"
- ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${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"
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild
deleted file mode 100644
index 7b06370..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 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.2.ebuild,v 1.1 2013/01/23 10:30:56 sera Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="0"
-IUSE="X"
-
-ECJ_GCJ_SLOT="4.2"
-
-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}/include
-
- local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
- exeinto ${gcjhome}/bin
- cat "${FILESDIR}"/javac.in | 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#" \
- | newexe - 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 or 1.6 APIs."
- ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.html"
- ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${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"
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
deleted file mode 100644
index 3fa0e80..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.7.2.ebuild,v 1.1 2013/01/23 10:30:56 sera Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="0"
-IUSE="X"
-
-ECJ_GCJ_SLOT="4.2"
-
-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}/include
-
- local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
- exeinto ${gcjhome}/bin
- cat "${FILESDIR}"/javac.in | 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#" \
- | newexe - 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 or 1.6 APIs."
- ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.html"
- ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${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"
-}
diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
deleted file mode 100644
index fc15c6c..0000000
--- a/dev-java/gcj-jdk/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-<maintainer>
- <email>gnu_andrew@member.fsf.org</email>
- <name>Andrew John Hughes</name>
-</maintainer>
-<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/, dev-java/gcj-jdk/files/
@ 2018-02-03 22:48 Andrew John Hughes
0 siblings, 0 replies; 5+ messages in thread
From: Andrew John Hughes @ 2018-02-03 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 97c0077e752b024cc79a476477c52d403ec5023c
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Sat Feb 3 22:48:32 2018 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Sat Feb 3 22:48:32 2018 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=97c0077e
dev-java/gcj-jdk: Update to latest version of GCC 5 and merge with broken system version, which lacks environment file.
Package-Manager: portage-2.3.5
dev-java/gcj-jdk/ChangeLog | 10 +-
.../gcj-jdk/files/{gcj-jdk.env => gcj-jdk.env.sh} | 8 +-
dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild | 109 ---------------------
...cj-jdk-5.3.0.ebuild => gcj-jdk-5.4.0-r1.ebuild} | 11 +--
4 files changed, 18 insertions(+), 120 deletions(-)
diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 3261fcef..8beb1bcc 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,7 +1,15 @@
# ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.19 2015/05/21 08:50:13 chewi Exp $
+*gcj-jdk-5.4.0-r1 (03 Feb 2018)
+
+ 03 Feb 2018; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +files/gcj-jdk.env.sh, +gcj-jdk-5.4.0-r1.ebuild, -files/gcj-jdk.env,
+ -gcj-jdk-5.1.0-r2.ebuild, -gcj-jdk-5.3.0.ebuild:
+ dev-java/gcj-jdk: Update to latest version of GCC 5 and merge with broken
+ system version, which lacks environment file.
+
*gcj-jdk-5.3.0 (25 Mar 2016)
25 Mar 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
similarity index 72%
rename from dev-java/gcj-jdk/files/gcj-jdk.env
rename to dev-java/gcj-jdk/files/gcj-jdk.env.sh
index beed450e..0fde8b32 100644
--- a/dev-java/gcj-jdk/files/gcj-jdk.env
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-VERSION="GCJ @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
+VERSION="GCJ ${PV}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
JAVAC="${JAVA_HOME}/bin/javac"
PATH="${JAVA_HOME}/bin"
ROOTPATH="${JAVA_HOME}/bin"
diff --git a/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
deleted file mode 100644
index 8790c660..00000000
--- a/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-#KEYWORDS="~amd64"
-SLOT="0"
-IUSE="awt javadoc"
-
-API_DIFF_PV="5.1.0"
-
-# perl is needed for javac wrapper
-RDEPEND="
- dev-java/ecj-gcj:*
- dev-lang/perl
- ~sys-devel/gcc-${PV}[awt?,gcj]
- javadoc? ( dev-java/gnu-classpath:0[gjdoc] )"
-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 gcjprefix="${EPREFIX}${gcjhome}"
- 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}/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 awt && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
- use javadoc && dosym /usr/bin/gjdoc ${gcjhome}/bin/javadoc
-
- 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
-
- exeinto ${gcjhome}/bin
- sed -e "s#@JAVA@#${gcjprefix}/bin/java#" \
- -e "s#@ECJ_JAR@#${EPREFIX}/usr/share/eclipse-ecj/ecj.jar#" \
- -e "s#@RT_JAR@#${gcjprefix}/jre/lib/rt.jar#" \
- -e "s#@TOOLS_JAR@#${gcjprefix}/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"
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-5.3.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
similarity index 96%
rename from dev-java/gcj-jdk/gcj-jdk-5.3.0.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
index fb8452bd..021552bc 100644
--- a/dev-java/gcj-jdk/gcj-jdk-5.3.0.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
+EAPI=6
inherit java-vm-2 multilib
DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
+HOMEPAGE="https://www.gentoo.org/"
SRC_URI=""
LICENSE="GPL-2"
@@ -15,7 +14,7 @@ KEYWORDS="~amd64"
SLOT="0"
IUSE="awt javadoc"
-API_DIFF_PV="${PV}"
+API_DIFF_PV="5.1.0"
# perl is needed for javac wrapper
RDEPEND="
@@ -88,7 +87,7 @@ src_install() {
| newexe - javac
assert
- set_java_env
+ java-vm_install-env
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/, dev-java/gcj-jdk/files/
@ 2024-04-15 8:18 Florian Schmaus
0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2024-04-15 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 3ed1e6aba13d86ee7fe04f81a863fb52ef302e8a
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 08:18:33 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 08:18:33 2024 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=3ed1e6ab
dev-java/gcj-jdk: treeclean
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/gcj-jdk/ChangeLog | 160 -------------------------------
dev-java/gcj-jdk/files/gcj-jdk.env.sh | 18 ----
dev-java/gcj-jdk/files/javac.in | 57 -----------
dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild | 109 ---------------------
dev-java/gcj-jdk/metadata.xml | 21 ----
5 files changed, 365 deletions(-)
diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
deleted file mode 100644
index 8beb1bcc..00000000
--- a/dev-java/gcj-jdk/ChangeLog
+++ /dev/null
@@ -1,160 +0,0 @@
-# ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.19 2015/05/21 08:50:13 chewi Exp $
-
-*gcj-jdk-5.4.0-r1 (03 Feb 2018)
-
- 03 Feb 2018; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +files/gcj-jdk.env.sh, +gcj-jdk-5.4.0-r1.ebuild, -files/gcj-jdk.env,
- -gcj-jdk-5.1.0-r2.ebuild, -gcj-jdk-5.3.0.ebuild:
- dev-java/gcj-jdk: Update to latest version of GCC 5 and merge with broken
- system version, which lacks environment file.
-
-*gcj-jdk-5.3.0 (25 Mar 2016)
-
- 25 Mar 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +gcj-jdk-5.3.0.ebuild, metadata.xml:
- dev-java/gcj-jdk: Add support for GCJ 5.3.0.
-
-*gcj-jdk-5.1.0-r1 (23 Jun 2015)
-
- 23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
- +gcj-jdk-5.1.0-r1.ebuild, -gcj-jdk-5.1.0.ebuild, metadata.xml:
- Make javadoc symlink optional and provide it using GNU Classpath. Resolves bug
- #465572.
-
- 21 May 2015; James Le Cuirot <chewi@gentoo.org> -gcj-jdk-4.8.3.ebuild,
- gcj-jdk-4.8.4.ebuild:
- ~ppc keyword.
-
-*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)
-
- 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)
-*gcj-jdk-4.7.4 (14 Jul 2014)
-*gcj-jdk-4.7.3-r1 (14 Jul 2014)
-
- 14 Jul 2014; Ralph Sennhauser <sera@gentoo.org> -gcj-jdk-4.5.1-r1.ebuild,
- -gcj-jdk-4.5.2-r1.ebuild, -gcj-jdk-4.5.3.ebuild, -gcj-jdk-4.5.4.ebuild,
- -gcj-jdk-4.5.4-r1.ebuild, -gcj-jdk-4.6.0.ebuild, -gcj-jdk-4.6.1.ebuild,
- -gcj-jdk-4.6.2-r1.ebuild, -gcj-jdk-4.6.3.ebuild, -gcj-jdk-4.6.3-r1.ebuild,
- -gcj-jdk-4.6.3-r2.ebuild, -gcj-jdk-4.6.3-r3.ebuild, -gcj-jdk-4.7.2.ebuild,
- +gcj-jdk-4.7.3-r1.ebuild, +gcj-jdk-4.7.4.ebuild, +gcj-jdk-4.8.2.ebuild,
- +gcj-jdk-4.8.3.ebuild, +files/javac.in:
- Add missing versions for 4.7 and 4.8
- Fix 4.7.3 to be able to build ant-core-1.9 #489266
- Thanks to Andrew John Hughes <gnu_andrew@member.fsf.org> for the javac
- wrapper und for providing new API diffs
- Drop 4.5 and 4.6 as they are to old to build current icedtea:7
- Drop ia64 ppc ppc64 on 4.8 as the correspondig gcc is missing those keywords
-
- 18 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -gcj-jdk-4.4.4-r1.ebuild,
- -gcj-jdk-4.4.5-r1.ebuild, -gcj-jdk-4.4.6.ebuild:
- [QA] Removed ebuilds which have no gcc counterpart anymore.
-
- 24 Dec 2013; Tom Wijsman <TomWij@gentoo.org> gcj-jdk-4.4.4-r1.ebuild,
- gcj-jdk-4.4.5-r1.ebuild, gcj-jdk-4.4.6.ebuild, gcj-jdk-4.5.1-r1.ebuild,
- gcj-jdk-4.5.2-r1.ebuild, gcj-jdk-4.5.3.ebuild, gcj-jdk-4.5.4-r1.ebuild,
- gcj-jdk-4.5.4.ebuild, gcj-jdk-4.6.0.ebuild, gcj-jdk-4.6.1.ebuild,
- gcj-jdk-4.6.2-r1.ebuild, gcj-jdk-4.6.3-r1.ebuild, gcj-jdk-4.6.3-r2.ebuild,
- gcj-jdk-4.6.3-r3.ebuild, gcj-jdk-4.6.3.ebuild, gcj-jdk-4.7.2.ebuild,
- gcj-jdk-4.7.3.ebuild:
- Reflect gtk --> awt USE flag change of sys-devel/gcc.
-
-*gcj-jdk-4.7.3 (27 Jun 2013)
-
- 27 Jun 2013; Tom Wijsman <TomWij@gentoo.org> +gcj-jdk-4.7.3.ebuild:
- Version bump to 4.7.3; fixes bug #473074, reported by Ivan Iraci.
-
- 17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
- Add proxy-maintainers to metadata.xml
-
-*gcj-jdk-4.7.2 (23 Jan 2013)
-*gcj-jdk-4.6.3-r3 (23 Jan 2013)
-*gcj-jdk-4.5.4-r1 (23 Jan 2013)
-
- 23 Jan 2013; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.5.4-r1.ebuild,
- +gcj-jdk-4.6.3-r3.ebuild, +gcj-jdk-4.7.2.ebuild:
- Bump and make gcc[gtk] dep optional. #453422
-
- 13 Jan 2013; Ralph Sennhauser <sera@gentoo.org> files/gcj-jdk.env:
- Make vm env file Prefix aware. #445350
-
-*gcj-jdk-4.6.3-r2 (23 Oct 2012)
-*gcj-jdk-4.5.4 (23 Oct 2012)
-
- 23 Oct 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.5.4.ebuild,
- +gcj-jdk-4.6.3-r2.ebuild:
- Don't require corresponding gcc to be active. #439228
- Backport various fixes to 4.5.4.
-
-*gcj-jdk-4.6.3-r1 (28 Sep 2012)
-
- 28 Sep 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.6.3-r1.ebuild:
- No longer install symlinks in /usr/bin to work with recent gcc-config.
- #431930
- Add missing dodir for server vm.
- Use get_libdir for vm home.
-
- 16 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
- gcj-jdk-4.6.3.ebuild:
- Keyword ~arm, bug #305773.
-
-*gcj-jdk-4.6.3 (05 Jun 2012)
-*gcj-jdk-4.6.2-r1 (05 Jun 2012)
-*gcj-jdk-4.6.1 (05 Jun 2012)
-*gcj-jdk-4.6.0 (05 Jun 2012)
-
- 05 Jun 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.6.0.ebuild,
- +gcj-jdk-4.6.1.ebuild, +gcj-jdk-4.6.2-r1.ebuild, +gcj-jdk-4.6.3.ebuild:
- Import from java-overlay.
- Adds Prefix support and missing use dep, thanks to XU Benda
- <heroxbd@gentoo.org>. #416367
- Remove JAVA_PROVIDE, old style virtuals are dead.
-
- 15 Apr 2012; Mike Frysinger <vapier@gentoo.org> gcj-jdk-4.5.3.ebuild:
- Add back ia64 love #349020 by Dennis Schridde.
-
-*gcj-jdk-4.5.2-r1 (20 Sep 2011)
-*gcj-jdk-4.5.1-r1 (20 Sep 2011)
-*gcj-jdk-4.4.6 (20 Sep 2011)
-*gcj-jdk-4.4.5-r1 (20 Sep 2011)
-*gcj-jdk-4.4.4-r1 (20 Sep 2011)
-
- 20 Sep 2011; Vlastimil Babka <caster@gentoo.org> -gcj-jdk-4.4.4.ebuild,
- +gcj-jdk-4.4.4-r1.ebuild, -gcj-jdk-4.4.5.ebuild, +gcj-jdk-4.4.5-r1.ebuild,
- +gcj-jdk-4.4.6.ebuild, -gcj-jdk-4.5.1.ebuild, +gcj-jdk-4.5.1-r1.ebuild,
- -gcj-jdk-4.5.2.ebuild, +gcj-jdk-4.5.2-r1.ebuild:
- Add 4.4.6 variant and revbump the rest to have the same set of symlinks as
- added for 4.5.3.
-
-*gcj-jdk-4.5.3 (10 Aug 2011)
-
- 10 Aug 2011; Vlastimil Babka <caster@gentoo.org> +gcj-jdk-4.5.3.ebuild:
- Version bump for gcc-4.5.3, apply improvements (more tool symlinks) from
- java-overlay.
-
-*gcj-jdk-4.5.2 (07 Jan 2011)
-
- 07 Jan 2011; Vlastimil Babka <caster@gentoo.org> +gcj-jdk-4.5.2.ebuild:
- Version bump.
-
-*gcj-jdk-4.5.1 (14 Nov 2010)
-*gcj-jdk-4.4.5 (14 Nov 2010)
-*gcj-jdk-4.4.4 (14 Nov 2010)
-
- 14 Nov 2010; Vlastimil Babka <caster@gentoo.org> +gcj-jdk-4.4.4.ebuild,
- +gcj-jdk-4.4.5.ebuild, +gcj-jdk-4.5.1.ebuild, +files/gcj-jdk.env,
- +metadata.xml:
- Initial import from java-overlay. Great thanks to Hanno Meyer-Thurow
- (geki) <h.mth@web.de> and Andrew John Hughes <gnu_andrew@member.fsf.org>
- for maintaining it in the overlays.
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env.sh b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
deleted file mode 100644
index 0fde8b32..00000000
--- a/dev-java/gcj-jdk/files/gcj-jdk.env.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="GCJ ${PV}"
-JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
-JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin"
-ROOTPATH="${JAVA_HOME}/bin"
-LDPATH="${JAVA_HOME}/lib"
-INFOPATH="${JAVA_HOME}/info"
-MANPATH="${JAVA_HOME}/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH INFOPATH MANPATH"
diff --git a/dev-java/gcj-jdk/files/javac.in b/dev-java/gcj-jdk/files/javac.in
deleted file mode 100644
index 8eeda68c..00000000
--- a/dev-java/gcj-jdk/files/javac.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
-use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
-
-my $ECJ_WARNINGS="-nowarn";
-
-my ( @bcoption, @source15, @target15, @cp );
-push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
- unless grep {$_ eq '-bootclasspath'} @ARGV;
-push @source15, '-source', '1.5'
- unless grep {$_ eq '-source'} @ARGV;
-push @target15, '-target', '1.5'
- unless grep {$_ eq '-target'} @ARGV;
-push @cp, '-cp', '.'
- unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
-my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
-
-# Work around ecj's inability to handle duplicate command-line
-# options and unknown javac options.
-sub gen_ecj_opts
-{
- my @new_args = @{$_[0]};
-
- for my $opt (NO_DUP_ARGS)
- {
- my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
- if (@indices > 1) {
- shift @indices; # keep last instance only
- splice @new_args, $_, 2 for @indices;
- }
- }
-
- for my $opt (STRIP_ARGS)
- {
- my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
- splice @new_args, $_, 1 for @indices;
- }
-
- return \@new_args;
-}
-
-sub split_vm_args
-{
- my @new_args = @{$_[0]};
-
- my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
- my @javac_args = grep $_ !~ /^-J/, @new_args;
-
- return (\@vm_args, \@javac_args);
-}
-
-my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
-my @CLASSPATH = ('@ECJ_JAR@');
-push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
-$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
-exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
diff --git a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
deleted file mode 100644
index 021552bc..00000000
--- a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="awt javadoc"
-
-API_DIFF_PV="5.1.0"
-
-# perl is needed for javac wrapper
-RDEPEND="
- dev-java/ecj-gcj:*
- dev-lang/perl
- ~sys-devel/gcc-${PV}[awt?,gcj]
- javadoc? ( dev-java/gnu-classpath:0[gjdoc] )"
-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 gcjprefix="${EPREFIX}${gcjhome}"
- 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}/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 awt && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
- use javadoc && dosym /usr/bin/gjdoc ${gcjhome}/bin/javadoc
-
- 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
-
- exeinto ${gcjhome}/bin
- sed -e "s#@JAVA@#${gcjprefix}/bin/java#" \
- -e "s#@ECJ_JAR@#${EPREFIX}/usr/share/eclipse-ecj/ecj.jar#" \
- -e "s#@RT_JAR@#${gcjprefix}/jre/lib/rt.jar#" \
- -e "s#@TOOLS_JAR@#${gcjprefix}/lib/tools.jar#" \
- "${FILESDIR}"/javac.in \
- | newexe - javac
- assert
-
- java-vm_install-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 "Long-term, GCJ is deprecated in GCC 6 and will be removed from GCC 7"
- 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/metadata.xml b/dev-java/gcj-jdk/metadata.xml
deleted file mode 100644
index ca7a5fb7..00000000
--- a/dev-java/gcj-jdk/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>gnu_andrew@member.fsf.org</email>
- <name>Andrew John Hughes</name>
- </maintainer>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
- <use>
- <flag name="awt">Install AWT libraries, needed by some GUIs (not needed to build icedtea)</flag>
- <flag name="javadoc">Provide javadoc using gjdoc from GNU Classpath.</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-15 8:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-20 3:19 [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/, dev-java/gcj-jdk/files/ Andrew John Hughes
-- strict thread matches above, loose matches on Subject: below --
2024-04-15 8:18 Florian Schmaus
2018-02-03 22:48 Andrew John Hughes
2015-03-20 23:18 Andrew John Hughes
2013-09-19 19:20 Andrew John Hughes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox