public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jre-bin/
Date: Fri,  1 Jan 2016 22:50:06 +0000 (UTC)	[thread overview]
Message-ID: <1451688554.87fe654ed20b0cd6043341d99670a053029d8d0c.chewi@gentoo> (raw)

commit:     87fe654ed20b0cd6043341d99670a053029d8d0c
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 22:44:22 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 22:49:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87fe654e

dev-java/oracle-jre-bin: awt flag, nsplugin

 * Change awt USE flag to !headless-awt
 * Install nsplugin to /usr/lib/nsbrowser/plugins in line with
   eselect-java and icedtea-web changes

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-jre-bin/metadata.xml               |   1 +
 .../oracle-jre-bin-1.8.0.66-r1.ebuild              | 239 +++++++++++++++++++++
 2 files changed, 240 insertions(+)

diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml
index e93f517..223ad67 100644
--- a/dev-java/oracle-jre-bin/metadata.xml
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -5,6 +5,7 @@
   <longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription>
   <use>
     <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</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>

diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.66-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.66-r1.ebuild
new file mode 100644
index 0000000..526e032
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.66-r1.ebuild
@@ -0,0 +1,239 @@
+# 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 updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+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="jre-${MY_PV}-linux-x64.tar.gz"
+AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AT_amd64} )
+	x86? ( ${AT_x86} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cups +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux"
+
+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 )
+	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 )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre"
+
+pkg_nofetch() {
+	local AT_ARCH="AT_${ARCH}"
+	local AT="${!AT_ARCH}"
+
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
+
+	if use jce; then
+		einfo "Also download '${JCE_FILE}' from:"
+		einfo "'${JCE_URI}'"
+		einfo "and move it to '${DISTDIR}'"
+	fi
+
+	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#jre-${MY_PV}-oth-JPR"
+	einfo
+
+}
+
+src_unpack() {
+	default
+
+	# 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 jre1.8.0_05 to work.
+	mv "${WORKDIR}"/jre* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || 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 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 .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
+		   bin/{javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
+		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	if use jce ; then
+		dodir ${dest}/lib/security/strong-jce
+		mv "${ddest}"/lib/security/US_export_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		mv "${ddest}"/lib/security/local_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/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
+
+	# 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 JRE ${SLOT}#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/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
+
+	# 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}"/lib/fontconfig.* || die
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/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
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}


             reply	other threads:[~2016-01-01 22:50 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-01 22:50 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-09-20  7:59 [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jre-bin/ Michał Górny
2019-08-18  7:21 Georgy Yakovlev
2019-01-25 10:16 Miroslav Šulc
2019-01-25 10:05 Mikle Kolyada
2019-01-24 22:22 Thomas Deutschmann
2019-01-17  9:50 Miroslav Šulc
2019-01-17  8:45 Miroslav Šulc
2018-10-26  0:52 Thomas Deutschmann
2018-10-20 17:46 Mikle Kolyada
2018-10-19 14:34 James Le Cuirot
2018-08-18 21:30 James Le Cuirot
2018-08-16  0:39 Thomas Deutschmann
2018-08-14  0:50 Mikle Kolyada
2018-08-10 21:02 James Le Cuirot
2018-04-25 20:43 James Le Cuirot
2018-04-24 23:42 Thomas Deutschmann
2018-04-23 20:42 James Le Cuirot
2018-04-23 10:01 Mikle Kolyada
2018-04-22 23:01 James Le Cuirot
2018-01-23 21:28 James Le Cuirot
2018-01-23 16:41 Agostino Sarubbo
2018-01-21 21:08 Thomas Deutschmann
2018-01-21 16:39 James Le Cuirot
2018-01-21 16:39 James Le Cuirot
2018-01-19 20:34 James Le Cuirot
2018-01-19 20:34 James Le Cuirot
2017-12-10 22:22 Ulrich Müller
2017-10-25 20:05 James Le Cuirot
2017-10-24  7:07 Agostino Sarubbo
2017-10-23 20:11 James Le Cuirot
2017-10-22 20:33 Thomas Deutschmann
2017-10-21 23:20 James Le Cuirot
2017-08-29 22:05 James Le Cuirot
2017-08-18 20:25 Thomas Deutschmann
2017-08-01 19:47 James Le Cuirot
2017-07-31 11:43 Tobias Klausmann
2017-07-26 21:18 Patrick McLean
2017-07-21  8:57 Pacho Ramos
2017-07-20 20:02 James Le Cuirot
2017-04-26  9:47 James Le Cuirot
2017-04-26  9:01 Agostino Sarubbo
2017-04-26  9:00 Agostino Sarubbo
2017-04-25  8:58 James Le Cuirot
2017-01-24  8:39 Agostino Sarubbo
2017-01-24  8:39 Agostino Sarubbo
2017-01-23 22:52 James Le Cuirot
2017-01-23 22:52 James Le Cuirot
2017-01-23 22:52 James Le Cuirot
2017-01-23 22:52 James Le Cuirot
2016-10-19 12:49 James Le Cuirot
2016-10-19 10:28 Agostino Sarubbo
2016-10-19 10:26 Agostino Sarubbo
2016-10-19 10:17 James Le Cuirot
2016-07-28 14:27 James Le Cuirot
2016-07-28 14:08 Agostino Sarubbo
2016-07-28  8:43 Agostino Sarubbo
2016-07-27 22:19 James Le Cuirot
2016-04-21 20:33 James Le Cuirot
2016-04-21 10:22 Agostino Sarubbo
2016-04-21 10:21 Agostino Sarubbo
2016-04-20 21:39 James Le Cuirot
2016-04-17 22:09 James Le Cuirot
2016-04-17 22:09 James Le Cuirot
2016-03-26 16:03 Agostino Sarubbo
2016-03-26 16:02 Agostino Sarubbo
2016-03-25 22:34 James Le Cuirot
2016-02-13 16:38 James Le Cuirot
2016-02-13 15:42 Agostino Sarubbo
2016-02-13 15:42 Agostino Sarubbo
2016-02-09 22:19 James Le Cuirot
2016-01-22 13:43 James Le Cuirot
2016-01-21 14:48 James Le Cuirot
2016-01-21 14:26 Agostino Sarubbo
2016-01-21 14:26 Agostino Sarubbo
2016-01-21 13:54 James Le Cuirot
2015-10-22  9:29 James Le Cuirot
2015-10-22  7:33 Agostino Sarubbo
2015-10-22  7:33 Agostino Sarubbo
2015-10-21 21:48 James Le Cuirot
2015-10-21 21:48 James Le Cuirot
2015-09-09  9:05 James Le Cuirot
2015-09-06 21:00 James Le Cuirot
2015-08-31 22:43 James Le Cuirot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1451688554.87fe654ed20b0cd6043341d99670a053029d8d0c.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox