* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2015-09-07 22:43 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2015-09-07 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 6804ed55a394fbfbb178da4caccfb832a617357e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 22:42:34 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 22:43:42 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6804ed55
dev-java/icedtea: Patch CACAO for a dynamic maximum heap
It has been discovered that CACAO has been giving us memory problems
because it had a fixed default heap size of only 128MB, whereas
HotSpot uses a quarter of the physical RAM. I have patched CACAO to do
the same. See IcedTea bugs #2611 and #2612.
Package-Manager: portage-2.2.20.1
.../files/6-cacao-dynmaxheap-Makefile.patch | 10 ++++++
dev-java/icedtea/files/6-cacao-dynmaxheap.patch | 42 ++++++++++++++++++++++
.../files/7-cacao-dynmaxheap-Makefile.patch | 10 ++++++
dev-java/icedtea/files/7-cacao-dynmaxheap.patch | 42 ++++++++++++++++++++++
...-6.1.13.8.ebuild => icedtea-6.1.13.8-r1.ebuild} | 4 +++
...ea-7.2.5.6.ebuild => icedtea-7.2.5.6-r1.ebuild} | 4 +++
6 files changed, 112 insertions(+)
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
new file mode 100644
index 0000000..dc87ae8
--- /dev/null
+++ b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig 2015-07-28 07:21:16.447388803 -0700
++++ Makefile.in 2015-09-06 09:13:16.548000000 -0700
+@@ -182,6 +182,7 @@
+ @WITH_RHINO_TRUE@ patches/rhino.patch
+
+ @BUILD_CACAO_TRUE@am__append_22 = \
++@BUILD_CACAO_TRUE@ patches/cacao/dynmaxheap.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/memory.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/hotspot/original/memory.patch \
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
new file mode 100644
index 0000000..33b9818
--- /dev/null
+++ b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User James Le Cuirot <chewi@gentoo.org>
+# Date 1441543564 -3600
+# Sun Sep 06 13:46:04 2015 +0100
+# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
+# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
+Dynamically set the maximum heap size on Linux
+
+diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100
++++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100
+@@ -33,6 +33,10 @@
+ #include <errno.h>
+ #include <stdlib.h>
+
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "vm/types.h"
+
+ #include "arch.h"
+@@ -702,6 +706,19 @@
+ opt_heapstartsize = HEAP_STARTSIZE;
+ opt_stacksize = STACK_SIZE;
+
++#if defined(__LINUX__)
++ // Calculate 1/4 of the physical memory.
++ uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++ if (qmem > INT32_MAX) {
++ // More than 2GB will overflow so cap it.
++ opt_heapmaxsize = 2047 * 1024 * 1024;
++ } else if (qmem > HEAP_MAXSIZE) {
++ // Otherwise use this if greater than default (128MB).
++ opt_heapmaxsize = (s4) qmem;
++ }
++#endif
++
+ // First of all, parse the -XX options.
+
+ #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
new file mode 100644
index 0000000..13e3053
--- /dev/null
+++ b/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig 2015-07-22 14:54:37.116940780 -0700
++++ Makefile.in 2015-09-06 05:05:47.220000000 -0700
+@@ -134,6 +134,7 @@
+ @WITH_RHINO_TRUE@ patches/rhino.patch
+
+ @BUILD_CACAO_TRUE@am__append_10 = \
++@BUILD_CACAO_TRUE@ patches/cacao/dynmaxheap.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/memory.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/armhf.patch \
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
new file mode 100644
index 0000000..33b9818
--- /dev/null
+++ b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User James Le Cuirot <chewi@gentoo.org>
+# Date 1441543564 -3600
+# Sun Sep 06 13:46:04 2015 +0100
+# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
+# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
+Dynamically set the maximum heap size on Linux
+
+diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100
++++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100
+@@ -33,6 +33,10 @@
+ #include <errno.h>
+ #include <stdlib.h>
+
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "vm/types.h"
+
+ #include "arch.h"
+@@ -702,6 +706,19 @@
+ opt_heapstartsize = HEAP_STARTSIZE;
+ opt_stacksize = STACK_SIZE;
+
++#if defined(__LINUX__)
++ // Calculate 1/4 of the physical memory.
++ uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++ if (qmem > INT32_MAX) {
++ // More than 2GB will overflow so cap it.
++ opt_heapmaxsize = 2047 * 1024 * 1024;
++ } else if (qmem > HEAP_MAXSIZE) {
++ // Otherwise use this if greater than default (128MB).
++ opt_heapmaxsize = (s4) qmem;
++ }
++#endif
++
+ // First of all, parse the -XX options.
+
+ #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/icedtea-6.1.13.8.ebuild b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
similarity index 97%
rename from dev-java/icedtea/icedtea-6.1.13.8.ebuild
rename to dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
index 745d54b..ff53a11 100644
--- a/dev-java/icedtea/icedtea-6.1.13.8.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
@@ -152,6 +152,10 @@ src_unpack() {
}
java_prepare() {
+ # CACAO has a fixed default max heap of 128MB. This sucks.
+ cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
+ epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
+
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
diff --git a/dev-java/icedtea/icedtea-7.2.5.6.ebuild b/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
similarity index 98%
rename from dev-java/icedtea/icedtea-7.2.5.6.ebuild
rename to dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
index 06dbc68..d8a172f 100644
--- a/dev-java/icedtea/icedtea-7.2.5.6.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
@@ -196,6 +196,10 @@ src_unpack() {
}
java_prepare() {
+ # CACAO has a fixed default max heap of 128MB. This sucks.
+ cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
+ epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
+
if ! use cups; then
# CUPS is always needed at build time but you can at least make it dlopen.
sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2015-10-10 22:22 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2015-10-10 22:22 UTC (permalink / raw
To: gentoo-commits
commit: 23e8fa2dfbb91d9e3da98e3da7c607085df62406
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 22:22:05 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 22:22:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e8fa2d
dev-java/icedtea: Backport XShm fix from 2.7.0
Addresses bug #561500.
Package-Manager: portage-2.2.20.1
dev-java/icedtea/files/TryXShmAttach.patch | 201 +++++++++++++++++++++
...ea-7.2.6.1.ebuild => icedtea-7.2.6.1-r1.ebuild} | 4 +
2 files changed, 205 insertions(+)
diff --git a/dev-java/icedtea/files/TryXShmAttach.patch b/dev-java/icedtea/files/TryXShmAttach.patch
new file mode 100644
index 0000000..4157bb6
--- /dev/null
+++ b/dev-java/icedtea/files/TryXShmAttach.patch
@@ -0,0 +1,201 @@
+
+# HG changeset patch
+# User andrew
+# Date 1438275152 -3600
+# Node ID a2334007f1a8504d2bd4a2c2a037732c289649c3
+# Parent ab23850139cb2c666e613010842a1f984b184a3a
+PR2568: openjdk causes a full desktop crash on RHEL 6 i586
+Summary: Re-apply "8025775: JNI warnings in TryXShmAttach"; some changes lost in bad merge changeset 4b26f93b23ba
+
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XConstants.java
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Thu Jul 30 17:52:32 2015 +0100
+@@ -699,9 +699,4 @@
+ public static final long XkbModifierMapMask = (1L<<2);
+ public static final long XkbVirtualModsMask = (1L<<6); //server map
+
+- /*****************************************************************
+- * X SHARED MEMORY EXTENSION FUNCTIONS
+- *****************************************************************/
+-
+- public static final int X_ShmAttach = 1;
+ }
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XErrorHandler.java
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Thu Jul 30 17:52:32 2015 +0100
+@@ -41,29 +41,6 @@
+ return XErrorHandlerUtil.SAVED_XERROR_HANDLER(display, err);
+ }
+ }
+-
+- /**
+- * This is a base synthetic error handler containing a boolean flag which allows
+- * to show that an error is handled or not.
+- */
+- public static class XErrorHandlerWithFlag extends XBaseErrorHandler {
+- private volatile boolean errorOccurred = false;
+-
+- public boolean getErrorOccurredFlag() {
+- return errorOccurred;
+- }
+-
+- /**
+- * Sets an internal boolean flag to a particular value. Should be always called
+- * with {@code false} value of the parameter {@code errorOccurred} before this
+- * error handler is set as current.
+- * @param errorOccurred {@code true} to indicate that an error was handled,
+- * {@code false} to reset the internal boolean flag
+- */
+- public void setErrorOccurredFlag(boolean errorOccurred) {
+- this.errorOccurred = errorOccurred;
+- }
+- }
+
+ /*
+ * Instead of validating window id, we simply call XGetWindowProperty,
+@@ -99,75 +76,4 @@
+ return theInstance;
+ }
+ }
+-
+- /**
+- * This is a synthetic error handler for errors generated by the native function
+- * {@code XShmAttach}. If an error is handled, an internal boolean flag of the
+- * handler is set to {@code true}.
+- */
+- public static final class XShmAttachHandler extends XErrorHandlerWithFlag {
+- private XShmAttachHandler() {}
+-
+- @Override
+- public int handleError(long display, XErrorEvent err) {
+- if (err.get_minor_code() == XConstants.X_ShmAttach) {
+- setErrorOccurredFlag(true);
+- return 0;
+- }
+- return super.handleError(display, err);
+- }
+-
+- // Shared instance
+- private static XShmAttachHandler theInstance = new XShmAttachHandler();
+- public static XShmAttachHandler getInstance() {
+- return theInstance;
+- }
+- }
+-
+- /**
+- * This is a synthetic error handler for {@code BadAlloc} errors generated by the
+- * native {@code glX*} functions. Its internal boolean flag is set to {@code true},
+- * if an error is handled.
+- */
+- public static final class GLXBadAllocHandler extends XErrorHandlerWithFlag {
+- private GLXBadAllocHandler() {}
+-
+- @Override
+- public int handleError(long display, XErrorEvent err) {
+- if (err.get_error_code() == XConstants.BadAlloc) {
+- setErrorOccurredFlag(true);
+- return 0;
+- }
+- return super.handleError(display, err);
+- }
+-
+- private static GLXBadAllocHandler theInstance = new GLXBadAllocHandler();
+- public static GLXBadAllocHandler getInstance() {
+- return theInstance;
+- }
+- }
+-
+- /**
+- * This is a synthetic error handler for errors generated by the native function
+- * {@code XChangeWindowAttributes}. If an error is handled, an internal boolean
+- * flag of the handler is set to {@code true}.
+- */
+- public static final class XChangeWindowAttributesHandler extends XErrorHandlerWithFlag {
+- private XChangeWindowAttributesHandler() {}
+-
+- @Override
+- public int handleError(long display, XErrorEvent err) {
+- if ((err.get_request_code() == XProtocolConstants.X_ChangeWindowAttributes) &&
+- (err.get_error_code() == XConstants.BadAccess)) {
+- setErrorOccurredFlag(true);
+- return 0;
+- }
+- return super.handleError(display, err);
+- }
+-
+- private static XChangeWindowAttributesHandler theInstance = new XChangeWindowAttributesHandler();
+- public static XChangeWindowAttributesHandler getInstance() {
+- return theInstance;
+- }
+- }
+ }
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_GraphicsEnv.h
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Thu Jul 30 17:52:32 2015 +0100
+@@ -54,7 +54,7 @@
+
+ void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps);
+ void resetXShmAttachFailed();
+-jboolean TryXShmAttach(JNIEnv *env, Display *display, XShmSegmentInfo *shminfo);
++jboolean isXShmAttachFailed();
+
+ #endif /* MITSHM */
+
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_xembed_server.c
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Thu Jul 30 17:52:32 2015 +0100
+@@ -644,19 +644,12 @@
+ return dim;
+ }
+
+-Boolean isMapped(JNIEnv* env, Window w) {
++Boolean isMapped(Window w) {
+ XWindowAttributes attr;
+ Status status = 0;
+- jboolean errorOccurredFlag;
+- jobject errorHandlerRef;
+- jobject savedError;
+- unsigned char xerror_code;
+-
+- EXEC_WITH_XERROR_HANDLER(env, "sun/awt/X11/XErrorHandler$IgnoreBadWindowHandler",
+- "()Lsun/awt/X11/XErrorHandler$IgnoreBadWindowHandler;", JNI_FALSE,
+- errorHandlerRef, errorOccurredFlag,
+- status = XGetWindowAttributes(awt_display, w, &attr));
+- xerror_code = GET_XERROR_CODE(env, savedError);
++ WITH_XERROR_HANDLER(xerror_ignore_bad_window);
++ status = XGetWindowAttributes(awt_display, w, &attr);
++ RESTORE_XERROR_HANDLER;
+ if (status == 0 || xerror_code != Success) {
+ return False;
+ }
+@@ -692,7 +685,7 @@
+ sdata->version = *data;
+ flags = *(data+1);
+ new_mapped = (flags & XEMBED_MAPPED) != 0;
+- currently_mapped = isMapped(env, sdata->handle);
++ currently_mapped = isMapped(sdata->handle);
+ if (new_mapped != currently_mapped) {
+ if (new_mapped) {
+ XMapWindow(awt_display, sdata->handle);
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Thu Jul 30 17:52:32 2015 +0100
+@@ -551,8 +551,6 @@
+ {
+ XImage *img = NULL;
+ XShmSegmentInfo *shminfo;
+- JNIEnv* env;
+- jboolean xShmAttachResult;
+
+ shminfo = malloc(sizeof(XShmSegmentInfo));
+ if (shminfo == NULL) {
+@@ -603,7 +601,7 @@
+ */
+ shmctl(shminfo->shmid, IPC_RMID, 0);
+
+- if (xShmAttachResult == JNI_FALSE) {
++ if (isXShmAttachFailed() == JNI_TRUE) {
+ J2dRlsTraceLn1(J2D_TRACE_ERROR,
+ "X11SD_SetupSharedSegment XShmAttach has failed: %s",
+ strerror(errno));
+
diff --git a/dev-java/icedtea/icedtea-7.2.6.1.ebuild b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
similarity index 98%
rename from dev-java/icedtea/icedtea-7.2.6.1.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
index 2027cea..9645c54 100644
--- a/dev-java/icedtea/icedtea-7.2.6.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
@@ -284,6 +284,10 @@ src_configure() {
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+ # https://bugs.gentoo.org/show_bug.cgi?id=561500
+ ln -s "${FILESDIR}/TryXShmAttach.patch" || die
+ export DISTRIBUTION_PATCHES="TryXShmAttach.patch"
+
econf ${config} \
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2015-11-14 22:36 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2015-11-14 22:36 UTC (permalink / raw
To: gentoo-commits
commit: 2436b440b61db32787500d180cedaa482ba4aeeb
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 22:30:49 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 22:30:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2436b440
dev-java/icedtea: Version bump to 7.2.6.2
This version works with CACAO so the ~ppc keyword is restored. There
are still problems with ~ppc64. :(
Sorry for changing the X/awt flag again but upstream preferred the
term headless, which is technically more accurate than awt, so I
compromised and went with headless-awt.
Package-Manager: portage-2.2.20.1
dev-java/icedtea/Manifest | 8 +
dev-java/icedtea/files/7-cacao-dynmaxheap.patch | 28 +-
dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild | 416 ++++++++++++++++++++++++
dev-java/icedtea/metadata.xml | 1 +
4 files changed, 439 insertions(+), 14 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 366d921..b405ad2 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -8,13 +8,21 @@ DIST icedtea-2.5-langtools-a6d3d79b4547.tar.bz2 1702391 SHA256 9f272f88ea0e8c090
DIST icedtea-2.5-openjdk-44f140fd2873.tar.bz2 127517 SHA256 d100158d10a47b064f700f516874c987f105e05947e580d5a143e00fb0b30fad SHA512 82bceecd1fb29b184ea45e5cfbf819b497707e041bc8d25a4ca8447e736db5f5d859dd9ad0129ba2fe300ce3d2ace18d8e528967ec43e467ef12991a860ea5d3 WHIRLPOOL e037bbbd9f85d81ce57759e68f40116db3178a43f4260806e0734fc2a1cd05f86f43cdd82aacaa8f4780e75a1ec7c7e0a7780baf722803a0a711506f0ba847f2
DIST icedtea-2.5.6.tar.xz 2034152 SHA256 bb3c7e9fd372c737849d9d3129d935174492a0d924a2801223c822426338b8c4 SHA512 773601e4fc08d9a448f6f306e5678eca6f0b5b4704cdca66a40434de6e6b8208bc826e2a63235160b6b88bd92d746f8f7d1a74cfcfc0eaa58417ac3c8cb8aeb3 WHIRLPOOL 2443d7e1387f7d4d9f5b05d85a1768c9346e394713333862e62e24585091aaab0d74f9099c8aa1bd6add5b4cd5179132c238021f1a40576c7a40de43ab170bce
DIST icedtea-2.6-corba-2545636482d6.tar.bz2 1071895 SHA256 cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8 SHA512 16a0bd71db484cd948ef3e941566af5b63d657f4d946caed0cef2fb104680beb21bd8633a6f48501c987cedb7949d7228ca7957e5fae3f4adc9ec48050193a12 WHIRLPOOL 98a317a85c4eed1098c7391f67e6687869337a1576bedc65ec4ddfde5885b4c514d12a5aebdac20a70970bb4c79d8b14f7bc153bf0b105b747f4e63ac79c3b79
+DIST icedtea-2.6-corba-a4d55c5cec23.tar.bz2 1072249 SHA256 92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af SHA512 819974b10fe3d0ba15e45da843b3bc908e7caafb9fe264c43026bfa1a10daecef6e4cf23bd486f89cae0d6952ef812a170cf297a934679fc6dec29ca941c4826 WHIRLPOOL 69317e8f7d426cd338a1c698251b17bd6dc27d5010288cfacc008c3029b1ababc66541c4af6c5b8c12e5755503dd50e36dc4ab173851811bc3162b7d59f55bd5
DIST icedtea-2.6-hotspot-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
+DIST icedtea-2.6-hotspot-f40363c11191.tar.bz2 8164274 SHA256 984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a SHA512 37c80f977b22e6cab2bda5c2f579f016feb0f910bc5c7b4426f22983e74eb53c6b495681301cfd60e0773034c93ca2a60af512275cff4851a2857c2eb338b769 WHIRLPOOL 0c914f92902b982a0a85dae119d33cfd0485a025f80e0f2442c817e658341ac7bc8ab2b4e512a67aaf33027e0bf378386925f498d7400054cf80ec4efeac66b3
+DIST icedtea-2.6-jaxp-f1202fb27695.tar.bz2 2733459 SHA256 94cda3ba29ab3cd36d50f2e6c98a5e250eb6372379e171288b3022b978136fc0 SHA512 d0aa1a744b3f5522fe2264af26766a3945d7b5e4555b229a9f837b457bafe068111fdae6ac3d7349ce8907e0b1c747a0b31a11936e4794f646b5827cca5cde0c WHIRLPOOL f447ad445ea9abc5dffd3c49da50ca1063f59bfdaedb4702bcc48a6bfe217794cc8eae16f2cdfc8fb455104f47f6cccb40dbcf959077a9d33f1d34f18901e920
DIST icedtea-2.6-jaxp-ffbe529eeac7.tar.bz2 2737160 SHA256 c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb SHA512 1d8e68f0118f0e8465e333a8edd8aa9fdc16591c62bf4cc5c7791fb7f9acb97b9c6290fa4879a13138a68cb8b4fa93534cef3ebaee7bb8f3c0565595a3228493 WHIRLPOOL e85c5840883eaef4b1ebbb2dd0bae7d82457e01b6591653ac8d2d12a045f0736cb85b4c056a33614df7bb3b63cd61cf9e7caecdb5dae5f1d6be4f7ed1456cb53
+DIST icedtea-2.6-jaxws-14c411b1183c.tar.bz2 2022452 SHA256 14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4 SHA512 3dd649f7565a449e831f14c2242e0fe9126f62380aa166bff627557774656c1604f8512ec93ec3ae243a851000b0fc014767de8ad58df8bb8892c88b8465d0e0 WHIRLPOOL 41665b394fc3ba3657e61cb3f45c43bfdce3e9c9a44f0a68ddc25bf19994c275da43c1f3b01f0fe96ff63d27901a529ff10183fa0d7c28196af3d8d08570a059
DIST icedtea-2.6-jaxws-b9776fab65b8.tar.bz2 2021243 SHA256 2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f SHA512 0d5fc0001571381d151033b4e8ca98658bed3943c34faafc73ffea2d537d44b433ad49e246fc00335828418fc6e1c40d75fd1ee2280ebf0bf4014b4551f80bb0 WHIRLPOOL f35173656c30525678a1a09a5b30ef019816ee006e7c0682c3852df7a92523eef28b936418805d6dc874a31db3d3ddd1d02938227a8ba6b9080d17239c68ff74
DIST icedtea-2.6-jdk-61d3e001dee6.tar.bz2 32421128 SHA256 a8083e75e14ddb4575bf2cd733e80a0074201b45d8debbe04f84564b32875363 SHA512 d5921683a63cca12fb73224ddd248ae37a986af1f9df131a130fb6f2f808631730298770382a90468b136c2bedb699985d129acb7e0fa2de662ab7543bcfba4c WHIRLPOOL 17d84d00f39774e08ba2934fd3e59cf5a372d0a8180576b2dbe6add617f36482cbd31f6d982e0b50b27fea54b9d35aec8552ab8d399cf7bd75047d4e55c1356d
+DIST icedtea-2.6-jdk-db69ae53157a.tar.bz2 32431054 SHA256 7ad801d5f6b61818c78f2f39931df24d8c6f6a1c821180c998975ac884eb8af1 SHA512 8107583bd87227460d030f0cab87d526e8aa097f073ccedb21eb634affc9e22ae908b722d92f9c9357d2d3f50c65a48a9f5b62cd86845dbdfd37bbc0750edff2 WHIRLPOOL 36a2cb4a23bbf14683c65c53b30dff1af9858d45a25a2bb55e4308d30d6042de3d27875c9fdc8a8a56b8fe707da437469ebbad07868061bd8ccad97853a0a66a
+DIST icedtea-2.6-langtools-73356b81c5c7.tar.bz2 1710526 SHA256 a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335 SHA512 e049b6ec3abf28de05e96c882add05e87ea2edb75219e94739e4ea2e543166c9a663be43a2c2c82c95fe14b457eb675b8d1b96a4a289888941cd0b1b67b7539a WHIRLPOOL 78346964728729d3b4bdd87b9dbd30097ee6ce68f5872ea1878c288aff31a9cac25120ab485cf4c94b6a0d3a2d825893cbeee99b9021fea0601bd0c2fdbf455e
DIST icedtea-2.6-langtools-9c6e1de67d7d.tar.bz2 1710699 SHA256 6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43 SHA512 38136bba4d52b8de60e9a38f6ad47253d7513e46d82830ebb8f2f8659f66f99b7e3d7c4ad31c604cc5c516f1de331f2cdaf0ab0b37cff1dfd327c25ccc0f246f WHIRLPOOL 697447e27419d265a4e3f178f665ba59ba11ae0865acb4133c3e20096501b119b10c566c3a15ab5bd8b83a96fa48de36ca7be41cab92cff73c2e269e470bf333
DIST icedtea-2.6-openjdk-39b2c4354d0a.tar.bz2 129720 SHA256 0168a0174ee47407139ee32458c4d2a298ba4f44260343b209250156e4da463f SHA512 b17315b58d6662953f7a6d73eb222a5a81165f55bed2f48f3d3915a169e8c8e503b5f22c59fce5cd3202ed2392f946f8701d9cff92d235ae44696d370f2efd28 WHIRLPOOL 5f14c467228f0a96c4b2e9b67a64836d871fbbfa13daec5b77adb8b39d8db4d20d18130f548c838826d58523f1cdc7972744ddbb564d07dc0fe27f6fa456a629
+DIST icedtea-2.6-openjdk-601ca7147b8c.tar.bz2 129844 SHA256 4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49 SHA512 e3a61447569e39817e7c7ebf0a8fadaf0c708dfee2815a8f576b6d5fa91479ecf2f7fd30285b9d18c8286f3911f2ddc226d8f8da1219da8c2c80fa1fbf47607c WHIRLPOOL 8397f49988174b2027bcb3674981260d0e6651cded064baf8067820eb6dca6c12d0bceb94b86e83b856455b008a7ca517e04be5820dee4dec63a4b8397e07efd
DIST icedtea-2.6.1.tar.xz 2049108 SHA256 cce4fac1e729690e986ef6f6d1c47b507f622a61da33d57d2b0a8c12e23e2068 SHA512 b465a025cd44c5395b43067042882cf272f5a9c71f06380a9bc4dedbd5e99c512161c84eaad8175aeb87d0477cd568aca4968862f02b9bd969736d2ee904b990 WHIRLPOOL 682dc4e4b14a604b1f30bf4a315ec56e91fddb72445dfe4110517e0e0dc5c4deb68565accf0600e6959febd818161078f1c65cf74a87e848c803820afce2bdb1
+DIST icedtea-2.6.2.tar.xz 2074196 SHA256 bee8565c507a484ea876b62474aec379ac0e434acb9de8213279f47e1fe22076 SHA512 30772a71b53afb5f6acfcf8e31fd8c2ce25d056669b82af0024fb3e6623e27cbcc158ab39c7157e78e11949389fe576e220d8f70f32d98456464b53d4ee2ed51 WHIRLPOOL 32028cbd37fcfc9d2f1378938e7a7d6a34d9c03295fbfa0ac7f02c9e9c32933a3668947b7fa0b260bfb73b381a5297bc3cef26657534aded62689c2d2621b99c
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
index 33b9818..edce1e8 100644
--- a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
+++ b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
@@ -1,26 +1,26 @@
# HG changeset patch
# User James Le Cuirot <chewi@gentoo.org>
-# Date 1441543564 -3600
-# Sun Sep 06 13:46:04 2015 +0100
-# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
-# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
+# Date 1441541110 -3600
+# Sun Sep 06 13:05:10 2015 +0100
+# Node ID 80e5553df66e3abb3680f747cbb8e32b394b4211
+# Parent 468081e3e037df27b6427aa298dfaaa20f4ba4bf
Dynamically set the maximum heap size on Linux
-diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100
-+++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100
-@@ -33,6 +33,10 @@
- #include <errno.h>
- #include <stdlib.h>
+diff -r 468081e3e037 -r 80e5553df66e src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp Wed Jun 10 19:52:58 2015 +0200
++++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:05:10 2015 +0100
+@@ -32,6 +32,10 @@
+ #include <stdint.h>
+ #include <inttypes.h>
+#if defined(__LINUX__)
+#include <unistd.h>
+#endif
+
- #include "vm/types.h"
+ #include "md-abi.hpp"
- #include "arch.h"
-@@ -702,6 +706,19 @@
+ #include "mm/codememory.hpp"
+@@ -690,6 +694,19 @@
opt_heapstartsize = HEAP_STARTSIZE;
opt_stacksize = STACK_SIZE;
@@ -38,5 +38,5 @@ diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
+#endif
+
// First of all, parse the -XX options.
+ options_xx(vm_args);
- #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild
new file mode 100644
index 0000000..9aed560
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild
@@ -0,0 +1,416 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+SLOT="7"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-4)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="a4d55c5cec23.tar.bz2"
+JAXP_TARBALL="f1202fb27695.tar.bz2"
+JAXWS_TARBALL="14c411b1183c.tar.bz2"
+JDK_TARBALL="db69ae53157a.tar.bz2"
+LANGTOOLS_TARBALL="73356b81c5c7.tar.bz2"
+OPENJDK_TARBALL="601ca7147b8c.tar.bz2"
+HOTSPOT_TARBALL="f40363c11191.tar.bz2"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+ http://icedtea.classpath.org/download/source/${SRC_PKG}
+ ${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
+ ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+ ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+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"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+RESTRICT="test"
+
+IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
+ jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
+ pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
+
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+ >=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+ >=net-print/cups-1.2.12"
+X_COMMON_DEP="
+ >=media-libs/giflib-4.1.6:=
+ >=media-libs/libpng-1.2:0=
+ >=x11-libs/libX11-1.1.3
+ >=x11-libs/libXext-1.1.1
+ >=x11-libs/libXi-1.1.3
+ >=x11-libs/libXrender-0.9.4
+ >=x11-libs/libXtst-1.0.3
+ x11-libs/libXt"
+X_DEPEND="
+ >=x11-libs/libXau-1.0.3
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXinerama-1.0.2
+ x11-proto/inputproto
+ >=x11-proto/xextproto-7.1.1
+ x11-proto/xineramaproto
+ x11-proto/xproto"
+
+COMMON_DEP="
+ >=dev-libs/glib-2.26:2
+ >=dev-util/systemtap-1
+ media-libs/fontconfig
+ >=media-libs/freetype-2.5.3:2=[infinality?]
+ >=media-libs/lcms-2.5
+ >=sys-libs/zlib-1.2.3:=
+ virtual/jpeg:0=
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8:=
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2=
+ >=x11-libs/pango-1.24.5
+ )
+ javascript? ( dev-java/rhino:1.6 )
+ kerberos? ( virtual/krb5 )
+ nss? ( >=dev-libs/nss-3.12.5-r1 )
+ sctp? ( net-misc/lksctp-tools )
+ smartcard? ( sys-apps/pcsc-lite )
+ sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+ !dev-java/icedtea:0
+ !dev-java/icedtea-web:7
+ >=gnome-base/gsettings-desktop-schemas-3.12.2
+ media-fonts/dejavu
+ alsa? ( ${ALSA_COMMON_DEP} )
+ cjk? (
+ media-fonts/arphicfonts
+ media-fonts/baekmuk-fonts
+ media-fonts/lklug
+ media-fonts/lohit-fonts
+ media-fonts/sazanami
+ )
+ cups? ( ${CUPS_COMMON_DEP} )
+ !headless-awt? ( ${X_COMMON_DEP} )
+ selinux? ( sec-policy/selinux-java )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+ || (
+ >=dev-java/gcj-jdk-4.3
+ dev-java/icedtea-bin:7
+ dev-java/icedtea-bin:6
+ dev-java/icedtea:7
+ dev-java/icedtea:6
+ )
+ app-arch/cpio
+ app-arch/unzip
+ app-arch/zip
+ app-misc/ca-certificates
+ >=dev-java/ant-core-1.8.2
+ dev-lang/perl
+ >=dev-libs/libxslt-1.1.26
+ dev-libs/openssl
+ sys-apps/attr
+ sys-apps/lsb-release
+ virtual/pkgconfig
+ pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+ nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+ local CHECKREQS_DISK_BUILD
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="9000M"
+ else
+ CHECKREQS_DISK_BUILD="8500M"
+ fi
+
+ check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ icedtea_check_requirements
+}
+
+pkg_setup() {
+ icedtea_check_requirements
+
+ JAVA_PKG_WANT_BUILD_VM="
+ icedtea-7 icedtea-bin-7
+ icedtea-6 icedtea-bin-6
+ gcj-jdk"
+ JAVA_PKG_WANT_SOURCE="1.5"
+ JAVA_PKG_WANT_TARGET="1.5"
+
+ java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${SRC_PKG}
+}
+
+java_prepare() {
+ if ! use cups; then
+ # CUPS is always needed at build time but you can at least make it dlopen.
+ sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
+ fi
+
+ # For bootstrap builds as the sandbox control file might not yet exist.
+ addpredict /proc/self/coredump_filter
+
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+}
+
+src_configure() {
+ local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
+ local vm=$(java-pkg_get-current-vm)
+
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
+ use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
+ fi
+
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+ if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+ hotspot_port="yes"
+ fi
+
+ # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+ # Otherwise use CACAO on ppc and Zero on anything else
+ if test "x${hotspot_port}" != "xyes"; then
+ if use ppc; then
+ use_cacao="yes"
+ else
+ use_zero="yes"
+ fi
+ fi
+
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ jamvm_config="--enable-jamvm"
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ cacao_config="--enable-cacao"
+
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
+ export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch"
+ ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
+ fi
+
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
+ zero_config="--enable-zero"
+ fi
+
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+ if use javascript ; then
+ config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+ else
+ config+=" --without-rhino"
+ fi
+
+ unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+ econf ${config} \
+ --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+ --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+ --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+ --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+ --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+ --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
+ --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+ --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+ --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+ --with-jdk-home="$(java-config -O)" \
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --with-pkgversion="Gentoo ${PF}" \
+ --disable-downloading --disable-Werror \
+ --disable-hotspot-tests --disable-jdk-tests \
+ --enable-system-lcms --enable-system-jpeg \
+ --enable-system-zlib \
+ $(use_enable !headless-awt system-gif) \
+ $(use_enable !headless-awt system-png) \
+ $(use_enable !debug optimizations) \
+ $(use_enable doc docs) \
+ $(use_enable gtk system-gtk) \
+ $(use_enable infinality) \
+ $(use_enable kerberos system-kerberos) \
+ $(use_enable nss) \
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable sctp system-sctp) \
+ $(use_enable smartcard system-pcsc) \
+ $(use_enable sunec) \
+ ${zero_config} ${cacao_config} ${jamvm_config}
+}
+
+src_compile() {
+ # Would use GENTOO_VM otherwise.
+ export ANT_RESPECT_JAVA_HOME=TRUE
+
+ # With ant >=1.8.2 all required tasks are part of ant-core
+ export ANT_TASKS="none"
+
+ emake
+}
+
+src_test() {
+ # Use Xvfb for tests
+ unset DISPLAY
+
+ Xemake check
+}
+
+src_install() {
+ default
+
+ local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+ local ddest="${ED}${dest#/}"
+
+ if ! use alsa; then
+ rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ if use headless-awt; then
+ rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
+ "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
+ fi
+
+ if ! use examples; then
+ rm -r "${ddest}"/demo "${ddest}"/sample || die
+ fi
+
+ if ! use source; then
+ rm -v "${ddest}"/src.zip || die
+ fi
+
+ # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+ if use webstart || use nsplugin; then
+ dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+ dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+ fi
+ if use webstart; then
+ dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+ dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+ fi
+
+ # Fix the permissions.
+ find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+ # We need to generate keystore - bug #273306
+ einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+ mkdir "${T}/certgen" && cd "${T}/certgen" || die
+ cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+ for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+ openssl x509 -text -in "${c}" >> all.crt || die
+ done
+ ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+ cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+ chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+ # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
+ # install it anyway. Bug 390663
+ cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+ eprefixify "${T}"/fontconfig.Gentoo.properties
+ insinto "${dest}"/jre/lib
+ doins "${T}"/fontconfig.Gentoo.properties
+
+ set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+ if has_version "<=dev-java/icedtea-7.2.0:7"; then
+ # portage would preserve the symlink otherwise, related to bug #384397
+ rm -f "${EROOT}/usr/lib/jvm/icedtea7"
+ elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
+ elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
+ elog "If you had icedtea7 as system VM, the change should be automatic, however"
+ elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+ elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+ fi
+
+ gnome2_icon_savelist;
+}
+
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 3b78fab..1deac51 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -17,6 +17,7 @@
<use>
<flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
<flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
+ <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="infinality">Enable better font rendering using fontconfig.</flag>
<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2015-11-14 22:36 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2015-11-14 22:36 UTC (permalink / raw
To: gentoo-commits
commit: cdc63b04129d3549e687ac0684c71f4cc9a24730
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 22:34:27 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 22:34:27 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc63b04
dev-java/icedtea: Remove vulnerable versions of 7
Package-Manager: portage-2.2.20.1
dev-java/icedtea/Manifest | 18 -
.../files/7-cacao-dynmaxheap-Makefile.patch | 10 -
dev-java/icedtea/files/TryXShmAttach.patch | 201 ----------
dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild | 442 ---------------------
dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild | 416 -------------------
5 files changed, 1087 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index b405ad2..38c6296 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,31 +1,13 @@
-DIST icedtea-2.5-aarch64-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
-DIST icedtea-2.5-corba-a146d87ff390.tar.bz2 1070505 SHA256 d2c060e77ac62a2ace76cf7d098973803398a33c627b40401ca36e9344442136 SHA512 065f138eeedddf0703a2229d10c384a6003b4404a6fa2766ef3a1df8d29d71f1fddc609b9840ddaa31553a29c287eab33d368e227ccc25650aba4e98d50b4aa2 WHIRLPOOL 274acd68bf5e06d68bac50253ebb0e68bf0333188636ce7d96a403778af737547d4a3a154c1bc99c8151816b18dba25cdda1febf19cada7f2e9f3c0884a3c51e
-DIST icedtea-2.5-hotspot-383de087ee57.tar.bz2 7802328 SHA256 2831eeb73a4af0007fb31978e8a17aae1e9677bd545563956f99b1e0ec8bb923 SHA512 42d540632e315318e91a61ee21e2fb6c8e4b813d5bba734b9a1658be8799063a7547d6ee30846a070e806e63f77220a08e215d071c8f622cddfc1f923e9d7d07 WHIRLPOOL 747c4b273126989081789574a63a99ca8a03e9024e5626e9dd78c320df047bcb774610efb4a32cab8bf25b1e8b71f8b4268d298338edac512a46a43dc55179ba
-DIST icedtea-2.5-jaxp-3d9457280537.tar.bz2 2738979 SHA256 488480d8f69297e38f4b6df0131dfc445b59cad9b99327f29096ad820c972c38 SHA512 743931ba791ba09d5f0c45d589e5ba2562f6bed395f766619c8d1d15fd35f709e888017387d6cd01005156dca756450c7c0d286ca8a1585c012099164d977920 WHIRLPOOL 3f78e43fd0a31f97b944ff87133795a0a71be9a8b0b4efeb718ff215d947267270de8533d4378d82f2685cc69f9b599b5acf70564527fb37452666e998a8ebc1
-DIST icedtea-2.5-jaxws-bc5d03e92fd3.tar.bz2 2019582 SHA256 98c6c09d41ef3d179fb4f47e733be0f306ad85479473d5ec51c58acac07cf491 SHA512 a50929f80c40ddf11ad35571540a7d09c6b069b4d055dec41ff6c50d1d737bcf26fc7d14096d4528d184f7c83cadc61cf764664ecd25693afdbe48e59bf00c68 WHIRLPOOL c3e40d74a9ac4c2aa9e9a722c39de36f713b85b36517b8e1bc3b992d040a695c4fd50bafce5f4a4a8f55522faf580c16ba87818368d5a48d05e7e9a809880966
-DIST icedtea-2.5-jdk-48b2e510f78e.tar.bz2 31880992 SHA256 c944ef8d1810e861b54d3f8122960dd4b247b52ed23afd5b1cb053da988fffe4 SHA512 84f4122ec8336b5e3c71b17426f77d0b7719d0e688f3c5a9606db5749187e7858334de5438b683729b73fb91200b8cf087ee2166cd284baab38b3ac5d08ac6a1 WHIRLPOOL 68d2f890434afab440dd8e63fcfc00bdeb792b276ed9bbf2eb813197e2842d7d5903f1f3ca04df830118ced1fe2443b211faebf6f172d9e6dfab82fb1e2ebf22
-DIST icedtea-2.5-langtools-a6d3d79b4547.tar.bz2 1702391 SHA256 9f272f88ea0e8c090fb659c48f96f73fb066e6863f13f293e4ab19d691254693 SHA512 4a39600151f400cf6c17124757e4e8e877cf863445b9c95fb6c8c095f3f46072054f1b2f0262b4964594d6a330579cead0fdd423d61cfd425ec05b90121f79fe WHIRLPOOL 553ede3cf18308f79f4cedf57b2f491780532e23c546e158aca286076d6ab618d1fdf6d825a79fcf3c1a9fc18b2c130d2f84c29c37f3e19fe6e01a14bcb969d8
-DIST icedtea-2.5-openjdk-44f140fd2873.tar.bz2 127517 SHA256 d100158d10a47b064f700f516874c987f105e05947e580d5a143e00fb0b30fad SHA512 82bceecd1fb29b184ea45e5cfbf819b497707e041bc8d25a4ca8447e736db5f5d859dd9ad0129ba2fe300ce3d2ace18d8e528967ec43e467ef12991a860ea5d3 WHIRLPOOL e037bbbd9f85d81ce57759e68f40116db3178a43f4260806e0734fc2a1cd05f86f43cdd82aacaa8f4780e75a1ec7c7e0a7780baf722803a0a711506f0ba847f2
-DIST icedtea-2.5.6.tar.xz 2034152 SHA256 bb3c7e9fd372c737849d9d3129d935174492a0d924a2801223c822426338b8c4 SHA512 773601e4fc08d9a448f6f306e5678eca6f0b5b4704cdca66a40434de6e6b8208bc826e2a63235160b6b88bd92d746f8f7d1a74cfcfc0eaa58417ac3c8cb8aeb3 WHIRLPOOL 2443d7e1387f7d4d9f5b05d85a1768c9346e394713333862e62e24585091aaab0d74f9099c8aa1bd6add5b4cd5179132c238021f1a40576c7a40de43ab170bce
-DIST icedtea-2.6-corba-2545636482d6.tar.bz2 1071895 SHA256 cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8 SHA512 16a0bd71db484cd948ef3e941566af5b63d657f4d946caed0cef2fb104680beb21bd8633a6f48501c987cedb7949d7228ca7957e5fae3f4adc9ec48050193a12 WHIRLPOOL 98a317a85c4eed1098c7391f67e6687869337a1576bedc65ec4ddfde5885b4c514d12a5aebdac20a70970bb4c79d8b14f7bc153bf0b105b747f4e63ac79c3b79
DIST icedtea-2.6-corba-a4d55c5cec23.tar.bz2 1072249 SHA256 92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af SHA512 819974b10fe3d0ba15e45da843b3bc908e7caafb9fe264c43026bfa1a10daecef6e4cf23bd486f89cae0d6952ef812a170cf297a934679fc6dec29ca941c4826 WHIRLPOOL 69317e8f7d426cd338a1c698251b17bd6dc27d5010288cfacc008c3029b1ababc66541c4af6c5b8c12e5755503dd50e36dc4ab173851811bc3162b7d59f55bd5
-DIST icedtea-2.6-hotspot-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
DIST icedtea-2.6-hotspot-f40363c11191.tar.bz2 8164274 SHA256 984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a SHA512 37c80f977b22e6cab2bda5c2f579f016feb0f910bc5c7b4426f22983e74eb53c6b495681301cfd60e0773034c93ca2a60af512275cff4851a2857c2eb338b769 WHIRLPOOL 0c914f92902b982a0a85dae119d33cfd0485a025f80e0f2442c817e658341ac7bc8ab2b4e512a67aaf33027e0bf378386925f498d7400054cf80ec4efeac66b3
DIST icedtea-2.6-jaxp-f1202fb27695.tar.bz2 2733459 SHA256 94cda3ba29ab3cd36d50f2e6c98a5e250eb6372379e171288b3022b978136fc0 SHA512 d0aa1a744b3f5522fe2264af26766a3945d7b5e4555b229a9f837b457bafe068111fdae6ac3d7349ce8907e0b1c747a0b31a11936e4794f646b5827cca5cde0c WHIRLPOOL f447ad445ea9abc5dffd3c49da50ca1063f59bfdaedb4702bcc48a6bfe217794cc8eae16f2cdfc8fb455104f47f6cccb40dbcf959077a9d33f1d34f18901e920
-DIST icedtea-2.6-jaxp-ffbe529eeac7.tar.bz2 2737160 SHA256 c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb SHA512 1d8e68f0118f0e8465e333a8edd8aa9fdc16591c62bf4cc5c7791fb7f9acb97b9c6290fa4879a13138a68cb8b4fa93534cef3ebaee7bb8f3c0565595a3228493 WHIRLPOOL e85c5840883eaef4b1ebbb2dd0bae7d82457e01b6591653ac8d2d12a045f0736cb85b4c056a33614df7bb3b63cd61cf9e7caecdb5dae5f1d6be4f7ed1456cb53
DIST icedtea-2.6-jaxws-14c411b1183c.tar.bz2 2022452 SHA256 14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4 SHA512 3dd649f7565a449e831f14c2242e0fe9126f62380aa166bff627557774656c1604f8512ec93ec3ae243a851000b0fc014767de8ad58df8bb8892c88b8465d0e0 WHIRLPOOL 41665b394fc3ba3657e61cb3f45c43bfdce3e9c9a44f0a68ddc25bf19994c275da43c1f3b01f0fe96ff63d27901a529ff10183fa0d7c28196af3d8d08570a059
-DIST icedtea-2.6-jaxws-b9776fab65b8.tar.bz2 2021243 SHA256 2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f SHA512 0d5fc0001571381d151033b4e8ca98658bed3943c34faafc73ffea2d537d44b433ad49e246fc00335828418fc6e1c40d75fd1ee2280ebf0bf4014b4551f80bb0 WHIRLPOOL f35173656c30525678a1a09a5b30ef019816ee006e7c0682c3852df7a92523eef28b936418805d6dc874a31db3d3ddd1d02938227a8ba6b9080d17239c68ff74
-DIST icedtea-2.6-jdk-61d3e001dee6.tar.bz2 32421128 SHA256 a8083e75e14ddb4575bf2cd733e80a0074201b45d8debbe04f84564b32875363 SHA512 d5921683a63cca12fb73224ddd248ae37a986af1f9df131a130fb6f2f808631730298770382a90468b136c2bedb699985d129acb7e0fa2de662ab7543bcfba4c WHIRLPOOL 17d84d00f39774e08ba2934fd3e59cf5a372d0a8180576b2dbe6add617f36482cbd31f6d982e0b50b27fea54b9d35aec8552ab8d399cf7bd75047d4e55c1356d
DIST icedtea-2.6-jdk-db69ae53157a.tar.bz2 32431054 SHA256 7ad801d5f6b61818c78f2f39931df24d8c6f6a1c821180c998975ac884eb8af1 SHA512 8107583bd87227460d030f0cab87d526e8aa097f073ccedb21eb634affc9e22ae908b722d92f9c9357d2d3f50c65a48a9f5b62cd86845dbdfd37bbc0750edff2 WHIRLPOOL 36a2cb4a23bbf14683c65c53b30dff1af9858d45a25a2bb55e4308d30d6042de3d27875c9fdc8a8a56b8fe707da437469ebbad07868061bd8ccad97853a0a66a
DIST icedtea-2.6-langtools-73356b81c5c7.tar.bz2 1710526 SHA256 a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335 SHA512 e049b6ec3abf28de05e96c882add05e87ea2edb75219e94739e4ea2e543166c9a663be43a2c2c82c95fe14b457eb675b8d1b96a4a289888941cd0b1b67b7539a WHIRLPOOL 78346964728729d3b4bdd87b9dbd30097ee6ce68f5872ea1878c288aff31a9cac25120ab485cf4c94b6a0d3a2d825893cbeee99b9021fea0601bd0c2fdbf455e
-DIST icedtea-2.6-langtools-9c6e1de67d7d.tar.bz2 1710699 SHA256 6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43 SHA512 38136bba4d52b8de60e9a38f6ad47253d7513e46d82830ebb8f2f8659f66f99b7e3d7c4ad31c604cc5c516f1de331f2cdaf0ab0b37cff1dfd327c25ccc0f246f WHIRLPOOL 697447e27419d265a4e3f178f665ba59ba11ae0865acb4133c3e20096501b119b10c566c3a15ab5bd8b83a96fa48de36ca7be41cab92cff73c2e269e470bf333
-DIST icedtea-2.6-openjdk-39b2c4354d0a.tar.bz2 129720 SHA256 0168a0174ee47407139ee32458c4d2a298ba4f44260343b209250156e4da463f SHA512 b17315b58d6662953f7a6d73eb222a5a81165f55bed2f48f3d3915a169e8c8e503b5f22c59fce5cd3202ed2392f946f8701d9cff92d235ae44696d370f2efd28 WHIRLPOOL 5f14c467228f0a96c4b2e9b67a64836d871fbbfa13daec5b77adb8b39d8db4d20d18130f548c838826d58523f1cdc7972744ddbb564d07dc0fe27f6fa456a629
DIST icedtea-2.6-openjdk-601ca7147b8c.tar.bz2 129844 SHA256 4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49 SHA512 e3a61447569e39817e7c7ebf0a8fadaf0c708dfee2815a8f576b6d5fa91479ecf2f7fd30285b9d18c8286f3911f2ddc226d8f8da1219da8c2c80fa1fbf47607c WHIRLPOOL 8397f49988174b2027bcb3674981260d0e6651cded064baf8067820eb6dca6c12d0bceb94b86e83b856455b008a7ca517e04be5820dee4dec63a4b8397e07efd
-DIST icedtea-2.6.1.tar.xz 2049108 SHA256 cce4fac1e729690e986ef6f6d1c47b507f622a61da33d57d2b0a8c12e23e2068 SHA512 b465a025cd44c5395b43067042882cf272f5a9c71f06380a9bc4dedbd5e99c512161c84eaad8175aeb87d0477cd568aca4968862f02b9bd969736d2ee904b990 WHIRLPOOL 682dc4e4b14a604b1f30bf4a315ec56e91fddb72445dfe4110517e0e0dc5c4deb68565accf0600e6959febd818161078f1c65cf74a87e848c803820afce2bdb1
DIST icedtea-2.6.2.tar.xz 2074196 SHA256 bee8565c507a484ea876b62474aec379ac0e434acb9de8213279f47e1fe22076 SHA512 30772a71b53afb5f6acfcf8e31fd8c2ce25d056669b82af0024fb3e6623e27cbcc158ab39c7157e78e11949389fe576e220d8f70f32d98456464b53d4ee2ed51 WHIRLPOOL 32028cbd37fcfc9d2f1378938e7a7d6a34d9c03295fbfa0ac7f02c9e9c32933a3668947b7fa0b260bfb73b381a5297bc3cef26657534aded62689c2d2621b99c
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
-DIST icedtea-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
DIST icedtea6-1.13.8.tar.xz 4566076 SHA256 fcbc623957e393a00d6189cb88288fed21c21860485092ea7719a12fbbc00adb SHA512 16ab0ec383809467266f9e55ce7d0333187041db3796aa940bc91078557397728b5c2b13b80d20b171b133da589207cbb7b9906719dd949af91df1cac207c9ec WHIRLPOOL 193b67b98c90b42252b894b4032d057073570a7b4460dd8c9f8f2ddce0647c6268702b8ceb519251d4eca489213ff20e384f0653cf8fae034947f72c8d0fa2a4
DIST openjdk-6-src-b36-22_jul_2015.tar.xz 33757312 SHA256 c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 SHA512 52ce3ca2feae2fb00e0363d5c0a7e03efc79b8fe803049ee91e252e436433b6bcba0e0536f886f4def8297d34fb6c1bdcc5ddbbcac9344abee172c0adf6e126e WHIRLPOOL 026e1629cc0bf1ff0342d68eca3a9c822d51c2eea3a1cbf828aa001e59cce5946eca5681d89890fd7968f52b51592e5a472eb6f8e033a1906631da5c50b78684
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
deleted file mode 100644
index 13e3053..0000000
--- a/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig 2015-07-22 14:54:37.116940780 -0700
-+++ Makefile.in 2015-09-06 05:05:47.220000000 -0700
-@@ -134,6 +134,7 @@
- @WITH_RHINO_TRUE@ patches/rhino.patch
-
- @BUILD_CACAO_TRUE@am__append_10 = \
-+@BUILD_CACAO_TRUE@ patches/cacao/dynmaxheap.patch \
- @BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
- @BUILD_CACAO_TRUE@ patches/cacao/memory.patch \
- @BUILD_CACAO_TRUE@ patches/cacao/armhf.patch \
diff --git a/dev-java/icedtea/files/TryXShmAttach.patch b/dev-java/icedtea/files/TryXShmAttach.patch
deleted file mode 100644
index 4157bb6..0000000
--- a/dev-java/icedtea/files/TryXShmAttach.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-
-# HG changeset patch
-# User andrew
-# Date 1438275152 -3600
-# Node ID a2334007f1a8504d2bd4a2c2a037732c289649c3
-# Parent ab23850139cb2c666e613010842a1f984b184a3a
-PR2568: openjdk causes a full desktop crash on RHEL 6 i586
-Summary: Re-apply "8025775: JNI warnings in TryXShmAttach"; some changes lost in bad merge changeset 4b26f93b23ba
-
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XConstants.java
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Thu Jul 30 17:52:32 2015 +0100
-@@ -699,9 +699,4 @@
- public static final long XkbModifierMapMask = (1L<<2);
- public static final long XkbVirtualModsMask = (1L<<6); //server map
-
-- /*****************************************************************
-- * X SHARED MEMORY EXTENSION FUNCTIONS
-- *****************************************************************/
--
-- public static final int X_ShmAttach = 1;
- }
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XErrorHandler.java
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Thu Jul 30 17:52:32 2015 +0100
-@@ -41,29 +41,6 @@
- return XErrorHandlerUtil.SAVED_XERROR_HANDLER(display, err);
- }
- }
--
-- /**
-- * This is a base synthetic error handler containing a boolean flag which allows
-- * to show that an error is handled or not.
-- */
-- public static class XErrorHandlerWithFlag extends XBaseErrorHandler {
-- private volatile boolean errorOccurred = false;
--
-- public boolean getErrorOccurredFlag() {
-- return errorOccurred;
-- }
--
-- /**
-- * Sets an internal boolean flag to a particular value. Should be always called
-- * with {@code false} value of the parameter {@code errorOccurred} before this
-- * error handler is set as current.
-- * @param errorOccurred {@code true} to indicate that an error was handled,
-- * {@code false} to reset the internal boolean flag
-- */
-- public void setErrorOccurredFlag(boolean errorOccurred) {
-- this.errorOccurred = errorOccurred;
-- }
-- }
-
- /*
- * Instead of validating window id, we simply call XGetWindowProperty,
-@@ -99,75 +76,4 @@
- return theInstance;
- }
- }
--
-- /**
-- * This is a synthetic error handler for errors generated by the native function
-- * {@code XShmAttach}. If an error is handled, an internal boolean flag of the
-- * handler is set to {@code true}.
-- */
-- public static final class XShmAttachHandler extends XErrorHandlerWithFlag {
-- private XShmAttachHandler() {}
--
-- @Override
-- public int handleError(long display, XErrorEvent err) {
-- if (err.get_minor_code() == XConstants.X_ShmAttach) {
-- setErrorOccurredFlag(true);
-- return 0;
-- }
-- return super.handleError(display, err);
-- }
--
-- // Shared instance
-- private static XShmAttachHandler theInstance = new XShmAttachHandler();
-- public static XShmAttachHandler getInstance() {
-- return theInstance;
-- }
-- }
--
-- /**
-- * This is a synthetic error handler for {@code BadAlloc} errors generated by the
-- * native {@code glX*} functions. Its internal boolean flag is set to {@code true},
-- * if an error is handled.
-- */
-- public static final class GLXBadAllocHandler extends XErrorHandlerWithFlag {
-- private GLXBadAllocHandler() {}
--
-- @Override
-- public int handleError(long display, XErrorEvent err) {
-- if (err.get_error_code() == XConstants.BadAlloc) {
-- setErrorOccurredFlag(true);
-- return 0;
-- }
-- return super.handleError(display, err);
-- }
--
-- private static GLXBadAllocHandler theInstance = new GLXBadAllocHandler();
-- public static GLXBadAllocHandler getInstance() {
-- return theInstance;
-- }
-- }
--
-- /**
-- * This is a synthetic error handler for errors generated by the native function
-- * {@code XChangeWindowAttributes}. If an error is handled, an internal boolean
-- * flag of the handler is set to {@code true}.
-- */
-- public static final class XChangeWindowAttributesHandler extends XErrorHandlerWithFlag {
-- private XChangeWindowAttributesHandler() {}
--
-- @Override
-- public int handleError(long display, XErrorEvent err) {
-- if ((err.get_request_code() == XProtocolConstants.X_ChangeWindowAttributes) &&
-- (err.get_error_code() == XConstants.BadAccess)) {
-- setErrorOccurredFlag(true);
-- return 0;
-- }
-- return super.handleError(display, err);
-- }
--
-- private static XChangeWindowAttributesHandler theInstance = new XChangeWindowAttributesHandler();
-- public static XChangeWindowAttributesHandler getInstance() {
-- return theInstance;
-- }
-- }
- }
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_GraphicsEnv.h
---- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Thu Jul 30 17:52:32 2015 +0100
-@@ -54,7 +54,7 @@
-
- void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps);
- void resetXShmAttachFailed();
--jboolean TryXShmAttach(JNIEnv *env, Display *display, XShmSegmentInfo *shminfo);
-+jboolean isXShmAttachFailed();
-
- #endif /* MITSHM */
-
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_xembed_server.c
---- openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Thu Jul 30 17:52:32 2015 +0100
-@@ -644,19 +644,12 @@
- return dim;
- }
-
--Boolean isMapped(JNIEnv* env, Window w) {
-+Boolean isMapped(Window w) {
- XWindowAttributes attr;
- Status status = 0;
-- jboolean errorOccurredFlag;
-- jobject errorHandlerRef;
-- jobject savedError;
-- unsigned char xerror_code;
--
-- EXEC_WITH_XERROR_HANDLER(env, "sun/awt/X11/XErrorHandler$IgnoreBadWindowHandler",
-- "()Lsun/awt/X11/XErrorHandler$IgnoreBadWindowHandler;", JNI_FALSE,
-- errorHandlerRef, errorOccurredFlag,
-- status = XGetWindowAttributes(awt_display, w, &attr));
-- xerror_code = GET_XERROR_CODE(env, savedError);
-+ WITH_XERROR_HANDLER(xerror_ignore_bad_window);
-+ status = XGetWindowAttributes(awt_display, w, &attr);
-+ RESTORE_XERROR_HANDLER;
- if (status == 0 || xerror_code != Success) {
- return False;
- }
-@@ -692,7 +685,7 @@
- sdata->version = *data;
- flags = *(data+1);
- new_mapped = (flags & XEMBED_MAPPED) != 0;
-- currently_mapped = isMapped(env, sdata->handle);
-+ currently_mapped = isMapped(sdata->handle);
- if (new_mapped != currently_mapped) {
- if (new_mapped) {
- XMapWindow(awt_display, sdata->handle);
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/java2d/x11/X11SurfaceData.c
---- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Thu Jul 30 17:52:32 2015 +0100
-@@ -551,8 +551,6 @@
- {
- XImage *img = NULL;
- XShmSegmentInfo *shminfo;
-- JNIEnv* env;
-- jboolean xShmAttachResult;
-
- shminfo = malloc(sizeof(XShmSegmentInfo));
- if (shminfo == NULL) {
-@@ -603,7 +601,7 @@
- */
- shmctl(shminfo->shmid, IPC_RMID, 0);
-
-- if (xShmAttachResult == JNI_FALSE) {
-+ if (isXShmAttachFailed() == JNI_TRUE) {
- J2dRlsTraceLn1(J2D_TRACE_ERROR,
- "X11SD_SetupSharedSegment XShmAttach has failed: %s",
- strerror(errno));
-
diff --git a/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild b/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
deleted file mode 100644
index d8a172f..0000000
--- a/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
+++ /dev/null
@@ -1,442 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-SLOT="7"
-
-inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-4)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="a146d87ff390.tar.bz2"
-JAXP_TARBALL="3d9457280537.tar.bz2"
-JAXWS_TARBALL="bc5d03e92fd3.tar.bz2"
-JDK_TARBALL="48b2e510f78e.tar.bz2"
-LANGTOOLS_TARBALL="a6d3d79b4547.tar.bz2"
-OPENJDK_TARBALL="44f140fd2873.tar.bz2"
-HOTSPOT_TARBALL="383de087ee57.tar.bz2"
-AARCH64_TARBALL="b19bc5aeaa09.tar.bz2"
-
-CACAO_TARBALL="e215e36be9fc.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-AARCH64_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch64-${AARCH64_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
- http://icedtea.classpath.org/download/source/${SRC_PKG}
- ${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
- arm? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
- arm64? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
- !arm? ( !arm64? ( ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL} ) )
- ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-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"
-KEYWORDS="~ppc"
-RESTRICT="test"
-
-IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
- jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
- pulseaudio selinux smartcard source +sunec test zero +webstart"
-
-REQUIRED_USE="gtk? ( awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.2.12"
-X_COMMON_DEP="
- >=media-libs/giflib-4.1.6:=
- >=media-libs/libpng-1.2:0=
- >=x11-libs/libX11-1.1.3
- >=x11-libs/libXext-1.1.1
- >=x11-libs/libXi-1.1.3
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.0.3
- x11-libs/libXt"
-X_DEPEND="
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
- x11-proto/inputproto
- >=x11-proto/xextproto-7.1.1
- x11-proto/xineramaproto
- x11-proto/xproto"
-
-COMMON_DEP="
- >=dev-libs/glib-2.26:2
- >=dev-util/systemtap-1
- media-libs/fontconfig
- >=media-libs/freetype-2.5.3:2=[infinality?]
- >=media-libs/lcms-2.5
- >=sys-libs/zlib-1.2.3:=
- virtual/jpeg:0=
- gtk? (
- >=dev-libs/atk-1.30.0
- >=x11-libs/cairo-1.8.8:=
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.8:2=
- >=x11-libs/pango-1.24.5
- )
- javascript? ( dev-java/rhino:1.6 )
- kerberos? ( virtual/krb5 )
- nss? ( >=dev-libs/nss-3.12.5-r1 )
- smartcard? ( sys-apps/pcsc-lite )
- sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea:0
- !dev-java/icedtea-web:7
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- alsa? ( ${ALSA_COMMON_DEP} )
- awt? ( ${X_COMMON_DEP} )
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- cups? ( ${CUPS_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
- || (
- >=dev-java/gcj-jdk-4.3
- dev-java/icedtea-bin:7
- dev-java/icedtea-bin:6
- dev-java/icedtea:7
- dev-java/icedtea:6
- )
- app-arch/cpio
- app-arch/unzip
- app-arch/zip
- app-misc/ca-certificates
- >=dev-java/ant-core-1.8.2
- dev-lang/perl
- >=dev-libs/libxslt-1.1.26
- dev-libs/openssl
- sys-apps/attr
- sys-apps/lsb-release
- virtual/pkgconfig
- pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
- local CHECKREQS_DISK_BUILD
-
- if use doc; then
- CHECKREQS_DISK_BUILD="9000M"
- else
- CHECKREQS_DISK_BUILD="8500M"
- fi
-
- check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- icedtea_check_requirements
-}
-
-pkg_setup() {
- icedtea_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="
- icedtea-7 icedtea-bin-7
- icedtea-6 icedtea-bin-6
- gcj-jdk"
- JAVA_PKG_WANT_SOURCE="1.5"
- JAVA_PKG_WANT_TARGET="1.5"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${SRC_PKG}
-}
-
-java_prepare() {
- # CACAO has a fixed default max heap of 128MB. This sucks.
- cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
- epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
-
- if ! use cups; then
- # CUPS is always needed at build time but you can at least make it dlopen.
- sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
- fi
-
- # For bootstrap builds as the sandbox control file might not yet exist.
- addpredict /proc/self/coredump_filter
-
- # icedtea doesn't like some locales. #330433 #389717
- export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
- local cacao_config config hotspot_port hs_tarball jamvm_config use_cacao use_jamvm use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # gcj-jdk ensures ecj is present.
- if use jbootstrap || has "${vm}" gcj-jdk; then
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- config+=" --enable-bootstrap"
- else
- config+=" --disable-bootstrap"
- fi
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use JamVM if requested
- if use jamvm; then
- use_jamvm="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
- if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
- hotspot_port="yes"
- fi
-
- # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use CACAO on ppc and Zero on anything else
- if test "x${hotspot_port}" != "xyes"; then
- if use ppc; then
- use_cacao="yes"
- else
- use_zero="yes"
- fi
- fi
-
- # Turn on JamVM if needed (non-HS archs) or requested
- if test "x${use_jamvm}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-jamvm"'
- fi
- jamvm_config="--enable-jamvm"
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- fi
- cacao_config="--enable-cacao"
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
- fi
- zero_config="--enable-zero"
- fi
-
- # Use appropriate HotSpot tarball for architecture
- if { use arm || use arm64; }; then
- hs_tarball="${DISTDIR}/${AARCH64_GENTOO_TARBALL}";
- else
- hs_tarball="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}";
- fi
-
- config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
- if use javascript ; then
- config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
- else
- config+=" --without-rhino"
- fi
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- econf ${config} \
- --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
- --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
- --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
- --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
- --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
- --with-hotspot-src-zip="${hs_tarball}" \
- --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
- --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
- --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
- --with-jdk-home="$(java-config -O)" \
- --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
- --with-pkgversion="Gentoo ${PF}" \
- --disable-downloading --disable-Werror \
- --disable-hotspot-tests --disable-jdk-tests \
- --enable-system-lcms --enable-system-jpeg \
- --enable-system-zlib \
- $(use_enable awt system-gif) \
- $(use_enable awt system-png) \
- $(use_enable !debug optimizations) \
- $(use_enable doc docs) \
- $(use_enable gtk system-gtk) \
- $(use_enable infinality) \
- $(use_enable kerberos system-kerberos) \
- $(use_enable nss) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- $(use_enable smartcard system-pcsc) \
- $(use_enable sunec) \
- ${zero_config} ${cacao_config} ${jamvm_config}
-}
-
-src_compile() {
- # Would use GENTOO_VM otherwise.
- export ANT_RESPECT_JAVA_HOME=TRUE
-
- # With ant >=1.8.2 all required tasks are part of ant-core
- export ANT_TASKS="none"
-
- emake
-}
-
-src_test() {
- # Use Xvfb for tests
- unset DISPLAY
-
- Xemake check
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- dodoc README NEWS AUTHORS
- dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
- cd openjdk.build/j2sdk-image || die
-
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if ! use awt; then
- rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- # Don't hide classes
- rm lib/ct.sym || die
-
- #402507
- mkdir jre/.systemPrefs || die
- touch jre/.systemPrefs/.system.lock || die
- touch jre/.systemPrefs/.systemRootModFile || die
-
- # doins doesn't preserve executable bits.
- cp -vRP bin include jre lib man "${ddest}" || die
-
- dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
- if use doc; then
- docinto html
- dodoc -r ../docs/*
- fi
-
- if use examples; then
- cp -vRP demo sample "${ddest}" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
- fi
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- # Needs to be done before generating cacerts
- java-vm_set-pax-markings "${ddest}"
-
- # We need to generate keystore - bug #273306
- einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
- mkdir "${T}/certgen" && cd "${T}/certgen" || die
- cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
- for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
- openssl x509 -text -in "${c}" >> all.crt || die
- done
- ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
- cp -vRP cacerts "${ddest}/jre/lib/security/" || die
- chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
- # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
- # install it anyway. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env "${FILESDIR}/icedtea.env"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-7.2.0:7"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea7"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
- elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
- elog "If you had icedtea7 as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-}
diff --git a/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
deleted file mode 100644
index 9645c54..0000000
--- a/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-SLOT="7"
-
-inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-4)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="2545636482d6.tar.bz2"
-JAXP_TARBALL="ffbe529eeac7.tar.bz2"
-JAXWS_TARBALL="b9776fab65b8.tar.bz2"
-JDK_TARBALL="61d3e001dee6.tar.bz2"
-LANGTOOLS_TARBALL="9c6e1de67d7d.tar.bz2"
-OPENJDK_TARBALL="39b2c4354d0a.tar.bz2"
-HOTSPOT_TARBALL="b19bc5aeaa09.tar.bz2"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
- http://icedtea.classpath.org/download/source/${SRC_PKG}
- ${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL}
- ${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
- ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-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"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
-
-IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
- jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
- pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
-
-REQUIRED_USE="gtk? ( awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.2.12"
-X_COMMON_DEP="
- >=media-libs/giflib-4.1.6:=
- >=media-libs/libpng-1.2:0=
- >=x11-libs/libX11-1.1.3
- >=x11-libs/libXext-1.1.1
- >=x11-libs/libXi-1.1.3
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.0.3
- x11-libs/libXt"
-X_DEPEND="
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
- x11-proto/inputproto
- >=x11-proto/xextproto-7.1.1
- x11-proto/xineramaproto
- x11-proto/xproto"
-
-COMMON_DEP="
- >=dev-libs/glib-2.26:2
- >=dev-util/systemtap-1
- media-libs/fontconfig
- >=media-libs/freetype-2.5.3:2=[infinality?]
- >=media-libs/lcms-2.5
- >=sys-libs/zlib-1.2.3:=
- virtual/jpeg:0=
- gtk? (
- >=dev-libs/atk-1.30.0
- >=x11-libs/cairo-1.8.8:=
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.8:2=
- >=x11-libs/pango-1.24.5
- )
- javascript? ( dev-java/rhino:1.6 )
- kerberos? ( virtual/krb5 )
- nss? ( >=dev-libs/nss-3.12.5-r1 )
- sctp? ( net-misc/lksctp-tools )
- smartcard? ( sys-apps/pcsc-lite )
- sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea:0
- !dev-java/icedtea-web:7
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- alsa? ( ${ALSA_COMMON_DEP} )
- awt? ( ${X_COMMON_DEP} )
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- cups? ( ${CUPS_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
- || (
- >=dev-java/gcj-jdk-4.3
- dev-java/icedtea-bin:7
- dev-java/icedtea-bin:6
- dev-java/icedtea:7
- dev-java/icedtea:6
- )
- app-arch/cpio
- app-arch/unzip
- app-arch/zip
- app-misc/ca-certificates
- >=dev-java/ant-core-1.8.2
- dev-lang/perl
- >=dev-libs/libxslt-1.1.26
- dev-libs/openssl
- sys-apps/attr
- sys-apps/lsb-release
- virtual/pkgconfig
- pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
- local CHECKREQS_DISK_BUILD
-
- if use doc; then
- CHECKREQS_DISK_BUILD="9000M"
- else
- CHECKREQS_DISK_BUILD="8500M"
- fi
-
- check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- icedtea_check_requirements
-}
-
-pkg_setup() {
- icedtea_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="
- icedtea-7 icedtea-bin-7
- icedtea-6 icedtea-bin-6
- gcj-jdk"
- JAVA_PKG_WANT_SOURCE="1.5"
- JAVA_PKG_WANT_TARGET="1.5"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${SRC_PKG}
-}
-
-java_prepare() {
- if ! use cups; then
- # CUPS is always needed at build time but you can at least make it dlopen.
- sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
- fi
-
- # For bootstrap builds as the sandbox control file might not yet exist.
- addpredict /proc/self/coredump_filter
-
- # icedtea doesn't like some locales. #330433 #389717
- export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
- local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # gcj-jdk ensures ecj is present.
- if use jbootstrap || has "${vm}" gcj-jdk; then
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- config+=" --enable-bootstrap"
- else
- config+=" --disable-bootstrap"
- fi
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use JamVM if requested
- if use jamvm; then
- use_jamvm="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
- if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
- hotspot_port="yes"
- fi
-
- # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use CACAO on ppc and Zero on anything else
- if test "x${hotspot_port}" != "xyes"; then
- if use ppc; then
- use_cacao="yes"
- else
- use_zero="yes"
- fi
- fi
-
- # Turn on JamVM if needed (non-HS archs) or requested
- if test "x${use_jamvm}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-jamvm"'
- fi
- jamvm_config="--enable-jamvm"
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- fi
- cacao_config="--enable-cacao"
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
- fi
- zero_config="--enable-zero"
- fi
-
- config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
- if use javascript ; then
- config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
- else
- config+=" --without-rhino"
- fi
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- # https://bugs.gentoo.org/show_bug.cgi?id=561500
- ln -s "${FILESDIR}/TryXShmAttach.patch" || die
- export DISTRIBUTION_PATCHES="TryXShmAttach.patch"
-
- econf ${config} \
- --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
- --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
- --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
- --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
- --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
- --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
- --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
- --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
- --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
- --with-jdk-home="$(java-config -O)" \
- --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
- --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --with-pkgversion="Gentoo ${PF}" \
- --disable-downloading --disable-Werror \
- --disable-hotspot-tests --disable-jdk-tests \
- --enable-system-lcms --enable-system-jpeg \
- --enable-system-zlib \
- $(use_enable awt system-gif) \
- $(use_enable awt system-png) \
- $(use_enable !debug optimizations) \
- $(use_enable doc docs) \
- $(use_enable gtk system-gtk) \
- $(use_enable infinality) \
- $(use_enable kerberos system-kerberos) \
- $(use_enable nss) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- $(use_enable sctp system-sctp) \
- $(use_enable smartcard system-pcsc) \
- $(use_enable sunec) \
- ${zero_config} ${cacao_config} ${jamvm_config}
-}
-
-src_compile() {
- # Would use GENTOO_VM otherwise.
- export ANT_RESPECT_JAVA_HOME=TRUE
-
- # With ant >=1.8.2 all required tasks are part of ant-core
- export ANT_TASKS="none"
-
- emake
-}
-
-src_test() {
- # Use Xvfb for tests
- unset DISPLAY
-
- Xemake check
-}
-
-src_install() {
- default
-
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}${dest#/}"
-
- if ! use alsa; then
- rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if ! use awt; then
- rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
- "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
- fi
-
- if ! use examples; then
- rm -r "${ddest}"/demo "${ddest}"/sample || die
- fi
-
- if ! use source; then
- rm -v "${ddest}"/src.zip || die
- fi
-
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
- fi
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- # We need to generate keystore - bug #273306
- einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
- mkdir "${T}/certgen" && cd "${T}/certgen" || die
- cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
- for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
- openssl x509 -text -in "${c}" >> all.crt || die
- done
- ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
- cp -vRP cacerts "${ddest}/jre/lib/security/" || die
- chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
- # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
- # install it anyway. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env "${FILESDIR}/icedtea.env"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-7.2.0:7"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea7"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
- elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
- elog "If you had icedtea7 as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-
- gnome2_icon_savelist;
-}
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2015-11-15 16:21 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2015-11-15 16:21 UTC (permalink / raw
To: gentoo-commits
commit: f3e22731e7dbca0708dc3b260e11186a944a3a9c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 16:17:27 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 16:20:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e22731
dev-java/icedtea: Remove vulnerable versions of 6
Package-Manager: portage-2.2.20.1
dev-java/icedtea/Manifest | 2 -
.../files/6-cacao-dynmaxheap-Makefile.patch | 10 -
dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild | 351 ---------------------
dev-java/icedtea/metadata.xml | 1 -
4 files changed, 364 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 1cd5480..1bad920 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -9,7 +9,5 @@ DIST icedtea-2.6.2.tar.xz 2074196 SHA256 bee8565c507a484ea876b62474aec379ac0e434
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
-DIST icedtea6-1.13.8.tar.xz 4566076 SHA256 fcbc623957e393a00d6189cb88288fed21c21860485092ea7719a12fbbc00adb SHA512 16ab0ec383809467266f9e55ce7d0333187041db3796aa940bc91078557397728b5c2b13b80d20b171b133da589207cbb7b9906719dd949af91df1cac207c9ec WHIRLPOOL 193b67b98c90b42252b894b4032d057073570a7b4460dd8c9f8f2ddce0647c6268702b8ceb519251d4eca489213ff20e384f0653cf8fae034947f72c8d0fa2a4
DIST icedtea6-1.13.9.tar.xz 4573884 SHA256 61e0fb2ed0fc2d793a42e24d2192423f8a7ccb04f130d82d5889a0ecf52bc965 SHA512 b1a6e7d36904e3a9cea620c86dc656324bc99622d470f021f86a66c77919d8faf774d199f42669f9813f1ca4c41f2a920a66f9927d33eeca5476edd26438822a WHIRLPOOL 32586b8563cb7c9246bfb1731d409a03d0367b653dff866f9a3e8b4deb1f09d6405e8e103a94681fe3e80ba4dd042782a2defec409f0b020c1d3c263bf3feec1
-DIST openjdk-6-src-b36-22_jul_2015.tar.xz 33757312 SHA256 c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 SHA512 52ce3ca2feae2fb00e0363d5c0a7e03efc79b8fe803049ee91e252e436433b6bcba0e0536f886f4def8297d34fb6c1bdcc5ddbbcac9344abee172c0adf6e126e WHIRLPOOL 026e1629cc0bf1ff0342d68eca3a9c822d51c2eea3a1cbf828aa001e59cce5946eca5681d89890fd7968f52b51592e5a472eb6f8e033a1906631da5c50b78684
DIST openjdk-6-src-b37-11_nov_2015.tar.xz 33790124 SHA256 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d SHA512 e7da587e5cb5a99d3a92bc64ae1bc668bd470cd5664f097197d87af07aa32414903c1b212693449e471b933ed6b1bc7e754fb56ccd7af23038d766dbfdf8eba8 WHIRLPOOL 685fd308007bc236b2c461c09186f910ef5c829a3f557fad5b37902d0550b66d7be82502a66209c99430639d875356f5249fa5047f46468983d164aa156aed17
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
deleted file mode 100644
index dc87ae8..0000000
--- a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig 2015-07-28 07:21:16.447388803 -0700
-+++ Makefile.in 2015-09-06 09:13:16.548000000 -0700
-@@ -182,6 +182,7 @@
- @WITH_RHINO_TRUE@ patches/rhino.patch
-
- @BUILD_CACAO_TRUE@am__append_22 = \
-+@BUILD_CACAO_TRUE@ patches/cacao/dynmaxheap.patch \
- @BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
- @BUILD_CACAO_TRUE@ patches/cacao/memory.patch \
- @BUILD_CACAO_TRUE@ patches/cacao/hotspot/original/memory.patch \
diff --git a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
deleted file mode 100644
index ff53a11..0000000
--- a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-ICEDTEA_BRANCH=$(get_version_component_range 1-3)
-OPENJDK_BUILD="36"
-OPENJDK_DATE="22_jul_2015"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
-# Download cacao and jamvm regardless for use with EXTRA_ECONF
-CACAO_TARBALL="68fe50ac34ec.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
- http://icedtea.classpath.org/download/source/${SRC_PKG}
- https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
- http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-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"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-RESTRICT="test"
-
-IUSE="+alsa +awt cacao cjk +cups debug doc examples +gtk javascript
- +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux
- source systemtap test zero +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.2.12"
-X_COMMON_DEP="
- >=media-libs/giflib-4.1.6:=
- >=media-libs/libpng-1.2:0=
- >=x11-libs/libX11-1.1.3
- >=x11-libs/libXext-1.1.1
- >=x11-libs/libXi-1.1.3
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.0.3
- x11-libs/libXt"
-X_DEPEND="
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
- x11-proto/inputproto
- >=x11-proto/xextproto-7.1.1
- x11-proto/xineramaproto
- x11-proto/xproto"
-
-COMMON_DEP="
- >=media-libs/freetype-2.3.5:2=
- >=media-libs/lcms-2.5
- >=sys-libs/zlib-1.2.3:=
- virtual/jpeg:0=
- javascript? ( dev-java/rhino:1.6 )
- kerberos? ( virtual/krb5 )
- nss? ( >=dev-libs/nss-3.12.5-r1 )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= )
- systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea6
- !dev-java/icedtea-web:6
- media-fonts/dejavu
- alsa? ( ${ALSA_COMMON_DEP} )
- awt? ( ${X_COMMON_DEP} )
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- cups? ( ${CUPS_COMMON_DEP} )
- gtk? ( >=x11-libs/gtk+-2.8:2 )
- selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
- || (
- >=dev-java/gcj-jdk-4.3
- dev-java/icedtea-bin:6
- dev-java/icedtea:6
- )
- app-arch/cpio
- app-arch/unzip
- app-arch/zip
- app-misc/ca-certificates
- >=dev-java/ant-core-1.8.2
- dev-lang/perl
- >=dev-libs/libxslt-1.1.26
- dev-libs/openssl
- sys-apps/lsb-release
- virtual/pkgconfig
- pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
- nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
- local CHECKREQS_DISK_BUILD
-
- if use doc; then
- CHECKREQS_DISK_BUILD="8500M"
- else
- CHECKREQS_DISK_BUILD="8000M"
- fi
-
- check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- icedtea_check_requirements
-}
-
-pkg_setup() {
- icedtea_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="
- icedtea-6 icedtea-bin-6
- gcj-jdk"
- JAVA_PKG_WANT_SOURCE="1.5"
- JAVA_PKG_WANT_TARGET="1.5"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${SRC_PKG}
-}
-
-java_prepare() {
- # CACAO has a fixed default max heap of 128MB. This sucks.
- cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
- epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
-
- # For bootstrap builds as the sandbox control file might not yet exist.
- addpredict /proc/self/coredump_filter
-
- # icedtea doesn't like some locales. #330433 #389717
- export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
- local cacao_config config hotspot_port use_cacao use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # gcj-jdk ensures ecj is present.
- if use jbootstrap || has "${vm}" gcj-jdk; then
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- config+=" --enable-bootstrap"
- else
- config+=" --disable-bootstrap"
- fi
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, arm, sparc and x86.
- if { use amd64 || use arm || use sparc || use x86; }; then
- hotspot_port="yes"
- fi
-
- # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use CACAO on ppc and Zero on anything else
- if test "x${hotspot_port}" != "xyes"; then
- if { use ppc || use ppc64; }; then
- use_cacao="yes"
- else
- use_zero="yes"
- fi
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- fi
- cacao_config="--enable-cacao"
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- zero_config="--enable-zero"
- fi
-
- config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
- if use javascript ; then
- config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
- else
- config+=" --without-rhino"
- fi
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- econf ${config} \
- --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
- --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
- --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
- --with-jdk-home="$(java-config -O)" \
- --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
- --with-pkgversion="Gentoo package ${PF}" \
- --disable-downloading --disable-Werror \
- $(use_enable awt system-gif) \
- $(use_enable awt system-png) \
- $(use_enable !debug optimizations) \
- $(use_enable doc docs) \
- $(use_enable kerberos system-kerberos) \
- $(use_enable nss) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- $(use_enable pulseaudio pulse-java) \
- $(use_enable systemtap) \
- ${zero_config} ${cacao_config}
-}
-
-src_compile() {
- # Would use GENTOO_VM otherwise.
- export ANT_RESPECT_JAVA_HOME=TRUE
-
- # With ant >=1.8.2 all required tasks are part of ant-core
- export ANT_TASKS="none"
-
- emake
-}
-
-src_test() {
- # Use Xvfb for tests
- unset DISPLAY
-
- Xemake check
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- dodoc README NEWS AUTHORS
- dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
- cd openjdk.build/j2sdk-image || die
-
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if ! use awt ; then
- rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- # Don't hide classes
- rm lib/ct.sym || die
-
- #402507
- mkdir jre/.systemPrefs || die
- touch jre/.systemPrefs/.system.lock || die
- touch jre/.systemPrefs/.systemRootModFile || die
-
- # doins doesn't preserve executable bits.
- cp -vRP bin include jre lib man "${ddest}" || die
-
- dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
- if use doc; then
- docinto html
- dodoc -r ../docs/*
- fi
-
- if use examples; then
- cp -vRP demo sample "${ddest}" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
- fi
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- # Needs to be done before generating cacerts
- java-vm_set-pax-markings "${ddest}"
-
- # We need to generate keystore - bug #273306
- einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
- mkdir "${T}/certgen" && cd "${T}/certgen" || die
- cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
- for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
- openssl x509 -text -in "${c}" >> all.crt || die
- done
- ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
- cp -vRP cacerts "${ddest}/jre/lib/security/" || die
- chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
- set_java_env "${FILESDIR}/icedtea.env"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea6"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
- elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
- elog "If you had icedtea6 as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 1deac51..83663b2 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -15,7 +15,6 @@
</maintainer>
<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>
<use>
- <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
<flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="infinality">Enable better font rendering using fontconfig.</flag>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2016-01-03 21:16 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2016-01-03 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 878e7d8b49d822f9f80ba0f3671b87b8cef19980
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 21:07:57 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 21:16:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878e7d8b
dev-java/icedtea: Allow newer icedtea-web and update CACAO patch
Although the previous dynamic max heap patch helped, there were still
major issues with the value being stored in a signed 32-bit int. The
patch series has been submitted upstream to both IcedTea and CACAO.
Package-Manager: portage-2.2.26
dev-java/icedtea/files/6-cacao-dynmaxheap.patch | 42 ------
dev-java/icedtea/files/6-cacao-pr-157.patch | 143 +++++++++++++++++++++
dev-java/icedtea/files/7-cacao-dynmaxheap.patch | 42 ------
dev-java/icedtea/files/7-cacao-pr-157.patch | 139 ++++++++++++++++++++
...1.13.9-r1.ebuild => icedtea-6.1.13.9-r2.ebuild} | 4 +-
...7.2.6.3-r2.ebuild => icedtea-7.2.6.3-r3.ebuild} | 8 +-
6 files changed, 288 insertions(+), 90 deletions(-)
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
deleted file mode 100644
index 33b9818..0000000
--- a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User James Le Cuirot <chewi@gentoo.org>
-# Date 1441543564 -3600
-# Sun Sep 06 13:46:04 2015 +0100
-# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
-# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
-Dynamically set the maximum heap size on Linux
-
-diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100
-+++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100
-@@ -33,6 +33,10 @@
- #include <errno.h>
- #include <stdlib.h>
-
-+#if defined(__LINUX__)
-+#include <unistd.h>
-+#endif
-+
- #include "vm/types.h"
-
- #include "arch.h"
-@@ -702,6 +706,19 @@
- opt_heapstartsize = HEAP_STARTSIZE;
- opt_stacksize = STACK_SIZE;
-
-+#if defined(__LINUX__)
-+ // Calculate 1/4 of the physical memory.
-+ uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
-+
-+ if (qmem > INT32_MAX) {
-+ // More than 2GB will overflow so cap it.
-+ opt_heapmaxsize = 2047 * 1024 * 1024;
-+ } else if (qmem > HEAP_MAXSIZE) {
-+ // Otherwise use this if greater than default (128MB).
-+ opt_heapmaxsize = (s4) qmem;
-+ }
-+#endif
-+
- // First of all, parse the -XX options.
-
- #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/files/6-cacao-pr-157.patch b/dev-java/icedtea/files/6-cacao-pr-157.patch
new file mode 100644
index 0000000..3419b8f
--- /dev/null
+++ b/dev-java/icedtea/files/6-cacao-pr-157.patch
@@ -0,0 +1,143 @@
+diff -Naur cacao/cacao/src/vm/options.c cacao/cacao/src/vm/options.c
+--- cacao/cacao/src/vm/options.c 2013-01-10 16:45:14.000000000 +0000
++++ cacao/cacao/src/vm/options.c 2016-01-03 11:48:06.439004345 +0000
+@@ -26,6 +26,7 @@
+ #include "config.h"
+
+ #include <limits.h>
++#include <stddef.h>
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -56,9 +57,9 @@
+
+ bool opt_run = true;
+
+-s4 opt_heapmaxsize = 0; /* maximum heap size */
+-s4 opt_heapstartsize = 0; /* initial heap size */
+-s4 opt_stacksize = 0; /* thread stack size */
++size_t opt_heapmaxsize = 0; /* maximum heap size */
++size_t opt_heapstartsize = 0; /* initial heap size */
++size_t opt_stacksize = 0; /* thread stack size */
+
+ bool opt_verbose = false;
+ bool opt_debugcolor = false; /* use ANSI terminal sequences */
+diff -Naur cacao/cacao/src/vm/options.h cacao/cacao/src/vm/options.h
+--- cacao/cacao/src/vm/options.h 2013-01-10 16:45:14.000000000 +0000
++++ cacao/cacao/src/vm/options.h 2016-01-03 11:48:55.397204706 +0000
+@@ -32,6 +32,7 @@
+ extern "C" {
+ #endif
+
++#include <stddef.h>
+ #include <stdint.h>
+
+ #include "vm/types.h"
+@@ -82,9 +83,9 @@
+ extern bool opt_jar;
+ extern bool opt_run;
+
+-extern s4 opt_heapmaxsize;
+-extern s4 opt_heapstartsize;
+-extern s4 opt_stacksize;
++extern size_t opt_heapmaxsize;
++extern size_t opt_heapstartsize;
++extern size_t opt_stacksize;
+
+ extern bool opt_verbose;
+ extern bool opt_debugcolor;
+diff -Naur cacao/cacao/src/vm/vm.cpp cacao/cacao/src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp 2013-01-10 16:45:14.000000000 +0000
++++ cacao/cacao/src/vm/vm.cpp 2016-01-03 11:50:15.779891441 +0000
+@@ -25,6 +25,7 @@
+
+ #include "config.h"
+
++#include <stddef.h>
+ #include <stdint.h>
+
+ #include <exception>
+@@ -33,6 +34,10 @@
+ #include <errno.h>
+ #include <stdlib.h>
+
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "vm/types.h"
+
+ #include "arch.h"
+@@ -699,6 +704,19 @@
+ opt_heapstartsize = HEAP_STARTSIZE;
+ opt_stacksize = STACK_SIZE;
+
++#if defined(__LINUX__)
++ // Calculate 1/4 of the physical memory.
++ size_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++ if (qmem > INT32_MAX) {
++ // Allocate no more than 2GB.
++ opt_heapmaxsize = INT32_MAX;
++ } else if (qmem > HEAP_MAXSIZE) {
++ // Otherwise use this if greater than default (128MB).
++ opt_heapmaxsize = qmem;
++ }
++#endif
++
+ // First of all, parse the -XX options.
+
+ #if defined(ENABLE_VMLOG)
+@@ -914,18 +932,33 @@
+ case OPT_SS:
+ {
+ char c;
+- int j;
++ size_t j;
+
++ errno = 0;
+ c = opt_arg[strlen(opt_arg) - 1];
++ j = strtoul(opt_arg, NULL, 10);
++
++ if (errno)
++ break; // Invalid.
+
+ if ((c == 'k') || (c == 'K')) {
+- j = atoi(opt_arg) * 1024;
++ if (j > SIZE_MAX / 1024)
++ break; // Overflow.
++ else
++ j *= 1024;
+
+ } else if ((c == 'm') || (c == 'M')) {
+- j = atoi(opt_arg) * 1024 * 1024;
+-
+- } else
+- j = atoi(opt_arg);
++ if (j > SIZE_MAX / 1024 / 1024)
++ break; // Overflow.
++ else
++ j *= 1024 * 1024;
++
++ } else if ((c == 'g') || (c == 'G')) {
++ if (j > SIZE_MAX / 1024 / 1024 / 1024)
++ break; // Overflow.
++ else
++ j *= 1024 * 1024 * 1024;
++ }
+
+ if (opt == OPT_MX)
+ opt_heapmaxsize = j;
+@@ -1525,9 +1558,9 @@
+ void VM::print_run_time_config()
+ {
+ puts("Run-time variables:\n");
+- printf(" maximum heap size : %d\n", opt_heapmaxsize);
+- printf(" initial heap size : %d\n", opt_heapstartsize);
+- printf(" stack size : %d\n", opt_stacksize);
++ printf(" maximum heap size : %lu\n", opt_heapmaxsize);
++ printf(" initial heap size : %lu\n", opt_heapstartsize);
++ printf(" stack size : %lu\n", opt_stacksize);
+
+ #if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+ printf(" gnu.classpath.boot.library.path: %s\n", _properties.get("gnu.classpath.boot.library.path"));
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
deleted file mode 100644
index edce1e8..0000000
--- a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User James Le Cuirot <chewi@gentoo.org>
-# Date 1441541110 -3600
-# Sun Sep 06 13:05:10 2015 +0100
-# Node ID 80e5553df66e3abb3680f747cbb8e32b394b4211
-# Parent 468081e3e037df27b6427aa298dfaaa20f4ba4bf
-Dynamically set the maximum heap size on Linux
-
-diff -r 468081e3e037 -r 80e5553df66e src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp Wed Jun 10 19:52:58 2015 +0200
-+++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:05:10 2015 +0100
-@@ -32,6 +32,10 @@
- #include <stdint.h>
- #include <inttypes.h>
-
-+#if defined(__LINUX__)
-+#include <unistd.h>
-+#endif
-+
- #include "md-abi.hpp"
-
- #include "mm/codememory.hpp"
-@@ -690,6 +694,19 @@
- opt_heapstartsize = HEAP_STARTSIZE;
- opt_stacksize = STACK_SIZE;
-
-+#if defined(__LINUX__)
-+ // Calculate 1/4 of the physical memory.
-+ uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
-+
-+ if (qmem > INT32_MAX) {
-+ // More than 2GB will overflow so cap it.
-+ opt_heapmaxsize = 2047 * 1024 * 1024;
-+ } else if (qmem > HEAP_MAXSIZE) {
-+ // Otherwise use this if greater than default (128MB).
-+ opt_heapmaxsize = (s4) qmem;
-+ }
-+#endif
-+
- // First of all, parse the -XX options.
- options_xx(vm_args);
-
diff --git a/dev-java/icedtea/files/7-cacao-pr-157.patch b/dev-java/icedtea/files/7-cacao-pr-157.patch
new file mode 100644
index 0000000..0701363
--- /dev/null
+++ b/dev-java/icedtea/files/7-cacao-pr-157.patch
@@ -0,0 +1,139 @@
+diff -Naur cacao/cacao/src/vm/options.cpp cacao/cacao/src/vm/options.cpp
+--- cacao/cacao/src/vm/options.cpp 2014-12-12 21:14:45.000000000 +0000
++++ cacao/cacao/src/vm/options.cpp 2015-12-23 21:01:37.644275263 +0000
+@@ -26,6 +26,7 @@
+ #include "config.h"
+
+ #include <limits.h>
++#include <stddef.h>
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -60,9 +61,9 @@
+
+ bool opt_run = true;
+
+-s4 opt_heapmaxsize = 0; /* maximum heap size */
+-s4 opt_heapstartsize = 0; /* initial heap size */
+-s4 opt_stacksize = 0; /* thread stack size */
++size_t opt_heapmaxsize = 0; /* maximum heap size */
++size_t opt_heapstartsize = 0; /* initial heap size */
++size_t opt_stacksize = 0; /* thread stack size */
+
+ bool opt_verbose = false;
+ bool opt_debugcolor = false; /* use ANSI terminal sequences */
+diff -Naur cacao/cacao/src/vm/options.hpp cacao/cacao/src/vm/options.hpp
+--- cacao/cacao/src/vm/options.hpp 2014-12-12 21:14:45.000000000 +0000
++++ cacao/cacao/src/vm/options.hpp 2015-12-23 21:01:37.645275246 +0000
+@@ -26,6 +26,7 @@
+ #ifndef OPTIONS_HPP_
+ #define OPTIONS_HPP_ 1
+
++#include <stddef.h> // for size_t
+ #include <stdint.h> // for int64_t
+ #include <stdio.h> // for FILE
+ #include "config.h" // for ENABLE_DEBUG_FILTER, etc
+@@ -77,9 +78,9 @@
+ extern bool opt_jar;
+ extern bool opt_run;
+
+-extern s4 opt_heapmaxsize;
+-extern s4 opt_heapstartsize;
+-extern s4 opt_stacksize;
++extern size_t opt_heapmaxsize;
++extern size_t opt_heapstartsize;
++extern size_t opt_stacksize;
+
+ extern bool opt_verbose;
+ extern bool opt_debugcolor;
+diff -Naur cacao/cacao/src/vm/vm.cpp cacao/cacao/src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp 2014-12-12 21:14:45.000000000 +0000
++++ cacao/cacao/src/vm/vm.cpp 2015-12-23 21:01:38.046268504 +0000
+@@ -29,9 +29,14 @@
+ #include <cerrno>
+ #include <cstdlib>
+ #include <exception>
++#include <stddef.h>
+ #include <stdint.h>
+ #include <inttypes.h>
+
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "md-abi.hpp"
+
+ #include "mm/codememory.hpp"
+@@ -690,6 +695,19 @@
+ opt_heapstartsize = HEAP_STARTSIZE;
+ opt_stacksize = STACK_SIZE;
+
++#if defined(__LINUX__)
++ // Calculate 1/4 of the physical memory.
++ size_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++ if (qmem > INT32_MAX) {
++ // Allocate no more than 2GB.
++ opt_heapmaxsize = INT32_MAX;
++ } else if (qmem > HEAP_MAXSIZE) {
++ // Otherwise use this if greater than default (128MB).
++ opt_heapmaxsize = qmem;
++ }
++#endif
++
+ // First of all, parse the -XX options.
+ options_xx(vm_args);
+
+@@ -896,18 +914,33 @@
+ case OPT_SS:
+ {
+ char c;
+- int j;
++ size_t j;
+
++ errno = 0;
+ c = opt_arg[strlen(opt_arg) - 1];
++ j = strtoul(opt_arg, NULL, 10);
++
++ if (errno)
++ break; // Invalid.
+
+ if ((c == 'k') || (c == 'K')) {
+- j = atoi(opt_arg) * 1024;
++ if (j > SIZE_MAX / 1024)
++ break; // Overflow.
++ else
++ j *= 1024;
+
+ } else if ((c == 'm') || (c == 'M')) {
+- j = atoi(opt_arg) * 1024 * 1024;
+-
+- } else
+- j = atoi(opt_arg);
++ if (j > SIZE_MAX / 1024 / 1024)
++ break; // Overflow.
++ else
++ j *= 1024 * 1024;
++
++ } else if ((c == 'g') || (c == 'G')) {
++ if (j > SIZE_MAX / 1024 / 1024 / 1024)
++ break; // Overflow.
++ else
++ j *= 1024 * 1024 * 1024;
++ }
+
+ if (opt == OPT_MX)
+ opt_heapmaxsize = j;
+@@ -1498,9 +1531,9 @@
+ void VM::print_run_time_config()
+ {
+ puts("Run-time variables:\n");
+- printf(" maximum heap size : %d\n", opt_heapmaxsize);
+- printf(" initial heap size : %d\n", opt_heapstartsize);
+- printf(" stack size : %d\n", opt_stacksize);
++ printf(" maximum heap size : %lu\n", opt_heapmaxsize);
++ printf(" initial heap size : %lu\n", opt_heapstartsize);
++ printf(" stack size : %lu\n", opt_stacksize);
+
+ #if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+ printf(" gnu.classpath.boot.library.path: %s\n", _properties.get("gnu.classpath.boot.library.path"));
diff --git a/dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
similarity index 98%
rename from dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild
rename to dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
index 403ef6b..552d4aa 100644
--- a/dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -206,7 +206,7 @@ src_configure() {
cacao_config="--enable-cacao"
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2611
- export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch"
+ export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
fi
diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r2.ebuild b/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
similarity index 98%
rename from dev-java/icedtea/icedtea-7.2.6.3-r2.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
index 684c6e8..d32b642 100644
--- a/dev-java/icedtea/icedtea-7.2.6.3-r2.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -152,8 +152,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
virtual/pkgconfig
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] )
+ nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] )
pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"/${ICEDTEA_PKG}
@@ -266,7 +266,7 @@ src_configure() {
cacao_config="--enable-cacao"
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
- export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch"
+ export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
fi
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2016-03-27 8:44 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2016-03-27 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 85cce8fde35da1ab82576d2e9c09c5041d5a039d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 12:02:04 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 08:43:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85cce8fd
dev-java/icedtea: Version bump to 7.2.6.5
This addresses vulnerabilities being handled in bug #578300.
Package-Manager: portage-2.2.28
dev-java/icedtea/Manifest | 16 ++++-----
dev-java/icedtea/files/icedtea-bug-2781.patch | 42 ----------------------
...7.2.6.4-r1.ebuild => icedtea-7.2.6.5-r1.ebuild} | 33 ++++++++---------
3 files changed, 23 insertions(+), 68 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 3875c9b..0bd0d60 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,11 @@
-DIST icedtea-2.6-corba-2135da66cc53.tar.bz2 1072269 SHA256 26bbfae0504fb7e83fd5eaba08d9e44e0c07a609cdf7c04fb6832a097b56bc08 SHA512 2e07d6529c347625c06aed7dc25b41b5ca425aedb0652cc92df477f8a4ab1343c4aa90b1204a94a327a550d75cfe13c0adaf607b7e064e11b5a9ed07afb9313f WHIRLPOOL 2cbf0e97038907800f6d88084fc9879714c8c1297842179e3f220dde416d6f47d076fdc2c2296600aa06dcf839ec029378db8e7a662ce8c3cbfd8eda67e9ac3b
-DIST icedtea-2.6-hotspot-19d919ae5506.tar.bz2 8162545 SHA256 3747417c3ba69d1ff7d80dc6df19454c4f4023c35f8b711e47baefe2fc772e65 SHA512 be3c356fac53112324f688e6336e8bcde453284f20671a1630b97a30bfaaedf1f7915984250e51aea106fbcc25790aca3f7d4ed419499394748f0391b17782c5 WHIRLPOOL 65251c4e6d91fd8a25bb2bc83b58aacd23f3e7f4f65112d135ec04f98136e351a8175a84a05c070a42d1a351c8301c55a34f65f120e908e129cecb0ff703d32d
-DIST icedtea-2.6-jaxp-bc6edb6c12a7.tar.bz2 2733735 SHA256 097cb0423271b6439b36db190a66bab9d447dd03ee22e42a6089a3b3b8363f62 SHA512 fb9a7607403ba15759427bd7ef1740949dc9cf3892e61a643b9dcdfda7633876d38606dd06af96b0fa362eec427c68b9faa458762defe502c81cdd97290a056b WHIRLPOOL 62583d7e1907b97b90f818b9b0e76fe10a0f57342597191157f6c0a696af8f1fdc4b4968aa2112c7b42900e6a988fd291b0d5ffe7c3de7d89473e536ab6b9e56
-DIST icedtea-2.6-jaxws-271b555de438.tar.bz2 2022035 SHA256 da7604aaaedaab93ba9ad21ee5ee8f18c807606a97d60037ae8c3647e823dfa1 SHA512 cc7d9ee95ba4350c44eb1e9c08e70f6c4e5f1c115a8bc1c3af91828e8c6b814c31494426edc08e75601506e8f6208d07e8425f0f5b14ba5f5de7c7e3165b76c4 WHIRLPOOL a9376fc7ccfd9fea8adf7716aa0da93a32f855acc565b6ea39fa38cbbf3a008a035e62d54d9b2e3633c8a1c185787e0a373d2b166ef609e6483a4d28a3fdd1fc
-DIST icedtea-2.6-jdk-dc86038147b2.tar.bz2 32420326 SHA256 9d3199c0f9c39238c6920c941026cf8661a92e97845f75d74e9ff277532b5d63 SHA512 d22cba72083b65ec5b818652e0520c7b63974ecd940f6f39e27ce83cac664de15c3c4611e088056b6ae123b77f605fb61c1226c05811b03086c39cc2e12f114d WHIRLPOOL 48d3cacd5ec54c8e7dd203abd53f956669ff861ebe98e677d107d31d6964467b2387995e644a64ba238f44dab287bb2f6ef5d6e8333aa167d994cd72d74fdda3
-DIST icedtea-2.6-langtools-fd0a34cb97b4.tar.bz2 1707682 SHA256 f9b0ce14c73c263276d3dfe78601714869cd2c0463bd01c637c8556d52a7d7cc SHA512 0044e405fdaaae8fa54dd576b9efec4e51bdc0ee410eeeb3f78984a20efd6bd31b678e9b113a9d33c4eafaab3cb4ef190c78a4d02172e010282768bad917c497 WHIRLPOOL 6c70b2b176b1186eb9faf1a017becef1cc05b7c1c49ddfe5251b5660972514bb65c613cd5a5de5a11a5f104d63414947d5a3229e30294f57e67ace001acd9ef9
-DIST icedtea-2.6-openjdk-4f1e498cad9c.tar.bz2 129984 SHA256 bb02e71972ad606e739c79fc11c6dc61b4840a526a41049a600a206cc37152e2 SHA512 0b5affd4dfd76f584d1cd921026c5ae1d1017ee176f323a14eaaa5d02aa699e744f4c42ca76c31be93b334bfade63e1ca6635f9d9191640841497ba92cfb813c WHIRLPOOL 46769805754e869e4348925e96e63acec443e7e7bc4181925eb3610181d78784c54e288d0383668607b86945ee1e2eb7eeb345a161abb4524cb9f5acc77566c2
-DIST icedtea-2.6.4.tar.xz 2078228 SHA256 d20a365feea95a4c01c9f9db1f7562f471f638bc672db9de6c6e654d2d826164 SHA512 96373c8452b3087804d906544cd84ddae5bd3969314bd856cb89a9aa02c49fde0ea04d602f6d0d9e82308d34c60aa6c309314ec03ec7c73a4bf3c18a8825d1e0 WHIRLPOOL 688051df4a304874761f5e37bd0b003e20df17cf9f1552230b9638aa6df62d09c8c29dcdf3c7646b523266cc40ad0b4a4528bf4dfb46eae2e91d7e5e575dbc5c
+DIST icedtea-2.6-corba-389551542e13.tar.bz2 1072454 SHA256 427969fdd78513a11ddd9d5131a068e0b26ca2c8f14951bf8b161fecd07fe77f SHA512 b9b48e79dc183e823caa2bc8600de001618ce5c9a10671639ade9cc6515ddf90a8a4554cf76c7633632ffc71833f247b39ae184a8c625f11cdd92a393eefb201 WHIRLPOOL 0a14f7f118c4bd4623b0351f870927e08485d79ede3153b7d171f9fc303b8a8dba182185c1db9b21fd88ad094d8706890c77cbfbb5dccb8a587130e53c37d622
+DIST icedtea-2.6-hotspot-04d7046d2d41.tar.bz2 8164174 SHA256 43983232fb10abeac99478e7045c04a93fef86185e2b9ee9c7b46f2903441cfc SHA512 7ecd1880eaa3e5c5dcad9ed083bd530e13f0a13476ee4594c37d2bbb55ca816423609075e97aadb3072010163bcb9b16935b5047688315af74a2d63099323a38 WHIRLPOOL 268d38ac11f1af3648e482d8e27b327b2d2ca7fcf7f2eab1350374c2dde4afa8373ac97ed3ef9531921bae8dbe7a07114c0dc2f14dc50f04bb50e078b0197aa7
+DIST icedtea-2.6-jaxp-8a56658cb829.tar.bz2 2732669 SHA256 7bb5e1bc9f0807061e157aeb356dd0e3b9fa019fb316beee3aa0181a335ba37a SHA512 64ad347aebc763ff8f9db3821b0197a400ffb5c6c75900be9b25d2af0b090323bebb0ab44b6f43a8d5c1a13f9d779dadf07a99d245281cfbcc0673db30b063cb WHIRLPOOL 83c9773b809dd85baa637152b3bbc2d7f9c7c61c4659a16edbc883ea0efaa70dde0533395b1e8b1f17fcc8b2f9cccd85e244e773b16bcf0cc735b8f51f4c076c
+DIST icedtea-2.6-jaxws-9c049d7f5adc.tar.bz2 2021930 SHA256 4e759ade7e47713f6f26afc1ffcd02f2edf967582fae2ec6b4d73dc81be926d0 SHA512 8b71f5bcdad6e2191c100d8095aa0bbffaafc79a4a4b81d495430ba6c4ea1287b407f36333def5384f646cd18d916270b900f8af475641ed8c5d3361dc613d69 WHIRLPOOL f8cbe3646698c3d8b564b700ea53c2e1cf37ce8f47498a286173cfe338330bc640844c4e0d6271e283c84c2db71f76f7bf8127fbf93145ed87a972662a3df32a
+DIST icedtea-2.6-jdk-e727fe32654c.tar.bz2 32423186 SHA256 cd3810553b1066c21f2fe08a73de72e38ba7e72295cd32dec70db481a24421ba SHA512 459c0ae24f9514020d794d8acf0189c0ef9dff589f034a061cea605890ae7ed6327ab4adc1761be406bd8e3c808d3f4506b3610b8096c5045844f54aac51c994 WHIRLPOOL 861ca3d1163357e5c5562146e8940082bfbc36e7cb12ac0517d68f5d4a4e98c8ddeeabc0376d2b9db2bbfd2742c64014f7deaa8553269a798be8e5e3f399969b
+DIST icedtea-2.6-langtools-f6593c32cc46.tar.bz2 1707644 SHA256 6c6c676c60af61638a0c3176f0312fcc0abad16d1d3cdbe11aeefcc3357a78d9 SHA512 d469a26381d5163998c85f9afa33facd1d46650b7097cdeb190d4b50b087abea5fb3b4caf8a72e228e5c7d012dc1e2c44c0bca6d4363be354f2923f48127aa8e WHIRLPOOL 940591f4601f00eb3ba5422a7687e148a4acb61ece99e29daa0eff145f4897750b9780af5cceb21aa1a1a951d4ce6dc84427bb76bbb42a23acab5e977cca501c
+DIST icedtea-2.6-openjdk-8e728c41fec5.tar.bz2 130030 SHA256 c66f56a91a6fa9e3c889bbbc5432a4e082b7d3735188fb508fa7ec70c142abdb SHA512 10626285c0dda1fa9ba3b843cc70d61c1d417dd87e5def60d8df6d19b4ce40d2b0b0e007b6a52b4468b5a152aa50f9efc6a45dfe6f31cfbf2d47897bee3ca13f WHIRLPOOL 8f4f5e5c4e75a0d9aae89872482925a37b80a7e85d74a8d6968c28fa3dd488176ddeff9c62f81b90a4e994ac2c04d6704b6a2eba4cf734783ff106af8942ce25
+DIST icedtea-2.6.5.tar.xz 2072216 SHA256 e752304496bb11ae9952beb11e6743dd84e55b340eaca716f310c5a0f48b53f7 SHA512 8b6dd1fcec8ceaa0525872123ab9327093c5df35b322569942909a0a61e0bd4225984e2f17f30bd392b829368379cbd3efc8b14ce09a442b9d13eaa78d749d5a WHIRLPOOL 8bd4512ddbeceeda7515a4e74555243582a8201eb800f7a357cb67e9744f30d030fbadd571e4130a18d9c43cbb4f25227e453e95976ae83118e0a79f4f6f2b39
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
diff --git a/dev-java/icedtea/files/icedtea-bug-2781.patch b/dev-java/icedtea/files/icedtea-bug-2781.patch
deleted file mode 100644
index 5cc32c3..0000000
--- a/dev-java/icedtea/files/icedtea-bug-2781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User Stefan Ring <stefan@complang.tuwien.ac.at>
-# Date 1452083014 -3600
-# Node ID 9295d3c06eb706407b5af1412674c8f0a0ce9fdf
-# Parent 468081e3e037df27b6427aa298dfaaa20f4ba4bf
-Fix some oversights during a large macro cleanup in 1e9787c3484e
-
-diff --git cacao/cacao/src/vm/jit/verify/typecheck-common.cpp cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
---- cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
-+++ cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
-@@ -281,7 +281,7 @@
-
- dv->type = sv->type;
- if (dv->type == TYPE_ADR) {
-- dv->typeinfo = sv->typeinfo;
-+ typeinfo_t::clone(sv->typeinfo, dv->typeinfo);
- }
- }
- return true;
-diff --git cacao/cacao/src/vm/jit/verify/typeinfo.cpp cacao/cacao/src/vm/jit/verify/typeinfo.cpp
---- cacao/cacao/src/vm/jit/verify/typeinfo.cpp
-+++ cacao/cacao/src/vm/jit/verify/typeinfo.cpp
-@@ -1674,6 +1674,7 @@
- classref_or_classinfo common;
- classref_or_classinfo elementclass;
- int dimension;
-+ ArrayType elementtype;
- bool changed;
- typecheck_result r;
-
-diff --git cacao/cacao/src/vm/resolve.cpp cacao/cacao/src/vm/resolve.cpp
---- cacao/cacao/src/vm/resolve.cpp
-+++ cacao/cacao/src/vm/resolve.cpp
-@@ -703,7 +703,7 @@
-
- /* uninitialized objects are illegal here */
-
-- if (subtinfo->is_primitive()) {
-+ if (subtinfo->is_newobject()) {
- exceptions_throw_verifyerror(refmethod,
- "Invalid use of uninitialized object");
- return resolveFailed;
diff --git a/dev-java/icedtea/icedtea-7.2.6.4-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
similarity index 94%
rename from dev-java/icedtea/icedtea-7.2.6.4-r1.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
index 9d0e86f..f1c743e 100644
--- a/dev-java/icedtea/icedtea-7.2.6.4-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
@@ -16,13 +16,13 @@ ICEDTEA_VER=$(get_version_component_range 2-4)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="2135da66cc53.tar.bz2"
-JAXP_TARBALL="bc6edb6c12a7.tar.bz2"
-JAXWS_TARBALL="271b555de438.tar.bz2"
-JDK_TARBALL="dc86038147b2.tar.bz2"
-LANGTOOLS_TARBALL="fd0a34cb97b4.tar.bz2"
-OPENJDK_TARBALL="4f1e498cad9c.tar.bz2"
-HOTSPOT_TARBALL="19d919ae5506.tar.bz2"
+CORBA_TARBALL="389551542e13.tar.bz2"
+JAXP_TARBALL="8a56658cb829.tar.bz2"
+JAXWS_TARBALL="9c049d7f5adc.tar.bz2"
+JDK_TARBALL="e727fe32654c.tar.bz2"
+LANGTOOLS_TARBALL="f6593c32cc46.tar.bz2"
+OPENJDK_TARBALL="8e728c41fec5.tar.bz2"
+HOTSPOT_TARBALL="04d7046d2d41.tar.bz2"
CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -61,7 +61,7 @@ KEYWORDS="~amd64 ~arm ~x86"
RESTRICT="test"
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
- jamvm javascript +jbootstrap kerberos nsplugin nss pax_kernel
+ jamvm javascript +jbootstrap kerberos libressl nsplugin nss pax_kernel
pulseaudio sctp selinux smartcard source +sunec test +webstart zero"
REQUIRED_USE="gtk? ( !headless-awt )"
@@ -79,7 +79,8 @@ X_COMMON_DEP="
>=x11-libs/libXi-1.1.3
>=x11-libs/libXrender-0.9.4
>=x11-libs/libXtst-1.0.3
- x11-libs/libXt"
+ x11-libs/libXt
+ x11-libs/libXcomposite"
X_DEPEND="
>=x11-libs/libXau-1.0.3
>=x11-libs/libXdmcp-1.0.2
@@ -146,7 +147,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
>=dev-java/ant-core-1.8.2
dev-lang/perl
>=dev-libs/libxslt-1.1.26
- dev-libs/openssl
+ !libressl? ( dev-libs/openssl )
+ libressl? ( dev-libs/libressl )
sys-apps/attr
sys-apps/lsb-release
virtual/pkgconfig
@@ -193,11 +195,6 @@ src_unpack() {
}
java_prepare() {
- if ! use cups; then
- # CUPS is always needed at build time but you can at least make it dlopen.
- sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
- fi
-
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
@@ -266,9 +263,8 @@ src_configure() {
cacao_config="--enable-cacao"
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781
- export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch icedtea-bug-2781.patch"
- ln -snf "${FILESDIR}"/{${SLOT}-cacao-pr-157,icedtea-bug-2781}.patch . || die
+ export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
+ ln -snf "${FILESDIR}"/${SLOT}-cacao-pr-157.patch . || die
fi
# Turn on Zero if needed (non-HS/CACAO archs) or requested
@@ -312,6 +308,7 @@ src_configure() {
$(use_enable !headless-awt system-gif) \
$(use_enable !headless-awt system-png) \
$(use_enable !debug optimizations) \
+ $(use_enable cups system-cups) \
$(use_enable doc docs) \
$(use_enable gtk system-gtk) \
$(use_enable infinality) \
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2016-04-10 22:05 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2016-04-10 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 09df6195352995d2cf9fe45df3212974e0993e0d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 21:51:55 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 22:05:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09df6195
dev-java/icedtea: Version bump to 3.0.0 final for Java 8
Package-Manager: portage-2.2.28
dev-java/icedtea/Manifest | 10 +
dev-java/icedtea/files/8-ccache.patch | 11 +
dev-java/icedtea/icedtea-3.0.0.ebuild | 383 ++++++++++++++++++++++++++++++++++
3 files changed, 404 insertions(+)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 0bd0d60..1a1a700 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -6,8 +6,18 @@ DIST icedtea-2.6-jdk-e727fe32654c.tar.bz2 32423186 SHA256 cd3810553b1066c21f2fe0
DIST icedtea-2.6-langtools-f6593c32cc46.tar.bz2 1707644 SHA256 6c6c676c60af61638a0c3176f0312fcc0abad16d1d3cdbe11aeefcc3357a78d9 SHA512 d469a26381d5163998c85f9afa33facd1d46650b7097cdeb190d4b50b087abea5fb3b4caf8a72e228e5c7d012dc1e2c44c0bca6d4363be354f2923f48127aa8e WHIRLPOOL 940591f4601f00eb3ba5422a7687e148a4acb61ece99e29daa0eff145f4897750b9780af5cceb21aa1a1a951d4ce6dc84427bb76bbb42a23acab5e977cca501c
DIST icedtea-2.6-openjdk-8e728c41fec5.tar.bz2 130030 SHA256 c66f56a91a6fa9e3c889bbbc5432a4e082b7d3735188fb508fa7ec70c142abdb SHA512 10626285c0dda1fa9ba3b843cc70d61c1d417dd87e5def60d8df6d19b4ce40d2b0b0e007b6a52b4468b5a152aa50f9efc6a45dfe6f31cfbf2d47897bee3ca13f WHIRLPOOL 8f4f5e5c4e75a0d9aae89872482925a37b80a7e85d74a8d6968c28fa3dd488176ddeff9c62f81b90a4e994ac2c04d6704b6a2eba4cf734783ff106af8942ce25
DIST icedtea-2.6.5.tar.xz 2072216 SHA256 e752304496bb11ae9952beb11e6743dd84e55b340eaca716f310c5a0f48b53f7 SHA512 8b6dd1fcec8ceaa0525872123ab9327093c5df35b322569942909a0a61e0bd4225984e2f17f30bd392b829368379cbd3efc8b14ce09a442b9d13eaa78d749d5a WHIRLPOOL 8bd4512ddbeceeda7515a4e74555243582a8201eb800f7a357cb67e9744f30d030fbadd571e4130a18d9c43cbb4f25227e453e95976ae83118e0a79f4f6f2b39
+DIST icedtea-3.0-corba-37af47894175.tar.xz 936876 SHA256 d77480d5d0c9620562a66b01fda9be4de58c2881cec680b4f2682ef09087b3cc SHA512 21b2f069f1eaca62a46518173de3c1368963db489f436d5ad705c7cb36ecc259d342c059c4c593427e96604164f78be761e1fe4118d8517ece3630280524ad30 WHIRLPOOL ac7292f0a32cfa7b58d3616b704bfd90ead49044bb51fccc1ca87900555d15f28b3d3137512fe007b40f0a130d3e6eb9d805112725914b0f0721ac8dbad8794c
+DIST icedtea-3.0-hotspot-5e587a29a6aa.tar.xz 6766584 SHA256 76717fa6a84fde60075c19fbc261709bd9c3b849952c817c0ac6b46b757ac0d7 SHA512 c8a2355ef81ad1dd4a2f6be0e5cdaba9d6d66a4fd5514718cc09ed391bcce269a17a34fbc89d7c6d3e7a2632f2ffcb0028a8faaf41649055a096407a24cacd0e WHIRLPOOL 4e83ea5ee631ca76e7919a944f9f1a3a007ca951a99552ee087bd6d2d6e027c5ce9963ec3c593c8132a984dd9818fc42abfb0792b3628d44491488700b20ec09
+DIST icedtea-3.0-jaxp-4ed5441e40e1.tar.xz 2296120 SHA256 4ccce5442642561cda78116a019f5c0ea690725a374ccf5695b3af00393d26e8 SHA512 47e968f674176f74706ab268098a1635a54de7282993abc46a1c72c8d24f21216ed898bbca830623f5afd11912a744138547d6d22a82f68fa1ba15ccc7a9e375 WHIRLPOOL e94f961336d1e8b176ab2486ae98852049f930af3ee31dd3f7491544244c78d6b5657334fb45b9cc863bb6c377a6b1ab5d71df1257d02bc9e79513cd41ecc2ce
+DIST icedtea-3.0-jaxws-a81c04154cc5.tar.xz 2266356 SHA256 ef550609aaa526084256a7fdf6c326015641d6d8c80540c830c0c62302a2f076 SHA512 53ef8dfb1fa0602bfbbb75ca1f8a80af6c09029f22e69625680ce55aa04b820bdfc042d57e5edafbf25ea4f43c32fb988bad9e19b78676cb937af9062ec28ca2 WHIRLPOOL d76bae6c0b1540fe28dbbb5d516fea2c09facb29fd605df38429273e8358de6d0ca1f685098aa3c334a4ca9eeff66ff9759ba704697786a230315d236e01cca1
+DIST icedtea-3.0-jdk-3334efeacd83.tar.xz 38245460 SHA256 fa74b8aaa389495a685f3a28151a1957ff8ff88a4d4792059c5c1fb7c12eb1cd SHA512 92106e36d9dd522c355eec877709862b7e1ae18790a0965fa7fc74c1cd2b4aea145b630e37fa953e9cfd0feaadcba0117675bbb8e2c5705379078e16ac53a37e WHIRLPOOL 86cd77313b1fc50d6ff96de3e41d2d9c53627971ba475120d1724a1a690876e3383be6633baf074e14d95f0c0c16727f4bda5465ee66423dba1c8cc6533ab800
+DIST icedtea-3.0-langtools-dd581e8047e6.tar.xz 2055716 SHA256 e0e0e6a7cf8575506579306f76cca872b01a3f08a4880fb9b316444fb206ea86 SHA512 da64e53d360f591af599105cb244898f5092c3613f12f013244f9180b27629efcc0d5abbf2cf3043fd8c80edccfb9ad34dff854f36e539d24d206f6908c4f908 WHIRLPOOL f96b5afc4744f0cab3efdbb460da1c82bd2d8a370b59891ca3d0d351ecaf772c8c8414f92267be52f816d7d227d3dc175db2058fb6c9b7a7113b634fa47038e0
+DIST icedtea-3.0-nashorn-697c5f792bec.tar.xz 2220600 SHA256 b4c59d8269511f2073498518e599ec91dff11c57cadc0b97fa88af81835122c0 SHA512 e719c91ede0db0a5a0c97ff8ee165fadfecab053a48116d48974e24af06559540d2924b0d582fa4d4d5e4971ebc5929aa70b775f0fc6991c8311ca78d7860cd2 WHIRLPOOL e29ab3b81d095034e90c2996802f2c4ce1b338be817cf81ffddb084eedf52638e2b011b379534a9856303d3c3b722ef699d61d25a18f8e7910442c3139e01265
+DIST icedtea-3.0-openjdk-8ed8d26a3f9a.tar.xz 330164 SHA256 5b032673d74c4e2529427b9570b177285dc9a6430d016ef2e072dd2167669031 SHA512 9b0c6952e66708810cbdcd4f0a093f8d6f954c5cf1d098b6d70eced8908689fc0716fbb76ea6344c4a01127177fb078b31706551289aa7bd80fb649efe4d9018 WHIRLPOOL 361e0f9d3653a5718b3a2a1609c5b73adcee89c22f81e1c108c39499b5e755be639241a1de2946622731255ccbb8d00b097f77176fd31e7b9cfebfdcf94e1feb
+DIST icedtea-3.0.0.tar.xz 1402156 SHA256 947add69b3b89d7685cb0c9e2b51fc561e27f6e7c0bf1ea98dac8156fa8629a9 SHA512 80bece0c0dbe4c0eaf8716abd0018ae71fc62dd9a3698eeca37383af51884cac5b1185f226003e396b4b5691beca478b5419755795f906962e9f66674294ae9b WHIRLPOOL 4811b4041f96e2debc1f8760eb1c9c318f3c40b36ee45042788c99b74c9886c46a9859fe23eb369f531c596252a89e80b32b71b364e13bd1478c04e66911e824
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
+DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
DIST icedtea6-1.13.9.tar.xz 4573884 SHA256 61e0fb2ed0fc2d793a42e24d2192423f8a7ccb04f130d82d5889a0ecf52bc965 SHA512 b1a6e7d36904e3a9cea620c86dc656324bc99622d470f021f86a66c77919d8faf774d199f42669f9813f1ca4c41f2a920a66f9927d33eeca5476edd26438822a WHIRLPOOL 32586b8563cb7c9246bfb1731d409a03d0367b653dff866f9a3e8b4deb1f09d6405e8e103a94681fe3e80ba4dd042782a2defec409f0b020c1d3c263bf3feec1
DIST openjdk-6-src-b37-11_nov_2015.tar.xz 33790124 SHA256 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d SHA512 e7da587e5cb5a99d3a92bc64ae1bc668bd470cd5664f097197d87af07aa32414903c1b212693449e471b933ed6b1bc7e754fb56ccd7af23038d766dbfdf8eba8 WHIRLPOOL 685fd308007bc236b2c461c09186f910ef5c829a3f557fad5b37902d0550b66d7be82502a66209c99430639d875356f5249fa5047f46468983d164aa156aed17
diff --git a/dev-java/icedtea/files/8-ccache.patch b/dev-java/icedtea/files/8-ccache.patch
new file mode 100644
index 0000000..c846dba
--- /dev/null
+++ b/dev-java/icedtea/files/8-ccache.patch
@@ -0,0 +1,11 @@
+--- openjdk/common/autoconf/generated-configure.sh.orig 2016-04-01 04:32:19.000000000 +0100
++++ openjdk/common/autoconf/generated-configure.sh 2016-04-10 20:04:53.472885447 +0100
+@@ -35764,7 +35764,7 @@
+ # precompiled headers.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
+ $as_echo_n "checking if ccache supports precompiled headers... " >&6; }
+- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
++ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.[456789]|[2-9])") 2> /dev/null`
+ if test "x$HAS_GOOD_CCACHE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
+ $as_echo "no, disabling ccache" >&6; }
diff --git a/dev-java/icedtea/icedtea-3.0.0.ebuild b/dev-java/icedtea/icedtea-3.0.0.ebuild
new file mode 100644
index 0000000..f0267be
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.0.0.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+EAPI="5"
+SLOT="8"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="37af47894175.tar.xz"
+JAXP_TARBALL="4ed5441e40e1.tar.xz"
+JAXWS_TARBALL="a81c04154cc5.tar.xz"
+JDK_TARBALL="3334efeacd83.tar.xz"
+LANGTOOLS_TARBALL="dd581e8047e6.tar.xz"
+OPENJDK_TARBALL="8ed8d26a3f9a.tar.xz"
+NASHORN_TARBALL="697c5f792bec.tar.xz"
+HOTSPOT_TARBALL="5e587a29a6aa.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+ http://icedtea.classpath.org/download/source/${SRC_PKG}
+ ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+ ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+ ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+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"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
+ jamvm +jbootstrap libressl nsplugin pax_kernel
+ pulseaudio sctp selinux smartcard +source +sunec test +webstart zero"
+
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+ >=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+ >=net-print/cups-1.2.12"
+X_COMMON_DEP="
+ >=media-libs/giflib-4.1.6:=
+ >=media-libs/libpng-1.2:0=
+ >=x11-libs/libX11-1.1.3
+ >=x11-libs/libXext-1.1.1
+ >=x11-libs/libXi-1.1.3
+ >=x11-libs/libXrender-0.9.4
+ >=x11-libs/libXtst-1.0.3
+ x11-libs/libXcomposite"
+X_DEPEND="
+ >=x11-libs/libXau-1.0.3
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXinerama-1.0.2
+ x11-proto/inputproto
+ >=x11-proto/xextproto-7.1.1
+ x11-proto/xineramaproto
+ x11-proto/xproto"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+# Kerberos will be added following PR1537
+COMMON_DEP="
+ >=dev-libs/glib-2.26:2
+ >=dev-util/systemtap-1
+ media-libs/fontconfig
+ >=media-libs/freetype-2.5.3:2=
+ >=media-libs/lcms-2.5
+ >=sys-libs/zlib-1.2.3:=
+ virtual/jpeg:0=
+ sctp? ( net-misc/lksctp-tools )
+ smartcard? ( sys-apps/pcsc-lite )
+ sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+ !dev-java/icedtea:0
+ !dev-java/icedtea-web:7
+ media-fonts/dejavu
+ alsa? ( ${ALSA_COMMON_DEP} )
+ cjk? (
+ media-fonts/arphicfonts
+ media-fonts/baekmuk-fonts
+ media-fonts/lklug
+ media-fonts/lohit-fonts
+ media-fonts/sazanami
+ )
+ cups? ( ${CUPS_COMMON_DEP} )
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8:=
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2=
+ >=x11-libs/pango-1.24.5
+ )
+ !headless-awt? ( ${X_COMMON_DEP} )
+ selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+ || (
+ dev-java/icedtea-bin:8
+ dev-java/icedtea-bin:7
+ dev-java/icedtea:8
+ dev-java/icedtea:7
+ )
+ app-arch/cpio
+ app-arch/unzip
+ app-arch/zip
+ app-misc/ca-certificates
+ dev-lang/perl
+ !libressl? ( dev-libs/openssl )
+ libressl? ( dev-libs/libressl )
+ sys-apps/attr
+ sys-apps/lsb-release
+ x11-libs/libXt
+ virtual/pkgconfig
+ pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+ local CHECKREQS_DISK_BUILD
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="9000M"
+ else
+ CHECKREQS_DISK_BUILD="8500M"
+ fi
+
+ check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ icedtea_check_requirements
+}
+
+pkg_setup() {
+ icedtea_check_requirements
+
+ JAVA_PKG_WANT_BUILD_VM="
+ icedtea-8 icedtea-bin-8
+ icedtea-7 icedtea-bin-7"
+ JAVA_PKG_WANT_SOURCE="1.5"
+ JAVA_PKG_WANT_TARGET="1.5"
+
+ java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${SRC_PKG}
+}
+
+java_prepare() {
+ # For bootstrap builds as the sandbox control file might not yet exist.
+ addpredict /proc/self/coredump_filter
+
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+}
+
+src_configure() {
+ local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
+ local vm=$(java-pkg_get-current-vm)
+
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
+ use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
+ fi
+
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+ if { use amd64 || use arm64 || use ppc64 || use sparc || use x86; }; then
+ hotspot_port="yes"
+ fi
+
+ # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+ # Otherwise use Zero for now until alternate VMs are working
+ if test "x${hotspot_port}" != "xyes"; then
+ use_zero="yes"
+ fi
+
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+ jamvm_config="--enable-jamvm"
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+ cacao_config="--enable-cacao"
+ fi
+
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
+ zero_config="--enable-zero"
+ fi
+
+ # https://bugs.openjdk.java.net/browse/JDK-8067132
+ export DISTRIBUTION_PATCHES="${SLOT}-ccache.patch"
+ ln -snf "${FILESDIR}"/${SLOT}-ccache.patch . || die
+
+ # IcedTea itself doesn't handle ccache yet.
+ if has ccache ${FEATURES}; then
+ ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
+ export enable_ccache=yes
+ else
+ export enable_ccache=no
+ fi
+
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+ unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+ econf ${config} \
+ --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+ --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+ --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+ --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+ --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+ --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
+ --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+ --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+ --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+ --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+ --with-jdk-home="$(java-config -O)" \
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --with-pkgversion="Gentoo ${PF}" \
+ --disable-downloading --disable-Werror --disable-tests \
+ --enable-system-lcms --enable-system-jpeg \
+ --enable-system-zlib --disable-systemtap-tests \
+ $(use_enable !headless-awt system-gif) \
+ $(use_enable !headless-awt system-png) \
+ $(use_enable !debug optimizations) \
+ $(use_enable doc docs) \
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable sunec) \
+ ${zero_config} ${cacao_config} ${jamvm_config}
+}
+
+src_compile() {
+ # OpenJDK is quite picky about ccache and dies if you attempt to use
+ # it via wrapper symlinks like Gentoo normally does.
+ PATH=$(sed 's#[^:]*/ccache/bin:##g' <<< "${PATH}") emake
+}
+
+src_test() {
+ # Use Xvfb for tests
+ unset DISPLAY
+
+ Xemake check
+}
+
+src_install() {
+ default
+
+ local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+ local ddest="${ED}${dest#/}"
+
+ if ! use alsa; then
+ rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ # Ensures Headless-AwtGraphicsEnvironment is used.
+ # Hack; we should get IcedTea to support passing --disable-headful
+ if use headless-awt; then
+ rm -vr "${ddest}"/jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
+ "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
+ fi
+
+ if ! use examples; then
+ rm -r "${ddest}"/demo "${ddest}"/sample || die
+ fi
+
+ if ! use source; then
+ rm -v "${ddest}"/src.zip || die
+ fi
+
+ # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+ if use webstart || use nsplugin; then
+ dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+ dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+ fi
+ if use webstart; then
+ dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+ dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+ fi
+ dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+ # Fix the permissions.
+ find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+ # We need to generate keystore - bug #273306
+ einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+ mkdir "${T}/certgen" && cd "${T}/certgen" || die
+ cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+ for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+ openssl x509 -text -in "${c}" >> all.crt || die
+ done
+ ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+ cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+ chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+ set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2016-04-14 20:24 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2016-04-14 20:24 UTC (permalink / raw
To: gentoo-commits
commit: a851b2296de0329ca97a9c94afd8f6e0c9b216d4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 20:18:39 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 20:24:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a851b229
dev-java/icedtea: Goodbye Java 6! (bug #483018)
IcedTea for Java 6 (1.x) is still maintained upstream but Gentoo no
longer needs it. If you need it, upstream will continue to provide
source ebuilds in the java overlay for the foreseeable future.
Package-Manager: portage-2.2.28
dev-java/icedtea/Manifest | 3 -
dev-java/icedtea/files/6-cacao-pr-157.patch | 143 ------------
dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild | 351 ----------------------------
dev-java/icedtea/metadata.xml | 1 -
4 files changed, 498 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 1a1a700..f200eb7 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -15,9 +15,6 @@ DIST icedtea-3.0-langtools-dd581e8047e6.tar.xz 2055716 SHA256 e0e0e6a7cf85755065
DIST icedtea-3.0-nashorn-697c5f792bec.tar.xz 2220600 SHA256 b4c59d8269511f2073498518e599ec91dff11c57cadc0b97fa88af81835122c0 SHA512 e719c91ede0db0a5a0c97ff8ee165fadfecab053a48116d48974e24af06559540d2924b0d582fa4d4d5e4971ebc5929aa70b775f0fc6991c8311ca78d7860cd2 WHIRLPOOL e29ab3b81d095034e90c2996802f2c4ce1b338be817cf81ffddb084eedf52638e2b011b379534a9856303d3c3b722ef699d61d25a18f8e7910442c3139e01265
DIST icedtea-3.0-openjdk-8ed8d26a3f9a.tar.xz 330164 SHA256 5b032673d74c4e2529427b9570b177285dc9a6430d016ef2e072dd2167669031 SHA512 9b0c6952e66708810cbdcd4f0a093f8d6f954c5cf1d098b6d70eced8908689fc0716fbb76ea6344c4a01127177fb078b31706551289aa7bd80fb649efe4d9018 WHIRLPOOL 361e0f9d3653a5718b3a2a1609c5b73adcee89c22f81e1c108c39499b5e755be639241a1de2946622731255ccbb8d00b097f77176fd31e7b9cfebfdcf94e1feb
DIST icedtea-3.0.0.tar.xz 1402156 SHA256 947add69b3b89d7685cb0c9e2b51fc561e27f6e7c0bf1ea98dac8156fa8629a9 SHA512 80bece0c0dbe4c0eaf8716abd0018ae71fc62dd9a3698eeca37383af51884cac5b1185f226003e396b4b5691beca478b5419755795f906962e9f66674294ae9b WHIRLPOOL 4811b4041f96e2debc1f8760eb1c9c318f3c40b36ee45042788c99b74c9886c46a9859fe23eb369f531c596252a89e80b32b71b364e13bd1478c04e66911e824
-DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
-DIST icedtea6-1.13.9.tar.xz 4573884 SHA256 61e0fb2ed0fc2d793a42e24d2192423f8a7ccb04f130d82d5889a0ecf52bc965 SHA512 b1a6e7d36904e3a9cea620c86dc656324bc99622d470f021f86a66c77919d8faf774d199f42669f9813f1ca4c41f2a920a66f9927d33eeca5476edd26438822a WHIRLPOOL 32586b8563cb7c9246bfb1731d409a03d0367b653dff866f9a3e8b4deb1f09d6405e8e103a94681fe3e80ba4dd042782a2defec409f0b020c1d3c263bf3feec1
-DIST openjdk-6-src-b37-11_nov_2015.tar.xz 33790124 SHA256 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d SHA512 e7da587e5cb5a99d3a92bc64ae1bc668bd470cd5664f097197d87af07aa32414903c1b212693449e471b933ed6b1bc7e754fb56ccd7af23038d766dbfdf8eba8 WHIRLPOOL 685fd308007bc236b2c461c09186f910ef5c829a3f557fad5b37902d0550b66d7be82502a66209c99430639d875356f5249fa5047f46468983d164aa156aed17
diff --git a/dev-java/icedtea/files/6-cacao-pr-157.patch b/dev-java/icedtea/files/6-cacao-pr-157.patch
deleted file mode 100644
index 3419b8f..0000000
--- a/dev-java/icedtea/files/6-cacao-pr-157.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur cacao/cacao/src/vm/options.c cacao/cacao/src/vm/options.c
---- cacao/cacao/src/vm/options.c 2013-01-10 16:45:14.000000000 +0000
-+++ cacao/cacao/src/vm/options.c 2016-01-03 11:48:06.439004345 +0000
-@@ -26,6 +26,7 @@
- #include "config.h"
-
- #include <limits.h>
-+#include <stddef.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -56,9 +57,9 @@
-
- bool opt_run = true;
-
--s4 opt_heapmaxsize = 0; /* maximum heap size */
--s4 opt_heapstartsize = 0; /* initial heap size */
--s4 opt_stacksize = 0; /* thread stack size */
-+size_t opt_heapmaxsize = 0; /* maximum heap size */
-+size_t opt_heapstartsize = 0; /* initial heap size */
-+size_t opt_stacksize = 0; /* thread stack size */
-
- bool opt_verbose = false;
- bool opt_debugcolor = false; /* use ANSI terminal sequences */
-diff -Naur cacao/cacao/src/vm/options.h cacao/cacao/src/vm/options.h
---- cacao/cacao/src/vm/options.h 2013-01-10 16:45:14.000000000 +0000
-+++ cacao/cacao/src/vm/options.h 2016-01-03 11:48:55.397204706 +0000
-@@ -32,6 +32,7 @@
- extern "C" {
- #endif
-
-+#include <stddef.h>
- #include <stdint.h>
-
- #include "vm/types.h"
-@@ -82,9 +83,9 @@
- extern bool opt_jar;
- extern bool opt_run;
-
--extern s4 opt_heapmaxsize;
--extern s4 opt_heapstartsize;
--extern s4 opt_stacksize;
-+extern size_t opt_heapmaxsize;
-+extern size_t opt_heapstartsize;
-+extern size_t opt_stacksize;
-
- extern bool opt_verbose;
- extern bool opt_debugcolor;
-diff -Naur cacao/cacao/src/vm/vm.cpp cacao/cacao/src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp 2013-01-10 16:45:14.000000000 +0000
-+++ cacao/cacao/src/vm/vm.cpp 2016-01-03 11:50:15.779891441 +0000
-@@ -25,6 +25,7 @@
-
- #include "config.h"
-
-+#include <stddef.h>
- #include <stdint.h>
-
- #include <exception>
-@@ -33,6 +34,10 @@
- #include <errno.h>
- #include <stdlib.h>
-
-+#if defined(__LINUX__)
-+#include <unistd.h>
-+#endif
-+
- #include "vm/types.h"
-
- #include "arch.h"
-@@ -699,6 +704,19 @@
- opt_heapstartsize = HEAP_STARTSIZE;
- opt_stacksize = STACK_SIZE;
-
-+#if defined(__LINUX__)
-+ // Calculate 1/4 of the physical memory.
-+ size_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
-+
-+ if (qmem > INT32_MAX) {
-+ // Allocate no more than 2GB.
-+ opt_heapmaxsize = INT32_MAX;
-+ } else if (qmem > HEAP_MAXSIZE) {
-+ // Otherwise use this if greater than default (128MB).
-+ opt_heapmaxsize = qmem;
-+ }
-+#endif
-+
- // First of all, parse the -XX options.
-
- #if defined(ENABLE_VMLOG)
-@@ -914,18 +932,33 @@
- case OPT_SS:
- {
- char c;
-- int j;
-+ size_t j;
-
-+ errno = 0;
- c = opt_arg[strlen(opt_arg) - 1];
-+ j = strtoul(opt_arg, NULL, 10);
-+
-+ if (errno)
-+ break; // Invalid.
-
- if ((c == 'k') || (c == 'K')) {
-- j = atoi(opt_arg) * 1024;
-+ if (j > SIZE_MAX / 1024)
-+ break; // Overflow.
-+ else
-+ j *= 1024;
-
- } else if ((c == 'm') || (c == 'M')) {
-- j = atoi(opt_arg) * 1024 * 1024;
--
-- } else
-- j = atoi(opt_arg);
-+ if (j > SIZE_MAX / 1024 / 1024)
-+ break; // Overflow.
-+ else
-+ j *= 1024 * 1024;
-+
-+ } else if ((c == 'g') || (c == 'G')) {
-+ if (j > SIZE_MAX / 1024 / 1024 / 1024)
-+ break; // Overflow.
-+ else
-+ j *= 1024 * 1024 * 1024;
-+ }
-
- if (opt == OPT_MX)
- opt_heapmaxsize = j;
-@@ -1525,9 +1558,9 @@
- void VM::print_run_time_config()
- {
- puts("Run-time variables:\n");
-- printf(" maximum heap size : %d\n", opt_heapmaxsize);
-- printf(" initial heap size : %d\n", opt_heapstartsize);
-- printf(" stack size : %d\n", opt_stacksize);
-+ printf(" maximum heap size : %lu\n", opt_heapmaxsize);
-+ printf(" initial heap size : %lu\n", opt_heapstartsize);
-+ printf(" stack size : %lu\n", opt_stacksize);
-
- #if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
- printf(" gnu.classpath.boot.library.path: %s\n", _properties.get("gnu.classpath.boot.library.path"));
diff --git a/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
deleted file mode 100644
index a5d637d..0000000
--- a/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-ICEDTEA_BRANCH=$(get_version_component_range 1-3)
-OPENJDK_BUILD="37"
-OPENJDK_DATE="11_nov_2015"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
-# Download cacao and jamvm regardless for use with EXTRA_ECONF
-CACAO_TARBALL="68fe50ac34ec.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
- http://icedtea.classpath.org/download/source/${SRC_PKG}
- https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
- http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-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"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="test"
-
-IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
- javascript +jbootstrap kerberos nsplugin +nss pax_kernel pulseaudio
- selinux source systemtap test +webstart zero"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.2.12"
-X_COMMON_DEP="
- >=media-libs/giflib-4.1.6:=
- >=media-libs/libpng-1.2:0=
- >=x11-libs/libX11-1.1.3
- >=x11-libs/libXext-1.1.1
- >=x11-libs/libXi-1.1.3
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.0.3
- x11-libs/libXt"
-X_DEPEND="
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
- x11-proto/inputproto
- >=x11-proto/xextproto-7.1.1
- x11-proto/xineramaproto
- x11-proto/xproto"
-
-COMMON_DEP="
- >=media-libs/freetype-2.3.5:2=
- >=media-libs/lcms-2.5
- >=sys-libs/zlib-1.2.3:=
- virtual/jpeg:0=
- javascript? ( dev-java/rhino:1.6 )
- kerberos? ( virtual/krb5 )
- nss? ( >=dev-libs/nss-3.12.5-r1 )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= )
- systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea6
- !dev-java/icedtea-web:6
- media-fonts/dejavu
- alsa? ( ${ALSA_COMMON_DEP} )
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- cups? ( ${CUPS_COMMON_DEP} )
- gtk? ( >=x11-libs/gtk+-2.8:2 )
- !headless-awt? ( ${X_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
- || (
- >=dev-java/gcj-jdk-4.3
- dev-java/icedtea-bin:6
- dev-java/icedtea:6
- )
- app-arch/cpio
- app-arch/unzip
- app-arch/zip
- app-misc/ca-certificates
- >=dev-java/ant-core-1.8.2
- dev-lang/perl
- >=dev-libs/libxslt-1.1.26
- dev-libs/openssl
- sys-apps/lsb-release
- virtual/pkgconfig
- pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
- nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
- local CHECKREQS_DISK_BUILD
-
- if use doc; then
- CHECKREQS_DISK_BUILD="8500M"
- else
- CHECKREQS_DISK_BUILD="8000M"
- fi
-
- check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- icedtea_check_requirements
-}
-
-pkg_setup() {
- icedtea_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="
- icedtea-6 icedtea-bin-6
- gcj-jdk"
- JAVA_PKG_WANT_SOURCE="1.5"
- JAVA_PKG_WANT_TARGET="1.5"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${SRC_PKG}
-}
-
-java_prepare() {
- # For bootstrap builds as the sandbox control file might not yet exist.
- addpredict /proc/self/coredump_filter
-
- # icedtea doesn't like some locales. #330433 #389717
- export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
- local cacao_config config hotspot_port use_cacao use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # gcj-jdk ensures ecj is present.
- if use jbootstrap || has "${vm}" gcj-jdk; then
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- config+=" --enable-bootstrap"
- else
- config+=" --disable-bootstrap"
- fi
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, arm, sparc and x86.
- if { use amd64 || use arm || use sparc || use x86; }; then
- hotspot_port="yes"
- fi
-
- # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use CACAO on ppc and Zero on anything else
- if test "x${hotspot_port}" != "xyes"; then
- if { use ppc || use ppc64; }; then
- use_cacao="yes"
- else
- use_zero="yes"
- fi
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- fi
- cacao_config="--enable-cacao"
-
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2611
- export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
- ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- zero_config="--enable-zero"
- fi
-
- config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
- if use javascript ; then
- config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
- else
- config+=" --without-rhino"
- fi
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- econf ${config} \
- --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
- --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
- --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
- --with-jdk-home="$(java-config -O)" \
- --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
- --with-pkgversion="Gentoo package ${PF}" \
- --disable-downloading --disable-Werror \
- $(use_enable !headless-awt system-gif) \
- $(use_enable !headless-awt system-png) \
- $(use_enable !debug optimizations) \
- $(use_enable doc docs) \
- $(use_enable kerberos system-kerberos) \
- $(use_enable nss) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- $(use_enable pulseaudio pulse-java) \
- $(use_enable systemtap) \
- ${zero_config} ${cacao_config}
-}
-
-src_compile() {
- # Would use GENTOO_VM otherwise.
- export ANT_RESPECT_JAVA_HOME=TRUE
-
- # With ant >=1.8.2 all required tasks are part of ant-core
- export ANT_TASKS="none"
-
- emake
-}
-
-src_test() {
- # Use Xvfb for tests
- unset DISPLAY
-
- Xemake check
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- dodoc README NEWS AUTHORS
- dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
- cd openjdk.build/j2sdk-image || die
-
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if use headless-awt ; then
- rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- # Don't hide classes
- rm lib/ct.sym || die
-
- #402507
- mkdir jre/.systemPrefs || die
- touch jre/.systemPrefs/.system.lock || die
- touch jre/.systemPrefs/.systemRootModFile || die
-
- # doins doesn't preserve executable bits.
- cp -vRP bin include jre lib man "${ddest}" || die
-
- dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
- if use doc; then
- docinto html
- dodoc -r ../docs/*
- fi
-
- if use examples; then
- cp -vRP demo sample "${ddest}" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
- dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
- dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
- fi
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- # Needs to be done before generating cacerts
- java-vm_set-pax-markings "${ddest}"
-
- # We need to generate keystore - bug #273306
- einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
- mkdir "${T}/certgen" && cd "${T}/certgen" || die
- cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
- for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
- openssl x509 -text -in "${c}" >> all.crt || die
- done
- ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
- cp -vRP cacerts "${ddest}/jre/lib/security/" || die
- chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
- set_java_env "${FILESDIR}/icedtea.env"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea6"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
- elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
- elog "If you had icedtea6 as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index b5480c2..e0f7e15 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -32,7 +32,6 @@
<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
<flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
<flag name="sunec">Build the SunEC provider against system NSS</flag>
- <flag name="systemtap">Enable SystemTap probes in HotSpot.</flag>
<flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
<flag name="webstart">Enable Web Start support (via NetX).</flag>
</use>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2016-08-02 22:34 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2016-08-02 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 5224f936687046ed6550a5ebf5122d714874ee8b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 22:32:50 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 22:34:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5224f936
dev-java/icedtea: Version bump to 3.1.0
Package-Manager: portage-2.3.0
dev-java/icedtea/Manifest | 10 +
dev-java/icedtea/files/icedtea.env.sh | 18 ++
dev-java/icedtea/icedtea-3.1.0.ebuild | 365 ++++++++++++++++++++++++++++++++++
dev-java/icedtea/metadata.xml | 2 +
4 files changed, 395 insertions(+)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 2db0569..b673db4 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -15,6 +15,16 @@ DIST icedtea-3.0-langtools-ad6886e3a101.tar.xz 2056412 SHA256 260260115257602173
DIST icedtea-3.0-nashorn-c89dc17f7c75.tar.xz 2220176 SHA256 e7040d55a499c002cd6edcedc44890072a2f88cb19a341950e5865c544b51edc SHA512 3cf12d2696b630eec2a4c6fefe08db9e14db62bbd81a3a4546ef886f6b7fa059a2f41dd3a4377ab2da1f65d371b70766caac4054b447454863de82ce961c3d31 WHIRLPOOL ad2ede063f0e6cb1a67f90d42ddcf2ab33175008361620abf04ccc1a55b9e3c2a8a9827100137842c8f6de2a3af367b6143c0916a5ffa4920dbcd33fb66547c0
DIST icedtea-3.0-openjdk-6a70821528ba.tar.xz 330720 SHA256 8b766fffa39d67e62802a8cddd23e02b0ac2fd6aff48658b4b08fd6dbee38184 SHA512 5054d4a541b8f3e6fd09cd44355b39d3a0e1ea27247bcaf8bb800e1e3cf23a4133076383b74c19be1928a5fc0c3986ab3303614a834b9741209dcf20eb19d703 WHIRLPOOL 7ea8c98d4dca75325841929aa8049ecf713e637124e4ce6f9a98d7845d25153d851c42f632132ab61ff6823e0aeab07ad0dc43e6f699d4f3747b536e90eb0b76
DIST icedtea-3.0.1.tar.xz 1403400 SHA256 346ce30de1de6c493729b79b246f250438fc5b8df7eae47229a97f9000a73af2 SHA512 01506994e3c4b4a1dc927251de0db5e5a22754031604cf7c8660597525616d3205527ed768d67aa4b4c62b40a0e3fbd3327c97b95c81b634175dec69c5802c8f WHIRLPOOL 0641f49b6fcccb3981e2756a2403638897887634ff09b6ede9ae61af80259b5bc1168c6c5f236a07157befec4a1fe848d0814afe5515bb5a98c591370c62dacb
+DIST icedtea-3.1-corba-7ea39ff8c227.tar.xz 938792 SHA256 5e334d4250de441517c0e761a3202dfdf4beacb75c0f7a03617b62d89cb71c21 SHA512 9b0ebefec9cdc6b653b7b88b2db4c7dd7aebe0e120c23e967cf3433837bc52c65b31da36034161d1c7ae18ddc18a2a5294b2a1469eeec23c7817ef1530909d67 WHIRLPOOL 677945e73e1cbe207fc737e53ec8e8e706a44e8c2031f386b932af2650dc45695e7d64c640ac8378b88d2fb3f4e02efa67e723bb58de5c4282cd2ae200cd6f9a
+DIST icedtea-3.1-hotspot-e480e0df8eea.tar.xz 6797536 SHA256 33581ea3ef4deffa786be82e110ae3d6b0431cc56140eb51453af1f11962b174 SHA512 8fcd3934afb446cd683f991f99c2b22fbeee607a1221665d7300d1e8d53740d7d2fee7894ccc53cddb02b902acaff68fd3ca1454dc244feeb641f5d5fd6308b4 WHIRLPOOL 3d004d4bb41991a8390d0ab28d3b8239c68ef33e9e1a5ce55b7236234580c6dc6f4be1cca6c1e409233c2fd6fc1f82b1a7ad24a0a2784ecb506cf36537427f1b
+DIST icedtea-3.1-jaxp-9368913c75fa.tar.xz 2299184 SHA256 6d58edfd2b7f07b4d543910f7525fe08d94d56899b96493efce217b4a226aca3 SHA512 e7e605937292f37aa8a5510f3bfda20ccdeee17d6cbe5a69260eddbb7f39733ef9dd7d91ffd3e968aee926d1c21b4ace2522cb28687915168baf070b0fe38354 WHIRLPOOL 1faf6d50a091cb3f4aa5db3faac8cbb1c206e6bf5955905b1d3c45abacb6cf0757c6f28c5e8be38b7cbe4891ce82a9a28a4a8bcba2ead77ac03523e4496301ef
+DIST icedtea-3.1-jaxws-534ca1b701d1.tar.xz 2267744 SHA256 811ad76dfcffe1e6f2ef39a088f27a8858ed3371ef93816c8dc453f90516c7d7 SHA512 0fd71e75e38a90e4d74477c9c7a2843d3b7fb9430332fa18a1a2f36376918832f6091bc3f2de86900e332bb4fc11a480ce7aedafeaddc3fc93493944183dc42a WHIRLPOOL 93ce79f91478cd740b9c91b5c4c24001a72c616206b983e756be5df8d8e36b3b542e5757d574dbeb29433f57ab4b66845dcc1f85201cfdb700c3b90668e419f7
+DIST icedtea-3.1-jdk-3d312c038b60.tar.xz 38656892 SHA256 83880a4b865e33e7913bec603da1e5439ea3602b3540d8071408de7bef8162a9 SHA512 9fb70cd63412c4de7112fa1645b485ef5840dc21ff8fc35c12a10d843b879d6400a6109634351974257a1e12d2843ad4b22811d4d9662cbe2e2114838bd6cba8 WHIRLPOOL 33461af7edf71e20f5e304f9056e9566652847b19c654aee163f1bea141c0993e9e3047eb6d7d5121ca2527f316cc1f9549642f3faa42ef4af5d023524cd2cbd
+DIST icedtea-3.1-langtools-05822f2e947b.tar.xz 2060848 SHA256 2a7f8dd0b0c1b256c58b8e841033b7915beb08d983350f9a9357115a05677f1d SHA512 c6eb7b5287cb7dbf518ac9d7167b9e63df086b9abe893adfc72b7ba5d9e0a16861fa72b5fbb46ce58bd02cf837b81d03cd1b860dea947a9e58ff39a8d62411ee WHIRLPOOL 289b389621276947376934eaa1d40fa30929e8ae83b7bca34dbd5470676e6ce6e026f1523269a89a5de9abe3abc18b60fdd00b77bf30be09660c725ed3032245
+DIST icedtea-3.1-nashorn-289b6e3c6e05.tar.xz 2219684 SHA256 56b36f5f7c073b140f8316084a23080553d8790d9f1f7e6d6288c6b0fd45cd7f SHA512 61f060f02a8852681212ac26018de0ad3403156f9c1fb984c658fa31bc4e58a0da588188c57d629da022b32c763c2f5915a8938997c6f94b127ceacde8d050f9 WHIRLPOOL 7c1f866c9e58f01d21cfdb999cb4991faba63f160378baa3ef7b7c2c1e7ce6e1f0578d001b0f419234e91571bf9eba3b6c0570c5efdaf855508ffeb54bc32dc5
+DIST icedtea-3.1-openjdk-453780834f92.tar.xz 334244 SHA256 c19f7ffaec510db20b3c66b6447040012c28df319ab1dcfaf0a41c0e807bdddc SHA512 f2b40a39418e9df667a871293629cec85a8b43edd9051caf80961e1b92916e7a7509dfebaaf6c461ff0d51e6e8d653d7584de8ff35fb7229e8def6ee0f8ddadc WHIRLPOOL a072fd9dac5cefd00f60557bd25f4089ede0400caf64b179924df2cd1a18ded15d9eef072d355870c735d311012ecb53178b834ea3a738d994decacf13433b16
+DIST icedtea-3.1-shenandoah-997386c525f7.tar.xz 6839400 SHA256 9363a37649f102de9c49e11f1fdd2b42be82f83e004265894cfc036325d511ea SHA512 7cf4b07c62d790225ce102ab7e835e00bf53cbeace9c1bc10faf84f5d1a8b6eb9e2be62e542e98d7ecef75594738fa660bb738e951c91067220487cd105b3454 WHIRLPOOL 8bf3d81d01d84e362ed0d446a9183702e6f22a3eb186842cf4e63a98842263e28e98fd4d16d4c995cd6b2c87e839ee2484b2182edca6b02ae6702a25f7cdf61e
+DIST icedtea-3.1.0.tar.xz 1437400 SHA256 75616641ad6d8437124c32fed3fadddac67b14bba26757e15f6c2f69149233b4 SHA512 85b54df0d50e5554b62191c7e868c7c2154619617732af227408a8d6a9c8b2a4b86fc2f98f33b58c4b14485931e6da4eff8d50026d63b0f7a5a46bf9d66140a3 WHIRLPOOL c2f3b42a2b16fd1e28d3a9f1929cba76e2f0aa77872eac8f451b53fb20eaaf7aec140c769133af976e0377315742d6a2cc054a325c82195380dd8cc5e5bc45c7
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
diff --git a/dev-java/icedtea/files/icedtea.env.sh b/dev-java/icedtea/files/icedtea.env.sh
new file mode 100644
index 0000000..33a91d3
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea.env.sh
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IcedTea JDK ${PV}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[ ${SLOT} = 7 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)"
+MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.${SLOT}"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/icedtea-3.1.0.ebuild b/dev-java/icedtea/icedtea-3.1.0.ebuild
new file mode 100644
index 0000000..d62b4ad
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.1.0.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+EAPI="5"
+SLOT="8"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="7ea39ff8c227.tar.xz"
+JAXP_TARBALL="9368913c75fa.tar.xz"
+JAXWS_TARBALL="534ca1b701d1.tar.xz"
+JDK_TARBALL="3d312c038b60.tar.xz"
+LANGTOOLS_TARBALL="05822f2e947b.tar.xz"
+OPENJDK_TARBALL="453780834f92.tar.xz"
+NASHORN_TARBALL="289b6e3c6e05.tar.xz"
+HOTSPOT_TARBALL="e480e0df8eea.tar.xz"
+SHENANDOAH_TARBALL="997386c525f7.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+ http://icedtea.classpath.org/download/source/${SRC_PKG}
+ ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+ shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+ ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+ ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+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"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt infinality
+ jamvm +jbootstrap libressl nsplugin pax_kernel
+ pulseaudio sctp selinux shenandoah smartcard +source +sunec test +webstart zero"
+
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+ >=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+ >=net-print/cups-1.2.12"
+X_COMMON_DEP="
+ >=media-libs/giflib-4.1.6:=
+ >=media-libs/libpng-1.2:0=
+ >=x11-libs/libX11-1.1.3
+ >=x11-libs/libXext-1.1.1
+ >=x11-libs/libXi-1.1.3
+ >=x11-libs/libXrender-0.9.4
+ >=x11-libs/libXtst-1.0.3
+ x11-libs/libXcomposite"
+X_DEPEND="
+ >=x11-libs/libXau-1.0.3
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXinerama-1.0.2
+ x11-proto/inputproto
+ >=x11-proto/xextproto-7.1.1
+ x11-proto/xineramaproto
+ x11-proto/xproto"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+# Kerberos will be added following PR1537
+COMMON_DEP="
+ >=dev-libs/glib-2.26:2
+ >=dev-util/systemtap-1
+ media-libs/fontconfig
+ >=media-libs/lcms-2.5
+ >=sys-libs/zlib-1.2.3:=
+ virtual/jpeg:0=
+ !infinality? ( >=media-libs/freetype-2.5.3:2= )
+ infinality? ( <media-libs/freetype-2.6.4:2=[infinality] )
+ sctp? ( net-misc/lksctp-tools )
+ smartcard? ( sys-apps/pcsc-lite )
+ sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+ !dev-java/icedtea:0
+ !dev-java/icedtea-web:7
+ >=gnome-base/gsettings-desktop-schemas-3.12.2
+ virtual/ttf-fonts
+ alsa? ( ${ALSA_COMMON_DEP} )
+ cups? ( ${CUPS_COMMON_DEP} )
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8:=
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2=
+ >=x11-libs/pango-1.24.5
+ )
+ !headless-awt? ( ${X_COMMON_DEP} )
+ selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+ || (
+ dev-java/icedtea-bin:8
+ dev-java/icedtea-bin:7
+ dev-java/icedtea:8
+ dev-java/icedtea:7
+ )
+ app-arch/cpio
+ app-arch/unzip
+ app-arch/zip
+ app-misc/ca-certificates
+ dev-lang/perl
+ !libressl? ( dev-libs/openssl )
+ libressl? ( dev-libs/libressl )
+ sys-apps/attr
+ sys-apps/lsb-release
+ x11-libs/libXt
+ virtual/pkgconfig
+ pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+ local CHECKREQS_DISK_BUILD
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="9000M"
+ else
+ CHECKREQS_DISK_BUILD="8500M"
+ fi
+
+ check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ icedtea_check_requirements
+}
+
+pkg_setup() {
+ icedtea_check_requirements
+
+ JAVA_PKG_WANT_BUILD_VM="
+ icedtea-8 icedtea-bin-8
+ icedtea-7 icedtea-bin-7"
+ JAVA_PKG_WANT_SOURCE="1.5"
+ JAVA_PKG_WANT_TARGET="1.5"
+
+ java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${SRC_PKG}
+}
+
+java_prepare() {
+ # For bootstrap builds as the sandbox control file might not yet exist.
+ addpredict /proc/self/coredump_filter
+
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+}
+
+src_configure() {
+ local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+ local vm=$(java-pkg_get-current-vm)
+
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
+ use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
+ fi
+
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+ if { use amd64 || use arm64 || use ppc64 || use sparc || use x86; }; then
+ hotspot_port="yes"
+ fi
+
+ # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+ # Otherwise use Zero for now until alternate VMs are working
+ if test "x${hotspot_port}" != "xyes"; then
+ use_zero="yes"
+ fi
+
+ if use shenandoah; then
+ if use amd64; then
+ hs_config="--with-hotspot-build=shenandoah"
+ hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+ else
+ eerror "Shenandoah can only be built on x86_64. Please re-build with USE="-shenandoah""
+ fi
+ else
+ hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+ fi
+
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+ jamvm_config="--enable-jamvm"
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+ cacao_config="--enable-cacao"
+ fi
+
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
+ zero_config="--enable-zero"
+ fi
+
+ # Warn about potential problems with ccache enabled
+ if has ccache ${FEATURES}; then
+ ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
+ fi
+
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+ unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+ econf ${config} \
+ --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+ --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+ --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+ --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+ --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+ --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+ --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+ --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+ --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+ --with-jdk-home="$(java-config -O)" \
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --with-pkgversion="Gentoo ${PF}" \
+ --disable-downloading --disable-Werror --disable-tests \
+ --enable-system-lcms --enable-system-jpeg \
+ --enable-system-zlib --disable-systemtap-tests \
+ $(use_enable headless-awt headless) \
+ $(use_enable !headless-awt system-gif) \
+ $(use_enable !headless-awt system-png) \
+ $(use_enable doc docs) \
+ $(use_enable infinality) \
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable sunec) \
+ ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+ default
+}
+
+src_test() {
+ default
+}
+
+src_install() {
+ default
+
+ local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+ local ddest="${ED}${dest#/}"
+
+ if ! use alsa; then
+ rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ if ! use examples; then
+ rm -r "${ddest}"/demo "${ddest}"/sample || die
+ fi
+
+ if ! use source; then
+ rm -v "${ddest}"/src.zip || die
+ fi
+
+ dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+ # Fix the permissions.
+ find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+ # We need to generate keystore - bug #273306
+ einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+ mkdir "${T}/certgen" && cd "${T}/certgen" || die
+ cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+ for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+ openssl x509 -text -in "${c}" >> all.crt || die
+ done
+ ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+ cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+ chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index e0f7e15..31e4af2 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -22,6 +22,7 @@
<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>
<use>
<flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
+ <flag name="cups">Link against the CUPS library at compile time, rather than using it dynamically at runtime.</flag>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="infinality">Enable better font rendering using fontconfig.</flag>
<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
@@ -30,6 +31,7 @@
<flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
<flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
+ <flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (x86_64 only)</flag>
<flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
<flag name="sunec">Build the SunEC provider against system NSS</flag>
<flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2017-01-29 23:15 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2017-01-29 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 15b3bfec71352cac283b8e34e074e015e7773ef6
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 23:11:49 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 23:15:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b3bfec
dev-java/icedtea: Version bump to 3.3.0 wrt security bug #607676
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-java/icedtea/Manifest | 10 +
dev-java/icedtea/files/icedtea.env | 18 --
dev-java/icedtea/icedtea-3.3.0.ebuild | 369 ++++++++++++++++++++++++++++++++++
3 files changed, 379 insertions(+), 18 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 2a93e36..a6a4f84 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -16,6 +16,16 @@ DIST icedtea-3.2-nashorn-0fb33c8b64d1.tar.xz 2227096 SHA256 5f72fedfa82415fdf98a
DIST icedtea-3.2-openjdk-200203ccf4bb.tar.xz 336232 SHA256 6c1040b4044efdd0c413d15865304f1ac46230d91435a31347a7b755e91e7924 SHA512 89a3d39afcd6a7a1c8c55d0b7aa1a4c3d87878cf97ffe96fe13fe014edb28588cd8505281ba127eb6275b3639bbdc28593cdbf8cd56e4b033fa83c75c48b0029 WHIRLPOOL 67481776d8f838a388ec0e67cac0cb7466fa0bea606b359f003958cd8097f5c23351a6859e804d71f3ece3c0d122665857d8835818b809a9f025dcfb6d8d24b7
DIST icedtea-3.2-shenandoah-24002f5b584e.tar.xz 6861392 SHA256 ddd945ebb130efcf36e4cfd0c18ab8f9cfda3c5cc4ef281ab512a558a63cd04c SHA512 9da5974cd0bf15d2687439ab3ca79465c0a13ee8487b691d0c97c9404ab9c70e0a3387e3800e797ce7a85d5d5f59fc6e29f0d3e001f3bc1382244ce5e795d411 WHIRLPOOL a5b9fa8b23f97a6c5db011af2d2fdc89e55d7faebf4dcd047a2434dd50b8f86659d6c17d162af2be01d8acf9268af8e46c8143e47907e47600c9e101346e3d0e
DIST icedtea-3.2.0.tar.xz 1450484 SHA256 f2a197734cc1f820f14a6ba0aef0f198c24c77e9f026d14ddf185b684b178f80 SHA512 aefb65817cd90b2b1e46d75e1698ba4ff162b807f44232ff59670addc0ed67fa31c53d2031add1399cbb7f31faf77be89df2aeeb589d88b8a8aee8e14c3e9f15 WHIRLPOOL d5a950bd7e83dd632dea8d4e2ca3ccbe802258338be56981d795ad1b1a8ce37c8cf2c51670812c0fbb6fa51e840449282aaf5494115b972689a547f2df064baf
+DIST icedtea-3.3-corba-8eb9dd5fe2fb.tar.xz 940804 SHA256 19492bdd85166ce55d0f85f96e1d3d0b21e61f4604349ea0b94f6a0aa1388b61 SHA512 b1f44e1e41b3565bd45176f726e4d1c2999c5ff25a5f2e973f0e5836b7fd2cf6540eae83d3944b303677797e052abd950bb9748fb3e218e4c71b1ea059bf1209 WHIRLPOOL 35113a5283f3a36cd6b5d4022a187995fa75e7aad5b6517437af86e3314bb87d59f9805d0aa37d02650f12158d6088b54f0931e3b8ceea1722f9635b9fd0c0d2
+DIST icedtea-3.3-hotspot-6efaf77e82a1.tar.xz 6813884 SHA256 280f706bb0aaada0903e9e907811ea12bc1c216fdaeb2694910f3a99217f6e89 SHA512 8a593b1c9f022e7a3efa834c5547c59f1a2143f946edae2647a3368f9d4d39b9d473f36575d395e627e5bfac1f9cdef0efe607e0a81b40c46dca44ad6d59a65b WHIRLPOOL d6866b734102251a94367dc1a67e4f895f1efb96140438bbf0fb270c2a45325b8c97cab8d0d5ce696a8c19cb62af8f9f586ceef8e663de3743d54be47d90bf26
+DIST icedtea-3.3-jaxp-faf1c4a9a51d.tar.xz 2302792 SHA256 ba5933a2bbf04b0786fd5f046d43314f1b1b2bf2888c586521b37410783bccef SHA512 3addabc7478c8a443de5db5606b9eb71778484ed68943d3aa2b61c02bff993d3cb446333be7a5bfc90f8757d0125eb1f53f2483c60c79bb0f19e642e1696ddcd WHIRLPOOL 724e224e5974b01ff87f1319beced1b70ea65740989ab7d2c9e29d76e44d537cbde4f14c05bf3083d908fcdf58c336594bf12b0dab7569362ec687272ba21565
+DIST icedtea-3.3-jaxws-5f5237104669.tar.xz 2269396 SHA256 a443f3243978a87a055ab103468878e5e072706ab0c82d1949ba869fc63571b6 SHA512 1b83b0a90cf0c11220cae034d2f86ad51ff8f6d153dc22e8e9f65b8ec4de8f7148fd37356aa19098e6545967da3c53e87edac747adfa76e254c1fc9d31e4ec1b WHIRLPOOL cfd75b4209b3b654269b916697c09a3c537c80ba3c66721287ed9aa23bfb9691c563dc2371bacc9ba4dba0080212f86cfc7e5339b6c2d0e5d6e641e486bd54ab
+DIST icedtea-3.3-jdk-3642a826880b.tar.xz 38972276 SHA256 688e962ab13055eb6b8668bb48b50eecc7f02f5120b541cfa58f516f875f9f9d SHA512 60c932a057dc1869bec52ea73af2a21af9e622a196510d074c5d17c01bf7d98babd651f5577bafe96a832e6a54ded8704c4f7d964f0874edaf2222bdbe3c0c46 WHIRLPOOL 9a8dba06351e70e973e6f1fe01ac5aa4f3e8db4ff2c073df8ac0d88a94f65bd098fc2183bd76329df8cd248cef13170f0c986c9bd1a784fcd3f54b84c9290661
+DIST icedtea-3.3-langtools-d10a13bdc98c.tar.xz 2070432 SHA256 1b0b0fb49c81955573ce509e1801530faa6477e606192fec4b0f951904fb8ac0 SHA512 13065b54ca036ad11b8879d9ebaa725a823c25cda5b28f0092902bda2b8879cfd000d132916302f2661b63b03c0bec90d1adfe4863d38c201cfbdf74f1f942c6 WHIRLPOOL 257b6ac9ad6c515445f051b531f51524e3d34518686ff4c4f2fb416d26fde20746330499da9e41e545dc19fb398134c35b2080ee26e608c0b24e8fb25b1f3901
+DIST icedtea-3.3-nashorn-8c0fe384c4e7.tar.xz 2229336 SHA256 0ec045c9c4506f63602d86e72b0c3fdccd75fa95c47ee6a1238639274dc8e92d SHA512 c0aec36e921288b6ad11e71daa32111a4ee45302a2bbe407229cc143f05869372993f7b0dd366c07ecb31fac47e1d3cdb0c59cc1a48375d3719656c2159fee95 WHIRLPOOL 0e9421c077d617f2c67a67e590ad8e8322ebf33559a1f127efbcfaa1e30f3437bb8749d656fca211f4f848fcd98ebc5f41449a39499a9dadc64990d45fe000cd
+DIST icedtea-3.3-openjdk-d5760f7cce54.tar.xz 337064 SHA256 887c5bc24b068efced7d5209367149ca27d8fea330cd5a5fff7767c353b00921 SHA512 d98790823408e09f3fa9946ceeeda48187dddd3302625fc546d64a4ecc89967235c550af23c05368a90d8dd2ceb38c092cd3130958132d18d30692342bd1151e WHIRLPOOL e5477deaf846a1c78fba313ab6f5fdc2b053fccdad8d096d1e29eebfa33da2196243d6d77818d7d8fe78a69208578ba3ea42c6a683bf52208be81ea67dae7bd0
+DIST icedtea-3.3-shenandoah-d9a978177779.tar.xz 6866276 SHA256 0593a1105f0e1e59ec05298d608a2fa5d610a0e548e849ab013119f3b7a67229 SHA512 df658cea99bb306962fe393d6babc4e69b363f0e03d64ac90ef4ce8c14faec723cb6d338598e7b6739139f9e9aa447e3463fd9ab773fad95b5c5266955f5c53f WHIRLPOOL 8e0681fb8e843f6d05a0e82883c574574676689fcb9876fadb712c0ee64bcf6b29f4240b156e57a3e9548e0600b8218e2f1e86418ae993b02ed6f192d323ef22
+DIST icedtea-3.3.0.tar.xz 1453792 SHA256 b764ff09674f9139f94dfe9df8f6393ed55af149c7bb1033fbf119f68cea750b SHA512 58f8fc80ba68d38cac797192af827d6da5a93e165a5c62b8dfe852f848bfd8cb851dfb3d5d2c7b79f60f2fdced985ba473102afc4a2d5a56d6ddf1f8bb7cf9c3 WHIRLPOOL a7615c8b3869b0860bbc6feb9a9fa54d1271cf3bf4689f5fb91b338f75963f64f0ac93e770dbf379f26bb3c438fdd9beb3e0f9e96e46c5bda1d8c2dccc4153c2
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
diff --git a/dev-java/icedtea/files/icedtea.env b/dev-java/icedtea/files/icedtea.env
deleted file mode 100644
index 463add6..00000000
--- a/dev-java/icedtea/files/icedtea.env
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="IcedTea JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.@SLOT@"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/icedtea-3.3.0.ebuild b/dev-java/icedtea/icedtea-3.3.0.ebuild
new file mode 100644
index 00000000..2fb0249
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.3.0.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+EAPI="6"
+SLOT="8"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="8eb9dd5fe2fb.tar.xz"
+JAXP_TARBALL="faf1c4a9a51d.tar.xz"
+JAXWS_TARBALL="5f5237104669.tar.xz"
+JDK_TARBALL="3642a826880b.tar.xz"
+LANGTOOLS_TARBALL="d10a13bdc98c.tar.xz"
+OPENJDK_TARBALL="d5760f7cce54.tar.xz"
+NASHORN_TARBALL="8c0fe384c4e7.tar.xz"
+HOTSPOT_TARBALL="6efaf77e82a1.tar.xz"
+SHENANDOAH_TARBALL="d9a978177779.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+ http://icedtea.classpath.org/download/source/${SRC_PKG}
+ ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+ shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+ ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+ ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+ jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
+ pulseaudio sctp selinux shenandoah smartcard +source +sunec test +webstart zero"
+
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+ >=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+ >=net-print/cups-1.2.12"
+X_COMMON_DEP="
+ >=media-libs/giflib-4.1.6:0=
+ >=media-libs/libpng-1.2:0=
+ >=x11-libs/libX11-1.1.3
+ >=x11-libs/libXext-1.1.1
+ >=x11-libs/libXi-1.1.3
+ >=x11-libs/libXrender-0.9.4
+ >=x11-libs/libXtst-1.0.3
+ x11-libs/libXcomposite"
+X_DEPEND="
+ >=x11-libs/libXau-1.0.3
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXinerama-1.0.2
+ x11-proto/inputproto
+ >=x11-proto/xextproto-7.1.1
+ x11-proto/xineramaproto
+ x11-proto/xproto"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+ >=dev-libs/glib-2.26:2=
+ >=dev-util/systemtap-1
+ media-libs/fontconfig:1.0=
+ >=media-libs/freetype-2.5.3:2=
+ >=media-libs/lcms-2.5:2=
+ >=sys-libs/zlib-1.2.3
+ virtual/jpeg:0=
+ kerberos? ( virtual/krb5 )
+ sctp? ( net-misc/lksctp-tools )
+ smartcard? ( sys-apps/pcsc-lite )
+ sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+ !dev-java/icedtea:0
+ !dev-java/icedtea-web:7
+ >=gnome-base/gsettings-desktop-schemas-3.12.2
+ virtual/ttf-fonts
+ alsa? ( ${ALSA_COMMON_DEP} )
+ cups? ( ${CUPS_COMMON_DEP} )
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2
+ >=x11-libs/pango-1.24.5
+ )
+ !headless-awt? ( ${X_COMMON_DEP} )
+ selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+ || (
+ dev-java/icedtea-bin:8
+ dev-java/icedtea-bin:7
+ dev-java/icedtea:8
+ dev-java/icedtea:7
+ )
+ app-arch/cpio
+ app-arch/unzip
+ app-arch/zip
+ app-misc/ca-certificates
+ dev-lang/perl
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl:0 )
+ sys-apps/attr
+ sys-apps/lsb-release
+ x11-libs/libXt
+ virtual/pkgconfig
+ pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+ local CHECKREQS_DISK_BUILD
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="9000M"
+ else
+ CHECKREQS_DISK_BUILD="8500M"
+ fi
+
+ check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ icedtea_check_requirements
+}
+
+pkg_setup() {
+ icedtea_check_requirements
+
+ JAVA_PKG_WANT_BUILD_VM="
+ icedtea-8 icedtea-bin-8
+ icedtea-7 icedtea-bin-7"
+ JAVA_PKG_WANT_SOURCE="1.5"
+ JAVA_PKG_WANT_TARGET="1.5"
+
+ java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${SRC_PKG}
+}
+
+src_configure() {
+ # For bootstrap builds as the sandbox control file might not yet exist.
+ addpredict /proc/self/coredump_filter
+
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+
+ local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+ local vm=$(java-pkg_get-current-vm)
+
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
+ use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
+ fi
+
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+ if { use amd64 || use arm64 || use ppc64 || use sparc || use x86; }; then
+ hotspot_port="yes"
+ fi
+
+ # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+ # Otherwise use Zero for now until alternate VMs are working
+ if test "x${hotspot_port}" != "xyes"; then
+ use_zero="yes"
+ fi
+
+ if use shenandoah; then
+ if use amd64; then
+ hs_config="--with-hotspot-build=shenandoah"
+ hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+ else
+ eerror "Shenandoah can only be built on x86_64. Please re-build with USE="-shenandoah""
+ fi
+ else
+ hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+ fi
+
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+ jamvm_config="--enable-jamvm"
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+ cacao_config="--enable-cacao"
+ fi
+
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
+ zero_config="--enable-zero"
+ fi
+
+ # Warn about potential problems with ccache enabled
+ if has ccache ${FEATURES}; then
+ ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
+ config+=" --enable-ccache"
+ else
+ config+=" --disable-ccache"
+ fi
+
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+ unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+ econf ${config} \
+ --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+ --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+ --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+ --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+ --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+ --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+ --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+ --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+ --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+ --with-jdk-home="$(java-config -O)" \
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --with-pkgversion="Gentoo ${PF}" \
+ --disable-downloading --disable-Werror --disable-tests \
+ --enable-system-lcms --enable-system-jpeg \
+ --enable-system-zlib --disable-systemtap-tests \
+ --enable-improved-font-rendering \
+ $(use_enable headless-awt headless) \
+ $(use_enable !headless-awt system-gif) \
+ $(use_enable !headless-awt system-png) \
+ $(use_enable doc docs) \
+ $(use_enable kerberos system-kerberos) \
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable pch precompiled-headers) \
+ $(use_enable sctp system-sctp) \
+ $(use_enable smartcard system-pcsc) \
+ $(use_enable sunec) \
+ ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+ default
+}
+
+src_test() {
+ default
+}
+
+src_install() {
+ default
+
+ local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+ local ddest="${ED}${dest#/}"
+
+ if ! use alsa; then
+ rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ if ! use examples; then
+ rm -r "${ddest}"/demo "${ddest}"/sample || die
+ fi
+
+ if ! use source; then
+ rm -v "${ddest}"/src.zip || die
+ fi
+
+ dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+ # Fix the permissions.
+ find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+ # We need to generate keystore - bug #273306
+ einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+ mkdir "${T}/certgen" && cd "${T}/certgen" || die
+ cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+ for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+ openssl x509 -text -in "${c}" >> all.crt || die
+ done
+ ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+ cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+ chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2019-08-19 4:37 Georgy Yakovlev
0 siblings, 0 replies; 13+ messages in thread
From: Georgy Yakovlev @ 2019-08-19 4:37 UTC (permalink / raw
To: gentoo-commits
commit: 77d62e01ad0326205d332f2882462ff2a88b49b1
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 04:34:27 2019 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 04:36:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d62e01
dev-java/icedtea: drop 3.12.0
Bug: https://bugs.gentoo.org/691238
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-java/icedtea/Manifest | 11 -
dev-java/icedtea/files/generate-cacerts.pl | 358 ---------------------------
dev-java/icedtea/icedtea-3.12.0.ebuild | 385 -----------------------------
3 files changed, 754 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index c67a93978a8..550de24ec0b 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,14 +1,3 @@
-DIST icedtea-3.12-aarch32-57f4048a925b.tar.xz 6819888 BLAKE2B 96377f8aeeaf9a1bb4b3372f82c1666e5813a97537dabe3fd8faeeac8ed2b160c402bb35d0e0b2f6f9bc2b09faa1701a43cdea407982019ca126ff7e28076625 SHA512 5e6f4cbb5b325feefd5030d1b8f9725ba8aba028c9c93c34039fcff48893b9569d0cc92f5e0c70bc20ab7014edc81d3ff12edaab68c69a280cdab248e4e0e809
-DIST icedtea-3.12-corba-fa1553d2f23e.tar.xz 946504 BLAKE2B 729efade4ed039af95fa07fd3f6ed450fb9af8e271b054979fd37b460ab6a6273513e05e49956e15777f188952a939313d8b5f6bd52f0aa111825518693f5bd8 SHA512 d4ffe454a659db6c13b74c8e190beb3b427574d54fa44c80a3ba1dceb3af6f480ee99378d370ec2e9bfc6b5447a225eeb3e11821c83522479583fb21b0705bd7
-DIST icedtea-3.12-hotspot-3f9a60eb8ef0.tar.xz 6894876 BLAKE2B 0520d0e1a84e3b755b598d73de7587c01f4cba8148d371bcbcceb1d50849d3816929cfb07a81857ad0fc8d8b52ab3a9c68a4fc8dd3476bc52f59d2cac72eba81 SHA512 2a0c18fea7b67c5042b39746f2c7ef53e252d6665efbcd74ebf9b171b13e311821310537e8b14cd4f9798c483afdb1107b9af6bb047262b97a526bfbb481777a
-DIST icedtea-3.12-jaxp-7a977b82f34c.tar.xz 2291724 BLAKE2B f3366efa7bb076b9f8c8a0873c1bb909ad9299916c1285b3aebc004a4f33b16a6ab922867c19b7679c8a0bfb7686cbe5b80605ec942b1ac817a96277fe9c4f02 SHA512 a5b8ca9b90797c5f0bc03b763fca50334a308bfd6955f5f488b661da6698abd991dbe08a7ac1a128922c546eb0061853e12a18971adb16c27302e2d9d0f13872
-DIST icedtea-3.12-jaxws-752d9e54c69a.tar.xz 2274996 BLAKE2B 980f1bb71201fa43eb4c1852b0f518e512af908abf106e211add608560bfe531a5b0597cb11edabbdec63b94fe17800b7dbedd181a18e54a992b5dcb54a0b172 SHA512 f1deb09ccf6b1dff40d61f3bc54e55d430ebcbeb0cd53d6008cacf65b94824d486913b63034ee23a473298e0bee61ad1ea3e5520c2a3ab25e9e1e6d58d50d286
-DIST icedtea-3.12-jdk-bfaa5c6df4a8.tar.xz 39292332 BLAKE2B 0cebbd46b62b9c5ce7af0c6bb54157b8c44b97a99c060e90e3b23ff68210755be58265cd0ecdb5c2bed276d2465544a7f8435e58289b8e240b6ddf2a9b14123c SHA512 2e15cdb58c9ce65c99ad5b5506343fb29cda02a4ea8490cfbe79f708deecee2ef28ad0e5a384d2113e72678aa857d821729b588e5ef53208ae06d0d5278ec326
-DIST icedtea-3.12-langtools-fb494039358f.tar.xz 2074376 BLAKE2B dfca5f107f93196d232bdb077e910eee3de3033ecffae9d168c60de5a54cfb0591eeb9309356f385fdc2f9c2a813700401e763496651befae84acd4c1d23e2fe SHA512 838e3e458734d3fc8d2d968eb3bc7190838cd9a73bf3d61de662f9a992a9951a74021e25331d26545f0181b08c80f298de24e030dad4e076bd76368f3a14e960
-DIST icedtea-3.12-nashorn-93462e8b4f4f.tar.xz 2320548 BLAKE2B f97e168cfce1e6307926d8996a74072be9783c4045963e78a9d3f6e2890e9cb64201a5d697a29ddcddbe501fe7a3fb226601e0e2e2ef3450d965334561d5e47d SHA512 918489daf6d2816d0fac85ed89cccbb0e350dc068502857f1a7e518135c40e5fcca2709a60ae51bad392592bdc459675ea3543e684ba1ed0d8debc7a451af6d5
-DIST icedtea-3.12-openjdk-f0482b9b7f7b.tar.xz 360788 BLAKE2B 5f6727b709ffedd44e0224635b75cd15e8b85d14bae93fafb8337bdd1c5ee0b18cca8374b88d00110016d2ad94f539d8884da92cab245e3c83fdac4a389a5154 SHA512 999aa17c0e73ebc465a982c5492043487b860b84dd6e4dda3fa51e3099b4642f3f5e03eb30252f835be81f1ea60dc28cf5f0905cbe347758a1f903db430fcc35
-DIST icedtea-3.12-shenandoah-adb62c0031b8.tar.xz 7056328 BLAKE2B 90035e1b3f16ca7351197dcb7795c557700aaf264179827ae3e6b331ce60e3a9922d5e815ee0c010c6ded16973446841b9d72e918420408894bb5c7c8497c4d8 SHA512 c73bf2d1011ae4d059945e2e20c2515a3cd6e10e4413b77b290461679bbceaedd38a1b948ee7bfb8a42513b73ec99b81a9088cd96e6e61576041568ea2a0b492
-DIST icedtea-3.12.0.tar.xz 1519364 BLAKE2B 0e257aabc10bd93cf448feec99fd72175d33b7a32134d824c36ca5143e40fbdd37b5c6e5f572052d347fccd6dc89f3d99ba7eec3db6e7d73c6b6d9ec0d5695b4 SHA512 22582d65b9114749c7cfee0fc58fa2cb70e4cf77f3bc62e8097a6c601ead0bf86f530b942e6b0f32ef7bbc5bd17130da236714d83d6e9857c3c5b85c984f2efa
DIST icedtea-3.13-aarch32-26d64a5c4b9a.tar.xz 6832524 BLAKE2B 68399b723d1f6a0fc3c940ccbbae48a47767b3870ce0eecc2eb51ef6f36f25e4d742db3eb4b204815c571d1104301a492c60ed3c608a1fc3e36271a2618d5d27 SHA512 84e8217020d8ddd62745298b2d1591e5a6d9a9ff117930524170179dee4d4c35c35007603d5bf9601b7be404ba887b69953272f687d1a9858429e1fe26c9f049
DIST icedtea-3.13-corba-24a4cc7d7de6.tar.xz 946268 BLAKE2B d1bef8c7029c5017e0a43d6711c92643527930bb037511e84625055f38faef6fb701652458e64b062f3cdbd3e6ec35e5099411e07af3933589dc9c6a3f065ccf SHA512 834b8b09590f5b4f11bbc32af3222e1cb6bef14c44c34ae4d3f65b6320d1a78c297a341cadb76bb59156b434811510b83705d2d2994922c610ba1bafb3f59345
DIST icedtea-3.13-hotspot-ab8fadcbbde6.tar.xz 6908200 BLAKE2B 922a86a66d670ae920c2e5a1b81da7ffbf2bb20323bc6ac1bb8d5e034528d9e767ee2ef9855dfba467c8a6a81939739f76dec28ced50531d62d1dfeae2762d16 SHA512 60c144997b2566dc42698ca4cb888b92de6a9fdbb18e01703d00f54311ad56191862c61c89e3eff4d6c4793c98d3dafd5f723bc9a22db2329138d08e832ddc11
diff --git a/dev-java/icedtea/files/generate-cacerts.pl b/dev-java/icedtea/files/generate-cacerts.pl
deleted file mode 100644
index 17d29b36676..00000000000
--- a/dev-java/icedtea/files/generate-cacerts.pl
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007, 2008 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
-# OpenSSL's certificate bundle using OpenJDK's keytool.
-
-# First extract each of OpenSSL's bundled certificates into its own
-# aliased filename.
-
-# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
-# Check and prevention of duplicate aliases added by Vlastimil Babka <caster@gentoo.org>
-
-$file = $ARGV[1];
-open(CERTS, $file);
-@certs = <CERTS>;
-close(CERTS);
-
-$pem_file_count = 0;
-$in_cert_block = 0;
-$write_current_cert = 1;
-foreach $cert (@certs)
-{
- if ($cert =~ /Issuer: /)
- {
- $_ = $cert;
- if ($cert =~ /personal-freemail/)
- {
- $cert_alias = "thawtepersonalfreemailca";
- }
- elsif ($cert =~ /personal-basic/)
- {
- $cert_alias = "thawtepersonalbasicca";
- }
- elsif ($cert =~ /personal-premium/)
- {
- $cert_alias = "thawtepersonalpremiumca";
- }
- elsif ($cert =~ /server-certs/)
- {
- $cert_alias = "thawteserverca";
- }
- elsif ($cert =~ /premium-server/)
- {
- $cert_alias = "thawtepremiumserverca";
- }
- elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
- {
- $cert_alias = "verisignclass1ca";
- }
- elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
- {
- $cert_alias = "verisignclass1g2ca";
- }
- elsif ($cert =~
- /VeriSign Class 1 Public Primary Certification Authority - G3/)
- {
- $cert_alias = "verisignclass1g3ca";
- }
- elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
- {
- $cert_alias = "verisignclass2ca";
- }
- elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
- {
- $cert_alias = "verisignclass2g2ca";
- }
- elsif ($cert =~
- /VeriSign Class 2 Public Primary Certification Authority - G3/)
- {
- $cert_alias = "verisignclass2g3ca";
- }
- elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
- {
- $cert_alias = "verisignclass3ca";
- }
- # Version 1 of Class 3 Public Primary Certification Authority
- # - G2 is added. Version 3 is excluded. See below.
- elsif ($cert =~
- /VeriSign Class 3 Public Primary Certification Authority - G3/)
- {
- $cert_alias = "verisignclass3g3ca";
- }
- elsif ($cert =~
- /RSA Data Security.*Secure Server Certification Authority/)
- {
- $cert_alias = "verisignserverca";
- }
- elsif ($cert =~ /GTE CyberTrust Global Root/)
- {
- $cert_alias = "gtecybertrustglobalca";
- }
- elsif ($cert =~ /Baltimore CyberTrust Root/)
- {
- $cert_alias = "baltimorecybertrustca";
- }
- elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
- {
- $cert_alias = "entrustclientca";
- }
- elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
- {
- $cert_alias = "entrustglobalclientca";
- }
- elsif ($cert =~ /www.entrust.net\/CPS_2048/)
- {
- $cert_alias = "entrust2048ca";
- }
- elsif ($cert =~ /www.entrust.net\/CPS /)
- {
- $cert_alias = "entrustsslca";
- }
- elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
- {
- $cert_alias = "entrustgsslca";
- }
- elsif ($cert =~ /The Go Daddy Group/)
- {
- $cert_alias = "godaddyclass2ca";
- }
- elsif ($cert =~ /Starfield Class 2 Certification Authority/)
- {
- $cert_alias = "starfieldclass2ca";
- }
- elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
- {
- $cert_alias = "valicertclass2ca";
- }
- elsif ($cert =~ /GeoTrust Global CA$/)
- {
- $cert_alias = "geotrustglobalca";
- }
- elsif ($cert =~ /Equifax Secure Certificate Authority/)
- {
- $cert_alias = "equifaxsecureca";
- }
- elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
- {
- $cert_alias = "equifaxsecureebusinessca1";
- }
- elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
- {
- $cert_alias = "equifaxsecureebusinessca2";
- }
- elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
- {
- $cert_alias = "equifaxsecureglobalebusinessca1";
- }
- elsif ($cert =~ /Sonera Class1 CA/)
- {
- $cert_alias = "soneraclass1ca";
- }
- elsif ($cert =~ /Sonera Class2 CA/)
- {
- $cert_alias = "soneraclass2ca";
- }
- elsif ($cert =~ /AAA Certificate Services/)
- {
- $cert_alias = "comodoaaaca";
- }
- elsif ($cert =~ /AddTrust Class 1 CA Root/)
- {
- $cert_alias = "addtrustclass1ca";
- }
- elsif ($cert =~ /AddTrust External CA Root/)
- {
- $cert_alias = "addtrustexternalca";
- }
- elsif ($cert =~ /AddTrust Qualified CA Root/)
- {
- $cert_alias = "addtrustqualifiedca";
- }
- elsif ($cert =~ /UTN-USERFirst-Hardware/)
- {
- $cert_alias = "utnuserfirsthardwareca";
- }
- elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
- {
- $cert_alias = "utnuserfirstclientauthemailca";
- }
- elsif ($cert =~ /UTN - DATACorp SGC/)
- {
- $cert_alias = "utndatacorpsgcca";
- }
- elsif ($cert =~ /UTN-USERFirst-Object/)
- {
- $cert_alias = "utnuserfirstobjectca";
- }
- elsif ($cert =~ /America Online Root Certification Authority 1/)
- {
- $cert_alias = "aolrootca1";
- }
- elsif ($cert =~ /DigiCert Assured ID Root CA/)
- {
- $cert_alias = "digicertassuredidrootca";
- }
- elsif ($cert =~ /DigiCert Global Root CA/)
- {
- $cert_alias = "digicertglobalrootca";
- }
- elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
- {
- $cert_alias = "digicerthighassuranceevrootca";
- }
- elsif ($cert =~ /GlobalSign Root CA$/)
- {
- $cert_alias = "globalsignca";
- }
- elsif ($cert =~ /GlobalSign Root CA - R2/)
- {
- $cert_alias = "globalsignr2ca";
- }
- elsif ($cert =~ /Elektronik.*Kas.*2005/)
- {
- $cert_alias = "extra-elektronikkas2005";
- }
- elsif ($cert =~ /Elektronik/)
- {
- $cert_alias = "extra-elektronik2005";
- }
- # Mozilla does not provide these certificates:
- # baltimorecodesigningca
- # gtecybertrust5ca
- # trustcenterclass2caii
- # trustcenterclass4caii
- # trustcenteruniversalcai
- else
- {
- # Generate an alias using the OU and CN attributes of the
- # Issuer field if both are present, otherwise use only the
- # CN attribute. The Issuer field must have either the OU
- # or the CN attribute.
- $_ = $cert;
- if ($cert =~ /OU=/)
- {
- s/Issuer:.*?OU=//;
- # Remove other occurrences of OU=.
- s/OU=.*CN=//;
- # Remove CN= if there were not other occurrences of OU=.
- s/CN=//;
- s/\/emailAddress.*//;
- s/Certificate Authority/ca/g;
- s/Certification Authority/ca/g;
- }
- elsif ($cert =~ /CN=/)
- {
- s/Issuer:.*CN=//;
- s/\/emailAddress.*//;
- s/Certificate Authority/ca/g;
- s/Certification Authority/ca/g;
- }
- s/\W//g;
- tr/A-Z/a-z/;
- $cert_alias = "extra-$_";
-
- }
- while (-e "$cert_alias.pem")
- {
- $cert_alias = "$cert_alias" . "_";
- }
- }
- # When it attempts to parse:
- #
- # Class 3 Public Primary Certification Authority - G2, Version 3
- #
- # keytool says:
- #
- # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
- # Unparseable AuthorityInfoAccess extension due to
- # java.io.IOException: Invalid encoding of URI
- #
- # If we do not exclude this file
- # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
- # on this cert, printing:
- #
- # Couldn't verify: java.security.SignatureException: Signature
- # does not match.
- #
- elsif ($cert =~
- /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
- {
- $write_current_cert = 0;
- $pem_file_count--;
- }
- elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
- {
- if ($in_cert_block != 0)
- {
- die "$file is malformed.";
- }
- $in_cert_block = 1;
- if ($write_current_cert == 1)
- {
- $pem_file_count++;
- if (-e "$cert_alias.pem")
- {
- print "$cert_alias";
- die "already exists"
- }
- open(PEM, ">$cert_alias.pem");
- print PEM $cert;
- }
- }
- elsif ($cert eq "-----END CERTIFICATE-----\n")
- {
- $in_cert_block = 0;
- if ($write_current_cert == 1)
- {
- print PEM $cert;
- close(PEM);
- }
- $write_current_cert = 1
- }
- else
- {
- if ($in_cert_block == 1 && $write_current_cert == 1)
- {
- print PEM $cert;
- }
- }
-}
-
-# Check that the correct number of .pem files were produced.
-@pem_files = <*.pem>;
-if (@pem_files != $pem_file_count)
-{
- print "$pem_file_count";
- die "Number of .pem files produced does not match".
- " number of certs read from $file.";
-}
-
-# Now store each cert in the 'cacerts' file using keytool.
-$certs_written_count = 0;
-foreach $pem_file (@pem_files)
-{
- system "$ARGV[0] -noprompt -import".
- " -alias `basename $pem_file .pem`".
- " -keystore cacerts -storepass 'changeit' -file $pem_file";
- unlink($pem_file);
- $certs_written_count++;
-}
-
-# Check that the correct number of certs were added to the keystore.
-if ($certs_written_count != $pem_file_count)
-{
- die "Number of certs added to keystore does not match".
- " number of certs read from $file.";
-}
diff --git a/dev-java/icedtea/icedtea-3.12.0.ebuild b/dev-java/icedtea/icedtea-3.12.0.ebuild
deleted file mode 100644
index 185c2913550..00000000000
--- a/dev-java/icedtea/icedtea-3.12.0.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="fa1553d2f23e.tar.xz"
-JAXP_TARBALL="7a977b82f34c.tar.xz"
-JAXWS_TARBALL="752d9e54c69a.tar.xz"
-JDK_TARBALL="bfaa5c6df4a8.tar.xz"
-LANGTOOLS_TARBALL="fb494039358f.tar.xz"
-OPENJDK_TARBALL="f0482b9b7f7b.tar.xz"
-NASHORN_TARBALL="93462e8b4f4f.tar.xz"
-HOTSPOT_TARBALL="3f9a60eb8ef0.tar.xz"
-SHENANDOAH_TARBALL="adb62c0031b8.tar.xz"
-AARCH32_TARBALL="57f4048a925b.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
- https://icedtea.classpath.org/download/source/${SRC_PKG}
- ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
- ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
- ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
- shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
- arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
- ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-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"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
- jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
- pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero"
-
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.2.12"
-X_COMMON_DEP="
- >=media-libs/giflib-4.1.6:0=
- >=media-libs/libpng-1.2:0=
- >=x11-libs/libX11-1.1.3
- >=x11-libs/libXext-1.1.1
- >=x11-libs/libXi-1.1.3
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.0.3
- x11-libs/libXcomposite"
-X_DEPEND="
- x11-base/xorg-proto
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
- >=dev-libs/glib-2.26:2=
- >=dev-util/systemtap-1
- media-libs/fontconfig:1.0=
- >=media-libs/freetype-2.5.3:2=
- >=sys-libs/zlib-1.2.3
- virtual/jpeg:0=
- kerberos? ( virtual/krb5 )
- sctp? ( net-misc/lksctp-tools )
- smartcard? ( sys-apps/pcsc-lite )
- system-lcms? ( >=media-libs/lcms-2.9:2= )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea:0
- !dev-java/icedtea-web:7
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- virtual/ttf-fonts
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )
- gtk? (
- >=dev-libs/atk-1.30.0
- >=x11-libs/cairo-1.8.8
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.8:2
- >=x11-libs/pango-1.24.5
- )
- !headless-awt? ( ${X_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
- || (
- dev-java/icedtea-bin:8
- dev-java/icedtea-bin:7
- dev-java/icedtea:8
- dev-java/icedtea:7
- dev-java/openjdk:8
- dev-java/openjdk-bin:8
- )
- app-arch/cpio
- app-arch/unzip
- app-arch/zip
- app-misc/ca-certificates
- dev-lang/perl
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl:0 )
- sys-apps/attr
- sys-apps/lsb-release
- x11-libs/libXt
- virtual/pkgconfig
- pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
- local CHECKREQS_DISK_BUILD
-
- if use doc; then
- CHECKREQS_DISK_BUILD="9000M"
- else
- CHECKREQS_DISK_BUILD="8500M"
- fi
-
- check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- icedtea_check_requirements
-}
-
-pkg_setup() {
- icedtea_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="
- icedtea-8 icedtea-bin-8
- icedtea-7 icedtea-bin-7
- openjdk-8 openjdk-bin-8"
- JAVA_PKG_WANT_SOURCE="1.5"
- JAVA_PKG_WANT_TARGET="1.5"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${SRC_PKG}
-}
-
-src_configure() {
- # For bootstrap builds as the sandbox control file might not yet exist.
- addpredict /proc/self/coredump_filter
-
- # icedtea doesn't like some locales. #330433 #389717
- export LANG="C" LC_ALL="C"
-
- local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # gcj-jdk ensures ecj is present.
- if use jbootstrap || has "${vm}" gcj-jdk; then
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- config+=" --enable-bootstrap"
- else
- config+=" --disable-bootstrap"
- fi
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use JamVM if requested
- if use jamvm; then
- use_jamvm="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
- if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
- hotspot_port="yes"
- # Work around stack alignment issue, bug #647954.
- use x86 && append-flags -mincoming-stack-boundary=2
- fi
-
- # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use Zero for now until alternate VMs are working
- if test "x${hotspot_port}" != "xyes"; then
- use_zero="yes"
- fi
-
- if use shenandoah; then
- if { use amd64 || use arm64; }; then
- hs_config="--with-hotspot-build=shenandoah"
- hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
- else
- eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
- fi
- else
- if use arm ; then
- hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
- else
- hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
- fi
- fi
-
- # Turn on JamVM if needed (non-HS archs) or requested
- if test "x${use_jamvm}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-jamvm"'
- fi
- ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
- jamvm_config="--enable-jamvm"
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- fi
- ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
- cacao_config="--enable-cacao"
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
- fi
- zero_config="--enable-zero"
- fi
-
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- config+=" --enable-precompiled-headers"
- else
- config+=" --disable-precompiled-headers"
- fi
-
- config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- econf ${config} \
- --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
- --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
- --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
- --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
- --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
- --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
- --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
- --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
- --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
- --with-jdk-home="$(java-config -O)" \
- --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
- --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --with-pkgversion="Gentoo ${PF}" \
- --disable-ccache \
- --disable-downloading --disable-Werror --disable-tests \
- --disable-systemtap-tests --enable-improved-font-rendering \
- --enable-system-jpeg --enable-system-zlib \
- $(use_enable headless-awt headless) \
- $(use_enable !headless-awt system-gif) \
- $(use_enable !headless-awt system-png) \
- $(use_enable doc docs) \
- $(use_enable kerberos system-kerberos) \
- $(use_enable system-lcms) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- $(use_enable sctp system-sctp) \
- $(use_enable smartcard system-pcsc) \
- ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
- default
-}
-
-src_test() {
- default
-}
-
-src_install() {
- default
-
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}${dest#/}"
-
- if ! use alsa; then
- rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if ! use examples; then
- rm -r "${ddest}"/demo "${ddest}"/sample || die
- fi
-
- if ! use source; then
- rm -v "${ddest}"/src.zip || die
- fi
-
- dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- # We need to generate keystore - bug #273306
- einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
- mkdir "${T}/certgen" && cd "${T}/certgen" || die
- cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
- for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
- openssl x509 -text -in "${c}" >> all.crt || die
- done
- ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
- cp -vRP cacerts "${ddest}/jre/lib/security/" || die
- chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
- java-vm_install-env "${FILESDIR}/icedtea.env.sh"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- java-vm-2_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- java-vm-2_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2024-03-04 7:40 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-03-04 7:40 UTC (permalink / raw
To: gentoo-commits
commit: fe8b20a48349bbd32c170e1e15fb573ab7909680
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 07:39:57 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 07:40:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe8b20a4
dev-java/icedtea: fix build w/ make-4.4
Closes: https://bugs.gentoo.org/882611
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/icedtea/files/openjdk-8-make-4.4.patch | 13 +++++++++++++
dev-java/icedtea/icedtea-3.21.0.ebuild | 2 ++
2 files changed, 15 insertions(+)
diff --git a/dev-java/icedtea/files/openjdk-8-make-4.4.patch b/dev-java/icedtea/files/openjdk-8-make-4.4.patch
new file mode 100644
index 000000000000..1217895b7547
--- /dev/null
+++ b/dev-java/icedtea/files/openjdk-8-make-4.4.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/882611
+https://build.opensuse.org/package/view_file/openSUSE:Factory/java-1_8_0-openjdk/make-jobserver-detection.patch?expand=1
+--- openjdk/make/MakeHelpers.gmk
++++ openjdk/make/MakeHelpers.gmk
+@@ -145,7 +145,7 @@ endef
+
+ # Hook to be called as the very first thing when running a normal build
+ define AtMakeStart
+- $(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
++ $(if $(findstring jobserver,$(.FEATURES)),,$(error make -j is not supported, use make JOBS=n))
+ $(call CheckEnvironment)
+ @$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
+ @$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
diff --git a/dev-java/icedtea/icedtea-3.21.0.ebuild b/dev-java/icedtea/icedtea-3.21.0.ebuild
index 2cfc8e518512..c4fd8dd748b4 100644
--- a/dev-java/icedtea/icedtea-3.21.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.21.0.ebuild
@@ -203,7 +203,9 @@ src_configure() {
# ${FILESDIR} directly.
mkdir -v gentoo_patches || die
cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
+ cp -v "${FILESDIR}/openjdk-8-make-4.4.patch" gentoo_patches || die
export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
+ DISTRIBUTION_PATCHES+=" gentoo_patches//openjdk-8-make-4.4.patch"
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter #nowarn
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-03-04 7:40 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-29 23:15 [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-03-04 7:40 Sam James
2019-08-19 4:37 Georgy Yakovlev
2016-08-02 22:34 James Le Cuirot
2016-04-14 20:24 James Le Cuirot
2016-04-10 22:05 James Le Cuirot
2016-03-27 8:44 James Le Cuirot
2016-01-03 21:16 James Le Cuirot
2015-11-15 16:21 James Le Cuirot
2015-11-14 22:36 James Le Cuirot
2015-11-14 22:36 James Le Cuirot
2015-10-10 22:22 James Le Cuirot
2015-09-07 22:43 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox