From ceaa1419055a95e95c9723997d1c3d0289859272 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 9 Nov 2019 22:12:57 +0100
Subject: [PATCH] dev-java/sun-jai-bin: Bump to EAPI 7
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/697358
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 .../sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild   | 27 ++++++++++---------
 dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild | 24 +++++++++--------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
index 50218694eb44..b611b620af97 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit java-pkg-2
 
@@ -18,28 +18,29 @@ SRC_URI="
 LICENSE="sun-bcla-jai"
 SLOT="0"
 KEYWORDS="amd64"
+IUSE=""
+
 DEPEND=""
 RDEPEND=">=virtual/jre-1.3"
-IUSE=""
-RESTRICT="mirror"
+
+RESTRICT="bindist mirror"
 QA_PREBUILT="*"
 
-S=${WORKDIR}/${MY_P}/
+S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	rm "${S}/LICENSE-jai.txt"
+src_prepare() {
+	default
+	rm LICENSE-jai.txt || die
 }
 
 src_compile() { :; }
 
 src_install() {
-	dodoc *.txt || die
+	dodoc *.txt
 
-	cd lib
-	java-pkg_dojar *.jar
-	use x86 && java-pkg_doso *.so
-	use amd64 && java-pkg_doso *.so
+	java-pkg_dojar lib/*.jar
+	use x86 && java-pkg_doso lib/*.so
+	use amd64 && java-pkg_doso lib/*.so
 }
 
 pkg_postinst() {
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
index 20d0c2afe551..f244a96c1c95 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit java-pkg-2
 
@@ -9,20 +9,23 @@ MY_PV=${PV//./_}
 DESCRIPTION="JAI is a class library for managing images"
 HOMEPAGE="https://jai.dev.java.net/"
 SRC_URI="http://download.java.net/media/jai/builds/release/${MY_PV}/jai-${MY_PV}-lib-linux-i586.tar.gz"
+
 LICENSE="sun-bcla-jai"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
 DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.3"
-IUSE=""
-RESTRICT="mirror"
+
+RESTRICT="bindist mirror"
 QA_PREBUILT="*"
 
-S=${WORKDIR}/jai-${MY_PV}/
+S=${WORKDIR}/jai-${MY_PV}
 
-src_unpack() {
-	unpack ${A}
-	rm "${S}"/LICENSE-jai.txt
+src_prepare() {
+	default
+	rm LICENSE-jai.txt || die
 }
 
 src_compile() { :; }
@@ -30,9 +33,8 @@ src_compile() { :; }
 src_install() {
 	dodoc *.txt
 
-	cd lib
-	java-pkg_dojar *.jar
-	use x86 && java-pkg_doso *.so
+	java-pkg_dojar lib/*.jar
+	use x86 && java-pkg_doso lib/*.so
 }
 
 pkg_postinst() {
-- 
2.26.2