commit: e0667d5da578014c4b78cce2716f3fefc43272d5
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 21:11:44 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 21:11:44 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=e0667d5d
dev-java/icedtea: Remove versions in the tree and apply flag change
headless-awt has been chosen over headless as a compromise to set it
apart from the javafx flag in the Oracle ebuilds.
Andrew, sorry for removing the old ebuilds but I wanted to be sure
that you picked up these flag changes. You can still show or diff
these quite easily like so.
git show 63833bc:./icedtea-6.1.13.9.ebuild
git show 63833bc:./icedtea-7.2.6.2.ebuild
git diff 63833bc:./icedtea-6.1.13.9.ebuild icedtea-6.1.x.ebuild
git diff 63833bc:./icedtea-7.2.6.2.ebuild icedtea-7.2.x.ebuild
Package-Manager: portage-2.2.20.1
dev-java/icedtea/Manifest | 9 -
dev-java/icedtea/icedtea-3.0.0_pre06.ebuild | 8 +-
dev-java/icedtea/icedtea-6.1.13.9.ebuild | 347 ----------------------
dev-java/icedtea/icedtea-6.9999.ebuild | 14 +-
dev-java/icedtea/icedtea-7.2.6.2.ebuild | 412 --------------------------
dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild | 12 +-
dev-java/icedtea/metadata.xml | 2 +-
7 files changed, 18 insertions(+), 786 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 655f805..2149b5d 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,3 @@
-DIST icedtea-2.6-corba-a4d55c5cec23.tar.bz2 1072249 SHA256
92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af SHA512
819974b10fe3d0ba15e45da843b3bc908e7caafb9fe264c43026bfa1a10daecef6e4cf23bd486f89cae0d6952ef812a170cf297a934679fc6dec29ca941c4826
WHIRLPOOL
69317e8f7d426cd338a1c698251b17bd6dc27d5010288cfacc008c3029b1ababc66541c4af6c5b8c12e5755503dd50e36dc4ab173851811bc3162b7d59f55bd5
-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-jaxws-14c411b1183c.tar.bz2 2022452 SHA256
14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4 SHA512
3dd649f7565a449e831f14c2242e0fe9126f62380aa166bff627557774656c1604f8512ec93ec3ae243a851000b0fc014767de8ad58df8bb8892c88b8465d0e0
WHIRLPOOL
41665b394fc3ba3657e61cb3f45c43bfdce3e9c9a44f0a68ddc25bf19994c275da43c1f3b01f0fe96ff63d27901a529ff10183fa0d7c28196af3d8d08570a059
-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-openjdk-601ca7147b8c.tar.bz2 129844 SHA256
4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49 SHA512
e3a61447569e39817e7c7ebf0a8fadaf0c708dfee2815a8f576b6d5fa91479ecf2f7fd30285b9d18c8286f3911f2ddc226d8f8da1219da8c2c80fa1fbf47607c
WHIRLPOOL
8397f49988174b2027bcb3674981260d0e6651cded064baf8067820eb6dca6c12d0bceb94b86e83b856455b008a7ca517e04be5820dee4dec63a4b8397e07efd
-DIST icedtea-2.6.2.tar.xz 2074196 SHA256
bee8565c507a484ea876b62474aec379ac0e434acb9de8213279f47e1fe22076 SHA512
30772a71b53afb5f6acfcf8e31fd8c2ce25d056669b82af0024fb3e6623e27cbcc158ab39c7157e78e11949389fe576e220d8f70f32d98456464b53d4ee2ed51
WHIRLPOOL
32028cbd37fcfc9d2f1378938e7a7d6a34d9c03295fbfa0ac7f02c9e9c32933a3668947b7fa0b260bfb73b381a5297bc3cef26657534aded62689c2d2621b99c
DIST icedtea-2.7-corba-e3445769412d.tar.bz2 1071338 SHA256
5aebaa5d670337a87ecc154372bc9d225a5232599c44f31a1d231bf8c5b89fcb SHA512
587e4e382922a06f2cb73d767cee1a874011b0d2bf7c49671d41907300246d741280afa842f8b3b4af1e999776e8bb5484b63c11c2179e968bb041bcaf3b6cc9
WHIRLPOOL
babdd0ac5089822c3b12f20be9212f94f36ebfedf27a3c7d9e3800e4ccd7d4e114e5702b75ba6be13ffe10d8e0ec94a8daab6a607e346d1f473c268af1261784
DIST icedtea-2.7-hotspot-94f15794d5e7.tar.bz2 8157346 SHA256
8e580046488e2fc15fd98892add37fffd4f9f17bf5d62c5db0f5d1832707a31c SHA512
85fa2b91da2c565e3d57f4b39c70b00dca7ce4d1249b8989b554e73f298c99ba90940bec60fcc66476b567c54935de53bb711a9ff71a9deac8082a4ed9ce2b47
WHIRLPOOL
b1d6c25a2d29221061a03c42f3b8bf8d0de3198ff35150d8502daad9d46257c2b5822fde5bfe40662d1815c29399e6e0818214fcbc74d1134d57638719210ff0
DIST icedtea-2.7-jaxp-e3b08dc13807.tar.bz2 2737345 SHA256
8de42ee0a7cf50ac5ca9b55a36e3933992b4dc0160a29a380820aea5d8158c07 SHA512
52e2f3058514892721e2117bcd78fe0b45752874b68b5fd3e8aff4846eabb2fd4ba60e9a7bcd0a463001e22824bee5c88f3dbf2aff0236a3fe8e4a9e1b556638
WHIRLPOOL
934724081e3bcdb7c40fa9b799ae28d132c6b855daaa40305422993172cc7ea506d14c77f39ef7afcf5283fa7c8a360347569d21184413fca12a0a3c7ca9d29d
@@ -25,5 +17,4 @@ DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256
b8230f20d7022f9230bbfea13b
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/icedtea-3.0.0_pre06.ebuild
b/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild
index 5665e7b..f77138f 100644
--- a/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild
@@ -62,7 +62,7 @@ EHG_REVISION="${ICEDTEA_PKG}${ICEDTEA_PRE}"
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 ~ppc ~ppc64 ~x86"
-IUSE="+alsa cacao cjk +cups debug doc examples headless jamvm +jbootstrap
+nsplugin
+IUSE="+alsa cacao cjk +cups debug doc examples headless-awt jamvm +jbootstrap
+nsplugin
+nss pax_kernel pulseaudio sctp selinux smartcard +source test zero
+webstart"
# Ideally the following were optional at build time.
@@ -108,7 +108,7 @@ COMMON_DEP="
# cups is needed for X. #390945 #390975
RDEPEND="${COMMON_DEP}
!dev-java/icedtea:0
- !headless? (
+ !headless-awt? (
${CUPS_COMMON_DEP}
${X_COMMON_DEP}
media-fonts/dejavu
@@ -323,7 +323,7 @@ src_install() {
# Ensures HeadlessGraphicsEnvironment is used.
# Hack; we should get IcedTea to support passing --disable-headful
- if use headless ; then
+ if use headless-awt ; then
rm -vf "${ddest}"/jre/lib/$(get_system_arch)/libawt_xawt.so ||
die
fi
@@ -361,7 +361,7 @@ src_install() {
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
set_java_env "${FILESDIR}/icedtea.env"
- if use headless || ! use alsa || ! use cups; then
+ if use headless-awt || ! use alsa || ! use cups; then
java-vm_revdep-mask "${dest}"
fi
java-vm_sandbox-predict /proc/self/coredump_filter
diff --git a/dev-java/icedtea/icedtea-6.1.13.9.ebuild
b/dev-java/icedtea/icedtea-6.1.13.9.ebuild
deleted file mode 100644
index 15c6d9a..0000000
--- a/dev-java/icedtea/icedtea-6.1.13.9.ebuild
+++ /dev/null
@@ -1,347 +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 ([email protected])
-
-# *********************************************************
-# * 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 ~ppc ~ppc64 ~x86"
-RESTRICT="test"
-
-IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless 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} )
- 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? ( ${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"
- 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 system-gif) \
- $(use_enable !headless 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 ; 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/icedtea-6.9999.ebuild
b/dev-java/icedtea/icedtea-6.9999.ebuild
index aa14d2f..1a74fbf 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -36,9 +36,9 @@ SLOT="6"
KEYWORDS=""
RESTRICT="test"
-IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless javascript
- +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux
- source systemtap test zero +webstart"
+IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
+ 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="
@@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEP}
)
cups? ( ${CUPS_COMMON_DEP} )
gtk? ( >=x11-libs/gtk+-2.8:2 )
- !headless? ( ${X_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.
@@ -230,8 +230,8 @@ src_configure() {
--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
--with-pkgversion="Gentoo package ${PF}" \
--disable-downloading --disable-Werror \
- $(use_enable !headless system-gif) \
- $(use_enable !headless system-png) \
+ $(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) \
@@ -273,7 +273,7 @@ src_install() {
rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
fi
- if use headless ; then
+ if use headless-awt ; then
rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
{,jre/}bin/policytool bin/appletviewer || die
fi
diff --git a/dev-java/icedtea/icedtea-7.2.6.2.ebuild
b/dev-java/icedtea/icedtea-7.2.6.2.ebuild
deleted file mode 100644
index b889523..0000000
--- a/dev-java/icedtea/icedtea-7.2.6.2.ebuild
+++ /dev/null
@@ -1,412 +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 ([email protected])
-
-# *********************************************************
-# * 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 ~x86"
-RESTRICT="test"
-
-IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless infinality
- jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
- pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
-
-REQUIRED_USE="gtk? ( !headless )"
-
-# 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? ( ${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"
- 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 system-gif) \
- $(use_enable !headless 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; 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/icedtea-7.2.7.0_pre00.ebuild
b/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild
index 14fc818..579e2d9 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild
@@ -60,11 +60,11 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2
GPL-2-with-linking-exception LGPL-2 M
KEYWORDS=""
RESTRICT="test"
-IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless infinality
+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 )"
+REQUIRED_USE="gtk? ( !headless-awt )"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@@ -126,7 +126,7 @@ RDEPEND="${COMMON_DEP}
media-fonts/sazanami
)
cups? ( ${CUPS_COMMON_DEP} )
- !headless? ( ${X_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.
@@ -301,8 +301,8 @@ src_configure() {
--disable-hotspot-tests --disable-jdk-tests \
--enable-system-lcms --enable-system-jpeg \
--enable-system-zlib \
- $(use_enable !headless system-gif) \
- $(use_enable !headless system-png) \
+ $(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) \
@@ -343,7 +343,7 @@ src_install() {
rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* ||
die
fi
- if use headless; then
+ 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
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index ccb7c05..83663b2 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -16,7 +16,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="headless">Don't install graphical libraries (used to be
USE="-X")</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>
