commit:     db4ae1d21fa0cc86bfd16338ec3eed40d62471b7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 19:35:20 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 22:42:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db4ae1d2

dev-java/icedtea: Remove vulnerable version wrt bug #572716

Package-Manager: portage-2.2.27

 dev-java/icedtea/Manifest                  |   8 -
 dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild | 411 -----------------------------
 2 files changed, 419 deletions(-)

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 85044b2..3875c9b 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,18 +1,10 @@
 DIST icedtea-2.6-corba-2135da66cc53.tar.bz2 1072269 SHA256 
26bbfae0504fb7e83fd5eaba08d9e44e0c07a609cdf7c04fb6832a097b56bc08 SHA512 
2e07d6529c347625c06aed7dc25b41b5ca425aedb0652cc92df477f8a4ab1343c4aa90b1204a94a327a550d75cfe13c0adaf607b7e064e11b5a9ed07afb9313f
 WHIRLPOOL 
2cbf0e97038907800f6d88084fc9879714c8c1297842179e3f220dde416d6f47d076fdc2c2296600aa06dcf839ec029378db8e7a662ce8c3cbfd8eda67e9ac3b
-DIST icedtea-2.6-corba-9a3ca529125a.tar.bz2 1072549 SHA256 
1052ae3c70908aa3374818ada320685cb7abdc7bd7bbd3cfb4f26fbbe7435ec6 SHA512 
8d46557d564917514a14296b06cc35c1d84b1d7be7a3c6cd14770fe76481fcd02af9ff1cc528acde684cc1c5e2a065ce2e5254fae47fdaa3598c6e5ab8779697
 WHIRLPOOL 
8890517cc5b992d8d35c5486e3105c7e52dd86c94bdfafaa2657cf58a09e7b4e776b90cdd5a2ae311e12dadb6eab010b1b29416697cfb285f12ea5eceb31db36
 DIST icedtea-2.6-hotspot-19d919ae5506.tar.bz2 8162545 SHA256 
3747417c3ba69d1ff7d80dc6df19454c4f4023c35f8b711e47baefe2fc772e65 SHA512 
be3c356fac53112324f688e6336e8bcde453284f20671a1630b97a30bfaaedf1f7915984250e51aea106fbcc25790aca3f7d4ed419499394748f0391b17782c5
 WHIRLPOOL 
65251c4e6d91fd8a25bb2bc83b58aacd23f3e7f4f65112d135ec04f98136e351a8175a84a05c070a42d1a351c8301c55a34f65f120e908e129cecb0ff703d32d
-DIST icedtea-2.6-hotspot-c3cde6774003.tar.bz2 8163275 SHA256 
dd8f3771439b4d51fa84e3f9b384b80e6656cf1a19ee3492b4f2fe09b37eef0e SHA512 
3aadde373e01575cdd1fa3621ab132eb2273d70f08f8a3ad784cd238d8902626f9121c0f8abdddae7a810fb79cf70c0ea3fe7f2c2035fadd2803a2177a305ea9
 WHIRLPOOL 
ccdd1f3bc14380673204021b7a3f57bc03d70c5ba085e34ead4a32349bc95ae85e706dcc207d2c335d087b6dcd3a53f109dc0f31ebcb6b2c8c59654b6fa03233
 DIST icedtea-2.6-jaxp-bc6edb6c12a7.tar.bz2 2733735 SHA256 
097cb0423271b6439b36db190a66bab9d447dd03ee22e42a6089a3b3b8363f62 SHA512 
fb9a7607403ba15759427bd7ef1740949dc9cf3892e61a643b9dcdfda7633876d38606dd06af96b0fa362eec427c68b9faa458762defe502c81cdd97290a056b
 WHIRLPOOL 
62583d7e1907b97b90f818b9b0e76fe10a0f57342597191157f6c0a696af8f1fdc4b4968aa2112c7b42900e6a988fd291b0d5ffe7c3de7d89473e536ab6b9e56
-DIST icedtea-2.6-jaxp-f7bf82fcbd09.tar.bz2 2732623 SHA256 
a0e978bc07371901560a746cae492edf0bcb22ddbb9e47b77319ffda1351806b SHA512 
4a0de68af85699b611e37af0749cccdb0483ac75af1fbd0f63cdc2f0c173605bca77c60bbb41aff916c768b5a29a933fbd8e34d8bd2dd67c22cbd629078061ab
 WHIRLPOOL 
7904da721c88e6daf5ee32cb5492e5e3d09e10ec78c4275625f5ba0a04720cbec0de59f6a5900f62c90ce3284b9441400508b69e2660c43dc8561f15c4255601
 DIST icedtea-2.6-jaxws-271b555de438.tar.bz2 2022035 SHA256 
da7604aaaedaab93ba9ad21ee5ee8f18c807606a97d60037ae8c3647e823dfa1 SHA512 
cc7d9ee95ba4350c44eb1e9c08e70f6c4e5f1c115a8bc1c3af91828e8c6b814c31494426edc08e75601506e8f6208d07e8425f0f5b14ba5f5de7c7e3165b76c4
 WHIRLPOOL 
a9376fc7ccfd9fea8adf7716aa0da93a32f855acc565b6ea39fa38cbbf3a008a035e62d54d9b2e3633c8a1c185787e0a373d2b166ef609e6483a4d28a3fdd1fc
-DIST icedtea-2.6-jaxws-39ef53b9c403.tar.bz2 2021458 SHA256 
55897d92e368ac7df3e04d4f235e9dba12ea8264e20d4bd6b68e8c13e5addc1e SHA512 
a4cd98bc6c4b1b54dcee68f4a373322e550246ed88412e33d3700631bbd662d390df89047f9cc40f80c10f1ffce81142c301db06ef46bbc16e1245880242151d
 WHIRLPOOL 
0e1889c115a0e03a4f57bcc357b8b19470e768eeb2650554fe6573e057b4f6280c879101ce250b25d2b00b0964383c6399129736fd5236929964badef6a0228d
-DIST icedtea-2.6-jdk-5215185a1d57.tar.bz2 32415510 SHA256 
583898549b52e958521474db34f2ce535b6a0926c7df1fa99a3f0321b3a109f5 SHA512 
9cfe22d2a112d35c8008069c61118f5e289e78a91d325da301949843d5c7b747cdf99fa7c97c09ea4c15a263f47d09b65ee26ca01282aa4d9abed6087a09f656
 WHIRLPOOL 
3a7d1848f742318c1a93430956671d0618eb394f0282f3c7d81eba28770d942c11ba10fcae49342ffc50a056ec9e508d3cd6a3da6ce8c45e2850728bd80c5fcd
 DIST icedtea-2.6-jdk-dc86038147b2.tar.bz2 32420326 SHA256 
9d3199c0f9c39238c6920c941026cf8661a92e97845f75d74e9ff277532b5d63 SHA512 
d22cba72083b65ec5b818652e0520c7b63974ecd940f6f39e27ce83cac664de15c3c4611e088056b6ae123b77f605fb61c1226c05811b03086c39cc2e12f114d
 WHIRLPOOL 
48d3cacd5ec54c8e7dd203abd53f956669ff861ebe98e677d107d31d6964467b2387995e644a64ba238f44dab287bb2f6ef5d6e8333aa167d994cd72d74fdda3
-DIST icedtea-2.6-langtools-91fdb0c83e50.tar.bz2 1710122 SHA256 
f14716df84e047b19884ac5b0830e87b6cdf1925d0951195255c9124e89df27e SHA512 
2aa47e622194e0afd773c3f56df67afa35e69edc7af0c6385edc4d26383a3b1a29d87470c6fb2bc3d3e51b58c0283023ddb53bca4c4bf5504ed22fe457c39bb1
 WHIRLPOOL 
a1cd8f6b6ab9ebdf01c836480429ff877fd37b0f12faa1add187dae95628a5588b1d66aa5751dcf7ed969c821570483c010e0efc7a635e0d6f71810bc0eb1aae
 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-openjdk-f0e7f22f09ef.tar.bz2 129924 SHA256 
9e5d26bb1888a8a1378e078953aa04314d4fb4f263ebbaf7f459110c21f8d46d SHA512 
ff6246a8615a2113197eb41839912fa1fdc22d95252846b08ff1539db13715131aac65dc06f9086ffb83daa4558caf1b707091ed5ef058bebb5fffc9b665e472
 WHIRLPOOL 
73c87a7055493668d17a99e1d616d7de2320fd792455504c147d5211dff28168b4161c0bb057645678ab71e665ed84f914cc6aa910d00dd6fea8494fd21934ef
-DIST icedtea-2.6.3.tar.xz 2075476 SHA256 
df38aa10b4d30f3bae089dcc72f4c32fb2385cb541491791c12829960f53c612 SHA512 
ea3333739627d64513140db77c7db11d1d74b5e6802889d11e54d1930feaea3733241d1691cb01d4550d4035c0e2e1076a03883d93db400ebc26a3ab0c8092c3
 WHIRLPOOL 
3b15fa2a661ca58fbc31bb195dda1dcc185af1c66eb89475bb95b762bb84541b6db0df7d7e5eeda4276398b3ebdf47a0c7f32cde950a53c82bb3c3793c1c3afe
 DIST icedtea-2.6.4.tar.xz 2078228 SHA256 
d20a365feea95a4c01c9f9db1f7562f471f638bc672db9de6c6e654d2d826164 SHA512 
96373c8452b3087804d906544cd84ddae5bd3969314bd856cb89a9aa02c49fde0ea04d602f6d0d9e82308d34c60aa6c309314ec03ec7c73a4bf3c18a8825d1e0
 WHIRLPOOL 
688051df4a304874761f5e37bd0b003e20df17cf9f1552230b9638aa6df62d09c8c29dcdf3c7646b523266cc40ad0b4a4528bf4dfb46eae2e91d7e5e575dbc5c
 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

diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild 
b/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
deleted file mode 100644
index d68f417..0000000
--- a/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
+++ /dev/null
@@ -1,411 +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 ([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="9a3ca529125a.tar.bz2"
-JAXP_TARBALL="f7bf82fcbd09.tar.bz2"
-JAXWS_TARBALL="39ef53b9c403.tar.bz2"
-JDK_TARBALL="5215185a1d57.tar.bz2"
-LANGTOOLS_TARBALL="91fdb0c83e50.tar.bz2"
-OPENJDK_TARBALL="f0e7f22f09ef.tar.bz2"
-HOTSPOT_TARBALL="c3cde6774003.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-awt infinality
-       jamvm javascript +jbootstrap kerberos nsplugin nss 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/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
-               # 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
-       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
-       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() {
-       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; }

Reply via email to