dev-java/oracle-jdk-bin: awt flag, nsplugin, javapackager
authorJames Le Cuirot <chewi@gentoo.org>
Fri, 1 Jan 2016 22:33:04 +0000 (22:33 +0000)
committerJames Le Cuirot <chewi@gentoo.org>
Fri, 1 Jan 2016 22:49:14 +0000 (22:49 +0000)
 * Change awt USE flag to !headless-awt
 * Install nsplugin to /usr/lib/nsbrowser/plugins in line with
   eselect-java and icedtea-web changes
 * Don't install javapackager unless javafx is enabled (#565828)

Sorry for changing the X/awt flag again but icedtea upstream preferred
the term headless, which is technically more accurate than awt, so I
compromised and went with headless-awt. This isn't icedtea but
consistency is king and I may apply this flag to virtual/jre one day.

Package-Manager: portage-2.2.26

dev-java/oracle-jdk-bin/metadata.xml
dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65-r1.ebuild [moved from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild with 96% similarity]
dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66-r1.ebuild [new file with mode: 0644]

index d95caa10382643bd0be87a5c3cd587db1930295b..e7dceb3bd76079cf50322f6b22ce7b2d16499b90 100644 (file)
@@ -6,6 +6,7 @@
   <use>
     <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
     <flag name="derby">Install bundled Derby (Java database)</flag>
+    <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
     <flag name="javafx">Install JavaFX libraries</flag>
     <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
     <flag name="pax_kernel">Use paxctl to mark the JVM binaries</flag>
similarity index 96%
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65-r1.ebuild
index 0d8bfc85e6e87b2f8c47e83c44e1e399ed037efd..cf7e4831593e4f49fe781c61c528b8848edcd33d 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -61,7 +61,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.8"
 KEYWORDS="~arm ~arm64"
-IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
+IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source"
 REQUIRED_USE="javafx? ( alsa fontconfig )"
 
 RESTRICT="fetch preserve-libs strip"
@@ -79,7 +79,7 @@ QA_PREBUILT="*"
 #   dependencies below.
 #
 RDEPEND="!x64-macos? (
-               awt? (
+               !headless-awt? (
                        x11-libs/libX11
                        x11-libs/libXext
                        x11-libs/libXi
@@ -212,7 +212,7 @@ src_install() {
                rm -vf jre/lib/*/libjsoundalsa.* || die
        fi
 
-       if ! use awt ; then
+       if use headless-awt ; then
                rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
                   {,jre/}bin/{javaws,policytool} \
                   bin/appletviewer || die
@@ -221,7 +221,7 @@ src_install() {
        if ! use javafx ; then
                rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
                   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
-                  bin/*javafx* || die
+                  bin/*javafx* bin/javapackager || die
        fi
 
        if ! use nsplugin ; then
@@ -259,7 +259,9 @@ src_install() {
        fi
 
        if use nsplugin ; then
-               install_mozilla_plugin "${dest}/${nsplugin}"
+               local nsplugin_link=${nsplugin##*/}
+               nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+               dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
        fi
 
        if use source ; then
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66-r1.ebuild
new file mode 100644 (file)
index 0000000..e3b48a9
--- /dev/null
@@ -0,0 +1,358 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x64-macos )
+
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x64-macos )
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+       S_PV="$(get_version_component_range 1-3)"
+else
+       MY_PV_EXT="u$(get_version_component_range 4)"
+       S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
+DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+       SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
+       if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+               SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+       fi
+       SRC_URI+=" )"
+done
+unset d
+SRC_URI+=" jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+               !headless-awt? (
+                       x11-libs/libX11
+                       x11-libs/libXext
+                       x11-libs/libXi
+                       x11-libs/libXrender
+               )
+               javafx? (
+                       dev-libs/glib:2
+                       dev-libs/libxml2:2
+                       dev-libs/libxslt
+                       media-libs/freetype:2
+                       x11-libs/cairo
+                       x11-libs/gtk+:2
+                       x11-libs/libX11
+                       x11-libs/libXtst
+                       x11-libs/libXxf86vm
+                       x11-libs/pango
+                       virtual/opengl
+               )
+       )
+       alsa? ( media-libs/alsa-lib )
+       cups? ( net-print/cups )
+       doc? ( dev-java/java-sdk-docs:${SLOT} )
+       fontconfig? ( media-libs/fontconfig:1.0 )
+       !prefix? ( sys-libs/glibc:* )
+       selinux? ( sec-policy/selinux-java )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="app-arch/zip
+       jce? ( app-arch/unzip )
+       examples? ( x64-macos? ( app-arch/unzip ) )
+       pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jdk"
+
+check_tarballs_available() {
+       local uri=$1; shift
+       local dl= unavailable=
+       for dl in "${@}" ; do
+               [[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+       done
+
+       if [[ -n "${unavailable}" ]] ; then
+               if [[ -z ${_check_tarballs_available_once} ]] ; then
+                       einfo
+                       einfo "Oracle requires you to download the needed files manually after"
+                       einfo "accepting their license through a javascript capable web browser."
+                       einfo
+                       _check_tarballs_available_once=1
+               fi
+               einfo "Download the following files:"
+               for dl in ${unavailable}; do
+                       einfo "  ${dl}"
+               done
+               einfo "at '${uri}'"
+               einfo "and move them 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-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
+               einfo
+       fi
+}
+
+pkg_nofetch() {
+       local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+       if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+               distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+       fi
+       check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+
+       use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
+}
+
+src_unpack() {
+       if use x64-macos ; then
+               pushd "${T}" > /dev/null
+               mkdir dmgmount
+               hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+                       -mountpoint "${T}"/dmgmount
+               local update=$(get_version_component_range 4)
+               [[ ${#update} == 1 ]] && update="0${update}"
+               xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
+               hdiutil detach "${T}"/dmgmount
+               zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
+               mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
+               popd > /dev/null
+       else
+               default
+       fi
+
+       # Upstream is changing their versioning scheme every release around 1.8.0.*;
+       # to stop having to change it over and over again, just wildcard match and
+       # live a happy life instead of trying to get this new jdk1.8.0_05 to work.
+       mv "${WORKDIR}"/jdk* "${S}" || die
+}
+
+src_prepare() {
+       if use jce ; then
+               mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
+       fi
+
+       if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+               # Mark this binary early to run it now.
+               pax-mark Cm ./bin/javap
+
+               eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+               eqawarn
+               eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+       fi
+
+       # Remove the hook that calls Oracle's evil usage tracker. Not just
+       # because it's evil but because it breaks the sandbox during builds
+       # and we can't find any other feasible way to disable it or make it
+       # write somewhere else. See bug #559936 for details.
+       zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+       local dest="/opt/${P}"
+       local ddest="${ED}${dest#/}"
+
+       # Create files used as storage for system preferences.
+       mkdir jre/.systemPrefs || die
+       touch jre/.systemPrefs/.system.lock || die
+       touch jre/.systemPrefs/.systemRootModFile || die
+
+       if ! use alsa ; then
+               rm -vf jre/lib/*/libjsoundalsa.* || die
+       fi
+
+       if use headless-awt ; then
+               rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+                  {,jre/}bin/{javaws,policytool} \
+                  bin/appletviewer || die
+       fi
+
+       if ! use javafx ; then
+               rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+                  jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+                  bin/*javafx* bin/javapackager || die
+       fi
+
+       if ! use nsplugin ; then
+               rm -vf jre/lib/*/libnpjp2.* || die
+       else
+               local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+       fi
+
+       # Even though plugins linked against multiple ffmpeg versions are
+       # provided, they generally lag behind what Gentoo has available.
+       rm -vf jre/lib/*/libavplugin* || die
+
+       dodoc COPYRIGHT
+       dodir "${dest}"
+       cp -pPR bin include jre lib man "${ddest}" || die
+
+       if use derby ; then
+               cp -pPR db "${ddest}" || die
+       fi
+
+       if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
+               cp -pPR demo sample "${ddest}" || die
+       fi
+
+       if use jce ; then
+               dodir "${dest}"/jre/lib/security/strong-jce
+               mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+                       "${ddest}"/jre/lib/security/strong-jce || die
+               mv "${ddest}"/jre/lib/security/local_policy.jar \
+                       "${ddest}"/jre/lib/security/strong-jce || die
+               dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+                       "${dest}"/jre/lib/security/US_export_policy.jar
+               dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
+                       "${dest}"/jre/lib/security/local_policy.jar
+       fi
+
+       if use nsplugin ; then
+               local nsplugin_link=${nsplugin##*/}
+               nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+               dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+       fi
+
+       if use source ; then
+               cp -v src.zip "${ddest}" || die
+
+               if use javafx ; then
+                       cp -v javafx-src.zip "${ddest}" || die
+               fi
+       fi
+
+       if [[ -d jre/lib/desktop ]] ; then
+               # 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 jre/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}#" \
+                       -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+                       -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+                       -e "s#Application;##" \
+                       -e "/Encoding/d" \
+                       jre/lib/desktop/applications/sun_java.desktop \
+                       > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+               domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+       fi
+
+       # Prune all fontconfig files so libfontconfig will be used and only install
+       # a Gentoo specific one if fontconfig is disabled.
+       # http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+       rm "${ddest}"/jre/lib/fontconfig.*
+       if ! use fontconfig ; then
+               cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+               eprefixify "${T}"/fontconfig.properties
+               insinto "${dest}"/jre/lib/
+               doins "${T}"/fontconfig.properties
+       fi
+
+       # This needs to be done before CDS - #215225
+       java-vm_set-pax-markings "${ddest}"
+
+       # see bug #207282
+       einfo "Creating the Class Data Sharing archives"
+       case ${ARCH} in
+               arm|ia64)
+                       ${ddest}/bin/java -client -Xshare:dump || die
+                       ;;
+               x86)
+                       ${ddest}/bin/java -client -Xshare:dump || die
+                       # limit heap size for large memory on x86 #467518
+                       # this is a workaround and shouldn't be needed.
+                       ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+                       ;;
+               *)
+                       ${ddest}/bin/java -server -Xshare:dump || die
+                       ;;
+       esac
+
+       # Remove empty dirs we might have copied.
+       find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+       if use x64-macos ; then
+               # Fix miscellaneous install_name issues.
+               pushd "${ddest}"/jre/lib > /dev/null || die
+               local lib needed nlib npath
+               for lib in \
+                       decora_sse glass jfx{media,webkit} \
+                       javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
+               ; do
+                       lib=lib${lib}.dylib
+                       einfo "Fixing self-reference of ${lib}"
+                       install_name_tool \
+                               -id "${EPREFIX}${dest}/jre/lib/${lib}" \
+                               "${lib}"
+               done
+               popd > /dev/null
+
+               # This is still jdk1{5,6}, even on Java 8, so don't change it
+               # until you know different.
+               for nlib in jdk1{5,6} ; do
+                       install_name_tool -change \
+                               /usr/lib/libgcc_s_ppc64.1.dylib \
+                               $($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+                               "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+                       install_name_tool -id \
+                               "${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+                               "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+               done
+       fi
+
+       set_java_env
+       java-vm_revdep-mask
+       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}