# HG changeset patch # User holger # Date 1263639574 -3600 # Node ID 215927006721343436390d4a2f46bacbed0e7e61 # Parent 3f6f7997fa44cc3365256d2235cc485dcd94e257 bump JDK to 1.6.0.18 diff -r 3f6f7997fa44 -r 215927006721 dev-java/sun-jdk/files/fontconfig.Gentoo.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/sun-jdk/files/fontconfig.Gentoo.properties Sat Jan 16 11:59:34 2010 +0100 @@ -0,0 +1,161 @@ +# Version + +version=1 + +# Component Font Mappings + +allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1 +allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0 +allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0 +allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 + +serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 +serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1 + +serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 +serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1 + +serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 +serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1 + +serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 +serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1 + +sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1 + +sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1 + +sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1 + +sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1 + +monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 +monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1 + +monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 +monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1 + +monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 +monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1 + +monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 +monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1 + +dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1 + +dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1 + +dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1 + +dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1 + +dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 +dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1 + +dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 +dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1 + +dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 +dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1 + +dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 +dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1 + +# Search Sequences + +sequence.allfonts=latin-1 +sequence.allfonts.Big5=latin-1,chinese-big5 +sequence.allfonts.GB2312=latin-1,chinese-gb18030 +sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208 +sequence.allfonts.EUC-KR=latin-1,korean +sequence.allfonts.GB18030=latin-1,chinese-gb18030 +sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean + +# Exclusion Ranges + +exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be + +# Font File Names + +filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=/usr/share/fonts/arphicfonts/bsmi00lp.ttf +filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=/usr/share/fonts/baekmuk-fonts/batang.ttf +filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=/usr/share/fonts/baekmuk-fonts/gulim.ttf +filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf +filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf +filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=/usr/share/fonts/hkscs-ming/min_uni.ttf + +# AWT X11 font paths +awtfontpath.latin-1=/usr/share/fonts/Type1 +awtfontpath.chinese-big5=/usr/share/fonts/arphicfonts +awtfontpath.chinese-gb18030=/usr/share/fonts/arphicfonts +awtfontpath.japanese-x0208=/usr/share/fonts/kochi-substitute +awtfontpath.korean=/usr/share/fonts/baekmuk-fonts diff -r 3f6f7997fa44 -r 215927006721 dev-java/sun-jdk/files/sun-jdk-1.6.env --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/sun-jdk/files/sun-jdk-1.6.env Sat Jan 16 11:59:34 2010 +0100 @@ -0,0 +1,18 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.6.env,v 1.3 2007/04/30 11:03:14 betelgeuse Exp $ + +VERSION="Sun JDK @PV@" +JAVA_HOME=/opt/@P@ +JDK_HOME=/opt/@P@ +JAVAC=${JAVA_HOME}/bin/javac +PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" +MANPATH="/opt/@P@/man" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="1.6" +# Taken from sun.boot.class.path property +BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff -r 3f6f7997fa44 -r 215927006721 dev-java/sun-jdk/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/sun-jdk/metadata.xml Sat Jan 16 11:59:34 2010 +0100 @@ -0,0 +1,10 @@ + + + + java + Sun Java Development Kit Package. AKA.J2SE + + Enable Installation of Bundled Derby (Java DB) + Enable Java Cryptographic Extension Unlimited Strength Policy files + + diff -r 3f6f7997fa44 -r 215927006721 dev-java/sun-jdk/sun-jdk-1.6.0.18.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.18.ebuild Sat Jan 16 11:59:34 2010 +0100 @@ -0,0 +1,161 @@ +# Copyright 1999-2009 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.17.ebuild,v 1.3 2009/11/05 21:27:46 maekke 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 Java SE Development Kit" +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 derby 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" +QA_DT_HASH="opt/${P}/.*" + +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" + + use derby && dirs="${dirs} db" + + 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 + install_mozilla_plugin /opt/${P}/jre/lib/amd64/libnpjp2.so + 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 + + if use amd64 && use nsplugin; then + elog + elog "This version finally brings a browser plugin for amd64" + elog "It is the so-called Next-Generation Plug-In (plugin2)" + elog "Use eselect java-nsplugin to select it (${VMHANDLE})." + ewarn "Note that it works only in Firefox 3 or newer browsers!" + 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." +}