gentoo resync : 28.07.2021

4 files changed, 2 insertions, 102 deletions

diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index 46bb20fc6299..a31e10afee64 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,6 +1,4 @@
 DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
 DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
-EBUILD sun-jai-bin-1.1.3-r1.ebuild 1099 BLAKE2B 0257abd4b7fd290f56200786782459183a09c1c55e7cfe8702b85447f8f05b8e80e21a688e26bdb000b5ae28cae43bd9f9ea3b234df2cc5e3723781c6f0c3e34 SHA512 621448fc993b3376701632312d1efc7d8e675b7f3eeaf1ed2391a58b3e0e10e212a8dae9b69f2d52473703ff695e1c0edd5fc416ba9fcf8dd4e98dd2c74e0150
-EBUILD sun-jai-bin-1.1.3-r2.ebuild 1096 BLAKE2B c0087efbee4ff6b2055f4661401fb582016bb660bfaf13be938be60cafbb74e442384bf01f31291f844f57fc6a8de324d307ab9e1a46cc82aee19a2318d2ab62 SHA512 a06f8f9eb99a1682f0b96229300e77d9ccd8b40cd1576189da6c55757f09f1b6a6e280ba4666ad4b1c6e9c54dfe388ef526367d848de8676dcb32325c6a156b7
-EBUILD sun-jai-bin-1.1.3.ebuild 973 BLAKE2B 07e9e2c6e99b48b56f5ea8dc8d1bc8efc9d5a353b79b398ba078d92e1d92e286d61bad00a81a580e108a64317b3c87644889cb87dd1a69f51683f59380ab4a83 SHA512 2a2e4756e1b32c14d25642d912cba5b08371d4722b69fd0bf0db0f8c8d0348a7f4bbd136b9d28fe9355f3baeed54492c3b22bffce8f616c3d3c992feb518bc0e
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1100 BLAKE2B 27bde07cf2f3cf4a3549c6ba772b1ce8281f527058934adc725f248a499b264839de4308c70e57d0eba0cae25c4bbe17b7c0cd403d18ab07f1b1d30532538593 SHA512 9841c2bc9294daf8c6134017e65c25b58fc5b6606f8ca7ee1aa8ff2669f2c37a478933f90596e48c9cfe127523fc00aa9e365c5861a649255a4884c8523d4379
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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
deleted file mode 100644
index b611b620af97..000000000000
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PV=${PV//./_}
-DESCRIPTION="JAI is a class library for managing images"
-HOMEPAGE="https://jai.dev.java.net/"
-
-BASE=http://download.java.net/media/jai/builds/release/${MY_PV}
-MY_P="jai-${MY_PV}"
-SRC_URI="
-	!amd64? ( ${BASE}/${MY_P}-lib-linux-i586.tar.gz )
-	amd64? ( ${BASE}/${MY_P}-lib-linux-amd64.tar.gz )"
-
-LICENSE="sun-bcla-jai"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="bindist mirror"
-QA_PREBUILT="*"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	rm LICENSE-jai.txt || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc *.txt
-
-	java-pkg_dojar lib/*.jar
-	use x86 && java-pkg_doso lib/*.so
-	use amd64 && java-pkg_doso lib/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
-	elog 'To use you need to pass the following to java'
-	if use x86 || use amd64; then
-		elog '-Djava.library.path=$(java-config -i sun-jai-bin)'
-	fi
-	elog '-classpath $(java-config -p sun-jai-bin)'
-}
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index 9ad9f62e197e..36c1c67af629 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=""
 RDEPEND="virtual/jre:1.8"
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
deleted file mode 100644
index 1e21ce70574f..000000000000
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-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=""
-
-BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="bindist mirror"
-QA_PREBUILT="*"
-
-S=${WORKDIR}/jai-${MY_PV}
-
-src_prepare() {
-	default
-	rm LICENSE-jai.txt || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc *.txt
-
-	java-pkg_dojar lib/*.jar
-	use x86 && java-pkg_doso lib/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
-	elog 'To use you need to pass the following to java'
-	use x86 && elog '-Djava.library.path=$(java-config -i sun-jai-bin)'
-	elog '-classpath $(java-config -p sun-jai-bin)'
-}