From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Tue, 14 May 2019 00:33:55 +0000 (-0700)
Subject: dev-java/openjdk-bin: really remove libs for headless-awt
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8adf685bfbe0e138f8645af4c5995630346502ca;p=gentoo.git

dev-java/openjdk-bin: really remove libs for headless-awt

Bug: https://bugs.gentoo.org/685826
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---

diff --git a/dev-java/openjdk-bin/openjdk-bin-8.191_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.191_p12-r1.ebuild
similarity index 97%
rename from dev-java/openjdk-bin/openjdk-bin-8.191_p12.ebuild
rename to dev-java/openjdk-bin/openjdk-bin-8.191_p12-r1.ebuild
index baff27abbc59..6c1280109ae0 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.191_p12.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.191_p12-r1.ebuild
@@ -68,7 +68,7 @@ src_install() {
 	fi
 
 	if use headless-awt ; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		rm -fvr jre/lib/*/lib*{[jx]awt,splashscreen}* \
 			{,jre/}bin/policytool bin/appletviewer || die
 	fi
 
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.212_p03-r2.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.212_p03-r3.ebuild
similarity index 98%
rename from dev-java/openjdk-bin/openjdk-bin-8.212_p03-r2.ebuild
rename to dev-java/openjdk-bin/openjdk-bin-8.212_p03-r3.ebuild
index fd156f0edaf3..8a192994e1e4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.212_p03-r2.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.212_p03-r3.ebuild
@@ -70,7 +70,7 @@ src_install() {
 	fi
 
 	if use headless-awt ; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		rm -fvr jre/lib/*/lib*{[jx]awt,splashscreen}* \
 			{,jre/}bin/policytool bin/appletviewer || die
 	fi