diff options
author | Johann Schmitz <ercpe@gentoo.org> | 2014-11-04 18:05:44 +0000 |
---|---|---|
committer | Johann Schmitz <ercpe@gentoo.org> | 2014-11-04 18:05:44 +0000 |
commit | 3797496be6354145f720f5533879f32d41242428 (patch) | |
tree | 18c692e075c3583c3e8366265c58802ff8f095e0 /app-emulation | |
parent | New snapshot. (diff) | |
download | gentoo-2-3797496be6354145f720f5533879f32d41242428.tar.gz gentoo-2-3797496be6354145f720f5533879f32d41242428.tar.bz2 gentoo-2-3797496be6354145f720f5533879f32d41242428.zip |
Version bump to 1.7.0.72
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/emul-linux-x86-java/ChangeLog | 8 | ||||
-rw-r--r-- | app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.72.ebuild | 129 |
2 files changed, 136 insertions, 1 deletions
diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index f77249cf519c..3f0aac10cd58 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.144 2014/11/02 11:15:13 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.145 2014/11/04 18:05:44 ercpe Exp $ + +*emul-linux-x86-java-1.7.0.72 (04 Nov 2014) + + 04 Nov 2014; Johann Schmitz <ercpe@gentoo.org> + +emul-linux-x86-java-1.7.0.72.ebuild: + Version bump to 1.7.0.72 02 Nov 2014; Vlastimil Babka <caster@gentoo.org> -emul-linux-x86-java-1.7.0.51.ebuild, -emul-linux-x86-java-1.7.0.55.ebuild, diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.72.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.72.ebuild new file mode 100644 index 000000000000..468c22e37378 --- /dev/null +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.72.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.72.ebuild,v 1.1 2014/11/04 18:05:44 ercpe Exp $ + +EAPI="5" + +inherit java-vm-2 eutils prefix versionator + +# This URIs need to be updated when bumping! +JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html" + +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" + +X86_AT="jre-${MY_PV}-linux-i586.tar.gz" + +DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +SRC_URI="${X86_AT}" + +LICENSE="Oracle-BCLA-JavaSE" +SLOT="1.7" +KEYWORDS="-* ~amd64" +IUSE="+X alsa nsplugin pax_kernel" + +RESTRICT="fetch strip" +QA_PREBUILT="*" + +RDEPEND=" + || ( + ( + X? ( + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrender[abi_x86_32(-)] + x11-libs/libXtst[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] ) + alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) + ) + ( + X? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) + alsa? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) + ) + ) +" + +# scanelf won't create a PaX header, so depend on paxctl to avoid fallback +# marking. #427642 +DEPEND=" + pax_kernel? ( sys-apps/paxctl )" + +S="${WORKDIR}/jre${S_PV}" + +pkg_nofetch() { + einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again." + einfo "" + einfo "Please download '${X86_AT}' from:" + einfo "'${JRE_URI}'" + einfo "and move it to '${DISTDIR}'" + einfo + einfo "If the above mentioned urls do not point to the correct version anymore," + einfo "please download the files from Oracle's java download archive:" + einfo + einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jre-${MY_PV}-oth-JPR" + einfo +} + +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" + bin/java -client -Xshare:dump || die + bin/java -server -Xshare:dump || die +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}${dest}" + + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + rm -vf lib/i386/libjavaplugin_oji.so \ + lib/i386/libjavaplugin_nscp*.so + rm -vrf plugin/i386 + # Without nsplugin flag, also remove the new plugin + arch=i386; + if ! use nsplugin; then + rm -vf lib/${arch}/libnpjp2.so \ + lib/${arch}/libjavaplugin_jni.so + fi + + dodir "${dest}" + cp -pPR bin lib man "${ddest}" || die + + # Remove empty dirs we might have copied + find "${D}" -type d -empty -exec rmdir {} + || die + + dodoc COPYRIGHT README + + if use nsplugin; then + install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so + fi + + # Install desktop file for the Java Control Panel. + # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. + # make_desktop_entry can't be used as ${P} would end up in filename. + newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ + sun-jcontrol-${PN}-${SLOT}.png || die + sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \ + -e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ + -e "s#Application;##" \ + -e "/Encoding/d" \ + lib/desktop/applications/sun_java.desktop > \ + "${T}"/jcontrol-${PN}-${SLOT}.desktop || die + domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + + # http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html + rm "${ddest}"/lib/fontconfig.* || die + cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto "${dest}"/lib/ + doins "${T}"/fontconfig.properties + + set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" + java-vm_revdep-mask +} |