From 070626d3448b810187fcd30b6cc864c62c6cdf22 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 60b4402c8b..4114151662 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1811,12 +1811,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 0000000000..8213494c49
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a7e3ed176e..f0b16258cf 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes