diff options
Diffstat (limited to 'dev-java/sun-jdk')
-rw-r--r-- | dev-java/sun-jdk/ChangeLog | 9 | ||||
-rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild | 138 | ||||
-rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild (renamed from dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild) | 18 |
3 files changed, 160 insertions, 5 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 13d115d15ba6..f54630485608 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.254 2009/03/11 22:50:09 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.255 2009/03/26 04:44:37 serkan Exp $ + +*sun-jdk-1.6.0.13 (26 Mar 2009) +*sun-jdk-1.5.0.18 (26 Mar 2009) + + 26 Mar 2009; Serkan Kaba <serkan@gentoo.org> +sun-jdk-1.5.0.18.ebuild, + -sun-jdk-1.6.0.11.ebuild, +sun-jdk-1.6.0.13.ebuild: + Version bump wrt security bug #263810. Remove old. 11 Mar 2009; Markus Meier <maekke@gentoo.org> sun-jdk-1.6.0.12.ebuild: amd64 stable, bug #261500 diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild new file mode 100644 index 000000000000..1d065dded696 --- /dev/null +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild @@ -0,0 +1,138 @@ +# 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.5.0.18.ebuild,v 1.1 2009/03/26 04:44:37 serkan 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.13.ebuild index 608dd90b9cfb..ea63de00640a 100644 --- a/dev-java/sun-jdk/sun-jdk-1.6.0.11.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.11.ebuild,v 1.2 2008/12/10 22:04:25 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.13.ebuild,v 1.1 2009/03/26 04:44:37 serkan Exp $ inherit versionator java-vm-2 eutils pax-utils @@ -17,7 +17,7 @@ SRC_URI="x86? ( ${URL_BASE}/${X86_AT} ) amd64? ( ${URL_BASE}/${AMD64_AT} )" SLOT="1.6" LICENSE="dlj-1.1" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" RESTRICT="strip" IUSE="X alsa doc examples jce nsplugin odbc" @@ -97,7 +97,7 @@ src_install() { 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" + install_mozilla_plugin /opt/${P}/jre/lib/amd64/libnpjp2.so fi fi @@ -143,6 +143,16 @@ pkg_postinst() { 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." } |