1 |
caster 11/11/04 11:19:30 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: icedtea-7.2.0-r1.ebuild |
5 |
Log: |
6 |
Version bump from the java-overlay, bug #382485. |
7 |
|
8 |
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.10 dev-java/icedtea/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?rev=1.10&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?rev=1.10&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?r1=1.9&r2=1.10 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/metadata.xml,v |
20 |
retrieving revision 1.9 |
21 |
retrieving revision 1.10 |
22 |
diff -u -r1.9 -r1.10 |
23 |
--- metadata.xml 22 Apr 2011 16:23:32 -0000 1.9 |
24 |
+++ metadata.xml 4 Nov 2011 11:19:30 -0000 1.10 |
25 |
@@ -15,7 +15,6 @@ |
26 |
<longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription> |
27 |
<use> |
28 |
<flag name="cacao">Use the CACAO virtual machine instead of HotSpot on x86, amd64 or SPARC architectures.</flag> |
29 |
- <flag name="hs19">Use the new version of HotSpot (19).</flag> |
30 |
<flag name="hs20">Use the new version of HotSpot (20).</flag> |
31 |
<flag name="jamvm">Use the JamVM virtual machine instead of HotSpot.</flag> |
32 |
<flag name="nio2">Enable backport of NIO2 to OpenJDK6.</flag> |
33 |
|
34 |
|
35 |
|
36 |
1.37 dev-java/icedtea/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.37&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.37&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.36&r2=1.37 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v |
45 |
retrieving revision 1.36 |
46 |
retrieving revision 1.37 |
47 |
diff -u -r1.36 -r1.37 |
48 |
--- ChangeLog 4 Nov 2011 09:47:02 -0000 1.36 |
49 |
+++ ChangeLog 4 Nov 2011 11:19:30 -0000 1.37 |
50 |
@@ -1,6 +1,11 @@ |
51 |
# ChangeLog for dev-java/icedtea |
52 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.36 2011/11/04 09:47:02 caster Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.37 2011/11/04 11:19:30 caster Exp $ |
55 |
+ |
56 |
+*icedtea-7.2.0-r1 (04 Nov 2011) |
57 |
+ |
58 |
+ 04 Nov 2011; Vlastimil Babka <caster@g.o> +icedtea-7.2.0-r1.ebuild: |
59 |
+ Version bump from the java-overlay, bug #382485. |
60 |
|
61 |
04 Nov 2011; Vlastimil Babka <caster@g.o> |
62 |
-files/6.1.10.2-371405-linux_version.patch, -files/6.1.9.6-sparc.patch: |
63 |
|
64 |
|
65 |
|
66 |
1.1 dev-java/icedtea/icedtea-7.2.0-r1.ebuild |
67 |
|
68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.1&view=markup |
69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.1&content-type=text/plain |
70 |
|
71 |
Index: icedtea-7.2.0-r1.ebuild |
72 |
=================================================================== |
73 |
# Copyright 1999-2011 Gentoo Foundation |
74 |
# Distributed under the terms of the GNU General Public License v2 |
75 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.1 2011/11/04 11:19:30 caster Exp $ |
76 |
# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org) |
77 |
|
78 |
# ********************************************************* |
79 |
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * |
80 |
# ********************************************************* |
81 |
|
82 |
EAPI="4" |
83 |
|
84 |
inherit flag-o-matic java-pkg-2 java-vm-2 pax-utils versionator |
85 |
|
86 |
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" |
87 |
SLOT="7" |
88 |
KEYWORDS="~amd64" |
89 |
|
90 |
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" |
91 |
ICEDTEA_VER="$(get_version_component_range 2-3)" |
92 |
ICEDTEA_PKG=icedtea-${ICEDTEA_VER} |
93 |
OPENJDK_TARBALL="0a76e5390e68.tar.gz" |
94 |
CORBA_TARBALL="4d9e4fb8af09.tar.gz" |
95 |
HOTSPOT_TARBALL="b28ae681bae0.tar.gz" |
96 |
JAXP_TARBALL="948e734135ea.tar.gz" |
97 |
JAXWS_TARBALL="a2ebfdc9db7e.tar.gz" |
98 |
JDK_TARBALL="2054526dd141.tar.gz" |
99 |
LANGTOOLS_TARBALL="9b85f1265346.tar.gz" |
100 |
CACAO_TARBALL="4549072ab2de.tar.gz" |
101 |
JAMVM_TARBALL="310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz" |
102 |
SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz |
103 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/${OPENJDK_TARBALL} |
104 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/${CORBA_TARBALL} |
105 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxp/archive/${JAXP_TARBALL} |
106 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/${JAXWS_TARBALL} |
107 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/${JDK_TARBALL} |
108 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/${HOTSPOT_TARBALL} |
109 |
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL} |
110 |
jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_TARBALL} )" |
111 |
HOMEPAGE="http://icedtea.classpath.org" |
112 |
S=${WORKDIR}/${ICEDTEA_PKG} |
113 |
|
114 |
# Missing options: |
115 |
# shark - needs adding |
116 |
IUSE="debug doc examples jamvm javascript +nsplugin pulseaudio systemtap +webstart zero" |
117 |
|
118 |
RDEPEND=">=net-print/cups-1.2.12 |
119 |
>=x11-libs/libX11-1.1.3 |
120 |
>=media-libs/freetype-2.3.5 |
121 |
>=media-libs/alsa-lib-1.0 |
122 |
>=x11-libs/gtk+-2.8:2 |
123 |
>=x11-libs/libXinerama-1.0.2 |
124 |
>=x11-libs/libXp-1.0.0 |
125 |
>=x11-libs/libXi-1.1.3 |
126 |
>=x11-libs/libXau-1.0.3 |
127 |
>=x11-libs/libXdmcp-1.0.2 |
128 |
>=x11-libs/libXtst-1.0.3 |
129 |
virtual/jpeg |
130 |
>=media-libs/libpng-1.2 |
131 |
>=media-libs/giflib-4.1.6 |
132 |
>=media-libs/lcms-2.2 |
133 |
>=sys-libs/zlib-1.2.3 |
134 |
x11-proto/inputproto |
135 |
x11-proto/xineramaproto |
136 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) |
137 |
javascript? ( dev-java/rhino:1.6 ) |
138 |
zero? ( virtual/libffi ) |
139 |
>=x11-libs/libXrender-0.9.4 |
140 |
systemtap? ( >=dev-util/systemtap-1 ) |
141 |
!dev-java/icedtea:0 |
142 |
sys-apps/attr |
143 |
>=dev-libs/glib-2.26 |
144 |
media-libs/fontconfig" |
145 |
|
146 |
# Additional dependencies for building: |
147 |
# zip: extract OpenJDK tarball, and needed by configure |
148 |
# ant, ecj, jdk: required to build Java code |
149 |
# Only ant-core-1.7.1-r2 and later contain a version of Ant that |
150 |
# properly respects environment variables, if the build |
151 |
# sets some environment variables. |
152 |
# ca-certificates, perl and openssl are used for the cacerts keystore generation |
153 |
# xext headers have two variants depending on version - bug #288855 |
154 |
# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 |
155 |
DEPEND="${RDEPEND} |
156 |
|| ( |
157 |
>=dev-java/gcj-jdk-4.3 |
158 |
>=dev-java/cacao-0.99.2 |
159 |
dev-java/icedtea:7 |
160 |
dev-java/icedtea-bin:6 |
161 |
dev-java/icedtea:6 |
162 |
) |
163 |
app-arch/zip |
164 |
>=dev-libs/libxslt-1.1.26 |
165 |
>=dev-java/ant-core-1.7.1-r2 |
166 |
dev-java/ant-nodeps |
167 |
app-misc/ca-certificates |
168 |
dev-lang/perl |
169 |
dev-libs/openssl |
170 |
sys-apps/lsb-release" |
171 |
# || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )" |
172 |
|
173 |
PDEPEND="webstart? ( dev-java/icedtea-web:7 ) |
174 |
nsplugin? ( dev-java/icedtea-web:7[nsplugin] )" |
175 |
|
176 |
# a bit of hack so the VM switching is triggered without causing dependency troubles |
177 |
JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5" |
178 |
JAVA_PKG_WANT_SOURCE="1.5" |
179 |
JAVA_PKG_WANT_TARGET="1.5" |
180 |
|
181 |
pkg_setup() { |
182 |
# Shark support disabled for now - still experimental and needs sys-devel/llvm |
183 |
# if use shark ; then |
184 |
# if ( ! use x86 && ! use sparc && ! use ppc ) ; then |
185 |
# eerror "The Shark JIT has known issues on 64-bit platforms. Please rebuild" |
186 |
# errror "without the shark USE flag turned on." |
187 |
# die "Rebuild without the shark USE flag on." |
188 |
# fi |
189 |
# if ( ! use zero ) ; then |
190 |
# eerror "The use of the Shark JIT is only applicable when used with the zero assembler port."; |
191 |
# die "Rebuild without the shark USE flag on or with the zero USE flag turned on." |
192 |
# fi |
193 |
# fi |
194 |
|
195 |
if use nsplugin && ! use webstart ; then |
196 |
elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message." |
197 |
fi |
198 |
|
199 |
if [[ "${MERGE_TYPE}" == "binary" ]]; then |
200 |
return |
201 |
fi |
202 |
|
203 |
# quite a hack since java-config does not provide a way for a package |
204 |
# to limit supported VM's for building and their preferred order |
205 |
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then |
206 |
einfo "Honoring user-set JAVA_PKG_FORCE_VM" |
207 |
elif has_version "<=dev-java/icedtea-7.2.0:7"; then |
208 |
JAVA_PKG_FORCE_VM="icedtea7" |
209 |
elif has_version ">dev-java/icedtea-7.2.0:7"; then |
210 |
JAVA_PKG_FORCE_VM="icedtea-7" |
211 |
elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then |
212 |
JAVA_PKG_FORCE_VM="icedtea6" |
213 |
elif has_version ">dev-java/icedtea-6.1.10.4:6"; then |
214 |
JAVA_PKG_FORCE_VM="icedtea-6" |
215 |
elif has_version dev-java/icedtea-bin:6; then |
216 |
JAVA_PKG_FORCE_VM="icedtea6-bin" |
217 |
elif has_version dev-java/gcj-jdk; then |
218 |
JAVA_PKG_FORCE_VM="gcj-jdk" |
219 |
elif has_version dev-java/cacao; then |
220 |
JAVA_PKG_FORCE_VM="cacao" |
221 |
else |
222 |
die "Unable to find a supported VM for building" |
223 |
fi |
224 |
|
225 |
einfo "Forced vm ${JAVA_PKG_FORCE_VM}" |
226 |
java-vm-2_pkg_setup |
227 |
java-pkg-2_pkg_setup |
228 |
|
229 |
# without this, access violation is thrown |
230 |
addpredict "/proc/self/coredump_filter" |
231 |
} |
232 |
|
233 |
src_unpack() { |
234 |
unpack ${ICEDTEA_PKG}.tar.gz |
235 |
} |
236 |
|
237 |
unset_vars() { |
238 |
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS |
239 |
} |
240 |
|
241 |
src_configure() { |
242 |
local config procs rhino_jar |
243 |
local vm=$(java-pkg_get-current-vm) |
244 |
|
245 |
if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" ]] ; then |
246 |
# We can't currently bootstrap with a IcedTea6 JVM :( |
247 |
config="${config} --disable-bootstrap" |
248 |
elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" && "${vm}" != "icedtea7" && "${vm}" != "icedtea-7" ]] ; then |
249 |
eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea." |
250 |
die "Install a GNU Classpath JDK (gcj-jdk, cacao)" |
251 |
fi |
252 |
|
253 |
# OpenJDK-specific parallelism support. |
254 |
procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/') |
255 |
if [[ -n ${procs} ]] ; then |
256 |
config="${config} --with-parallel-jobs=${procs}"; |
257 |
einfo "Configuring using --with-parallel-jobs=${procs}" |
258 |
fi |
259 |
|
260 |
if use_zero ; then |
261 |
config="${config} --enable-zero" |
262 |
else |
263 |
config="${config} --disable-zero" |
264 |
fi |
265 |
|
266 |
if use javascript ; then |
267 |
rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar); |
268 |
fi |
269 |
|
270 |
# CACAO disabled until it has OpenJDK7 support |
271 |
# if use cacao ; then |
272 |
# config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"; |
273 |
# fi |
274 |
|
275 |
if use jamvm ; then |
276 |
config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"; |
277 |
fi |
278 |
|
279 |
unset_vars |
280 |
|
281 |
econf ${config} \ |
282 |
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ |
283 |
--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \ |
284 |
--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \ |
285 |
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \ |
286 |
--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \ |
287 |
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \ |
288 |
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \ |
289 |
--with-jdk-home="$(java-config -O)" \ |
290 |
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ |
291 |
--disable-jdk-tests \ |
292 |
$(use_enable !debug optimizations) \ |
293 |
$(use_enable doc docs) \ |
294 |
$(use_with javascript rhino ${rhino_jar}) \ |
295 |
$(use_enable zero) \ |
296 |
$(use_enable pulseaudio pulse-java) \ |
297 |
$(use_enable systemtap) |
298 |
} |
299 |
|
300 |
src_compile() { |
301 |
# Newer versions of Gentoo's ant add |
302 |
# an environment variable so it works properly... |
303 |
export ANT_RESPECT_JAVA_HOME=TRUE |
304 |
|
305 |
# ant -diagnostics in Ant 1.8.0 fails without xerces+xalan |
306 |
# otherwise we try to load the least that's needed to avoid possible classpath collisions |
307 |
export ANT_TASKS="xerces-2 xalan ant-nodeps" |
308 |
|
309 |
emake -j 1 |
310 |
} |
311 |
|
312 |
src_install() { |
313 |
local dest="/usr/$(get_libdir)/icedtea${SLOT}" |
314 |
local ddest="${D}/${dest}" |
315 |
dodir "${dest}" |
316 |
|
317 |
local arch=${ARCH} |
318 |
|
319 |
dodoc README NEWS AUTHORS |
320 |
dosym "/usr/share/doc/${PF}" "/usr/share/doc/${PN}${SLOT}" |
321 |
|
322 |
cd "${S}/openjdk.build/j2sdk-image" || die |
323 |
|
324 |
# Don't hide classes |
325 |
rm -f lib/ct.sym |
326 |
|
327 |
if use doc ; then |
328 |
# java-pkg_dohtml needed for package-list #302654 |
329 |
java-pkg_dohtml -r ../docs/* || die "Failed to install documentation" |
330 |
fi |
331 |
|
332 |
# doins can't handle symlinks. |
333 |
cp -vRP bin include jre lib man "${ddest}" || die "failed to copy" |
334 |
|
335 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
336 |
# the heap by the JIT compiler. |
337 |
pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*) |
338 |
|
339 |
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README |
340 |
|
341 |
if use examples; then |
342 |
dodir "${dest}/share"; |
343 |
cp -vRP demo sample "${ddest}/share/" || die |
344 |
fi |
345 |
|
346 |
cp src.zip "${ddest}" || die |
347 |
|
348 |
# Fix the permissions. |
349 |
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die |
350 |
|
351 |
# We need to generate keystore - bug #273306 |
352 |
einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/" |
353 |
mkdir "${T}/certgen" && cd "${T}/certgen" || die |
354 |
cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die |
355 |
for c in /usr/share/ca-certificates/*/*.crt; do |
356 |
openssl x509 -text -in "${c}" >> all.crt || die |
357 |
done |
358 |
./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die |
359 |
cp -vRP cacerts "${ddest}/jre/lib/security/" || die |
360 |
chmod 644 "${ddest}/jre/lib/security/cacerts" || die |
361 |
|
362 |
sed -e "s#@SLOT@#${SLOT}#g" \ |
363 |
-e "s#@PV@#${ICEDTEA_VER}#g" \ |
364 |
-e "s#@LIBDIR@#$(get_libdir)#g" \ |
365 |
< "${FILESDIR}/icedtea.env" > "${T}/icedtea.env" |
366 |
set_java_env "${T}/icedtea.env" |
367 |
|
368 |
# bug #388127 |
369 |
dodir /etc/sandbox.d |
370 |
echo 'SANDBOX_PREDICT="/dev/random:/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}" |
371 |
} |
372 |
|
373 |
use_zero() { |
374 |
use zero || ( ! use amd64 && ! use x86 && ! use sparc ) |
375 |
} |
376 |
|
377 |
pkg_preinst() { |
378 |
if has_version "<=dev-java/icedtea-7.2.0:7"; then |
379 |
# portage would preserve the symlink otherwise, related to bug #384397 |
380 |
rm -f "${ROOT}/usr/lib/jvm/icedtea7" |
381 |
elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*" |
382 |
elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1" |
383 |
elog "If you had icedtea7 as system VM, the change should be automatic, however" |
384 |
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" |
385 |
elog "and the same holds for any user VM settings. Sorry for the inconvenience." |
386 |
fi |
387 |
} |
388 |
|
389 |
pkg_postinst() { |
390 |
# Set as default VM if none exists |
391 |
java-vm-2_pkg_postinst |
392 |
} |