Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-java/sun-jdk/ChangeLog11
-rw-r--r--dev-java/sun-jdk/Manifest16
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild168
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild138
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild148
-rw-r--r--dev-java/sun-jre-bin/Manifest24
6 files changed, 487 insertions, 18 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index dfd0266593c6..216d64db496d 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for dev-java/sun-jdk
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.248 2008/11/22 15:03:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.249 2008/12/06 13:32:57 betelgeuse Exp $
+
+*sun-jdk-1.6.0.11 (06 Dec 2008)
+*sun-jdk-1.5.0.17 (06 Dec 2008)
+*sun-jdk-1.4.2.19 (06 Dec 2008)
+
+ 06 Dec 2008; Petteri Räty <betelgeuse@gentoo.org>
+ +sun-jdk-1.4.2.19.ebuild, +sun-jdk-1.5.0.17.ebuild,
+ +sun-jdk-1.6.0.11.ebuild:
+ Version bumps for security bug #250012.
22 Nov 2008; Markus Meier <maekke@gentoo.org> sun-jdk-1.6.0.10.ebuild:
x86 stable, bug #246995
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 360aec9b78b4..37de5495eca7 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -6,24 +6,32 @@ AUX sun-jdk-1.4.env 976 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed SHA1 8ce
AUX sun-jdk-1.5.env 859 RMD160 657a54eebf4f8773204ca442e48845e163a67154 SHA1 59241ca2cf7f5b2c2f5dcc3d69accb43d8ffb419 SHA256 6e5998ae21e11ee3981f613f4ca6615aebeec024fd6b9926e6097fb1ba976585
AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8
DIST j2sdk-1_4_2_18-linux-i586.bin 36380053 RMD160 424ec3f66def593d7f54868edae63c6bbca82b8a SHA1 9d970845c84959a8d9ad6242be0e9ae867d8ea27 SHA256 f592a0af6c6b0fd22256bee91d68b11cfafe802901b747a29434c2c18e184f04
+DIST j2sdk-1_4_2_19-linux-i586.bin 36387084 RMD160 4d2167bac874d7bce757563d88a9e124b3cb2ca7 SHA1 7c66d03bb6762e549b0644262d08075eb972ac53 SHA256 ce2a2be4ce97313626dd3dc093a7c594fa0f1ffb51e2e12dd341a8091b2c3369
DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
DIST jdk-5.0u16-dlj-linux-amd64.bin 44052125 RMD160 d977cb6659b37653b1fc4159921f8a7d48cc2b80 SHA1 4e4f574a85c73c9f518e5ebf5cfd3135fa7fafaa SHA256 5c6c4b44b218c75de8e713a377b3662f791e77ebdf9a00bc76d63274d2e2d261
DIST jdk-5.0u16-dlj-linux-i586.bin 49676902 RMD160 e358a1c3e554eb06cd4362ad175a95004661f38e SHA1 56e29e2d96fca31f6b0e34c208c13c82c523098d SHA256 0df21a7e636740c9812e3e1cd4002e914150acf3c806930d5128d05b37c28a08
+DIST jdk-5.0u17-dlj-linux-amd64.bin 44078142 RMD160 0d6735ee108386435a9d53256c2a77e0f4208902 SHA1 a45edcd64ea98f0ad5a5239512337b5db74d5faf SHA256 68d5a7dbde765b8f2f80cee7057df6ef76ad8af5cf5f8456cf3d1f3603c97fb8
+DIST jdk-5.0u17-dlj-linux-i586.bin 49690762 RMD160 a9baa1a26acf284b31b7b81278bd32a7dada7c38 SHA1 d9f72fbb0aed5c27d7d40671a318597906771fd9 SHA256 427a6abd1435c23bf3bc953cca13a0d3b22f3be5e1c1bb14d21ac88e898c021a
DIST jdk-6u10-dlj-linux-amd64.bin 72785631 RMD160 fa38bbcf970e75d0522e85d893635ccbaf23a218 SHA1 dd47b6afb2eed8253ab39d7b5a31fcff811cbca5 SHA256 c91bfe6759a9fe403a15b1fdc940ba7b04fd637a4f4ebb22a9d45f03159564e1
DIST jdk-6u10-dlj-linux-i586.bin 80041857 RMD160 a280938fb2ff5208294b76afa9e8c8f459f64841 SHA1 f4dc9d497042c5196afb7ae75257de8614673ea6 SHA256 dae79e8c56090ac3fb4ac3fe0df9faf6a0c9694a89ef978dce0ab970557ad264
+DIST jdk-6u11-dlj-linux-amd64.bin 72807418 RMD160 268d69287de89dd75ed11095b8bcd809967f375c SHA1 665ab8cab1342030e94e19a24eb76470a3677f6f SHA256 945c814f6aed133a36a4a4fcb0f27ec3a9de3901bc4b9bd46ee87468782c5026
+DIST jdk-6u11-dlj-linux-i586.bin 80060361 RMD160 ad6a4f82d103fb7e101351b7347ca8a9992a72db SHA1 6c1bb54d383e1fff69c5e33bfe9e3fcc05c653ab SHA256 c41faea381c3abae0e973a19b88f6e17f83c66fc6bc602a05ccd9a1c3d8a9303
DIST jdk-6u7-dlj-linux-amd64.bin 71703415 RMD160 22c910c68c78ca68143b8c5444b6d4b24ef3edc1 SHA1 dd2769bda4be1387e22bfe7d04e2dcc9d593fe5c SHA256 b8adc4ea7ae90aed08e9b981ac3a9f1160fc94965a5034e2ea7e63b0ba77a725
DIST jdk-6u7-dlj-linux-i586.bin 78515200 RMD160 1c626fa6a16be412f082bdadcb4c3018bd0e188d SHA1 1a697ed721260331918fa34913203c78562d1d63 SHA256 b57a1f49ca3c9d3dd45b3fc2ab569d84d159a076124e842a9c8d82abce92ff8b
EBUILD sun-jdk-1.4.2.18.ebuild 5184 RMD160 171c0a4e7aab36eb314f398ec278154ea1f8f070 SHA1 efb4dcafa46af82920f7229728f20a1f32a5281e SHA256 4bb32c98c3ef7ead70eee495575808b4680f7f1ef37ed0fce089386545115967
+EBUILD sun-jdk-1.4.2.19.ebuild 5190 RMD160 a8d6e74e530c60cdf784e8fe609c7d791b00e194 SHA1 10155794d3ac70b261b6d7f49905e8397b80981f SHA256 cafd2d8fc2097364d103d3b9dcec1bf1c7a8cc2182af50f6030c8c60ef567a2e
EBUILD sun-jdk-1.5.0.16.ebuild 4465 RMD160 0566c2220e5efa619b934f28edbaefb8a7a304c7 SHA1 760f83f7112b70c87b25da4a814e0f9b1d329346 SHA256 ee7dea802a8031a5a1bf1a3a3881e9b753c464880d71aaf32c14fe71a8ed1d40
+EBUILD sun-jdk-1.5.0.17.ebuild 4149 RMD160 703a777ab0c0fcc8265be88ddebce1d97450031f SHA1 4936afda46005d63e41ca296e8eb033b000ae6a9 SHA256 148a4189a42bf827ad049eaf10a29c6d2a9be92384309e555a3f26c0690f7a12
EBUILD sun-jdk-1.6.0.07-r1.ebuild 4259 RMD160 c12c32cb5789ac05d3901e25eb81a7f5d9a1db4f SHA1 c1e5e7700f6a2d33c8df800f4e71561f9f9151f4 SHA256 9f0d37a4a9432c1a6c984d61917b09215db3b9d018c9ad402bcbbb9b1b0b1fc0
EBUILD sun-jdk-1.6.0.07.ebuild 4282 RMD160 6893667750d098f6d2789596fd42e38403c807c9 SHA1 a8a6adf1927504f1cfb9ac72132656ffc5ec4b88 SHA256 49a8c73aa7a658d90402f0afee9b00bd39c0c44b5bf7ab6ecfae46cd78a50377
EBUILD sun-jdk-1.6.0.10.ebuild 4658 RMD160 9927a4325f216594320584b12b5227257f9d0dcb SHA1 881f965e636a19883c41956cf6c998a7d3cbce6b SHA256 283063b8c3c9842e76dde2105486303a2ea1f85339610be7c9d8f9e86f4f74b4
-MISC ChangeLog 46911 RMD160 02e6c1c9d5266d283fd410d0926dd71c71e0bf5f SHA1 4534bfdfce28cb381a1ccce755d535d5d859dfc1 SHA256 9009aeee1a1d2263d18744e9b5fa7f494320045089db790719d171f8ce6c620d
+EBUILD sun-jdk-1.6.0.11.ebuild 4664 RMD160 a936aff8fbd49ddeb8c2cf9969fb83eaadbbb895 SHA1 584a740e37f33622726291fe008b83419f386c16 SHA256 62a1645162c33472cdb90bab2defdf1a9ce7caf45855e901b48901154682abd2
+MISC ChangeLog 47190 RMD160 0d727aab02ba31f4b04c0e0a2c9fc63989911da0 SHA1 84b72c067ae1ae38ce3167677dac74a2e227d74c SHA256 1d07bea8650b2431e6042290de93f8602285ccdca7a7e1bb88ca309d26e699dd
MISC metadata.xml 352 RMD160 ca3d9b5f1a29c794d25667b59fb8dd6d18959c85 SHA1 daec179189ca09e38ffab061bb9f7c0c1766f09a SHA256 2e33901e40dedf73f59b2779ae2fe5d995a6a03cafb7944a6c067555222cae4c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkkoH2AACgkQkKaRLQcq0GLqFQCbBgbFg4pJLGI5JPAq8pWE/7zV
-5awAoLNShLCnnSXbQT87rART4u3f2l0P
-=fh3L
+iEYEARECAAYFAkk6fxwACgkQcxLzpIGCsLS4FgCgk5AGuXFuYmDfkaFUPaAaZPGK
+RggAoJF40ABKwdMYqgOaKtOdjbfSHksb
+=QBMm
-----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild
new file mode 100644
index 000000000000..07dc8c500f52
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild,v 1.1 2008/12/06 13:32:57 betelgeuse Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit pax-utils java-vm-2 eutils
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_PN=j2sdk
+MY_P=${MY_PN}${MY_PV}
+MY_PVB=${PV%.*}
+
+At="j2sdk-${PV//./_}-linux-i586.bin"
+jce_policy="jce_policy-${MY_PVB//./_}.zip"
+
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI="x86? ( ${At} )
+ jce? ( ${jce_policy} )"
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="~x86"
+# files are prestripped
+RESTRICT="fetch strip"
+IUSE="X alsa doc examples jce nsplugin odbc"
+
+DEPEND="sys-apps/sed
+ app-arch/unzip"
+
+RDEPEND="
+ alsa? ( media-libs/alsa-lib )
+ doc? ( =dev-java/java-sdk-docs-1.4.2* )
+ X? (
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXp
+ x11-libs/libXtst
+ x11-libs/libXt
+ x11-libs/libX11
+ )
+ odbc? ( dev-db/unixODBC )"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+DL_PREFIX="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef="
+DOWNLOAD_URL="${DL_PREFIX}${MY_PN}-${MY_PV}-oth-JPR@CDS-CDS_Developer"
+DOWNLOAD_URL_JCE="${DL_PREFIX}7503-jce-1.4.2-oth-JPR@CDS-CDS_Developer"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so
+ opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so
+ opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+ opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
+
+pkg_nofetch() {
+ einfo "Please download ${At} from:"
+ einfo ${DOWNLOAD_URL}
+ einfo "and move it to ${DISTDIR}"
+ if use jce; then
+ echo
+ einfo "Also download ${jce_policy} from:"
+ einfo ${DOWNLOAD_URL_JCE}
+ einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
+ einfo "and move it to ${DISTDIR}"
+ fi
+}
+
+src_unpack() {
+ if [ ! -r "${DISTDIR}/${At}" ]; then
+ die "cannot read ${At}. Please check the permission and try again."
+ fi
+ if use jce; then
+ if [ ! -r "${DISTDIR}/${jce_policy}" ]; then
+ die "cannot read ${jce_policy}. Please check the permission and try again."
+ fi
+ fi
+ #Search for the ELF Header
+ testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001')
+ startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1`
+ tail -n +${startAt} "${DISTDIR}/${At}" > install.sfx
+ chmod +x install.sfx
+ ./install.sfx || die
+ rm install.sfx
+
+ if [[ -f ${S}/lib/unpack ]]; then
+ UNPACK_CMD=${S}/lib/unpack
+ chmod +x $UNPACK_CMD
+ sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+ local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar \
+ jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar \
+ jre/javaws/javaws.jar"
+ for i in $PACKED_JARS; do
+ PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
+ if [ -f ${PACK_FILE} ]; then
+ echo " unpacking: $i"
+ $UNPACK_CMD ${PACK_FILE} "${S}"/$i
+ rm -f ${PACK_FILE}
+ fi
+ done
+ fi
+}
+
+src_install() {
+ local dirs="bin include jre lib man"
+ dodir /opt/${P}
+
+ cp -dPR ${dirs} "${D}/opt/${P}/"
+
+ # Set PaX markings on all JDK/JRE executables to allow code-generation on
+ # the heap by the JIT compiler.
+ pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*)
+
+ dodoc COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
+ dohtml README.html || die
+ if use examples; then
+ cp -pPR demo "${D}/opt/${P}/" || die
+ fi
+
+ cp -pPR src.zip "${D}/opt/${P}/" || die
+
+ if use jce ; then
+ # Using unlimited jce while still retaining the strong jce
+ # May have repercussions when you find you cannot symlink libraries
+ # in classpaths.
+ cd "${D}/opt/${P}/jre/lib/security"
+ unzip "${DISTDIR}/${jce_policy}"
+ mv jce unlimited-jce
+ dodir /opt/${P}/jre/lib/security/strong-jce
+ mv "${D}/opt/${P}/jre/lib/security/US_export_policy.jar" \
+ "${D}/opt/${P}/jre/lib/security/strong-jce" || die
+ mv "${D}/opt/${P}/jre/lib/security/local_policy.jar" \
+ "${D}/opt/${P}/jre/lib/security/strong-jce" || die
+ dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+ dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
+ fi
+
+ if use nsplugin; then
+ local plugin_dir="ns610"
+ if has_version '>=sys-devel/gcc-3.2' ; then
+ plugin_dir="ns610-gcc32"
+ fi
+
+ install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
+ fi
+
+ # bug #147259
+ dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
+ dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+
+ # create dir for system preferences
+ dodir /opt/${P}/.systemPrefs
+ # Create files used as storage for system preferences.
+ touch "${D}/opt/${P}/.systemPrefs/.system.lock"
+ chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock"
+ touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
+ chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
+
+ # install control panel for Gnome/KDE
+ sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+ -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+ "${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop" > \
+ "${T}/sun_java-${SLOT}.desktop"
+
+ domenu "${T}/sun_java-${SLOT}.desktop"
+
+ set_java_env
+ java-vm_revdep-mask
+}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild
new file mode 100644
index 000000000000..66c156512e7a
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.17.ebuild,v 1.1 2008/12/06 13:32:57 betelgeuse Exp $
+
+inherit versionator java-vm-2 eutils pax-utils
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
+
+X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
+
+DESCRIPTION="Sun's J2SE Development Kit, version 1.5"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
+ amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
+SLOT="1.5"
+LICENSE="dlj-1.1"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+IUSE="X alsa doc examples jce nsplugin odbc"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
+
+DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )"
+RDEPEND="sys-libs/glibc
+ alsa? ( media-libs/alsa-lib )
+ doc? ( =dev-java/java-sdk-docs-1.5.0* )
+ X? (
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXp
+ x11-libs/libXtst
+ x11-libs/libXt
+ x11-libs/libX11
+ )
+ odbc? ( dev-db/unixODBC )"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+src_unpack() {
+ sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
+}
+
+src_compile() {
+ # Set PaX markings on all JDK/JRE executables to allow code-generation on
+ # the heap by the JIT compiler. This needs to be done before CDS - #215225
+ pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
+
+ # see bug #207282
+ if use x86; then
+ einfo "Creating the Class Data Sharing archives"
+ "${S}"/bin/java -client -Xshare:dump || die
+ fi
+}
+
+src_install() {
+ local dirs="bin include jre lib man"
+
+ dodir /opt/${P}
+
+ cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
+ dodoc COPYRIGHT README.html || die
+ dohtml README.html || die
+
+ cp -pP src.zip "${D}/opt/${P}/" || die
+
+ if use examples; then
+ cp -pPR demo "${D}/opt/${P}/" || die
+ cp -pPR sample "${D}/opt/${P}/" || die
+ fi
+
+ if use jce; then
+ cd "${D}"/opt/${P}/jre/lib/security || die
+ dodir /opt/${P}/jre/lib/security/strong-jce
+ mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
+ "${D}"/opt/${P}/jre/lib/security/strong-jce || die
+ mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
+ "${D}"/opt/${P}/jre/lib/security/strong-jce || die
+ local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
+ dosym ${jcedir}/US_export_policy.jar \
+ /opt/${P}/jre/lib/security/ || die
+ dosym ${jcedir}/local_policy.jar \
+ /opt/${P}/jre/lib/security/ || die
+ fi
+
+ if use nsplugin; then
+ local plugin_dir="ns7-gcc29"
+ if has_version '>=sys-devel/gcc-3' ; then
+ plugin_dir="ns7"
+ fi
+
+ if use x86 ; then
+ install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+ else
+ eerror "No plugin available for amd64 arch"
+ fi
+ fi
+
+ # create dir for system preferences
+ dodir /opt/${P}/jre/.systemPrefs
+ # Create files used as storage for system preferences.
+ touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
+ chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
+ touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+ chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+
+ # install control panel for Gnome/KDE
+ if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
+ sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+ -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+ "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+ "${T}"/sun_java-${SLOT}.desktop \
+ || die "Failed to sed .desktop file"
+
+ domenu "${T}"/sun_java-${SLOT}.desktop
+ fi
+
+ # bug #56444
+ insinto /opt/${P}/jre/lib/
+ newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
+
+ set_java_env
+ java-vm_revdep-mask
+}
+
+pkg_postinst() {
+ # Set as default VM if none exists
+ java-vm-2_pkg_postinst
+
+ elog "The epoll-based implementation of SelectorProvider is not selected by"
+ elog "default."
+ elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
+ elog ""
+}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild
new file mode 100644
index 000000000000..e250bcd937ed
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild,v 1.1 2008/12/06 13:32:57 betelgeuse Exp $
+
+inherit versionator java-vm-2 eutils pax-utils
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
+
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/javase/6/"
+URL_BASE="http://download.java.net/dlj/binaries"
+SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
+ amd64? ( ${URL_BASE}/${AMD64_AT} )"
+SLOT="1.6"
+LICENSE="dlj-1.1"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+IUSE="X alsa doc examples jce nsplugin odbc"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
+ opt/${P}/jre/lib/i386/libdeploy.so
+ opt/${P}/jre/lib/i386/client/libjvm.so
+ opt/${P}/jre/lib/i386/server/libjvm.so"
+
+DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
+RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* )
+ sys-libs/glibc
+ alsa? ( media-libs/alsa-lib )
+ X? (
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXp
+ x11-libs/libXtst
+ amd64? ( x11-libs/libXt )
+ x11-libs/libX11
+ )
+ odbc? ( dev-db/unixODBC )"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
+
+src_unpack() {
+ sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
+}
+
+src_compile() {
+ # Set PaX markings on all JDK/JRE executables to allow code-generation on
+ # the heap by the JIT compiler. This needs to be done before CDS - #215225
+ pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
+
+ # see bug #207282
+ if use x86; then
+ einfo "Creating the Class Data Sharing archives"
+ "${S}"/bin/java -client -Xshare:dump || die
+ "${S}"/bin/java -server -Xshare:dump || die
+ fi
+}
+
+src_install() {
+ local dirs="bin include jre lib man"
+
+ dodir /opt/${P}
+
+ cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
+ dodoc COPYRIGHT || die
+ dohtml README.html || die
+
+ cp -pP src.zip "${D}/opt/${P}/" || die
+
+ if use examples; then
+ cp -pPR demo sample "${D}/opt/${P}/" || die
+ fi
+
+ if use jce; then
+ cd "${D}/opt/${P}/jre/lib/security"
+ dodir /opt/${P}/jre/lib/security/strong-jce
+ mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
+ "${D}"/opt/${P}/jre/lib/security/strong-jce || die
+ mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
+ "${D}"/opt/${P}/jre/lib/security/strong-jce || die
+ dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+ dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
+ fi
+
+ if use nsplugin; then
+ local plugin_dir="ns7-gcc29"
+ if has_version '>=sys-devel/gcc-3' ; then
+ plugin_dir="ns7"
+ fi
+
+ if use x86 ; then
+ install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+ install_mozilla_plugin /opt/${P}/jre/lib/i386/libnpjp2.so plugin2
+ else
+ eerror "No plugin available for amd64 arch"
+ fi
+ fi
+
+ # create dir for system preferences
+ dodir /opt/${P}/jre/.systemPrefs
+ # Create files used as storage for system preferences.
+ touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
+ chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
+ touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+ chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+
+ if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
+ # install control panel for Gnome/KDE
+ # The jre also installs these so make sure that they do not have the same
+ # Name
+ sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
+ -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
+ -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+ "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+ "${T}"/sun_jdk-${SLOT}.desktop
+
+ domenu "${T}"/sun_jdk-${SLOT}.desktop
+ fi
+
+ # bug #56444
+ insinto /opt/${P}/jre/lib/
+ newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
+
+ set_java_env
+ java-vm_revdep-mask
+}
+
+pkg_postinst() {
+ # Set as default VM if none exists
+ java-vm-2_pkg_postinst
+
+ if use x86 && use nsplugin; then
+ elog
+ elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
+ elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
+ ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
+ elog "For more info see https://jdk6.dev.java.net/plugin2/"
+ elog
+ fi
+
+ elog "Please reinstall eclipse-sdk if you have it installed and want"
+ elog "workaround for bug #215150."
+}
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index ac620df7107f..fd817e0d9da7 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -1,31 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80
AUX construct.sh 6964 RMD160 8e3de41f59023cb9bf6040fe5f5a36d1b39552e3 SHA1 bc24071dba36878abf7a2da88bfc063eb3727da1 SHA256 47847c81ee85bd1b7dba6e91c2d7757c15a8930f4748dc926e00553bc89fcbd6
AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
AUX sun-jre-bin-1.4.env 854 RMD160 c473374bfcd3f9fc31b8946f9bccbc9c843ae258 SHA1 38bff237744c087ace43879d36d8794a55aa02cc SHA256 8f504d30eeb00f2bd3a1fe35a56448c1784143b51e9875c9e2692117a7fafcae
AUX sun-jre-bin-1.5.env 794 RMD160 8354353bc23c7148c5bd73d0c7bf958123378e46 SHA1 09301d835309d81f20270ebe90b6a02efd2f3aea SHA256 a7007ac6473f00040646f34caa870195056acd994ef86a2b627f9658c1986a22
AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1 1e431f6a7990c4c0684e95a73da32e132183331b SHA256 6fd0124892813113266857364834fb8fa9f08db9f72045e639ec0b5acdfc4c09
-DIST j2re-1_4_2_17-linux-i586.bin 14376647 RMD160 62de02a90f67d8965cebc563636d688f6745b7ca SHA1 a4282ea13048c76274222476abfb0954d42c35b8 SHA256 18aa1f5a4b223d3858d1d75913bb036963be4a9bb9b9bdc38ae2b714e1408654
DIST j2re-1_4_2_18-linux-i586.bin 14379606 RMD160 725d9aeac47ee775cf904676c27a12b598847b74 SHA1 7558ba72c1002b6a0dd362041693bd3baa28cbc6 SHA256 75750575b54d15b47b5b7d50e03cc111e958edc1c6b18cc55cc582853d612206
-DIST jdk-5.0u15-dlj-linux-amd64.bin 44048720 RMD160 624e7cd75c82891b54f7a3183ded297c30db6e48 SHA1 1b337999c9771dad78fc1cb171ffc34e6afd3cef SHA256 2a8aacdafd1da1d0a7fb15d536629cd6f2547309f13438a413bd31cd86ddb2fa
-DIST jdk-5.0u15-dlj-linux-i586.bin 49670009 RMD160 b7fcb7e92c91cf4ef428a434c35c400832d08f8d SHA1 e52af3bc81f268d73a94772428d612769473834b SHA256 b4b340f86e3c8f3bb2f9fa1762f1c3f428cee1efc658c4fb8793f5cf299b2ad5
DIST jdk-5.0u16-dlj-linux-amd64.bin 44052125 RMD160 d977cb6659b37653b1fc4159921f8a7d48cc2b80 SHA1 4e4f574a85c73c9f518e5ebf5cfd3135fa7fafaa SHA256 5c6c4b44b218c75de8e713a377b3662f791e77ebdf9a00bc76d63274d2e2d261
DIST jdk-5.0u16-dlj-linux-i586.bin 49676902 RMD160 e358a1c3e554eb06cd4362ad175a95004661f38e SHA1 56e29e2d96fca31f6b0e34c208c13c82c523098d SHA256 0df21a7e636740c9812e3e1cd4002e914150acf3c806930d5128d05b37c28a08
DIST jdk-6u10-dlj-linux-amd64.bin 72785631 RMD160 fa38bbcf970e75d0522e85d893635ccbaf23a218 SHA1 dd47b6afb2eed8253ab39d7b5a31fcff811cbca5 SHA256 c91bfe6759a9fe403a15b1fdc940ba7b04fd637a4f4ebb22a9d45f03159564e1
DIST jdk-6u10-dlj-linux-i586.bin 80041857 RMD160 a280938fb2ff5208294b76afa9e8c8f459f64841 SHA1 f4dc9d497042c5196afb7ae75257de8614673ea6 SHA256 dae79e8c56090ac3fb4ac3fe0df9faf6a0c9694a89ef978dce0ab970557ad264
-DIST jdk-6u5-dlj-linux-amd64.bin 63756779 RMD160 ed4d9d72845fb15e7731582996b078b4449da1f6 SHA1 c0eac2aa33a0ad05fdeb960708cc270b2d330af5 SHA256 9a9b97ce5ac821f9a92541eb5e2353ddefd485eaa1b4f4de6b41fce8281831d4
-DIST jdk-6u5-dlj-linux-i586.bin 70537386 RMD160 bd1bd2a6601b7e972c9c5f3e1cce4ce7d408b055 SHA1 ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542 SHA256 b0f78f2e6baf88c1d7dc9334c6b86e621b2c9d629f5617f3f57a3bd7cbad0c99
-DIST jdk-6u6-dlj-linux-amd64.bin 63757892 RMD160 a28c5d8f9e43826d8e770a7755261ea153d82dac SHA1 f498cc49096278fe440caa586593268eb26461bb SHA256 f9e80c53e15d8faf0d3381e2e2540bade4c5f849ff72984a2ed34e3208f0b7ea
-DIST jdk-6u6-dlj-linux-i586.bin 70547201 RMD160 a24417210333fd7f16ee844c010f27d1460b1064 SHA1 a14c3003425b99ca2b89ebf7a82a8a33b0139894 SHA256 35ad958d88ed2af892c3879c815988bfae7775dd484e920186d1f8ad02a2c076
DIST jdk-6u7-dlj-linux-amd64.bin 71703415 RMD160 22c910c68c78ca68143b8c5444b6d4b24ef3edc1 SHA1 dd2769bda4be1387e22bfe7d04e2dcc9d593fe5c SHA256 b8adc4ea7ae90aed08e9b981ac3a9f1160fc94965a5034e2ea7e63b0ba77a725
DIST jdk-6u7-dlj-linux-i586.bin 78515200 RMD160 1c626fa6a16be412f082bdadcb4c3018bd0e188d SHA1 1a697ed721260331918fa34913203c78562d1d63 SHA256 b57a1f49ca3c9d3dd45b3fc2ab569d84d159a076124e842a9c8d82abce92ff8b
-EBUILD sun-jre-bin-1.4.2.17.ebuild 3588 RMD160 3647dfb6e5e80498f648dcaebaa3287b7aed8c28 SHA1 6adec30c24c45714f421ddc345274226ec823de6 SHA256 cb5c0d73b48b3fad0a14d077a7634c6d147823068ffc9e1e490ff04c23ed6824
EBUILD sun-jre-bin-1.4.2.18.ebuild 3492 RMD160 61db67b0ae92ca5ea003c240502db70b43bbfc48 SHA1 d77df61a7916c85daf00d31bf37805fd7eb782a2 SHA256 987bc9289e1063266ed0d56f40612bc63b3a762e63fc9abd95392e6060c4e7a7
-EBUILD sun-jre-bin-1.5.0.15.ebuild 3157 RMD160 c4ca728904e16c3a7db973e1cdb9c60ebc4e31db SHA1 cde8ddcea82862c6c6d406c436e32246013cb7c2 SHA256 9199bba86b527fd4d802051a381d7ee4c7928b36d441267ad08c223aa690757a
EBUILD sun-jre-bin-1.5.0.16.ebuild 3156 RMD160 e9ae4708bc8fb7fd1caec247f603909306f9e6c6 SHA1 5d86d40ba2a94f7c4b31e9818220da97c47d9433 SHA256 3c4ea924e306758107dbc272510c9521e039286431fa578df33c7805b02aafb9
-EBUILD sun-jre-bin-1.6.0.05-r1.ebuild 3421 RMD160 e4a36b52f553dd7842b06ad8bab611ae53dc5f13 SHA1 983bd4341066192f15061a700b9eab3f5c1628a8 SHA256 bfcf7a6195ade1aaaeb1b8a5c736a23f5e7bc9af06e25bcb4f04c09c1c821b27
-EBUILD sun-jre-bin-1.6.0.05.ebuild 3172 RMD160 80e6452714d62b5439663ae76474d7e19682285b SHA1 48252d44bb14c3722ec283266e8022ef2ab391e7 SHA256 a4ee3a639c966fabb6d2ec31eae6ffe2b9f5e473212febaba707b9f9c5f6aaa7
-EBUILD sun-jre-bin-1.6.0.06.ebuild 3416 RMD160 e18538dd060dd9e1b74db710b860cff25482dc8a SHA1 a79c43948c6b71c0fd894f5c06f9e37c83dc37de SHA256 f4568fcc12bf18695746f2430cc7829083c36bc5e615e12a1195e7f4ce852ef4
EBUILD sun-jre-bin-1.6.0.07.ebuild 3416 RMD160 8c5ef5b901bcb10d11e97c7bb10b329d899a08ae SHA1 e68d51060f9e39223dfbba2bc6851287b05563aa SHA256 cfbf72e06fe6b073b19c2bc5df770f7732409133c727a37623af91b7a30aa824
EBUILD sun-jre-bin-1.6.0.10.ebuild 3823 RMD160 0194a2959b71e95bcc81aead69ab9086e989ebcc SHA1 721597ef5a111672e041df36ecb9dec3a3534f9c SHA256 91b0c158643a7b71879be0862ec849f1fa81d5f60477fb2187ac849b6428134e
-MISC ChangeLog 24890 RMD160 6c2eba990fc4b54af147e70ebc7bd00d1a376569 SHA1 d80caa672c5632bfba9bdc45cf5834efa27ba5c9 SHA256 124a307d574cb44c76e549299bfcc700e4afbe3dcf1ff176b1af00cc0e5410ff
+MISC ChangeLog 25128 RMD160 18b52bf2be308c12ef3315dfff392c88aa05cce6 SHA1 51c80e642ba0b3de8a5b99af4fe433728ebd850e SHA256 c5d3cfa9b04901f4491d62f0a22b435e6df31bc5ffd3642a86f3be54e53d44ad
MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk6f5UACgkQcxLzpIGCsLROyQCdHXR3cjHAd8rdt0EyGpZX/eS2
+5XsAn24wOwBVcw6ikt4XVkQmCyyWRrkQ
+=W0SB
+-----END PGP SIGNATURE-----