public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/, dev-java/oracle-jdk-bin/files/
@ 2017-01-23 22:52 James Le Cuirot
  0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2017-01-23 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0cf038536759e588cf2d1e25539fb6d62c169d23
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 23:12:34 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 22:52:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf03853

dev-java/oracle-jdk-bin: Migrate to java-vm_install-env

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh     | 17 +++++++++++++++++
 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
new file mode 100644
index 00000000..86e7a6b
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Oracle JDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
+MANPATH="${EPREFIX}/opt/${P}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/classes"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
index ad9f0f7..82fc8b6 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
@@ -351,7 +351,7 @@ src_install() {
 		done
 	fi
 
-	set_java_env
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/, dev-java/oracle-jdk-bin/files/
@ 2017-01-24 12:41 James Le Cuirot
  0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2017-01-24 12:41 UTC (permalink / raw
  To: gentoo-commits

commit:     5fd0d712bb3fd3f8dbb36b4eb9cbc08137661741
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 12:39:46 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 12:39:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd0d712

dev-java/oracle-jdk-bin: Remove vulnerable 1.8.0.112 wrt bug #606118

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-java/oracle-jdk-bin/Manifest                   |  10 -
 .../oracle-jdk-bin/files/oracle-jdk-bin-1.8.env    |  17 -
 dev-java/oracle-jdk-bin/metadata.xml               |   1 -
 .../oracle-jdk-bin/oracle-jdk-bin-1.8.0.112.ebuild | 366 ---------------------
 4 files changed, 394 deletions(-)

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 2973f5a..8e2b208 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,14 +1,4 @@
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jdk-8u112-linux-i586-demos.tar.gz 55066408 SHA256 8b3c5fe1b5c6dcec93172f79b4629898bb51daf8e7b57ea58e632185900f3d64 SHA512 cdc30633bd1d1f3b18ccb8fad22befc5df2b02e90519cca248d2e073c71439733f6913aea852894fe0b76cd8d91cadb8365d965dcad562233d882b95371455a6 WHIRLPOOL 037f592c521ba0351ce4f67248a8538d5470baa08c23f41c19637e0b6b643705b496d2dc43fd59a624350d4f90b8d4d08f24a9b2f2c9ce822ebb7295dba5f4b8
-DIST jdk-8u112-linux-i586.tar.gz 185725687 SHA256 1e7c2fb80b339dd65f261d37e26ffd5f3136e5ff8778026ed227b47516df69a5 SHA512 c6b855d870013a526cc2f4e133310ddca0e6a5276d02e0972c04a05e107a2654d5199fef296c91a4284e0a66bc9fbb0c0aa5ea49ae4a0f83319f5595a0c857fa WHIRLPOOL 691788fcdb4513d8c974968b567430b24e80f38f34dc26b8c0cf267451c618975596b5891807c59624b2bd56fa0996db4d729a1d297531f3cbbe8a6ea70e4424
-DIST jdk-8u112-linux-x64-demos.tar.gz 55099439 SHA256 d5cf33c3daf8cd3cf476092283288126d2e4636c7ab0b183f0155d72d91b5c9e SHA512 6ff4bbceba63f1cc23183a1248a93a5968b80ec660029c69f60a9b96ad261651be1117348b50b634e02da0250b0432a0fdb1cb2ab515445eaad0ef7a4ae38269 WHIRLPOOL 9344364253c8ee9158e31bc96f98ab0e502d1b8ce98f816f88b81f9478b6e71bdb18d88edb7a8165dcbc8b2350082fb6a21c46e6caaf2663484f855713e7cedd
-DIST jdk-8u112-linux-x64.tar.gz 183212596 SHA256 777bd7d5268408a5a94f5e366c2e43e720c6ce4fe8c59d9a71e2961e50d774a5 SHA512 6f3c5851e4c1c6b9c2cabc05a4781dcf46b4e28469ac8637bcfcb3527027ba57bf89e59c8b87754a34f602f75bf3ea890825ab6ae63fdb7c118d6460a1435c94 WHIRLPOOL 5bc7fc00dbeaaaa32b1e8b42e5523f7c4b2ec66b65c6a2416ffb3761880575bb4c7b38ea88f527f553622f026eee616404fa1a3d8183c5cb1ae9a932eab7dc37
-DIST jdk-8u112-macosx-x64.dmg 233985686 SHA256 c9ebb729acb0ee8e6fbeda85751be20b024c45e3ebb83cc7c624908ffb8a466d SHA512 27cb0d5d823eaa90fbcb444f39b913bb37e2edad9d6e934378b1fae590c7410c52c064c2c70dcde7a1536616fb103791c7686b662eacb650a2048229e2048005 WHIRLPOOL bcf8f754ec63b1bd178400b1ff692426283ef2c8d503ba87945149176048fa7247f94b0385b18bbf3349d20a7b44a03af3506c3d9d10d9f983d3e2ddcc74a615
-DIST jdk-8u112-macosx-x86_64-demos.zip 55667608 SHA256 f648039d3553c10f06b603ad6e7925ffdb9b552929447ca9108c1a350358f337 SHA512 990e64dde1cbcc71b73b8f51ae8d3b9dec8d6fb760b5ce20a9e22f9272a46ab79caa4e597adc838b6e8179ef55ecff2a1a84a48554a6cedc6ab483a32b24e682 WHIRLPOOL 98e668d71268b37771ef00304394c3410dd07ad5b0734df1f27129d9686aebe2b1fade01609578fa334cdec060921e001fd8146ac1107bba39eed6ffeb92c69f
-DIST jdk-8u112-solaris-sparcv9-demos.tar.gz 9804200 SHA256 acd7237d7e3efc69d3769e80950fabcb4030372655f891979ad9312900ee2626 SHA512 07eb243589bae496770bc6a4fd0b3d1d2d0ab05f3a4afcdf5cd1d6fe656fbb489090e3d9f807766cc82571cd662dac5060ce8fbc6767c42373a5962ef59f9078 WHIRLPOOL a45b5e003db65591af847e62eee724ae826692dc06cba49721c0810d8ba6801660ddd45144e4a90bb5000829b5588f90151d757d1f5f3618bb64f4894d809504
-DIST jdk-8u112-solaris-sparcv9.tar.gz 103876511 SHA256 f01739d94564eced651ea93ce5d98d1ccbb63fa99a4b7a7c3db99d03e30cf475 SHA512 ef4463b8a7e49d4ddf5aa5bca6f279ed4d3fbeca867aecb1f0c30661b8a08bbf1d0a5a8ecddc4f951e8655bb8d936b63090034d09fa7cca3a4012602a7f775c8 WHIRLPOOL f2bd24163c905fc1e800267b4e1d1f4856ceaca409a24b1ba406fa779d5b78917de5bd4acaf54177220d6abd824b33b6e2e351604681e27be13e7b15c2072254
-DIST jdk-8u112-solaris-x64-demos.tar.gz 9755514 SHA256 bbd8e55531ae6b1f6ad759334ffd62c1746912822326915def857351df3a7d95 SHA512 182ed642f76de2e15eba7bb96c09f75d14dfe9bb3b85c881521cda3746b90419eefef3941545f37d3fd81ec98509ae9003f9b419c3277ad58c0ed412b8b07b48 WHIRLPOOL 1007923893b91c0a636b5a710d98d137f34069e875382dc45b79977c6eff4166fcc10f134a9630966247597012668ff6b9dbc532273902175c9ac356b7b3686a
-DIST jdk-8u112-solaris-x64.tar.gz 101560691 SHA256 8adb58456c1860be9e73e28a4d249b478918d331f2dbcbbbac7c558708b8b754 SHA512 f7aeb0c4c8904014e247cf57ff30a53c804f06454f3b7eadfc2b831d59961a35ec29b0a3d1beb7809bf05fed452b898637fd54e2b59d3caccae76cd2fbf4e776 WHIRLPOOL 60967fb1930ce00298a11f4488b9e52a48f2f01fd2df60bffab095c968a5c1f2a383cc454331e6d43d5fab8ed703861783268faa8328fbff55742e542b4bd934
 DIST jdk-8u121-linux-arm32-vfp-hflt-demos.tar.gz 10403176 SHA256 65e4007e4e52a9755e967fe8dd943a0bf5efa6d5658d7575c352d3c9c22aefab SHA512 6db56012e857a0606124a6d519531cfa3151dda3067a873204e2175f19eee9f229733e4656bedd48b9eee11213e97334b03b4069747059cee32cdef31ac03691 WHIRLPOOL 1175bee77955d83133b6e3c76c4171106703aa8e488d55551d53133903d8b2341c6e369b492f7c04bf1669afb30f892709402cae6b21285c52b1790e3c129aa7
 DIST jdk-8u121-linux-arm32-vfp-hflt.tar.gz 81645826 SHA256 134c73db663b1fb0f3d771a383dbea1a7cfeaa00e4d2872e0a6df94d242cf2f6 SHA512 d7074a427bc270dc73ab8a86ea7503aa04554599239b80493ed92b7a216d483190c78b188373947b658e4cc64a0edfa64158607a313a9d19b49efda82c71646b WHIRLPOOL 576e540f4f4f487b4be6d2572a32f8e54b095722785b217c52df6100efe9af69219f831fa21122c2479ad540f1f0757efbc9a8743be3ce4249c9fe7b0926e15f
 DIST jdk-8u121-linux-arm64-vfp-hflt-demos.tar.gz 10425709 SHA256 3a57e4d6bb0e088c3b799f9d95a59b655c9356b6efa2312eec2bbcdc820fa7af SHA512 0aac9333a53147073286aa7d576c21a50ae223f8a7d338a470f0bda664d914500e559338bb8b86c5dae6ce1868569602c01f0a8fc2243a46c6bf01d7c71d52c0 WHIRLPOOL daad0b7a197d1d8f74de2c2af37c0933543626e28361de28354efb138954a8cadd3a79f1fdd02283e510121f1bcedf11c318c6377a0de55be82829a316a07acf

diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.8.env b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.8.env
deleted file mode 100644
index b0bad33..00000000
--- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.8.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="Oracle JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.8"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/classes"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"

diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index 6850de6..e5ef792 100644
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -12,7 +12,6 @@
     <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>
     <flag name="source">Install JVM (and optionally JavaFX) sources</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.112.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.112.ebuild
deleted file mode 100644
index b380afc..00000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.112.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# 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
-			x11-libs/libXtst
-		)
-		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
-		use jce && unpack "${JCE_FILE}"
-	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 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 \
-				/usr/lib/libSystem.B.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
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/, dev-java/oracle-jdk-bin/files/
@ 2017-12-17 22:15 James Le Cuirot
  0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2017-12-17 22:15 UTC (permalink / raw
  To: gentoo-commits

commit:     94c0e74924bdbae2ac4e7968b3d955fff97f78fa
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 22:11:50 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 22:14:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c0e749

dev-java/oracle-jdk-bin: Version bump to 9.0.1 (Java 9)

Gentoo is not yet ready for Java 9 so a gentoo-vm USE flag has been
added and masked to potentially allow but deny by default the ability
for the system to recognise this JDK.

Oracle has dropped support for many platforms, including 32-bit x86.

Many thanks to Craig Andrews and Manuel Ullmann for providing the
initial ebuild that I based this on.

Closes: https://bugs.gentoo.org/634698
Closes: https://github.com/gentoo/gentoo/pull/6033
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-java/oracle-jdk-bin/Manifest                   |   3 +
 .../oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh   |  16 ++
 dev-java/oracle-jdk-bin/metadata.xml               |   3 +
 .../oracle-jdk-bin/oracle-jdk-bin-9.0.1.ebuild     | 239 +++++++++++++++++++++
 4 files changed, 261 insertions(+)

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 44ca4f553d7..154334c80a5 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -12,3 +12,6 @@ DIST jdk-8u152-solaris-sparcv9-demos.tar.gz 9769313 BLAKE2B a811ceae2a7ee8d6081b
 DIST jdk-8u152-solaris-sparcv9.tar.gz 104117809 BLAKE2B 1dc8e1297594bdd84186d4422dfc8fff94a78e0316f8873920c79342e7d0ab504794296622f0357acf137a3170f263acd0b2c1dd7179e50ff538b5648abf5a4b SHA512 9b87d11325e22bfb5f8e852ef4dcd182f091dcedfe71e5b19cc5a7d82f9f7ccb060b53512bc938d0e617648a8aa766bb722690751521b9a2cc3820507342548d
 DIST jdk-8u152-solaris-x64-demos.tar.gz 9756596 BLAKE2B 4a5ca101e20d1693eaca23120bc3244412276d51dcf7700dd5142b9d23b90a7ff0d3599dce7862e38a183ea9e1ea67afbc075bdfe84908811bec700a928f46f6 SHA512 1aeaf732ad3956ede4baa005f34024750e03919ef81b608229a3df556b47db1255ce027e4278891644433db0c360225a3e81e9a547d298a4b958beb8691f8ff2
 DIST jdk-8u152-solaris-x64.tar.gz 101758540 BLAKE2B 18b04a0eebc618148bdb215d4ca286fce141fb91dc9c0f05de2520eb073a819161af7a1533b3ecdab9961080ad52acd523b771c23a8a3da8797f0adaf974164e SHA512 4dd9606be347a61a03c0f670915c4e790d4f5eef80a67922342b539dcae7132b3157df04cd33e5f72fdc7e6fcb43e21b3b387e2da159cdfea0feb01183c68aa0
+DIST jdk-9.0.1_linux-x64_bin.tar.gz 354531775 BLAKE2B c8b81f2286a0c3c4aa8f617f4638fb0dfd70a318acb31ff6a650f566aaa0752a8bc0023ec2e4af99e2a0b6f63f30b21ac1e46d920beec486966f498a37e49cea SHA512 c62ae164553830ef2ab8fbeb6d8674ac0db3e845cabe969f33acf79beb66a16ca5096f4c3d5712d87a55b1a791ac0908b4909e8276661ee24900ad8e0a983a55
+DIST jdk-9.0.1_osx-x64_bin.dmg 400669840 BLAKE2B 1fbdbc46c2771a8d7c0d38074e4d145ad3ed32bc1f9ad6bbadecb232e5d96f8bb607839309a7fffcf9fa6731c9f43586033ab96ff1a2761c44a1d19618fc0999 SHA512 f84ea7be92b3cb219fb3b2c642e0ea088cacd252a7a795f9b65483eba7cc15bfa2ff139112d18c3eae1e7618b6aa457aca3aaaec8218581a54c81f263ab02a22
+DIST jdk-9.0.1_solaris-sparcv9_bin.tar.gz 216899843 BLAKE2B 54d5f6d903722f805d9d471aec40b8ac5bb74fa316caf81cd7e1b32f20263f2417b7edcfd6415708b9abee04cba5ad350417af3649f6c5a2c7f71fc5dd5f2639 SHA512 76ed079f2adb7b922dbfb56feb2c6aa3e30e745328b5beab4f67966b42dde509cc0e92c80bf7e5e43b1415d24350e49e3f229d15ddac3ecaa8f8a500b2f6bb79

diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
new file mode 100644
index 00000000000..503707550e2
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="Oracle JDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"

diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index 165190f3d7e..1951d0d6124 100644
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -10,6 +10,9 @@
     <flag name="commercial">Install features requiring a commercial license for production use</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="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+    <flag name="gtk2">Enable GTK+ 2 support in JavaFX</flag>
+    <flag name="gtk3">Enable GTK+ 3 support in JavaFX</flag>
     <flag name="javafx">Install JavaFX libraries</flag>
     <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
     <flag name="source">Install JVM (and optionally JavaFX) sources</flag>

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.1.ebuild
new file mode 100644
index 00000000000..f86453303c6
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix
+
+KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jdk-${PV}_linux-x64_bin.tar.gz"
+ARCH_FILES[sparc64-solaris]="jdk-${PV}_solaris-sparcv9_bin.tar.gz"
+ARCH_FILES[x64-macos]="jdk-${PV}_osx-x64_bin.dmg"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="${PV%%.*}"
+IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
+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
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/atk
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/gdk-pixbuf
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+
+			gtk2? (
+				x11-libs/cairo
+				x11-libs/gtk+:2
+			)
+			gtk3? (
+				x11-libs/cairo[glib]
+				x11-libs/gtk+:3
+			)
+		)
+	)
+	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 )"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "${DISTDIR}:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jdk9-downloads-3848520.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase9-3934878.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		S="${WORKDIR}/Contents/Home"
+		mkdir -p "${T}"/dmgmount || die
+		hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die
+		xar -Oxf "${T}"/dmgmount/JDK\ ${PV}.pkg jdk${PV//.}.pkg/Payload | zcat | cpio -idv || die
+		hdiutil detach "${T}"/dmgmount || die
+	else
+		S="${WORKDIR}/jdk-${PV}"
+		default
+	fi
+}
+
+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 commercial ; then
+		rm -vfr jmods/*.jfr.* lib/jfr* \
+			lib/missioncontrol || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/lib*{[jx]awt,splashscreen}* \
+		   bin/{appletviewer,javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/lib*{decora,fx,glass,prism}* \
+		   lib/libgstreamer-lite.* lib/*fx* \
+		   bin/javapackager jmods/javafx* || die
+	else
+		if ! use gtk2 ; then
+			rm -vf lib/libglassgtk2.* || die
+		elif ! use gtk3 ; then
+			rm -vf lib/libglassgtk3.* || die
+		fi
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/libnpjp2.*)
+		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
+		rm -v lib/src.zip || die
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JDK ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin conf include jmods lib "${ddest}" || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	"${ddest}/bin/java" -server -Xshare:dump || die
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/lib/${lib} \
+				"${ddest}"/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 9. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/, dev-java/oracle-jdk-bin/files/
@ 2018-03-10 21:45 James Le Cuirot
  0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2018-03-10 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     48b7242b8ddfc78f4a3a7d2beb5a8fc8ae125ac7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 21:43:43 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 21:45:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b7242b

dev-java/oracle-jdk-bin: Fix installation of fontconfig.properties

I previously simplified this but accidentally changed the filename.

Closes: https://bugs.gentoo.org/649022
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/{fontconfig.Gentoo.properties => fontconfig.properties}       | 0
 ...acle-jdk-bin-1.8.0.162.ebuild => oracle-jdk-bin-1.8.0.162-r1.ebuild} | 2 +-
 .../{oracle-jdk-bin-9.0.4-r1.ebuild => oracle-jdk-bin-9.0.4-r2.ebuild}  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties b/dev-java/oracle-jdk-bin/files/fontconfig.properties
similarity index 100%
rename from dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties
rename to dev-java/oracle-jdk-bin/files/fontconfig.properties

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
similarity index 99%
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
index a57793e032f..8da2c3466fa 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
@@ -239,7 +239,7 @@ src_install() {
 	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
 	if ! use fontconfig ; then
 		insinto "${dest}"/jre/lib/
-		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
 	fi
 
 	# Needs to be done before CDS, bug #215225.

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
similarity index 98%
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
index 216d6da2217..272910669d9 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
@@ -185,7 +185,7 @@ src_install() {
 	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
 	if ! use fontconfig ; then
 		insinto "${dest}"/lib/
-		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
 	fi
 
 	# Needs to be done before CDS, bug #215225.


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/, dev-java/oracle-jdk-bin/files/
@ 2020-09-19  8:07 Georgy Yakovlev
  0 siblings, 0 replies; 5+ messages in thread
From: Georgy Yakovlev @ 2020-09-19  8:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6a7faaad2f8c5312dfb8d6e539b5a7346652e98b
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 22:36:24 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 08:05:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7faaad

dev-java/oracle-jdk-bin: remove last rited pkg

Bug: https://bugs.gentoo.org/732630
Bug: https://bugs.gentoo.org/717638
Closes: https://bugs.gentoo.org/575978
Closes: https://bugs.gentoo.org/686672
Closes: https://bugs.gentoo.org/684306
Closes: https://bugs.gentoo.org/692420
Closes: https://bugs.gentoo.org/684120
Closes: https://bugs.gentoo.org/681828
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/17594
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/oracle-jdk-bin/Manifest                   |  15 --
 .../oracle-jdk-bin/files/fontconfig.properties     | 161 -----------
 .../oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh   |  16 --
 .../oracle-jdk-bin/files/oracle-jdk-bin.env.sh     |  16 --
 dev-java/oracle-jdk-bin/metadata.xml               |  16 --
 .../oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild | 297 ---------------------
 .../oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild    | 247 -----------------
 7 files changed, 768 deletions(-)

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
deleted file mode 100644
index 9295c539e8b..00000000000
--- a/dev-java/oracle-jdk-bin/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-DIST jdk-11.0.2_linux-x64_bin.tar.gz 179640645 BLAKE2B eec4537f9c1ca88d65a65b1b827afbe49b2a020f1ba9056fe4a2efa31bcf1e0f134eede8bb0f51669f1978c79cef9a1b7eba6c93eaa2bb79e1847713ccc1cd57 SHA512 f6cd77cdad20107d8920bcf403ec01a7fa6d6eb9c020cc59077bb07633ce824562bec8b261ff1a3ea0e3946f6e4f5db8f704b9700410967c10c583967629270d
-DIST jdk-8u202-linux-arm32-vfp-hflt-demos.tar.gz 9490823 BLAKE2B 8b7b52e371e0f47e0b0434a6809feaf45500ec46c49a2ea4ae0202de773df88dc3b400f260e629f65b8ddaebd362ba43a8fe83da430d4cdc5d21fe79a6da42ea SHA512 7a3e3d9b89825eee22b171d60d53ee5097823538d0b0ccfe6f3cdde4f9d42861fe85e571fe38bc40dc2d74aa1dd1d8a131dec40ce8f4254c91b51693bbf85d5c
-DIST jdk-8u202-linux-arm32-vfp-hflt.tar.gz 76402495 BLAKE2B 3957e542a0184a5193601553006a314cf970720bbb3ccffec95111d1dfbbbef92c25df93fc60a08eb27338cfbc400681afbd0532eeea54075e7f41e87237b6af SHA512 c406ced79d8ae86e25754e731c3c180f8855d46581e752febfa9c609b28ef2b590ee13f4700b80f51097649abace46aa562fc2fbb74a7face5aafda33732b08f
-DIST jdk-8u202-linux-arm64-vfp-hflt-demos.tar.gz 9494073 BLAKE2B da9d9dade31ebee6fde009ac178c8678e2163da9739950eef61152043cd65f4bd38e919e8da257e4452cbf8783373be387021ccdfda0d60537e58f5be4218efa SHA512 5364da862ffa745137f2305cbb1e9473cc0c5f495ac2d454328afdd4bfa9343f0e1bfbcb8119ac68466d239e7c42683af6a1a3a33ab7a784f6bed0610d9e0677
-DIST jdk-8u202-linux-arm64-vfp-hflt.tar.gz 73141712 BLAKE2B 3e9ba3b12616eddc5f55397bad22ca7dbded5a277beb9ee5ee9bace882247c8197534df42f79a0441b299724e41223fe493a2246669986a70860f66abe68130a SHA512 5a3950c3bf370fd41a81514d28f93da32a299376818cbb4f1b05be3adeca5a86e099ff9a225d8267bcd965cd51db9c357cee054faa6fad139d150d9b359964e7
-DIST jdk-8u202-linux-i586-demos.tar.gz 58698723 BLAKE2B 56c07b9ab2093689eb4b9136cdff41e5deba75f3388cbffc624c3c0c27b24c732a5ae826c1c2381065abad2320c1c5ccfaaad5933a03a395f148804950313e47 SHA512 e15e4141846ba0df052f90cee9827b71f158fdae4eae20289eab4a37a21a78f6ed5b9ef94345a324b23b7e5b6140fdbef7e00265d6f234cea56f2f6aa6c5dde8
-DIST jdk-8u202-linux-i586.tar.gz 197025433 BLAKE2B 6521552b0b41c9f0eebb4cd59247775a895d09ce899ee3bb941708c67ebd2c6f23bbce4ebde3def5c1d62fcb97d6c7d229457b33e982ab3d0709a10518b3c7b0 SHA512 1bb370b582628d92b41e4c205a76c75be783c044cf0bd27cc269bbf1cb50a9840ee10b50c7b1381373eabee0a2a4e47b007dceecd205d2f7adb89845e4d2e380
-DIST jdk-8u202-linux-x64-demos.tar.gz 58808123 BLAKE2B 1f2bd5364a3d658fad7859842f1cde270a7442707f61ecb0e2d840562a18dc6bf093c029491ab2c912fc8f52a93e6b23b201e4516416b8f97e4d914250563847 SHA512 1ff395bf6abbafa07ed9ddc1a58b05e564342ad7c9a3ef26d0a55b7f49e233ff9a5349984be55c295fd17e4ae15fc9e9a0960f6e76a67de4c8e598ac7707daf3
-DIST jdk-8u202-linux-x64.tar.gz 194042837 BLAKE2B db8193e47b93ebad1f984d39e887babea1f1e8e6b5cf9ea9ca8f243bd6f0e12c40fb1531ba5b22835a4c7c6613ea8bfd1bc233f322afee617988fc7123f6202a SHA512 a69cd3128595725435d7c0c3e02034f82f48694589afacca3430bd476f86489ec8ad57543c285a831f5affc8241b6d39ab84d1f1ac971200a3913baf97d54094
-DIST jdk-8u202-macosx-x64.dmg 261255287 BLAKE2B e9f1b21d87750c79c3dae1a37fb3727e426fa0baf95fed396f937541ebd9df2ee832cb2b9b7971020726107cc13382bef59267669872867749cf78b07d7ad680 SHA512 5935864f9ecb184dcbbac9c11de98443effc3f0264612c4a0c842465390551e5d73341eac950efb08ddcdd7b39ad0a49554fb1bf953f962f89a00322515ce368
-DIST jdk-8u202-macosx-x86_64-demos.zip 58980556 BLAKE2B 380567dce812bcdc4e67ead8185629f0d00163ac823ec15d8a68dc62cd66e7bd45231a6d38ffbc6a4ee255080cd7193d8797b823bb41abce06bdb65ae44e2b4d SHA512 c755ff14ef6d5d327e98e315d88640ad8d6513ec05ccb87c0925544b26ab18968cf85921f65029735abe9271dead6055b5efbe2b011583a160b280ed86015779
-DIST jdk-8u202-solaris-sparcv9-demos.tar.gz 8838689 BLAKE2B e86ed9372d9d76abb4eeab07b07fbbe988ae39b747b048d937d798cd908e6a8b838e07d5afb99e84357fd1cef8eac87bb039f643745b32df1085bfa9e71b28d3 SHA512 a6a7201b82f05641523f3fafa972659fbbfd1787d13f718b574d94a4e2646ead60fbb25037fa8ec14e12055c36b4c9d1046dce42b0785219ac3293515bf05b49
-DIST jdk-8u202-solaris-sparcv9.tar.gz 92381302 BLAKE2B 331eda8ffa0128853e872f7f2543e966efb2498b62f8d1179d9b47d6af8a411a59dc9b1733423ea73d330cba3cc59f10911e6c81dd6b9f5b497de6ec2f73a864 SHA512 e02fe78552e3c21d40c9bf380228bafd5ff46034d6b9040d0c08ec725003aa5be7da8c61a72a8175bf49074ba89e0e172019db8aa823b5b349414950afc56d33
-DIST jdk-8u202-solaris-x64-demos.tar.gz 8830525 BLAKE2B 6b6ced784d5b549d647c29b5859e376bbb44d3310d424bfdb087a3043d4849c43c24a370f166739850588f2b83ec7f24b3f3d9ae68a544f4f1cc152249137057 SHA512 eaa9adf1df2e554d2c76ea5f109e0ccf2f7c4a8221c78c402d1bfeb1da74cfe8bf2b8ecdac4cdfbef6b63b7439f94daadbcecd4dadfc73456400387c6d3a6353
-DIST jdk-8u202-solaris-x64.tar.gz 89523049 BLAKE2B 4b93344feaf6235d2e41cee688668c067ebb8107ba62b66d6cffec0b3b021a2f34537957743dfecfe7e97231ba709c948da0deac3bbbd7a9ca7de2086ee7f359 SHA512 4b4480bfc25be8d4bc8efe4aac3b5c28c240fd7f39875b5976bf735f58e11c39083d6c48387ecd81b507fd8284296df7844675450e6b5edc2c04627a73cc5923

diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.properties b/dev-java/oracle-jdk-bin/files/fontconfig.properties
deleted file mode 100644
index 43cb5eed0c4..00000000000
--- a/dev-java/oracle-jdk-bin/files/fontconfig.properties
+++ /dev/null
@@ -1,161 +0,0 @@
-# Version
-
-version=1
-
-# Component Font Mappings
-
-allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0
-allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0
-allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-
-serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-# Search Sequences
-
-sequence.allfonts=latin-1
-sequence.allfonts.Big5=latin-1,chinese-big5
-sequence.allfonts.GB2312=latin-1,chinese-gb18030
-sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208
-sequence.allfonts.EUC-KR=latin-1,korean
-sequence.allfonts.GB18030=latin-1,chinese-gb18030
-sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean
-
-# Exclusion Ranges
-
-exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be
-
-# Font File Names
-
-filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/bsmi00lp.ttf
-filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf
-filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf
-filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/hkscs-ming/min_uni.ttf
-
-# AWT X11 font paths
-awtfontpath.latin-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/Type1
-awtfontpath.chinese-big5=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
-awtfontpath.chinese-gb18030=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
-awtfontpath.japanese-x0208=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute
-awtfontpath.korean=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts

diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
deleted file mode 100644
index 503707550e2..00000000000
--- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Oracle JDK ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
-MANPATH=""
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"

diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
deleted file mode 100644
index 508a5c64787..00000000000
--- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Oracle JDK ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
-MANPATH="${EPREFIX}/opt/${P}/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/classes"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"

diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
deleted file mode 100644
index ef1e9ad9d7f..00000000000
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="commercial">Install features requiring a commercial license for production use</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="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
-    <flag name="gtk2">Enable GTK+ 2 support in JavaFX</flag>
-    <flag name="gtk3">Enable GTK+ 3 support in JavaFX</flag>
-    <flag name="javafx">Install JavaFX libraries</flag>
-    <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
-    <flag name="source">Install JVM (and optionally JavaFX) sources</flag>
-    <flag name="visualvm">Install VisualVM debugging tool</flag>
-  </use>
-</pkgmetadata>

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
deleted file mode 100644
index 03aed071bd2..00000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils gnome2-utils java-vm-2 prefix versionator
-
-KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-
-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}"
-
-declare -A ARCH_FILES
-ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz"
-ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
-ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
-ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz"
-ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg"
-ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz"
-
-for keyword in ${KEYWORDS//-\*} ; do
-	case "${keyword#\~}" in
-		*-linux) continue ;;
-		x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;;
-		*) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;;
-	esac
-
-	SRC_URI+="
-		${keyword#\~}? (
-			${ARCH_FILES[${keyword#\~}]}
-			examples? ( ${demo} )
-		)"
-done
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-IUSE="alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-RESTRICT="bindist 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
-			x11-libs/libXtst
-		)
-		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 )"
-
-DEPEND="app-arch/zip
-	examples? ( x64-macos? ( app-arch/unzip ) )"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _  ${S_PV})"
-
-pkg_nofetch() {
-	local a
-	einfo "Please download these files and move them to your distfiles directory:"
-	einfo
-	for a in ${A} ; do
-		[[ ! -f ${DISTDIR}/${a} ]] && einfo "  ${a}"
-	done
-	einfo
-	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-	einfo
-	einfo "If the above mentioned URL does not point to the correct version anymore,"
-	einfo "please download the file from Oracle's Java download archive:"
-	einfo
-	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
-	einfo
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		mkdir -p "${T}"/dmgmount || die
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount || die
-		local jdkgen=$(get_version_component_range 2)
-		local uver=$(get_version_component_range 4)
-		( cd "${T}" &&
-		  xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
-		  jdk${PV//.}.pkg/Payload ) || die
-		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
-		hdiutil detach "${T}"/dmgmount || die
-		mv Contents/Home "${S}" || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
-		# Mark this binary early to run it now.
-		pax-mark m ./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 commercial ; then
-		rm -vfr lib/missioncontrol jre/lib/jfr* || 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.*)
-		local nsplugin_link=${nsplugin##*/}
-		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
-		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
-	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
-
-	# Prune all fontconfig files so that libfontconfig will be used.
-	rm -v jre/lib/fontconfig.* || die
-
-	# Packaged as dev-util/visualvm but some users prefer this version.
-	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
-
-	# Install desktop file for the Java Control Panel. Using
-	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
-	if [[ -d jre/lib/desktop/icons ]] ; then
-		local icon
-		pushd jre/lib/desktop/icons >/dev/null || die
-		for icon in */*/apps/sun-jcontrol.png ; do
-			insinto /usr/share/icons/"${icon%/*}"
-			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
-		done
-		popd >/dev/null || die
-		make_desktop_entry \
-			"${dest}"/bin/jcontrol \
-			"Java Control Panel for Oracle JDK ${SLOT}" \
-			sun-jcontrol-${PN}-${SLOT} \
-			"Settings;Java;"
-	fi
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use examples && [[ ${A} = *-demos.* ]] ; then
-		cp -pPR demo sample "${ddest}" || die
-	fi
-
-	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
-		"${ddest}"/jre/lib/security/ || die
-
-	if use source ; then
-		cp -v src.zip "${ddest}" || die
-
-		if use javafx ; then
-			cp -v javafx-src.zip "${ddest}" || die
-		fi
-	fi
-
-	# Only install Gentoo-specific fontconfig if flag is disabled.
-	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	if ! use fontconfig ; then
-		insinto "${dest}"/jre/lib/
-		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
-	fi
-
-	# Needs to be done before CDS, bug #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
-		local lib
-		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
-			ebegin "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}"/jre/lib/${lib} \
-				"${ddest}"/jre/lib/${lib} || die
-			eend $?
-		done
-	fi
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx ; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postrm
-}

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
deleted file mode 100644
index 7456808001d..00000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils java-vm-2 prefix
-
-KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris"
-KEYWORDS="-* ~amd64"
-
-declare -A ARCH_FILES
-ARCH_FILES[amd64]="jdk-${PV}_linux-x64_bin.tar.gz"
-ARCH_FILES[sparc64-solaris]="jdk-${PV}_solaris-sparcv9_bin.tar.gz"
-ARCH_FILES[x64-macos]="jdk-${PV}_osx-x64_bin.dmg"
-
-for keyword in ${KEYWORDS//-\*} ; do
-	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
-done
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="${PV%%.*}"
-IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source"
-REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
-RESTRICT="bindist 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
-			x11-libs/libXtst
-		)
-		javafx? (
-			dev-libs/atk
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/gdk-pixbuf
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-
-			gtk2? (
-				x11-libs/cairo
-				x11-libs/gtk+:2
-			)
-			gtk3? (
-				x11-libs/cairo[glib]
-				x11-libs/gtk+:3
-			)
-		)
-	)
-	!prefix? (
-		dev-libs/elfutils
-		sys-libs/glibc:*
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	selinux? ( sec-policy/selinux-java )"
-
-pkg_nofetch() {
-	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
-	einfo "your distfiles directory:"
-	einfo
-	einfo "  https://www.oracle.com/technetwork/java/javase/downloads/jdk11-downloads-5066655.html"
-	einfo
-	einfo "If the above mentioned URL does not point to the correct version anymore,"
-	einfo "please download the file from Oracle's Java download archive:"
-	einfo
-	einfo "  https://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase11-5116896.html"
-	einfo
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		S="${WORKDIR}/Contents/Home"
-		mkdir -p "${T}"/dmgmount || die
-		hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die
-		( cd "${T}" &&
-		  xar -xf "${T}/dmgmount/JDK ${PV}.pkg" \
-		  jdk${PV//.}.pkg/Payload ) || die
-		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
-		hdiutil detach "${T}"/dmgmount || die
-	else
-		S="${WORKDIR}/jdk-${PV}"
-		default
-	fi
-}
-
-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 commercial ; then
-		rm -vfr jmods/*.jfr.* lib/jfr* \
-			lib/missioncontrol || die
-	fi
-
-	if use headless-awt ; then
-		rm -vf lib/lib*{[jx]awt,splashscreen}* \
-		   bin/{appletviewer,javaws,policytool} || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf lib/lib*{decora,fx,glass,prism}* \
-		   lib/libgstreamer-lite.* lib/*fx* \
-		   bin/javapackager jmods/javafx* || die
-	else
-		if ! use gtk2 ; then
-			rm -vf lib/libglassgtk2.* || die
-		elif ! use gtk3 ; then
-			rm -vf lib/libglassgtk3.* || die
-		fi
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf lib/libnpjp2.* || die
-	else
-		local nsplugin=$(echo lib/libnpjp2.*)
-		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
-		rm -v lib/src.zip || die
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf lib/libavplugin* || die
-
-#       # Prune all fontconfig files so that libfontconfig will be used.
-#       rm -v lib/fontconfig.* || die
-
-	# Install desktop file for the Java Control Panel. Using
-	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
-	if [[ -d lib/desktop/icons ]] ; then
-		local icon
-		pushd lib/desktop/icons >/dev/null || die
-		for icon in */*/apps/sun-jcontrol.png ; do
-			insinto /usr/share/icons/"${icon%/*}"
-			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
-		done
-		popd >/dev/null || die
-		make_desktop_entry \
-			"${dest}"/bin/jcontrol \
-			"Java Control Panel for Oracle JDK ${SLOT}" \
-			sun-jcontrol-${PN}-${SLOT} \
-			"Settings;Java;"
-	fi
-
-	dodir "${dest}"
-	cp -pPR bin conf include jmods lib "${ddest}" || die
-
-	# Only install Gentoo-specific fontconfig if flag is disabled.
-	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	if ! use fontconfig ; then
-		insinto "${dest}"/lib/
-		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
-	fi
-
-	# Needs to be done before CDS, bug #215225.
-	java-vm_set-pax-markings "${ddest}"
-
-	# See bug #207282.
-	einfo "Creating the Class Data Sharing archives"
-	# "${ddest}/bin/java" -server -Xshare:dump || die
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x64-macos ; then
-		local lib
-		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
-			ebegin "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}"/lib/${lib} \
-				"${ddest}"/lib/${lib} || die
-			eend $?
-		done
-	fi
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx ; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 9. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postrm
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-09-19  8:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-17 22:15 [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/, dev-java/oracle-jdk-bin/files/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2020-09-19  8:07 Georgy Yakovlev
2018-03-10 21:45 James Le Cuirot
2017-01-24 12:41 James Le Cuirot
2017-01-23 22:52 James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox