diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2011-11-21 13:26:03 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2011-11-21 13:26:03 +0000 |
commit | e13adb42be0d30cda03aa9558a5deaed60ddcd8d (patch) | |
tree | af4e674eb3ff25bf73ba2ee60bfd35e887ae57d1 /dev-java | |
parent | Version bump. (diff) | |
download | gentoo-2-e13adb42be0d30cda03aa9558a5deaed60ddcd8d.tar.gz gentoo-2-e13adb42be0d30cda03aa9558a5deaed60ddcd8d.tar.bz2 gentoo-2-e13adb42be0d30cda03aa9558a5deaed60ddcd8d.zip |
Use java-vm-2.eclass to set PaX markings
(Portage version: 2.1.10.35/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/sun-jdk/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild | 148 |
2 files changed, 154 insertions, 1 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 0e67bc97fd8b..978e38695d55 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/sun-jdk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.311 2011/11/18 22:11:13 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.312 2011/11/21 13:26:03 sera Exp $ + +*sun-jdk-1.6.0.29-r1 (21 Nov 2011) + + 21 Nov 2011; Ralph Sennhauser <sera@gentoo.org> +sun-jdk-1.6.0.29-r1.ebuild: + Use java-vm-2.eclass to set PaX markings 18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> sun-jdk-1.6.0.29.ebuild: Add missing pax markings for x86. Bug 389751 diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild new file mode 100644 index 000000000000..2de98c333d39 --- /dev/null +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2011 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.29-r1.ebuild,v 1.1 2011/11/21 13:26:03 sera Exp $ + +EAPI="4" + +inherit java-vm-2 eutils prefix versionator + +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" + +X86_AT="jdk-${MY_PV}-linux-i586.bin" +AMD64_AT="jdk-${MY_PV}-linux-x64.bin" + +# check the URIs when bumping, no idea about their stability yet +JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-${MY_PV}-download-513648.html" + +DESCRIPTION="Oracle's Java SE Development Kit" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +SRC_URI="x86? ( ${X86_AT} ) + amd64? ( ${AMD64_AT} )" + +LICENSE="Oracle-BCLA-JavaSE" +KEYWORDS="~amd64 ~x86" +SLOT="1.6" +IUSE="X alsa derby doc examples jce nsplugin" + +RESTRICT="fetch strip" +QA_TEXTRELS_x86=" + opt/${P}/jre/lib/i386/client/libjvm.so + opt/${P}/jre/lib/i386/motif21/libmawt.so + opt/${P}/jre/lib/i386/server/libjvm.so" + +RDEPEND="${DEPEND} + doc? ( dev-java/java-sdk-docs:1.6.0 ) + !prefix? ( sys-libs/glibc ) + alsa? ( media-libs/alsa-lib ) + X? ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libX11 + )" +DEPEND="jce? ( dev-java/sun-jce-bin:1.6 )" + +S="${WORKDIR}/jdk${S_PV}" + +pkg_nofetch() { + if use x86; then + AT=${X86_AT} + elif use amd64; then + AT=${AMD64_AT} + fi + + einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again." + einfo "Alternatives are switching to dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6" + + einfo "Please download ${AT} from:" + einfo "${JDK_URI}" + einfo "and move it to ${DISTDIR}" +} + +src_unpack() { + sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" +} + +src_compile() { + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + if use x86; then + "${S}"/bin/java -client -Xshare:dump || die + fi + "${S}"/bin/java -server -Xshare:dump || die +} + +src_install() { + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + if use x86; then + rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ + {,jre/}lib/i386/libjavaplugin_nscp*.so + rm -vrf jre/plugin/i386 + fi + # Without nsplugin flag, also remove the new plugin + local arch=${ARCH}; + use x86 && arch=i386; + if ! use nsplugin; then + rm -vf {,jre/}lib/${arch}/libnpjp2.so \ + {,jre/}lib/${arch}/libjavaplugin_jni.so + fi + + dodir /opt/${P} + cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die + + if use derby; then + cp -pPR db "${ED}"/opt/${P} || die + fi + + if use examples; then + cp -pPR demo sample "${ED}"/opt/${P} || die + fi + + # Remove empty dirs we might have copied + rmdir -v $(find "${D}" -type d -empty) || die + + dodoc COPYRIGHT + dohtml README.html + + if use jce; then + dodir /opt/${P}/jre/lib/security/strong-jce + mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \ + "${ED}"/opt/${P}/jre/lib/security/strong-jce || die + mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \ + "${ED}"/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/US_export_policy.jar + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \ + /opt/${P}/jre/lib/security/local_policy.jar + fi + + if use nsplugin; then + install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so + fi + + # Install desktop file for the Java Control Panel. Using VMHANDLE as file + # name to prevent file collision with jre and or other slots. + [[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die + sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)/" \ + -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \ + "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \ + "${T}"/${VMHANDLE}.desktop + + domenu "${T}"/${VMHANDLE}.desktop + + # bug #56444 + cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto /opt/${P}/jre/lib/ + doins "${T}"/fontconfig.properties + + set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" + java-vm_revdep-mask +} |