1 |
commit: 97c0077e752b024cc79a476477c52d403ec5023c |
2 |
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
3 |
AuthorDate: Sat Feb 3 22:48:32 2018 +0000 |
4 |
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
5 |
CommitDate: Sat Feb 3 22:48:32 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=97c0077e |
7 |
|
8 |
dev-java/gcj-jdk: Update to latest version of GCC 5 and merge with broken system version, which lacks environment file. |
9 |
|
10 |
Package-Manager: portage-2.3.5 |
11 |
|
12 |
dev-java/gcj-jdk/ChangeLog | 10 +- |
13 |
.../gcj-jdk/files/{gcj-jdk.env => gcj-jdk.env.sh} | 8 +- |
14 |
dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild | 109 --------------------- |
15 |
...cj-jdk-5.3.0.ebuild => gcj-jdk-5.4.0-r1.ebuild} | 11 +-- |
16 |
4 files changed, 18 insertions(+), 120 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog |
19 |
index 3261fcef..8beb1bcc 100644 |
20 |
--- a/dev-java/gcj-jdk/ChangeLog |
21 |
+++ b/dev-java/gcj-jdk/ChangeLog |
22 |
@@ -1,7 +1,15 @@ |
23 |
# ChangeLog for dev-java/gcj-jdk |
24 |
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 |
25 |
+# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2 |
26 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.19 2015/05/21 08:50:13 chewi Exp $ |
27 |
|
28 |
+*gcj-jdk-5.4.0-r1 (03 Feb 2018) |
29 |
+ |
30 |
+ 03 Feb 2018; Andrew John Hughes <gnu_andrew@××××××××××.org> |
31 |
+ +files/gcj-jdk.env.sh, +gcj-jdk-5.4.0-r1.ebuild, -files/gcj-jdk.env, |
32 |
+ -gcj-jdk-5.1.0-r2.ebuild, -gcj-jdk-5.3.0.ebuild: |
33 |
+ dev-java/gcj-jdk: Update to latest version of GCC 5 and merge with broken |
34 |
+ system version, which lacks environment file. |
35 |
+ |
36 |
*gcj-jdk-5.3.0 (25 Mar 2016) |
37 |
|
38 |
25 Mar 2016; Andrew John Hughes <gnu_andrew@××××××××××.org> |
39 |
|
40 |
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env b/dev-java/gcj-jdk/files/gcj-jdk.env.sh |
41 |
similarity index 72% |
42 |
rename from dev-java/gcj-jdk/files/gcj-jdk.env |
43 |
rename to dev-java/gcj-jdk/files/gcj-jdk.env.sh |
44 |
index beed450e..0fde8b32 100644 |
45 |
--- a/dev-java/gcj-jdk/files/gcj-jdk.env |
46 |
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env.sh |
47 |
@@ -1,10 +1,10 @@ |
48 |
-# Copyright 1999-2013 Gentoo Foundation |
49 |
+# Copyright 1999-2018 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Id$ |
52 |
|
53 |
-VERSION="GCJ @PV@" |
54 |
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@" |
55 |
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@" |
56 |
+VERSION="GCJ ${PV}" |
57 |
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}" |
58 |
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}" |
59 |
JAVAC="${JAVA_HOME}/bin/javac" |
60 |
PATH="${JAVA_HOME}/bin" |
61 |
ROOTPATH="${JAVA_HOME}/bin" |
62 |
|
63 |
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 |
64 |
deleted file mode 100644 |
65 |
index 8790c660..00000000 |
66 |
--- a/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild |
67 |
+++ /dev/null |
68 |
@@ -1,109 +0,0 @@ |
69 |
-# Copyright 1999-2015 Gentoo Foundation |
70 |
-# Distributed under the terms of the GNU General Public License v2 |
71 |
-# $Id$ |
72 |
- |
73 |
-EAPI="5" |
74 |
- |
75 |
-inherit java-vm-2 multilib |
76 |
- |
77 |
-DESCRIPTION="Java wrappers around GCJ" |
78 |
-HOMEPAGE="http://www.gentoo.org/" |
79 |
-SRC_URI="" |
80 |
- |
81 |
-LICENSE="GPL-2" |
82 |
-#KEYWORDS="~amd64" |
83 |
-SLOT="0" |
84 |
-IUSE="awt javadoc" |
85 |
- |
86 |
-API_DIFF_PV="5.1.0" |
87 |
- |
88 |
-# perl is needed for javac wrapper |
89 |
-RDEPEND=" |
90 |
- dev-java/ecj-gcj:* |
91 |
- dev-lang/perl |
92 |
- ~sys-devel/gcc-${PV}[awt?,gcj] |
93 |
- javadoc? ( dev-java/gnu-classpath:0[gjdoc] )" |
94 |
-DEPEND="${RDEPEND}" |
95 |
- |
96 |
-S="${WORKDIR}" |
97 |
- |
98 |
-src_install() { |
99 |
- # jre lib paths ... |
100 |
- local libarch="$(get_system_arch)" |
101 |
- local gcc_version=${PV} |
102 |
- local gccbin=$(gcc-config -B ${gcc_version}) |
103 |
- gccbin=${gccbin#"${EPREFIX}"} |
104 |
- local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1) |
105 |
- gcclib=${gcclib#"${EPREFIX}"} |
106 |
- local gcjhome="/usr/$(get_libdir)/${P}" |
107 |
- local gcjprefix="${EPREFIX}${gcjhome}" |
108 |
- local gccchost="${CHOST}" |
109 |
- local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*) |
110 |
- gcjlibdir=${gcjlibdir#"${EPREFIX}"} |
111 |
- |
112 |
- # links |
113 |
- dodir ${gcjhome}/bin |
114 |
- dodir ${gcjhome}/jre/bin |
115 |
- dosym ${gccbin}/gij ${gcjhome}/bin/java |
116 |
- dosym ${gccbin}/gij ${gcjhome}/jre/bin/java |
117 |
- dosym ${gccbin}/gjar ${gcjhome}/bin/jar |
118 |
- dosym ${gccbin}/grmic ${gcjhome}/bin/rmic |
119 |
- dosym ${gccbin}/gjavah ${gcjhome}/bin/javah |
120 |
- dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap |
121 |
- dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer |
122 |
- dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner |
123 |
- dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry |
124 |
- dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry |
125 |
- dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool |
126 |
- dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool |
127 |
- dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii |
128 |
- dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd |
129 |
- dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd |
130 |
- dosym ${gccbin}/grmid ${gcjhome}/bin/rmid |
131 |
- dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid |
132 |
- dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver |
133 |
- dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv |
134 |
- dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv |
135 |
- |
136 |
- dodir ${gcjhome}/jre/lib/${libarch}/client |
137 |
- dodir ${gcjhome}/jre/lib/${libarch}/server |
138 |
- dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so |
139 |
- dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so |
140 |
- use awt && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so |
141 |
- use javadoc && dosym /usr/bin/gjdoc ${gcjhome}/bin/javadoc |
142 |
- |
143 |
- dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \ |
144 |
- ${gcjhome}/jre/lib/rt.jar |
145 |
- dodir ${gcjhome}/lib |
146 |
- dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \ |
147 |
- ${gcjhome}/lib/tools.jar |
148 |
- dosym ${gcclib}/include ${gcjhome}/include |
149 |
- |
150 |
- exeinto ${gcjhome}/bin |
151 |
- sed -e "s#@JAVA@#${gcjprefix}/bin/java#" \ |
152 |
- -e "s#@ECJ_JAR@#${EPREFIX}/usr/share/eclipse-ecj/ecj.jar#" \ |
153 |
- -e "s#@RT_JAR@#${gcjprefix}/jre/lib/rt.jar#" \ |
154 |
- -e "s#@TOOLS_JAR@#${gcjprefix}/lib/tools.jar#" \ |
155 |
- "${FILESDIR}"/javac.in \ |
156 |
- | newexe - javac |
157 |
- assert |
158 |
- |
159 |
- set_java_env |
160 |
-} |
161 |
- |
162 |
-pkg_postinst() { |
163 |
- # Do not set as system VM (see below) |
164 |
- # java-vm-2_pkg_postinst |
165 |
- |
166 |
- ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs." |
167 |
- ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html" |
168 |
- ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html" |
169 |
- ewarn "Check for existing bugs relating to missing APIs and file" |
170 |
- ewarn "new ones at http://gcc.gnu.org/bugzilla/" |
171 |
- ewarn |
172 |
- ewarn "Due to this and limited manpower, we currently cannot support" |
173 |
- ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap" |
174 |
- ewarn "IcedTea without prior binary VM installation. To do that, execute:" |
175 |
- ewarn |
176 |
- ewarn "emerge -o icedtea && emerge icedtea" |
177 |
-} |
178 |
|
179 |
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 |
180 |
similarity index 96% |
181 |
rename from dev-java/gcj-jdk/gcj-jdk-5.3.0.ebuild |
182 |
rename to dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild |
183 |
index fb8452bd..021552bc 100644 |
184 |
--- a/dev-java/gcj-jdk/gcj-jdk-5.3.0.ebuild |
185 |
+++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild |
186 |
@@ -1,13 +1,12 @@ |
187 |
-# Copyright 1999-2016 Gentoo Foundation |
188 |
+# Copyright 1999-2018 Gentoo Foundation |
189 |
# Distributed under the terms of the GNU General Public License v2 |
190 |
-# $Id$ |
191 |
|
192 |
-EAPI="5" |
193 |
+EAPI=6 |
194 |
|
195 |
inherit java-vm-2 multilib |
196 |
|
197 |
DESCRIPTION="Java wrappers around GCJ" |
198 |
-HOMEPAGE="http://www.gentoo.org/" |
199 |
+HOMEPAGE="https://www.gentoo.org/" |
200 |
SRC_URI="" |
201 |
|
202 |
LICENSE="GPL-2" |
203 |
@@ -15,7 +14,7 @@ KEYWORDS="~amd64" |
204 |
SLOT="0" |
205 |
IUSE="awt javadoc" |
206 |
|
207 |
-API_DIFF_PV="${PV}" |
208 |
+API_DIFF_PV="5.1.0" |
209 |
|
210 |
# perl is needed for javac wrapper |
211 |
RDEPEND=" |
212 |
@@ -88,7 +87,7 @@ src_install() { |
213 |
| newexe - javac |
214 |
assert |
215 |
|
216 |
- set_java_env |
217 |
+ java-vm_install-env |
218 |
} |
219 |
|
220 |
pkg_postinst() { |