Gentoo Archives: gentoo-commits

From: "Ralph Sennhauser (sera)" <sera@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.4.5.ebuild
Date: Mon, 03 Feb 2014 08:49:59
Message-Id: 20140203084954.585B72004C@flycatcher.gentoo.org
1 sera 14/02/03 08:49:54
2
3 Modified: ChangeLog
4 Added: icedtea-7.2.4.5.ebuild
5 Log:
6 Version bump
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)
9
10 Revision Changes Path
11 1.116 dev-java/icedtea/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.116&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.116&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.115&r2=1.116
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
20 retrieving revision 1.115
21 retrieving revision 1.116
22 diff -u -r1.115 -r1.116
23 --- ChangeLog 30 Jan 2014 20:58:13 -0000 1.115
24 +++ ChangeLog 3 Feb 2014 08:49:54 -0000 1.116
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-java/icedtea
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.115 2014/01/30 20:58:13 sera Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.116 2014/02/03 08:49:54 sera Exp $
30 +
31 +*icedtea-7.2.4.5 (03 Feb 2014)
32 +
33 + 03 Feb 2014; Ralph Sennhauser <sera@g.o> +icedtea-7.2.4.5.ebuild:
34 + Version bump
35
36 30 Jan 2014; Ralph Sennhauser <sera@g.o> icedtea-6.1.13.1.ebuild:
37 Fix sandbox violation #499746
38
39
40
41 1.1 dev-java/icedtea/icedtea-7.2.4.5.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.5.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.5.ebuild?rev=1.1&content-type=text/plain
45
46 Index: icedtea-7.2.4.5.ebuild
47 ===================================================================
48 # Copyright 1999-2014 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.5.ebuild,v 1.1 2014/02/03 08:49:54 sera Exp $
51 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
52
53 # *********************************************************
54 # * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
55 # *********************************************************
56
57 EAPI="5"
58
59 inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
60
61 ICEDTEA_VER=$(get_version_component_range 2-)
62 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
63 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
64 CORBA_TARBALL="3594dbde270d.tar.gz"
65 JAXP_TARBALL="8fe156ad49e2.tar.gz"
66 JAXWS_TARBALL="32ea8b1ed91a.tar.gz"
67 JDK_TARBALL="9db88c18e114.tar.gz"
68 LANGTOOLS_TARBALL="dabd37b7e295.tar.gz"
69 OPENJDK_TARBALL="410eb7fef869.tar.gz"
70 HOTSPOT_TARBALL="2cb58882dac3.tar.gz"
71 CACAO_TARBALL="e215e36be9fc.tar.gz"
72 JAMVM_TARBALL="jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz"
73
74 CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
75 JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
76 JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
77 JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
78 LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
79 OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
80 HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
81 CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
82 JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
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 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
90 -> ${OPENJDK_GENTOO_TARBALL}
91 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
92 -> ${CORBA_GENTOO_TARBALL}
93 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
94 -> ${JAXP_GENTOO_TARBALL}
95 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
96 -> ${JAXWS_GENTOO_TARBALL}
97 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
98 -> ${JDK_GENTOO_TARBALL}
99 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
100 -> ${HOTSPOT_GENTOO_TARBALL}
101 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
102 -> ${LANGTOOLS_GENTOO_TARBALL}
103 http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
104 http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
105
106 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"
107 SLOT="7"
108 KEYWORDS="~amd64 ~ia64 ~x86"
109
110 IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin
111 +nss pax_kernel pulseaudio +source test +webstart"
112
113 # Ideally the following were optional at build time.
114 ALSA_COMMON_DEP="
115 >=media-libs/alsa-lib-1.0"
116 CUPS_COMMON_DEP="
117 >=net-print/cups-1.2.12"
118 X_COMMON_DEP="
119 >=dev-libs/atk-1.30.0
120 >=dev-libs/glib-2.26
121 media-libs/fontconfig
122 >=media-libs/freetype-2.3.5:2=
123 >=x11-libs/cairo-1.8.8:=
124 x11-libs/gdk-pixbuf:2
125 >=x11-libs/gtk+-2.8:2=
126 >=x11-libs/libX11-1.1.3
127 >=x11-libs/libXext-1.1.1
128 >=x11-libs/libXi-1.1.3
129 >=x11-libs/libXrender-0.9.4
130 >=x11-libs/libXtst-1.0.3
131 >=x11-libs/pango-1.24.5"
132 X_DEPEND="
133 >=x11-libs/libXau-1.0.3
134 >=x11-libs/libXdmcp-1.0.2
135 >=x11-libs/libXinerama-1.0.2
136 x11-proto/inputproto
137 >=x11-proto/xextproto-7.1.1
138 x11-proto/xineramaproto
139 x11-proto/xproto"
140
141 COMMON_DEP="
142 >=media-libs/giflib-4.1.6:=
143 >=media-libs/lcms-2.5
144 >=media-libs/libpng-1.2:=
145 >=sys-libs/zlib-1.2.3:=
146 virtual/jpeg:0=
147 javascript? ( dev-java/rhino:1.6 )
148 nss? ( >=dev-libs/nss-3.12.5-r1 )
149 pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= )
150 kerberos? ( virtual/krb5 )
151 >=dev-util/systemtap-1"
152
153 # cups is needed for X. #390945 #390975
154 RDEPEND="${COMMON_DEP}
155 !dev-java/icedtea:0
156 X? (
157 ${CUPS_COMMON_DEP}
158 ${X_COMMON_DEP}
159 media-fonts/dejavu
160 cjk? (
161 media-fonts/arphicfonts
162 media-fonts/baekmuk-fonts
163 media-fonts/lklug
164 media-fonts/lohit-fonts
165 media-fonts/sazanami
166 )
167 )
168 alsa? ( ${ALSA_COMMON_DEP} )
169 cups? ( ${CUPS_COMMON_DEP} )"
170
171 # Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
172 # ca-certificates, perl and openssl are used for the cacerts keystore generation
173 # xext headers have two variants depending on version - bug #288855
174 # autoconf - as long as we use eautoreconf, version restrictions for bug #294918
175 DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
176 || (
177 >=dev-java/gcj-jdk-4.3
178 dev-java/icedtea-bin:7
179 dev-java/icedtea-bin:6
180 dev-java/icedtea:7
181 dev-java/icedtea:6
182 )
183 app-arch/cpio
184 app-arch/unzip
185 app-arch/zip
186 app-misc/ca-certificates
187 dev-lang/perl
188 >=dev-libs/libxslt-1.1.26
189 dev-libs/openssl
190 virtual/pkgconfig
191 sys-apps/attr
192 sys-apps/lsb-release
193 ${X_DEPEND}
194 pax_kernel? ( sys-apps/paxctl )"
195
196 PDEPEND="webstart? ( dev-java/icedtea-web:7 )
197 nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
198
199 S="${WORKDIR}"/${ICEDTEA_PKG}
200
201 pkg_setup() {
202 JAVA_PKG_WANT_BUILD_VM="
203 icedtea-7 icedtea-bin-7 icedtea7
204 icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
205 gcj-jdk"
206 JAVA_PKG_WANT_SOURCE="1.5"
207 JAVA_PKG_WANT_TARGET="1.5"
208
209 java-vm-2_pkg_setup
210 java-pkg-2_pkg_setup
211 }
212
213 src_unpack() {
214 unpack ${SRC_PKG}
215 }
216
217 java_prepare() {
218 # For bootstrap builds as the sandbox control file might not yet exist.
219 addpredict /proc/self/coredump_filter
220
221 # icedtea doesn't like some locales. #330433 #389717
222 export LANG="C" LC_ALL="C"
223 }
224
225 src_configure() {
226 local config bootstrap use_zero zero_config
227 local vm=$(java-pkg_get-current-vm)
228
229 # Whether to bootstrap
230 bootstrap="disable"
231 if use jbootstrap; then
232 bootstrap="enable"
233 fi
234
235 if has "${vm}" gcj-jdk; then
236 # gcj-jdk ensures ecj is present.
237 use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
238 bootstrap="enable"
239 local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
240 config="${config} --with-ecj-jar=${ecj_jar}"
241 fi
242
243 config="${config} --${bootstrap}-bootstrap"
244
245 # Use CACAO if requested
246 if use cacao; then
247 use_cacao="yes";
248 fi
249
250 # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
251 # Otherwise use CACAO
252 if ! has "${ARCH}" amd64 sparc x86 ; then
253 if has "${ARCH}" ppc ppc64 arm ; then
254 use_cacao="yes";
255 else
256 use_zero="yes";
257 fi
258 fi
259
260 # Turn on CACAO if needed (non-HS archs) or requested
261 if test "x${use_cacao}" = "xyes"; then
262 cacao_config="--enable-cacao";
263 fi
264
265 # Turn on Zero if needed (non-HS/CACAO archs) or requested
266 if test "x${use_zero}" = "xyes"; then
267 zero_config="--enable-zero";
268 fi
269
270 # OpenJDK-specific parallelism support. Bug #389791, #337827
271 # Implementation modified from waf-utils.eclass
272 # Note that "-j" is converted to "-j1" as the system doesn't support --load-average
273 local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
274 config="${config} --with-parallel-jobs=${procs}";
275 einfo "Configuring using --with-parallel-jobs=${procs}"
276
277 if use javascript ; then
278 config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
279 else
280 config="${config} --without-rhino"
281 fi
282
283 unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
284
285 econf ${config} \
286 --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
287 --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
288 --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
289 --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
290 --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
291 --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
292 --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
293 --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
294 --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
295 --with-jdk-home="$(java-config -O)" \
296 --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
297 --disable-downloading --disable-Werror \
298 --enable-system-lcms \
299 $(use_enable !debug optimizations) \
300 $(use_enable doc docs) \
301 $(use_enable nss) \
302 $(use_enable pulseaudio pulse-java) \
303 $(use_enable kerberos system-kerberos) \
304 $(use_with pax_kernel pax paxctl) \
305 ${zero_config} ${cacao_config}
306 }
307
308 src_compile() {
309 # Would use GENTOO_VM otherwise.
310 export ANT_RESPECT_JAVA_HOME=TRUE
311
312 # With ant >=1.8.2 all required tasks are part of ant-core
313 export ANT_TASKS="none"
314
315 emake
316 }
317
318 src_test() {
319 # Use Xvfb for tests
320 unset DISPLAY
321
322 Xemake check
323 }
324
325 src_install() {
326 local dest="/usr/$(get_libdir)/icedtea${SLOT}"
327 local ddest="${ED}/${dest}"
328 dodir "${dest}"
329
330 dodoc README NEWS AUTHORS
331 dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
332
333 cd openjdk.build/j2sdk-image || die
334
335 # Ensures HeadlessGraphicsEnvironment is used.
336 if ! use X; then
337 rm -r jre/lib/$(get_system_arch)/xawt || die
338 fi
339
340 # Don't hide classes
341 rm lib/ct.sym || die
342
343 #402507
344 mkdir jre/.systemPrefs || die
345 touch jre/.systemPrefs/.system.lock || die
346 touch jre/.systemPrefs/.systemRootModFile || die
347
348 # doins can't handle symlinks.
349 cp -vRP bin include jre lib man "${ddest}" || die
350
351 dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
352
353 if use doc; then
354 # java-pkg_dohtml needed for package-list #302654
355 java-pkg_dohtml -r ../docs/* || die
356 fi
357
358 if use examples; then
359 dodir "${dest}/share";
360 cp -vRP demo sample "${ddest}/share/" || die
361 fi
362
363 if use source; then
364 cp src.zip "${ddest}" || die
365 fi
366
367 # Fix the permissions.
368 find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
369
370 # Needs to be done before generating cacerts
371 java-vm_set-pax-markings "${ddest}"
372
373 # We need to generate keystore - bug #273306
374 einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
375 mkdir "${T}/certgen" && cd "${T}/certgen" || die
376 cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
377 for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
378 openssl x509 -text -in "${c}" >> all.crt || die
379 done
380 ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
381 cp -vRP cacerts "${ddest}/jre/lib/security/" || die
382 chmod 644 "${ddest}/jre/lib/security/cacerts" || die
383
384 # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
385 # install it anyway. Bug 390663
386 cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
387 eprefixify "${T}"/fontconfig.Gentoo.properties
388 insinto "${dest}"/jre/lib
389 doins "${T}"/fontconfig.Gentoo.properties
390
391 set_java_env "${FILESDIR}/icedtea.env"
392 if ! use X || ! use alsa || ! use cups; then
393 java-vm_revdep-mask "${dest}"
394 fi
395 java-vm_sandbox-predict /proc/self/coredump_filter
396 }
397
398 pkg_preinst() {
399 if has_version "<=dev-java/icedtea-7.2.0:7"; then
400 # portage would preserve the symlink otherwise, related to bug #384397
401 rm -f "${EROOT}/usr/lib/jvm/icedtea7"
402 elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
403 elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
404 elog "If you had icedtea7 as system VM, the change should be automatic, however"
405 elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
406 elog "and the same holds for any user VM settings. Sorry for the inconvenience."
407 fi
408 }