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/icedtea/
Date: Tue, 14 Feb 2017 04:50:27
Message-Id: 1487047739.38a5dc631b5d3db29e2ec9f1dc3b84a366e916cf.gnu_andrew@gentoo
1 commit: 38a5dc631b5d3db29e2ec9f1dc3b84a366e916cf
2 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
3 AuthorDate: Tue Feb 14 04:48:59 2017 +0000
4 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
5 CommitDate: Tue Feb 14 04:48:59 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=38a5dc63
7
8 dev-java/icedtea: Remove unsupported IcedTea 1.x ebuilds.
9
10 Package-Manager: portage-2.3.2
11
12 dev-java/icedtea/ChangeLog | 4 +
13 dev-java/icedtea/Manifest | 3 -
14 dev-java/icedtea/icedtea-6.1.13.13.ebuild | 364 -----------------------------
15 dev-java/icedtea/icedtea-6.9999.ebuild | 366 ------------------------------
16 4 files changed, 4 insertions(+), 733 deletions(-)
17
18 diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
19 index 2d2bea86..c54b9c67 100644
20 --- a/dev-java/icedtea/ChangeLog
21 +++ b/dev-java/icedtea/ChangeLog
22 @@ -2,6 +2,10 @@
23 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
24 # $Header: $
25
26 + 14 Feb 2017; Andrew John Hughes <gnu_andrew@××××××××××.org>
27 + -icedtea-6.1.13.13.ebuild, -icedtea-6.9999.ebuild:
28 + dev-java/icedtea: Remove unsupported IcedTea 1.x ebuilds.
29 +
30 *icedtea-7.2.6.9 (14 Feb 2017)
31
32 14 Feb 2017; Andrew John Hughes <gnu_andrew@××××××××××.org>
33
34 diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
35 index 5c8de620..e30f38ab 100644
36 --- a/dev-java/icedtea/Manifest
37 +++ b/dev-java/icedtea/Manifest
38 @@ -32,9 +32,6 @@ DIST icedtea-3.4-langtools-d10a13bdc98c.tar.xz 2070432 SHA256 1b0b0fb49c81955573
39 DIST icedtea-3.4-nashorn-8c0fe384c4e7.tar.xz 2229336 SHA256 0ec045c9c4506f63602d86e72b0c3fdccd75fa95c47ee6a1238639274dc8e92d SHA512 c0aec36e921288b6ad11e71daa32111a4ee45302a2bbe407229cc143f05869372993f7b0dd366c07ecb31fac47e1d3cdb0c59cc1a48375d3719656c2159fee95 WHIRLPOOL 0e9421c077d617f2c67a67e590ad8e8322ebf33559a1f127efbcfaa1e30f3437bb8749d656fca211f4f848fcd98ebc5f41449a39499a9dadc64990d45fe000cd
40 DIST icedtea-3.4-openjdk-d5760f7cce54.tar.xz 337064 SHA256 887c5bc24b068efced7d5209367149ca27d8fea330cd5a5fff7767c353b00921 SHA512 d98790823408e09f3fa9946ceeeda48187dddd3302625fc546d64a4ecc89967235c550af23c05368a90d8dd2ceb38c092cd3130958132d18d30692342bd1151e WHIRLPOOL e5477deaf846a1c78fba313ab6f5fdc2b053fccdad8d096d1e29eebfa33da2196243d6d77818d7d8fe78a69208578ba3ea42c6a683bf52208be81ea67dae7bd0
41 DIST icedtea-3.4-shenandoah-d9a978177779.tar.xz 6866276 SHA256 0593a1105f0e1e59ec05298d608a2fa5d610a0e548e849ab013119f3b7a67229 SHA512 df658cea99bb306962fe393d6babc4e69b363f0e03d64ac90ef4ce8c14faec723cb6d338598e7b6739139f9e9aa447e3463fd9ab773fad95b5c5266955f5c53f WHIRLPOOL 8e0681fb8e843f6d05a0e82883c574574676689fcb9876fadb712c0ee64bcf6b29f4240b156e57a3e9548e0600b8218e2f1e86418ae993b02ed6f192d323ef22
42 -DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
43 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
44 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
45 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
46 -DIST icedtea6-1.13.13.tar.xz 4536860 SHA256 4fcfd0a4114f7b116e7a429894819b40bd43ee0935b90fd83978e1e3c8d2e92d SHA512 51e8c444fdcb5c14546b9e83d4c2173cbdf14ecaf5ac516a4a265f38282ebf47121e4f5afcab177225362dad58af35738eb37e1060d09d14918a0a92c0badd70 WHIRLPOOL d2f39a11722c861391a179cbbc517a9dfc8e00ecf407455d32f2abd6a9fdd7ffb822f511eadc22132c13a9c4c195be1ee17b8fd49bc59e7c3dde2f0c5ce40eaf
47 -DIST openjdk-6-src-b41-04_jan_2017.tar.xz 34402516 SHA256 8e34d451cec65fae8b4304651058ed4dc8d07bd45baa2f49780009097afc1a15 SHA512 263524e877b9398b8c67476cc527135939a62b74cf90f5f96bd8390e27943fa4ee99c95550e909433b7fe8a5c1f09208eae406514761cebc9bba6cf142d5ea0a WHIRLPOOL 3f40b603193d1764fd37336a4cf4a25c2be7ea2f59b151786369c182af4a296033535393e4f67ec3c5900c18540f3bdeeebfe9d6e20db821fc9f2a588e97ecc8
48
49 diff --git a/dev-java/icedtea/icedtea-6.1.13.13.ebuild b/dev-java/icedtea/icedtea-6.1.13.13.ebuild
50 deleted file mode 100644
51 index 3e24b6c3..00000000
52 --- a/dev-java/icedtea/icedtea-6.1.13.13.ebuild
53 +++ /dev/null
54 @@ -1,364 +0,0 @@
55 -# Copyright 1999-2017 Gentoo Foundation
56 -# Distributed under the terms of the GNU General Public License v2
57 -# $Id$
58 -# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
59 -
60 -# *********************************************************
61 -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
62 -# *********************************************************
63 -
64 -EAPI="6"
65 -SLOT="6"
66 -
67 -inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx
68 -
69 -ICEDTEA_VER=$(get_version_component_range 2-4)
70 -ICEDTEA_BRANCH=$(get_version_component_range 2-3)
71 -ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
72 -OPENJDK_BUILD="41"
73 -OPENJDK_DATE="04_jan_2017"
74 -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
75 -# Download cacao and jamvm regardless for use with EXTRA_ECONF
76 -CACAO_TARBALL="cacao-68fe50ac34ec.tar.gz"
77 -JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
78 -
79 -CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
80 -JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
81 -
82 -DROP_URL="http://icedtea.classpath.org/download/drops"
83 -
84 -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
85 -HOMEPAGE="http://icedtea.classpath.org"
86 -SRC_PKG="${ICEDTEA_PKG}.tar.xz"
87 -SRC_URI="
88 - http://icedtea.classpath.org/download/source/${SRC_PKG}
89 - https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
90 - ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
91 - ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
92 -
93 -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
94 -KEYWORDS="~amd64"
95 -RESTRICT="test"
96 -
97 -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
98 - jamvm javascript +jbootstrap kerberos libressl nsplugin +nss pax_kernel
99 - pulseaudio selinux smartcard source systemtap test +webstart zero"
100 -
101 -REQUIRED_USE="gtk? ( !headless-awt )"
102 -
103 -# Ideally the following were optional at build time.
104 -ALSA_COMMON_DEP="
105 - >=media-libs/alsa-lib-1.0"
106 -CUPS_COMMON_DEP="
107 - >=net-print/cups-1.2.12"
108 -X_COMMON_DEP="
109 - >=media-libs/giflib-4.1.6:=
110 - >=media-libs/libpng-1.2:0=
111 - >=x11-libs/libX11-1.1.3
112 - >=x11-libs/libXext-1.1.1
113 - >=x11-libs/libXi-1.1.3
114 - >=x11-libs/libXrender-0.9.4
115 - >=x11-libs/libXtst-1.0.3
116 - x11-libs/libXt
117 - x11-libs/libXcomposite"
118 -X_DEPEND="
119 - >=x11-libs/libXau-1.0.3
120 - >=x11-libs/libXdmcp-1.0.2
121 - >=x11-libs/libXinerama-1.0.2
122 - x11-proto/inputproto
123 - >=x11-proto/xextproto-7.1.1
124 - x11-proto/xineramaproto
125 - x11-proto/xproto"
126 -
127 -COMMON_DEP="
128 - app-misc/mime-types
129 - >=media-libs/freetype-2.3.5:2=
130 - >=media-libs/lcms-2.5
131 - >=sys-libs/zlib-1.2.3:=
132 - virtual/jpeg:0=
133 - javascript? ( dev-java/rhino:1.6 )
134 - kerberos? ( virtual/krb5 )
135 - nss? ( >=dev-libs/nss-3.12.5-r1 )
136 - systemtap? ( >=dev-util/systemtap-1 )"
137 -
138 -RDEPEND="${COMMON_DEP}
139 - !dev-java/icedtea6
140 - !dev-java/icedtea-web:6
141 - media-fonts/dejavu
142 - alsa? ( ${ALSA_COMMON_DEP} )
143 - cjk? (
144 - media-fonts/arphicfonts
145 - media-fonts/baekmuk-fonts
146 - media-fonts/lklug
147 - media-fonts/lohit-fonts
148 - media-fonts/sazanami
149 - )
150 - cups? ( ${CUPS_COMMON_DEP} )
151 - gtk? ( >=x11-libs/gtk+-2.8:2 )
152 - !headless-awt? ( ${X_COMMON_DEP} )
153 - selinux? ( sec-policy/selinux-java )
154 - smartcard? ( sys-apps/pcsc-lite )"
155 -
156 -# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
157 -# ca-certificates, perl and openssl are used for the cacerts keystore generation
158 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
159 - || (
160 - >=dev-java/gcj-jdk-4.3
161 - dev-java/icedtea:6
162 - )
163 - app-arch/cpio
164 - app-arch/unzip
165 - app-arch/zip
166 - app-misc/ca-certificates
167 - >=dev-java/ant-core-1.8.2
168 - dev-lang/perl
169 - >=dev-libs/libxslt-1.1.26
170 - !libressl? ( dev-libs/openssl )
171 - libressl? ( dev-libs/libressl )
172 - sys-apps/lsb-release
173 - virtual/pkgconfig
174 - pax_kernel? ( sys-apps/elfix )"
175 -
176 -PDEPEND="webstart? ( dev-java/icedtea-web:0 )
177 - nsplugin? ( dev-java/icedtea-web:0[nsplugin] )
178 - pulseaudio? ( dev-java/icedtea-sound )"
179 -
180 -S="${WORKDIR}"/${ICEDTEA_PKG}
181 -
182 -icedtea_check_requirements() {
183 - local CHECKREQS_DISK_BUILD
184 -
185 - if use doc; then
186 - CHECKREQS_DISK_BUILD="8500M"
187 - else
188 - CHECKREQS_DISK_BUILD="8000M"
189 - fi
190 -
191 - check-reqs_pkg_${EBUILD_PHASE}
192 -}
193 -
194 -pkg_pretend() {
195 - icedtea_check_requirements
196 -}
197 -
198 -pkg_setup() {
199 - icedtea_check_requirements
200 -
201 - JAVA_PKG_WANT_BUILD_VM="
202 - icedtea-6 gcj-jdk"
203 - JAVA_PKG_WANT_SOURCE="1.5"
204 - JAVA_PKG_WANT_TARGET="1.5"
205 -
206 - java-vm-2_pkg_setup
207 - java-pkg-2_pkg_setup
208 -}
209 -
210 -src_unpack() {
211 - unpack ${SRC_PKG}
212 -}
213 -
214 -src_configure() {
215 - # For bootstrap builds as the sandbox control file might not yet exist.
216 - addpredict /proc/self/coredump_filter
217 -
218 - # icedtea doesn't like some locales. #330433 #389717
219 - export LANG="C" LC_ALL="C"
220 -
221 - local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
222 - local vm=$(java-pkg_get-current-vm)
223 -
224 - # gcj-jdk ensures ecj is present.
225 - if use jbootstrap || has "${vm}" gcj-jdk; then
226 - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
227 - config+=" --enable-bootstrap"
228 - else
229 - config+=" --disable-bootstrap"
230 - fi
231 -
232 - # Use Zero if requested
233 - if use zero; then
234 - use_zero="yes"
235 - fi
236 -
237 - # Use JamVM if requested
238 - if use jamvm; then
239 - use_jamvm="yes"
240 - fi
241 -
242 - # Use CACAO if requested
243 - if use cacao; then
244 - use_cacao="yes"
245 - fi
246 -
247 - # Are we on a architecture with a HotSpot port?
248 - # In-tree JIT ports are available for amd64, arm, sparc and x86.
249 - if { use amd64 || use arm || use sparc || use x86; }; then
250 - hotspot_port="yes"
251 - fi
252 -
253 - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
254 - # Otherwise use CACAO on ppc and Zero on anything else
255 - if test "x${hotspot_port}" != "xyes"; then
256 - if { use ppc || use ppc64; }; then
257 - use_cacao="yes"
258 - else
259 - use_zero="yes"
260 - fi
261 - fi
262 -
263 - # Turn on JamVM if needed (non-HS archs) or requested
264 - if test "x${use_jamvm}" = "xyes"; then
265 - if test "x${hotspot_port}" = "xyes"; then
266 - ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
267 - ewarn 'If so, please rebuild with USE="-jamvm"'
268 - fi
269 - jamvm_config="--enable-jamvm"
270 - fi
271 -
272 - # Turn on CACAO if needed (non-HS archs) or requested
273 - if test "x${use_cacao}" = "xyes"; then
274 - if test "x${hotspot_port}" = "xyes"; then
275 - ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
276 - ewarn 'If so, please rebuild with USE="-cacao"'
277 - fi
278 - cacao_config="--enable-cacao"
279 - fi
280 -
281 - # Turn on Zero if needed (non-HS/CACAO archs) or requested
282 - if test "x${use_zero}" = "xyes"; then
283 - if test "x${hotspot_port}" = "xyes"; then
284 - ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
285 - fi
286 - zero_config="--enable-zero"
287 - fi
288 -
289 - config+=" --with-parallel-jobs=$(makeopts_jobs)"
290 -
291 - if use javascript ; then
292 - config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
293 - else
294 - config+=" --without-rhino"
295 - fi
296 -
297 - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
298 -
299 - econf ${config} \
300 - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
301 - --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
302 - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
303 - --with-jdk-home="$(java-config -O)" \
304 - --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
305 - --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
306 - --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
307 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
308 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
309 - --with-pkgversion="Gentoo ${PF}" \
310 - --disable-downloading --disable-Werror --disable-tests \
311 - --enable-system-lcms --enable-system-jpeg \
312 - --enable-system-zlib --disable-pulse-java --disable-systemtap-tests\
313 - $(use_enable !headless-awt system-gif) \
314 - $(use_enable !headless-awt system-png) \
315 - $(use_enable !debug optimizations) \
316 - $(use_enable doc docs) \
317 - $(use_enable kerberos system-kerberos) \
318 - $(use_enable nss) \
319 - $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
320 - $(use_enable systemtap) \
321 - ${zero_config} ${cacao_config} ${jamvm_config}
322 -}
323 -
324 -src_compile() {
325 - # Would use GENTOO_VM otherwise.
326 - export ANT_RESPECT_JAVA_HOME=TRUE
327 -
328 - # With ant >=1.8.2 all required tasks are part of ant-core
329 - export ANT_TASKS="none"
330 -
331 - emake
332 -}
333 -
334 -src_test() {
335 - # Use Xvfb for tests
336 - unset DISPLAY
337 -
338 - Xemake check
339 -}
340 -
341 -src_install() {
342 - local dest="/usr/$(get_libdir)/icedtea${SLOT}"
343 - local ddest="${ED}${dest#/}"
344 - dodir "${dest}"
345 -
346 - dodoc README NEWS AUTHORS
347 -
348 - cd openjdk.build/j2sdk-image || die
349 -
350 - if ! use alsa; then
351 - rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
352 - fi
353 -
354 - if use headless-awt ; then
355 - rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
356 - {,jre/}bin/policytool bin/appletviewer || die
357 - fi
358 -
359 - # Don't hide classes
360 - rm lib/ct.sym || die
361 -
362 - #402507
363 - mkdir jre/.systemPrefs || die
364 - touch jre/.systemPrefs/.system.lock || die
365 - touch jre/.systemPrefs/.systemRootModFile || die
366 -
367 - # doins doesn't preserve executable bits.
368 - cp -vRP bin include jre lib man "${ddest}" || die
369 -
370 - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
371 -
372 - if use doc; then
373 - docinto html
374 - dodoc -r ../docs/*
375 - fi
376 -
377 - if use examples; then
378 - cp -vRP demo sample "${ddest}" || die
379 - fi
380 -
381 - if use source; then
382 - cp src.zip "${ddest}" || die
383 - fi
384 -
385 - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
386 -
387 - # Fix the permissions.
388 - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
389 -
390 - # Needs to be done before generating cacerts
391 - java-vm_set-pax-markings "${ddest}"
392 -
393 - # We need to generate keystore - bug #273306
394 - einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
395 - mkdir "${T}/certgen" && cd "${T}/certgen" || die
396 - cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
397 - for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
398 - openssl x509 -text -in "${c}" >> all.crt || die
399 - done
400 - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
401 - cp -vRP cacerts "${ddest}/jre/lib/security/" || die
402 - chmod 644 "${ddest}/jre/lib/security/cacerts" || die
403 -
404 - java-vm_install-env "${FILESDIR}/icedtea.env.sh"
405 - java-vm_sandbox-predict /proc/self/coredump_filter
406 -}
407 -
408 -pkg_preinst() {
409 - if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
410 - # portage would preserve the symlink otherwise, related to bug #384397
411 - rm -f "${EROOT}/usr/lib/jvm/icedtea6"
412 - elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
413 - elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
414 - elog "If you had icedtea6 as system VM, the change should be automatic, however"
415 - elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
416 - elog "and the same holds for any user VM settings. Sorry for the inconvenience."
417 - fi
418 -}
419
420 diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild
421 deleted file mode 100644
422 index 8112b14f..00000000
423 --- a/dev-java/icedtea/icedtea-6.9999.ebuild
424 +++ /dev/null
425 @@ -1,366 +0,0 @@
426 -# Copyright 1999-2017 Gentoo Foundation
427 -# Distributed under the terms of the GNU General Public License v2
428 -# $Id$
429 -# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
430 -
431 -# *********************************************************
432 -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
433 -# *********************************************************
434 -
435 -EAPI="6"
436 -SLOT="6"
437 -
438 -inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing pax-utils prefix versionator virtualx
439 -
440 -ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
441 -ICEDTEA_BRANCH=$(get_version_component_range 1-3)
442 -OPENJDK_BUILD="41"
443 -OPENJDK_DATE="04_jan_2017"
444 -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
445 -# Download cacao and jamvm regardless for use with EXTRA_ECONF
446 -CACAO_TARBALL="cacao-68fe50ac34ec.tar.gz"
447 -JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
448 -
449 -CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
450 -JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
451 -
452 -DROP_URL="http://icedtea.classpath.org/download/drops"
453 -
454 -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
455 -HOMEPAGE="http://icedtea.classpath.org"
456 -SRC_URI="
457 - https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
458 - ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
459 - ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
460 -EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea6"
461 -
462 -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
463 -KEYWORDS=""
464 -
465 -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
466 - jamvm javascript +jbootstrap kerberos libressl nsplugin +nss pax_kernel
467 - pulseaudio selinux smartcard source systemtap test +webstart zero"
468 -
469 -REQUIRED_USE="gtk? ( !headless-awt )"
470 -
471 -# Ideally the following were optional at build time.
472 -ALSA_COMMON_DEP="
473 - >=media-libs/alsa-lib-1.0"
474 -CUPS_COMMON_DEP="
475 - >=net-print/cups-1.2.12"
476 -X_COMMON_DEP="
477 - >=media-libs/giflib-4.1.6:=
478 - >=media-libs/libpng-1.2:0=
479 - >=x11-libs/libX11-1.1.3
480 - >=x11-libs/libXext-1.1.1
481 - >=x11-libs/libXi-1.1.3
482 - >=x11-libs/libXrender-0.9.4
483 - >=x11-libs/libXtst-1.0.3
484 - x11-libs/libXt
485 - x11-libs/libXcomposite"
486 -X_DEPEND="
487 - >=x11-libs/libXau-1.0.3
488 - >=x11-libs/libXdmcp-1.0.2
489 - >=x11-libs/libXinerama-1.0.2
490 - x11-proto/inputproto
491 - >=x11-proto/xextproto-7.1.1
492 - x11-proto/xineramaproto
493 - x11-proto/xproto"
494 -
495 -COMMON_DEP="
496 - app-misc/mime-types
497 - >=media-libs/freetype-2.3.5:2=
498 - >=media-libs/lcms-2.5
499 - >=sys-libs/zlib-1.2.3:=
500 - virtual/jpeg:0=
501 - javascript? ( dev-java/rhino:1.6 )
502 - kerberos? ( virtual/krb5 )
503 - nss? ( >=dev-libs/nss-3.12.5-r1 )
504 - systemtap? ( >=dev-util/systemtap-1 )"
505 -
506 -RDEPEND="${COMMON_DEP}
507 - !dev-java/icedtea6
508 - !dev-java/icedtea-web:6
509 - media-fonts/dejavu
510 - alsa? ( ${ALSA_COMMON_DEP} )
511 - cjk? (
512 - media-fonts/arphicfonts
513 - media-fonts/baekmuk-fonts
514 - media-fonts/lklug
515 - media-fonts/lohit-fonts
516 - media-fonts/sazanami
517 - )
518 - cups? ( ${CUPS_COMMON_DEP} )
519 - gtk? ( >=x11-libs/gtk+-2.8:2 )
520 - !headless-awt? ( ${X_COMMON_DEP} )
521 - selinux? ( sec-policy/selinux-java )
522 - smartcard? ( sys-apps/pcsc-lite )"
523 -
524 -# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
525 -# ca-certificates, perl and openssl are used for the cacerts keystore generation
526 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
527 - || (
528 - >=dev-java/gcj-jdk-4.3
529 - dev-java/icedtea:6
530 - )
531 - app-arch/cpio
532 - app-arch/unzip
533 - app-arch/zip
534 - app-misc/ca-certificates
535 - >=dev-java/ant-core-1.8.2
536 - dev-lang/perl
537 - >=dev-libs/libxslt-1.1.26
538 - !libressl? ( dev-libs/openssl )
539 - libressl? ( dev-libs/libressl )
540 - sys-apps/lsb-release
541 - virtual/pkgconfig
542 - pax_kernel? ( sys-apps/elfix )"
543 -
544 -PDEPEND="webstart? ( dev-java/icedtea-web:0 )
545 - nsplugin? ( dev-java/icedtea-web:0[nsplugin] )
546 - pulseaudio? ( dev-java/icedtea-sound )"
547 -
548 -S="${WORKDIR}"/${ICEDTEA_PKG}
549 -
550 -icedtea_check_requirements() {
551 - local CHECKREQS_DISK_BUILD
552 -
553 - if use doc; then
554 - CHECKREQS_DISK_BUILD="8500M"
555 - else
556 - CHECKREQS_DISK_BUILD="8000M"
557 - fi
558 -
559 - check-reqs_pkg_${EBUILD_PHASE}
560 -}
561 -
562 -pkg_pretend() {
563 - icedtea_check_requirements
564 -}
565 -
566 -pkg_setup() {
567 - icedtea_check_requirements
568 -
569 - JAVA_PKG_WANT_BUILD_VM="
570 - icedtea-6 gcj-jdk"
571 - JAVA_PKG_WANT_SOURCE="1.5"
572 - JAVA_PKG_WANT_TARGET="1.5"
573 -
574 - java-vm-2_pkg_setup
575 - java-pkg-2_pkg_setup
576 -}
577 -
578 -src_unpack() {
579 - mercurial_src_unpack
580 -}
581 -
582 -src_prepare() {
583 - default
584 - eautoreconf
585 -}
586 -
587 -src_configure() {
588 - # For bootstrap builds as the sandbox control file might not yet exist.
589 - addpredict /proc/self/coredump_filter
590 -
591 - # icedtea doesn't like some locales. #330433 #389717
592 - export LANG="C" LC_ALL="C"
593 -
594 - local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
595 - local vm=$(java-pkg_get-current-vm)
596 -
597 - # gcj-jdk ensures ecj is present.
598 - if use jbootstrap || has "${vm}" gcj-jdk; then
599 - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
600 - config+=" --enable-bootstrap"
601 - else
602 - config+=" --disable-bootstrap"
603 - fi
604 -
605 - # Use Zero if requested
606 - if use zero; then
607 - use_zero="yes"
608 - fi
609 -
610 - # Use JamVM if requested
611 - if use jamvm; then
612 - use_jamvm="yes"
613 - fi
614 -
615 - # Use CACAO if requested
616 - if use cacao; then
617 - use_cacao="yes"
618 - fi
619 -
620 - # Are we on a architecture with a HotSpot port?
621 - # In-tree JIT ports are available for amd64, arm, sparc and x86.
622 - if { use amd64 || use arm || use sparc || use x86; }; then
623 - hotspot_port="yes"
624 - fi
625 -
626 - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
627 - # Otherwise use CACAO on ppc and Zero on anything else
628 - if test "x${hotspot_port}" != "xyes"; then
629 - if { use ppc || use ppc64; }; then
630 - use_cacao="yes"
631 - else
632 - use_zero="yes"
633 - fi
634 - fi
635 -
636 - # Turn on JamVM if needed (non-HS archs) or requested
637 - if test "x${use_jamvm}" = "xyes"; then
638 - if test "x${hotspot_port}" = "xyes"; then
639 - ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
640 - ewarn 'If so, please rebuild with USE="-jamvm"'
641 - fi
642 - jamvm_config="--enable-jamvm"
643 - fi
644 -
645 - # Turn on CACAO if needed (non-HS archs) or requested
646 - if test "x${use_cacao}" = "xyes"; then
647 - if test "x${hotspot_port}" = "xyes"; then
648 - ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
649 - ewarn 'If so, please rebuild with USE="-cacao"'
650 - fi
651 - cacao_config="--enable-cacao"
652 - fi
653 -
654 - # Turn on Zero if needed (non-HS/CACAO archs) or requested
655 - if test "x${use_zero}" = "xyes"; then
656 - if test "x${hotspot_port}" = "xyes"; then
657 - ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
658 - fi
659 - zero_config="--enable-zero"
660 - fi
661 -
662 - config+=" --with-parallel-jobs=$(makeopts_jobs)"
663 -
664 - if use javascript ; then
665 - config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
666 - else
667 - config+=" --without-rhino"
668 - fi
669 -
670 - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
671 -
672 - econf ${config} \
673 - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
674 - --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
675 - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
676 - --with-jdk-home="$(java-config -O)" \
677 - --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
678 - --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
679 - --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
680 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
681 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
682 - --with-pkgversion="Gentoo ${PF}" \
683 - --disable-downloading --disable-Werror --disable-tests \
684 - --enable-system-lcms --enable-system-jpeg \
685 - --enable-system-zlib --disable-pulse-java --disable-systemtap-tests\
686 - $(use_enable !headless-awt system-gif) \
687 - $(use_enable !headless-awt system-png) \
688 - $(use_enable !debug optimizations) \
689 - $(use_enable doc docs) \
690 - $(use_enable kerberos system-kerberos) \
691 - $(use_enable nss) \
692 - $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
693 - $(use_enable systemtap) \
694 - ${zero_config} ${cacao_config} ${jamvm_config}
695 -}
696 -
697 -src_compile() {
698 - # Would use GENTOO_VM otherwise.
699 - export ANT_RESPECT_JAVA_HOME=TRUE
700 -
701 - # With ant >=1.8.2 all required tasks are part of ant-core
702 - export ANT_TASKS="none"
703 -
704 - emake
705 -}
706 -
707 -src_test() {
708 - # Use Xvfb for tests
709 - unset DISPLAY
710 -
711 - Xemake check
712 -}
713 -
714 -src_install() {
715 - local dest="/usr/$(get_libdir)/icedtea${SLOT}"
716 - local ddest="${ED}${dest#/}"
717 - dodir "${dest}"
718 -
719 - dodoc README NEWS AUTHORS
720 -
721 - cd openjdk.build/j2sdk-image || die
722 -
723 - if ! use alsa; then
724 - rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
725 - fi
726 -
727 - if use headless-awt ; then
728 - rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
729 - {,jre/}bin/policytool bin/appletviewer || die
730 - fi
731 -
732 - # Don't hide classes
733 - rm lib/ct.sym || die
734 -
735 - #402507
736 - mkdir jre/.systemPrefs || die
737 - touch jre/.systemPrefs/.system.lock || die
738 - touch jre/.systemPrefs/.systemRootModFile || die
739 -
740 - # doins doesn't preserve executable bits.
741 - cp -vRP bin include jre lib man "${ddest}" || die
742 -
743 - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
744 -
745 - if use doc; then
746 - docinto html
747 - dodoc -r ../docs/*
748 - fi
749 -
750 - if use examples; then
751 - cp -vRP demo sample "${ddest}" || die
752 - fi
753 -
754 - if use source; then
755 - cp src.zip "${ddest}" || die
756 - fi
757 -
758 - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
759 -
760 - # Fix the permissions.
761 - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
762 -
763 - # Needs to be done before generating cacerts
764 - java-vm_set-pax-markings "${ddest}"
765 -
766 - # We need to generate keystore - bug #273306
767 - einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
768 - mkdir "${T}/certgen" && cd "${T}/certgen" || die
769 - cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
770 - for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
771 - openssl x509 -text -in "${c}" >> all.crt || die
772 - done
773 - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
774 - cp -vRP cacerts "${ddest}/jre/lib/security/" || die
775 - chmod 644 "${ddest}/jre/lib/security/cacerts" || die
776 -
777 - java-vm_install-env "${FILESDIR}/icedtea.env.sh"
778 - java-vm_sandbox-predict /proc/self/coredump_filter
779 -}
780 -
781 -pkg_preinst() {
782 - if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
783 - # portage would preserve the symlink otherwise, related to bug #384397
784 - rm -f "${EROOT}/usr/lib/jvm/icedtea6"
785 - elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
786 - elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
787 - elog "If you had icedtea6 as system VM, the change should be automatic, however"
788 - elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
789 - elog "and the same holds for any user VM settings. Sorry for the inconvenience."
790 - fi
791 -}