commit:     ca505ccd13775a781bdb3c1b75c9b3c6ae4fb860
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 21:52:26 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 21:52:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca505ccd

dev-java/icedtea: Remove vulnerable 7.2.6.8 wrt security bug #609562

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-java/icedtea/Manifest               |   8 -
 dev-java/icedtea/icedtea-7.2.6.8.ebuild | 387 --------------------------------
 dev-java/icedtea/metadata.xml           |   1 -
 3 files changed, 396 deletions(-)

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index ca92e998cc6..fb841391b6a 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,18 +1,10 @@
 DIST icedtea-2.6-corba-737fd3fbf139.tar.bz2 1073197 SHA256 
48df47fac80597978951125fda10366b4f65b73b322abb80aefbe1ec58227989 SHA512 
77e81659d3314172c2b80fb1441d268edc52e0ec0bd25f9a9596e3c7a545f0694a11cc2298952d72c85965529b344493d1f2c2187cf4d38749278018fc85a6b8
 WHIRLPOOL 
be4c4dc243f5f79dc0fae1938040f67b276d1cb835a31c5e4587827da50fb4c81b5b89c90cb0170783b4ed81a57bdf9a4f5ae659b8197d80b66d717530fc7270
-DIST icedtea-2.6-corba-9e002eaf26ed.tar.bz2 1072838 SHA256 
2f728daac0ca88e7097a223f8c1ceaff8b4597e4622c5e365931edb25aa04538 SHA512 
b306a562b999c7e221c2535d5ef575f835a0e1fbbc6fab331cfa3ae016c048d6d7f822786a270e61958c9590395ae360af0f8069beaa123c00be1592487c37dd
 WHIRLPOOL 
6a1428c051a1febf07c5fd48a5f401d9ca0f4dd98902deb149b01e202e73d69007d008fae9c565f23562ed8ee38772bb2f9adc0af056e4a1c7ce789625de57de
-DIST icedtea-2.6-hotspot-223f6c442d49.tar.bz2 8191191 SHA256 
ca55f548f3169ba9bb6ca81265900722150953ee19b19606e4bf8e6dd50d7194 SHA512 
e197a9e4e302d1b823eb4905ff58f2559d4d180e68deb7b9ec013ba41f155fb42b312f9f55315c67adfad632f37a01ee2f295d40f7c2b08dae07fc4aa8d509eb
 WHIRLPOOL 
e6fb07cbf9e144b0fb4464efea38152fcb2a1c1ff6b1bd77d4ce1da2ed289a9663c673be0fee80d3418b57547741d86317ec82fbd9852a341058b9fdd4377c30
 DIST icedtea-2.6-hotspot-9fc0d63c2a74.tar.bz2 8195300 SHA256 
d4ff2b6d44192a796af70e663b3ed2c7dd9e320729929ac650b4a1bc90ef329a SHA512 
9bd3b2fea69c9e7c27ad9e157a44a20c113acc41bb0c830f18395df61d919dea1cd6bb69f9849ca449be25a9244ccc7bf05a51b3c64521362b0d765bfd59fb32
 WHIRLPOOL 
4c7b688682aeafd7c1cd234428ef51c9ea3bcc44b0f77ba3a3f1d873510c1de2dfba430df94bafa7c6f990cc7e6e60c79e7b893b7f60599610d19a81fc7e6b79
-DIST icedtea-2.6-jaxp-3369fa5a875b.tar.bz2 2733402 SHA256 
ba1ba48e9ad9ee36df344e6e283f0f7a9f8aa9cee223c8ea2f2ee711092091fc SHA512 
6b865927f97f6fcb709790f9a53917241c00f7d1123b5a5babf6752bdb1fe3c01aa8cca5dea40b5b64ad2d5ef8cdbac80ff7f9f32e736a9f71283e3eaf1a7e99
 WHIRLPOOL 
42dccb729503b9af5ba464be221a9604ca2daec1db6bba17ae2fae607c3a9bfdf6a487af3c79c8b8b30d816f733636331cd847ae4c3081aaa24cfa1a2a7fb9d2
 DIST icedtea-2.6-jaxp-aa1c302a99fb.tar.bz2 2733907 SHA256 
bf4e27af83fc88353986b906a0ac245658cf9d7b34629254e5e21b4aeff0621f SHA512 
c1dd1b00d4f232ee8e3f365caa8502069bcf7cbda28e0900891ad9e63905a9bdeed00ae6e661148f181949494aae9bed6e2b0422711f24b2413c0bf484c08522
 WHIRLPOOL 
81289fe98950a8ce0832b2138870ee44883f3b1ac6ad20801244e39a85390c9074789920afd8ee7ffbb1fd5a7e6d61636cd00b2971657bc524d811822d6a6cc2
-DIST icedtea-2.6-jaxws-26bcf28b3a60.tar.bz2 2022420 SHA256 
753093e71ac609b9350bf16daf230fdc2f873cd573428883448098e39e4c041a SHA512 
a555c192377da223fef4f31a64296e71237389126db0777f9d64d086e026ecddb7d529d6330cb09097b726246ff880bf3597769ab695249d93fc7f2e14e9affe
 WHIRLPOOL 
869d5245443bd9f737cca91af861a5a27bd6071f73bd2da0b5af91a1ccd20beff1fdbef48bd705473da07be35b4e36bc673e67af4eb53484a40cd71ede159533
 DIST icedtea-2.6-jaxws-ea96df8beff4.tar.bz2 2022538 SHA256 
a5d499825c2b7745b73b5e3596057013503bd1df3d60d04cd924e02b25313ca3 SHA512 
3feea1a51d6e5d5e639eb482e6754525527f6aa307941470d012c31d26d0858f05bd9dcab39085260c916cb724920d9edf31522a3e85379e0d470c7fc0ea4e3b
 WHIRLPOOL 
828e4c841e72578d48efca217946ce5fd8f6a8af2dd4076502587704e6a4241d63221921fed99584eafb5930ab44b88aa64c7d4cc904009db6226574f38d2f3e
-DIST icedtea-2.6-jdk-52225839bbea.tar.bz2 32770146 SHA256 
ec1118f52eb208a529e99ec1a64351b737bc0f892e05f0ffd4327b4be533e761 SHA512 
68c401f90496861852a3531de8f0f5f2d1951e8a6aef7566bdbb98a06e32d9ea0bc263b05a03d4558f96afb37687f69131d371b28f23a6106e5937875f50f281
 WHIRLPOOL 
64d086bab0a3a6aa2e6afce36fe6c467990c1e2a5edc0e5a2b44f850d0f9c04b791ce1cca9436c40421ebd576694597d430ace24f9fd98bd6b06fd16a6bdb847
 DIST icedtea-2.6-jdk-ce87b1399385.tar.bz2 32812887 SHA256 
44feb033ad9ae3d4b10f6561f1743fe28a13bbcacd150f2f33f5ef116fece7c5 SHA512 
9010fd923fa3eda72ff2e532e659dbd406c93043c2a40075e23d395ecee670c1b0a30bd68430fe1fd69a2f65d834e440c91596b5f6e9c29474eef31eca1f9753
 WHIRLPOOL 
afe2a7bd7b13b0c840ca45b83f9c1987c18123af8a4d9767a5915838806a847208a856ce2b1643bf838e0e66bdb8d8a184404b874cdb49555cce46a4371e4458
-DIST icedtea-2.6-langtools-545e512eb4de.tar.bz2 1707805 SHA256 
004ec63ebdd0b6182c2bde3e190bb745a0d932ad7b05901a4376a04f06158813 SHA512 
c745318b9c1b24e77a2a2ce80fc20a15d92c82f91c914bb17fdbd025d8b525adc2619dcc44c2c3394e5204eb7d13e0d3f4c115fe0f548674c3e45f859e2abcba
 WHIRLPOOL 
b52c5862172c169ac0081f3e86212a049105ccd60290dd063c2d777d5a47de82002c01daa4db549c5aec79d869605c911f72d6190e46f79fb4e8b50dc7ddd8b2
 DIST icedtea-2.6-langtools-dd8e22d986c8.tar.bz2 1711235 SHA256 
3eb33811bf1f8a56ae19078e35da835273e828293bc355b5b04a416bd3c6c96a SHA512 
880924b19d3c021f137368eea51c380b0df8222c0148d8442b1b786d13a3698dc567d8783af1798a31364bdaa31b7580fcf02dfb82147a890407cd33c6a5595e
 WHIRLPOOL 
77567688d4309adebea657edc61efc8c872e9bd148f9f3aeac739df590d4dc3bb90b827d3ae78fe9f027b6962af1902bef900f72a47f641206718cc354f6ccec
 DIST icedtea-2.6-openjdk-2dd04ef37829.tar.bz2 130401 SHA256 
444c7dcfbcc665b4bb73b7c8b8256ac4d55fdb614ebdc3684a34d5f274684421 SHA512 
67493785ec7aa3093f3d558a82e45c3f699bea63ccefacf273754b046d0a10b5cd19bb9a3dad7803a19e5d242ac06082729d1ac73088479db5712ccd08fdd223
 WHIRLPOOL 
04a9f53fa974792b4cc2279a6d7a5816a075246dfd863e99182c7e929173b0bb89d6aae68f2114637461148b45757716356bd14e096fb2b116f537b5479f66a8
-DIST icedtea-2.6-openjdk-653c2662034d.tar.bz2 130319 SHA256 
e6bea22acb9e89e200fdc2a4a7a04ecee042f3ea9f9a49bab739fdd2598e4ce3 SHA512 
7f5076df16dafabe556c64ddfa51a684ba62f85dadf750d22d2a4abd2766073e1a67f1705bf2c6bbc6fdf2559ac3cc9a83658a23a6e541aa3bd605ce8e44cf8b
 WHIRLPOOL 
4a4dfd31c2a9b969082db38540458043d9eb2f7884297c2ba50d19ff96a7ef97748f3beeb444879fc9abf4cb363b5d1ba64e37dab38794a77f4b68b6e972bbe6
-DIST icedtea-2.6.8.tar.xz 2092212 SHA256 
854030ff1b580d896dbabbdb0e64dc0ef3537786285808a7b3cdfcb80520255d SHA512 
3f3d1b30cb867959bc651df76c6a2c06dfabb320e1ca96db9bce072b1758b070e9920918ebd00d3865cb4f9dee95a25c305db4224fb05f4fd047a49ffd2ee269
 WHIRLPOOL 
9af32f6e5c2bdf6ceb899fcaa7dd9f0d973cee82ba7e7f89bef9acb6d8a5b95d1886932751c2beef8aa38eb8e1939da33a8e0ecf77bb273ea5a5c763b4fa7761
 DIST icedtea-2.6.9.tar.xz 2107156 SHA256 
8e4f3eb8d41ef66f1797825343141046973c124b18bf7d4698fae0a9a25495ea SHA512 
6362e7329bdf5224d1c6340d4c03fe3ca6e5a879395c3af75390fcff9a8e8a599517a3f287d36110c301ba908e5bc4bcc8aa89cd605aa76f0e51f7a9aced6b3e
 WHIRLPOOL 
5d4db9fc4fd73e9009a26fbbaab0891df13aa5ca7e1292bad5832833088d8bd2fac5593c705d64b1042204353bd9d7a23a7212257045dc36c0e6610e31629988
 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

diff --git a/dev-java/icedtea/icedtea-7.2.6.8.ebuild 
b/dev-java/icedtea/icedtea-7.2.6.8.ebuild
deleted file mode 100644
index 50c8d71ff11..00000000000
--- a/dev-java/icedtea/icedtea-7.2.6.8.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Build written by Andrew John Hughes ([email protected])
-
-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="9e002eaf26ed.tar.bz2"
-JAXP_TARBALL="3369fa5a875b.tar.bz2"
-JAXWS_TARBALL="26bcf28b3a60.tar.bz2"
-JDK_TARBALL="52225839bbea.tar.bz2"
-LANGTOOLS_TARBALL="545e512eb4de.tar.bz2"
-OPENJDK_TARBALL="653c2662034d.tar.bz2"
-HOTSPOT_TARBALL="223f6c442d49.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 ~arm64 ~x86"
-
-IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
-       jamvm javascript +jbootstrap kerberos libressl 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
-       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"
-
-COMMON_DEP="
-       app-misc/mime-types
-       >=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: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
-       !libressl? ( dev-libs/openssl )
-       libressl? ( dev-libs/libressl )
-       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 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 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-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 cups system-cups) \
-               $(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
-
-       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() {
-       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 da61afccb8d..fd585923d58 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -24,7 +24,6 @@
   <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>
   <flag name="jbootstrap">If possible, recompile the final IcedTea executables 
with itself.</flag>
   <flag name="nss">Enable NSS security provider support.</flag>

Reply via email to