Gentoo Archives: gentoo-commits

From: Andrew John Hughes <gnu_andrew@××××××××××.org>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
Date: Tue, 02 Sep 2014 04:30:52
Message-Id: 1409237673.31773bdadf36b75d0c7124983d9093605a6a8223.gnu_andrew@gentoo
1 commit: 31773bdadf36b75d0c7124983d9093605a6a8223
2 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
3 AuthorDate: Thu Aug 28 14:54:33 2014 +0000
4 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
5 CommitDate: Thu Aug 28 14:54:33 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=31773bda
7
8 Support gcc 4.9.1.
9
10 Package-Manager: portage-2.2.11-r1
11 Manifest-Sign-Key: 248BDC07
12
13 ---
14 dev-java/gcj-jdk/ChangeLog | 6 ++
15 dev-java/gcj-jdk/Manifest | 31 +++++-----
16 dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild | 105 ++++++++++++++++++++++++++++++++++
17 3 files changed, 127 insertions(+), 15 deletions(-)
18
19 diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
20 index f6c3896..f604418 100644
21 --- a/dev-java/gcj-jdk/ChangeLog
22 +++ b/dev-java/gcj-jdk/ChangeLog
23 @@ -2,6 +2,12 @@
24 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
25 # $Header: $
26
27 +*gcj-jdk-4.9.1 (28 Aug 2014)
28 +
29 + 28 Aug 2014; Andrew John Hughes <gnu_andrew@××××××××××.org>
30 + +gcj-jdk-4.9.1.ebuild:
31 + Support gcc 4.9.1.
32 +
33 *gcj-jdk-4.9.0 (07 Aug 2014)
34
35 07 Aug 2014; Andrew John Hughes <gnu_andrew@××××××××××.org>
36
37 diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
38 index 07236ad..3b649cf 100644
39 --- a/dev-java/gcj-jdk/Manifest
40 +++ b/dev-java/gcj-jdk/Manifest
41 @@ -7,22 +7,23 @@ EBUILD gcj-jdk-4.6.4.ebuild 3680 SHA256 8c63f2ab224a7b39c73658cd92871ad012fcd910
42 EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb71375602d68bb1110d9493c47c09721 SHA512 bbd6ddd58d17fec3cc67e39396f1922ae52ae49240c6effd1021d58e06c2c53499f034134894080eedb1f2ec7657bfbde05aeb945993b01de54cac2417fbe5cd WHIRLPOOL 5b94a0c0bf7e779fbc1fda00f1bfb01c1294a0b7b287787c404eaf682452c99e5f51525e3fa77a197ff29686e5ad2fc02e0a9510e485609d45b0e88471cc5798
43 EBUILD gcj-jdk-4.8.2.ebuild 3743 SHA256 9fd0d79e3df75a6dd28aa05fbc17cebc9845b9f7d7f20443c0563cb918c7d2b5 SHA512 ad8b039e2dcd091304e03abc7a2e9117b6c78faa05fa82041ff4229019622fbdd895f60f7ae2cd7a24090e7440dff5588736ea5d44c26e51572a99f14634465b WHIRLPOOL 0b1437ceae94f01bdf0b8c54695e8d541f18f733863513b0874be3cd39445d0da1246094b4fa2701ffcfc55dd924488beb1d8a110acc884183bb588557f23aef
44 EBUILD gcj-jdk-4.9.0.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
45 -MISC ChangeLog 10560 SHA256 0a0e13599c0ba732e9d8d6a15343984cfb76e0baac17b61c5af3359af0955a79 SHA512 3309124b3ced6d1397456d7b985d764e12f96005f9c9695c2e4853ed1a82c993c7a4c528697ddbc7c019a440fcb995cad319aff7243ac916473595a670c63a01 WHIRLPOOL 62c615518fe5d7f75984b3542e0592ce6bc9cdd3c92b34a5537884ab31a7024ecc0d64a08d7a6d4fb2530c64dd5d3ad1938d4a0ca529400a129e3c00a08fa201
46 +EBUILD gcj-jdk-4.9.1.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
47 +MISC ChangeLog 10699 SHA256 5fcd36ff8280256661c8f6f862073e9e5ea27bea18d35100a4f8ca26d8591a70 SHA512 f0a0c01dfb9306fe47858c81fddc0eaa6059f08ec90aea18cbfd6005d65e85782468cc787260634fd59fa81cedf5d93857c6e0c90c10de45d13fb5b9c19748f2 WHIRLPOOL b47b8a6d20cde5de0a0768dc70fc44e60f4ad344e95e66030f1bf4430f195cbd5aaf40abf8d477f61d1d1dfd9abe16ef09c2ddb74b6f0a6b97c2da8186645aec
48 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
49 -----BEGIN PGP SIGNATURE-----
50 -Version: GnuPG v2.0.22 (GNU/Linux)
51 +Version: GnuPG v2
52
53 -iQIbBAEBCAAGBQJT48gLAAoJEDuWpXgki9wHX8YP9R5FjRE/6NB8aWd0AydWazZK
54 -Bq5+k3kq76hJ1m7Oe3pNx5uwq11jrldP1Y67gpWdn9T7Mzhb/IJM1uG75m4to8Qe
55 -C8Ikjduuw2mAiyRHZ1ZtjexHucCzt8VYpbfI1dtX8IG9pQz4Xv7N6pZpFMsBqMWM
56 -26D4E5jXZiUfY2OdC47HVaq/uBiHEaU0t/hJikM1DPa8hdOf+cEDtcKnjkJXZGnL
57 -E0VitDsCtZM5PZ4zCq+py6udaOsg6fQtsKcQlpWvv/WKs08bXq/HXI0GFUATrZXt
58 -dXDWMFXdYDC0gzoW6w+7nrcZZV98CJfUuZ7PFUCd0vzBD1COMjGaYhJxibj/A0xC
59 -zuKGcqKgZDXrqBA6eLvv+5K08XMom9jONo0y1AjGTjDxP7HxnG2FmAihpShVfT/u
60 -rhtKCV1g6TVFo/ZW/t5YZh2kNVDSZCNwdhoxj1HIxt8f0ZDJXCazTR4dzWpe9D8L
61 -/b6apQq4pjzoVdLwPYXAfavYBqXO0Dwg5nVhJe+ZY+tVbmt52tOfcHFOqJcYv26f
62 -B8cLA3bVdvlipe/PBQTZUhpBI3e/xEINE8ygzfUGW9cNkS0DAnFiraS3s1KzRsvS
63 -+rp+44zQRV83xZ91HXftl7UYI5ECyroKYVoDOBlGggHsxOBwhXyhVXuuWDwCT3dR
64 -HEpdMGf3UJuRPXJQbbQ=
65 -=jR9f
66 +iQIcBAEBCAAGBQJT/0KpAAoJEDuWpXgki9wHhkEP/2ow6LxtA7pPW1uLpGVeTQCN
67 +tItOg2kV35ji3yfC5D5utdLwD8SEqUpe/fb9YzMdkLiJiZNjcy2x7DCGvybOW6y5
68 +YfLRRON7JXBDTdQHZ6pYMwtnIthn2vy217oozeNzmAeUMAclLGpoyjGYpeZSU1i/
69 +3FPg76+68QkBNx8BkOqbitTCXdJUMNN+LrY5ikd1pLUu6PbGZYZZuM6x6OzswtJK
70 +7n3ntv6kdK0uNLaVSjuzoarLSSL/fcTxdETdjFJkj+xpt7cbD9rbGKgHW7kQySP5
71 +Kkx3BXBu90FBTFeR6FnmlnwSXlpMb9M53ZwNyWqurqt2gNgKfMZ+NyuKHlCX8dWp
72 +JaQ4iA5p82eMnnFJTrQONFkRccPzgplUcKW7jCPnDSkCTJcEDxcxu9UvC6M0NN1z
73 +YbzMO554qulBUVyKGp1zAXgMdpCYQBCwV9eCpYyg/F7Q9qyYth5Ln78qyvqDr0hR
74 +Mzou5xSO2BjAcUFvTMN+vlDWnYCgKS3zNrDDDTHmuQN258wTEVRnz/0P8QXm5OQ+
75 +kJ3nXHr4oqG6yONvxZRCSAUJ8sU/so3z8VKlgZpPBqojcRFMvbVUN920r9JdXRgl
76 +uTJJinfLkkNFqRwz9NDEozW2OnHO70riYdwPxspCMcpU3gxueP8AT0sCCvuu9nq+
77 +EXHfslk8kdqVIJ+OcNhs
78 +=1c4s
79 -----END PGP SIGNATURE-----
80
81 diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild
82 new file mode 100644
83 index 0000000..7b06370
84 --- /dev/null
85 +++ b/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild
86 @@ -0,0 +1,105 @@
87 +# Copyright 1999-2014 Gentoo Foundation
88 +# Distributed under the terms of the GNU General Public License v2
89 +# $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 $
90 +
91 +EAPI="5"
92 +
93 +inherit java-vm-2 multilib
94 +
95 +DESCRIPTION="Java wrappers around GCJ"
96 +HOMEPAGE="http://www.gentoo.org/"
97 +SRC_URI=""
98 +
99 +LICENSE="GPL-2"
100 +KEYWORDS=""
101 +SLOT="0"
102 +IUSE="X"
103 +
104 +ECJ_GCJ_SLOT="4.2"
105 +
106 +RDEPEND="
107 + ~sys-devel/gcc-${PV}[gcj]
108 + X? ( ~sys-devel/gcc-${PV}[awt] )
109 + dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
110 +DEPEND="${RDEPEND}"
111 +
112 +S="${WORKDIR}"
113 +
114 +src_install() {
115 + # jre lib paths ...
116 + local libarch="$(get_system_arch)"
117 + local gcc_version=${PV}
118 + local gccbin=$(gcc-config -B ${gcc_version})
119 + gccbin=${gccbin#"${EPREFIX}"}
120 + local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
121 + gcclib=${gcclib#"${EPREFIX}"}
122 + local gcjhome="/usr/$(get_libdir)/${P}"
123 + local gccchost="${CHOST}"
124 + local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
125 + gcjlibdir=${gcjlibdir#"${EPREFIX}"}
126 +
127 + # links
128 + dodir ${gcjhome}/bin
129 + dodir ${gcjhome}/jre/bin
130 + dosym ${gccbin}/gij ${gcjhome}/bin/java
131 + dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
132 + dosym ${gccbin}/gjar ${gcjhome}/bin/jar
133 + dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
134 + dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
135 + dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
136 + dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
137 + dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
138 + dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
139 + dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
140 + dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
141 + dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
142 + dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
143 + dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
144 + dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
145 + dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
146 + dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
147 + dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
148 + dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
149 + dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
150 + dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
151 +
152 + dodir ${gcjhome}/jre/lib/${libarch}/client
153 + dodir ${gcjhome}/jre/lib/${libarch}/server
154 + dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
155 + dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
156 + use X && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
157 +
158 + dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
159 + ${gcjhome}/jre/lib/rt.jar
160 + dodir ${gcjhome}/lib
161 + dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
162 + ${gcjhome}/lib/tools.jar
163 + dosym ${gcclib}/include ${gcjhome}/include
164 +
165 + local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
166 + exeinto ${gcjhome}/bin
167 + cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
168 + -e "s#@ECJ_JAR@#${ecj_jar}#" \
169 + -e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
170 + -e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
171 + | newexe - javac
172 +
173 + set_java_env
174 +}
175 +
176 +pkg_postinst() {
177 + # Do not set as system VM (see below)
178 + # java-vm-2_pkg_postinst
179 +
180 + ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
181 + ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.html"
182 + ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${PV}.html"
183 + ewarn "Check for existing bugs relating to missing APIs and file"
184 + ewarn "new ones at http://gcc.gnu.org/bugzilla/"
185 + ewarn
186 + ewarn "Due to this and limited manpower, we currently cannot support"
187 + ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
188 + ewarn "IcedTea without prior binary VM installation. To do that, execute:"
189 + ewarn
190 + ewarn "emerge -o icedtea && emerge icedtea"
191 +}