From eb5434af3df84bf332d85771c75cbb92f3b51d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Wed, 11 Nov 2020 17:29:54 +0000
Subject: [PATCH] openjdk: simplify ebuild at the expense of more runtime
 dependencies.

---
 dev-java/openjdk/Manifest                 |  2 +-
 dev-java/openjdk/openjdk-9.0.4_p12.ebuild | 29 +++++++----------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 43c3812..bd5d348 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -35,5 +35,5 @@ EBUILD openjdk-12.0.2_p1.ebuild 7781 BLAKE2B 9ac75843354349bc67d28277933a6ea6a53
 EBUILD openjdk-13.0.4_p1.ebuild 7781 BLAKE2B 9ac75843354349bc67d28277933a6ea6a5307db8bea5390d9e798414e02a7ffb483011caccd0b7b409ddb98443e0045dda0bb0d57fc192e00884e70326d5f50e SHA512 d99c2bf7cc4997219a043fabbde56e2d7f821933e308085fb666027fbe2548102d55a55f84f639b3ce787782b8d6558ec01695103691de5ebb8ab53bd0718ddc
 EBUILD openjdk-14.0.2_p1.ebuild 8298 BLAKE2B 8dc89c9353b7233b06099f8a171efc579a0e0df7d07e1d62f823124158eaccd464e2389dec87eb84b7818a5e13d7b1581e9c204adcd695bec381efba8bc0c738 SHA512 b98ec119c4e7e61a8490544833b1649655b1f03e5694e64ba739396698294da106306cea70241e689144912bccef2d334841c73d3e22d5653d96e043c37304c5
 EBUILD openjdk-15.0.0_p36.ebuild 8298 BLAKE2B 8dc89c9353b7233b06099f8a171efc579a0e0df7d07e1d62f823124158eaccd464e2389dec87eb84b7818a5e13d7b1581e9c204adcd695bec381efba8bc0c738 SHA512 b98ec119c4e7e61a8490544833b1649655b1f03e5694e64ba739396698294da106306cea70241e689144912bccef2d334841c73d3e22d5653d96e043c37304c5
-EBUILD openjdk-9.0.4_p12.ebuild 8043 BLAKE2B 76433abd5b19181bd6a85f708a2d6ac5cd9a34d5721004c6c680c5f952e5e8e997b9d223b3a1158ecc87bbeaaa96d0afe9ad568c2f6e94553d420766b4e2a092 SHA512 54ad4e658d1fde1b3f45525e79b1760311888f98a3c1623b2d3bfb4e60b749512a37103983f3e3e1cb34dbeee98ac473c5caf6fb5150fa57bba835fa73eb5c20
+EBUILD openjdk-9.0.4_p12.ebuild 7705 BLAKE2B 28c15dff232b54bd6b261544fb898cc4f5b4948c633c742162dda67ec5a4aab159c7d90482239e8e118c28c641f94cf4e36053c709d35bad07c9d40f797fadb3 SHA512 17c8b6b44c0e7df558ea36d48b2901c4e6c9653bbf4bc87a83eaaab6cec0dbc450b46d3334b2bbfb0b8087f7aa559653d4b38e52193e144280e3577f54ea63b4
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/openjdk-9.0.4_p12.ebuild b/dev-java/openjdk/openjdk-9.0.4_p12.ebuild
index a4c4f65..dfd2553 100644
--- a/dev-java/openjdk/openjdk-9.0.4_p12.ebuild
+++ b/dev-java/openjdk/openjdk-9.0.4_p12.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 KEYWORDS="amd64 arm64"
-IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
+IUSE="debug cups doc examples gentoo-vm +jbootstrap nsplugin +pch selinux source +webstart"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -37,15 +37,13 @@ COMMON_DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	media-libs/alsa-lib
 	cups? ( net-print/cups )
 	selinux? ( sec-policy/selinux-java )
 "
@@ -186,7 +184,6 @@ src_configure() {
 			--with-milestone="fcs" # magic variable that means "release version"
 			--with-zlib=system
 			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
 		)
 
 	# PaX breaks pch, bug #601016
@@ -220,16 +217,6 @@ src_install() {
 
 	cd "${S}"/build/*-release/images/jdk || die
 
-	if ! use alsa; then
-		rm -v jre/lib/libjsoundalsa.* || die
-	fi
-
-	# stupid build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
 	if ! use examples ; then
 		rm -vr demo/ || die
 	fi