gentoo resync : 29.12.2022

4 files changed, 2 insertions, 193 deletions

diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 06d4fe6f2161..b5ab8acbe6d8 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,9 +1,6 @@
 AUX README.gentoo-r2 452 BLAKE2B 81347eaa073b22f2b4ddb8c07dbdc07bbe81b2f848c2e86db295b5ee86f133e5c5c98997b7089f78850cdab38fc841647144474efd95c21d079223062dd9a9cc SHA512 0a844f4b180cfb447e267d9783a50f7785bb3458b5fa04e92b74ace3412b9af0f326adfe92929a3166fdfb37f6ee03553f7b7f097f14eab1c7927d25f5d722db
 AUX README.gentoo-r3 554 BLAKE2B d29ff7518dec550796a885ca4af41cbe2b112f314ddc33697f4fff8bf6f3a19f2ac7c19ae3f811f209b870e3df18aca2e1be8327c7a2fab5e7beeebc02732ba8 SHA512 5499c13e4897f8fd72add9e98a9408b32dbc2f4692f5e165a1596bbbcb60355dff1251537f8fc0f09433164db8d887d1ae90340302f86ba6e1cf7f8e96d7827e
 DIST dunce-0.1.1.crate 4311 BLAKE2B 07b775c2e79d6414af5854282fdfbba26ac4675207f840cf627a33c7bdbca163283466011c641d62646fa77f8623f1f7143b5e3d87c34e0b9840e4807eea2df8 SHA512 3fa16c1d6d78374e6360b9e2349516859b617ac5532ade34359d952002a1fb6d5e70f27ce2c9b3d6e230c753218fcf6e9b3973161bf1f8dd9c08152fbda2f5ad
-DIST icedtea-web-1.8.4.tar.gz 2358591 BLAKE2B a62a88cfce49f473a0ab768ca386c4733d69fd3b603b29a8d5e7478b33030e2d016a0577bfc0fa4657bb0b3f99a2524d1b46cad7a8e4f97c1404eff5ca218613 SHA512 d155ec6ed9a007b2c59fd09fed9f4005a79640016ae62287eab7076c05b5ddd56d07b0ff86babf732f1bb82653fc0f7cf434550eabdaac8d666e64feabe4f890
 DIST icedtea-web-1.8.8.tar.gz 2365638 BLAKE2B 39a19bd46a235d016f9192da7f15ffa17546dfbe8502df4991f6d45c6211723504c0d2dc0bc7aaa508e4b47295f244c65b6e7113666028824562b8d2b0ccf5b2 SHA512 99f246ce603e3edd4357a2c4d280f1ef92e1f760ca5d843eaccf7ca60950a47defec64eed87dac26c5c2e9776bed2f3e53f2c8793dabd47e1b5fc82823190dcc
-EBUILD icedtea-web-1.8.4-r1.ebuild 2412 BLAKE2B 908ed64b517a4ef3288a112a4051f9e8da8a99333232ed51ec26c58b39d11123ae38ccc0f0f70a213e452f3dd9634831bf9c6ce591119ad2ddfca8794467f281 SHA512 14b3cdc5db7503201e7eaaceb1ecd23628be9b7565022bc538c7abd732de9e16e35bf08024f0b03f0c751fd519ca3b3944944ba900f6d44c6b05bfb2d971485b
-EBUILD icedtea-web-1.8.8-r1.ebuild 3566 BLAKE2B e3d408f3e5eb1c182eb5b25cbe963b12080cac4219f005fadb9b02e523c2324a869c5239091358157108029924d5365d809ee6fc48dbe31f6886d0888c443185 SHA512 1b68665fca490828d342ac40f3da7a5183b2e7f08591b51529d211a9236dcfbecef0314a8038da911e6b6b26c5e29da005e7444fca4c13791482f1000ebbd8c5
-EBUILD icedtea-web-1.8.8.ebuild 2416 BLAKE2B 4902b8a63cdfa922c71af2471026d192fdde554eddd2573b9383bf0936cd6ebe5cbb43cc05d578744aa6078297daa72bd0ecac8f9947deff2db20cedc3f65bf6 SHA512 de1ee9abcf06632cb0dd76245e531baeedebfdd1f0d2b4475448fe28834cc5d5ef362d940b7e645a7771ef0d341fb41baa558087afbb7c9b4140d60f150bf140
+EBUILD icedtea-web-1.8.8-r1.ebuild 3562 BLAKE2B 51ebd18df92231794ed8b27fce03752de8e27f8908885b773f139c2be46dd0c510a6a33c19a7127a96b959c85d33373714e6bab78ae9e892d9422881667ae8d7 SHA512 6a649a6210120a49d37ecf8637ea928403c0673a1860e7499b979fbafa99cafba7f66eb3fe0565bffb77d532903fbffb94c81e13afbae14f020339e0d1a29ca9
 MISC metadata.xml 470 BLAKE2B ae3861fd34b819ef3889a6ca4f56702608b20fd74e4c856d934d8094649d2c19703010c0fc581154f77e6f82ec19b99fcb670b3bc16530c194a6e590084b8ccd SHA512 8911c14a652c2e24e0679263f040452513e4e018623169760953accedee778c6bab255ad78e07f43617907d4c6d8524f1493beaf48507d9743ee37d4aecea24d
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
deleted file mode 100644
index caabab18f661..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-README_GENTOO_SUFFIX="-r2"
-CRATES="dunce-0.1.1"
-
-inherit autotools bash-completion-r1 cargo readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="https://github.com/AdoptOpenJDK/IcedTea-Web"
-SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="doc"
-
-# tests require ton of java deps we don't have packaged/working
-# but rust tests pass.
-RESTRICT="test"
-
-BDEPEND="
-	app-arch/zip
-	sys-devel/bc
-	virtual/jdk:1.8
-	virtual/pkgconfig
-	virtual/rust
-	doc? ( sys-devel/bc )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-java-0.2.0
-	>=virtual/jre-1.8
-"
-
-S="${WORKDIR}/IcedTea-Web-${P}"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-src_prepare() {
-	eapply_user
-	sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
-	eautoreconf
-	cargo_gen_config
-}
-
-src_configure() {
-	xdg_environment_reset
-	# some functionality (tagsoup rhino) is disabled, because dev-java is
-	# unmaintained and a lot of things simply does not build anymore.
-	# native plugins also disabled, modern browsers no longer support it.
-	local myconf=(
-		--disable-native-plugin
-		--program-transform-name='s/^javaws$/itweb-javaws/'
-		--with-java="${EPREFIX}/usr/bin/java"
-		--with-jdk-home="${EPREFIX}/etc/java-config-2/current-system-vm"
-		--with-itw-libs=DISTRIBUTION
-		--without-rhino
-		--without-tagsoup
-		$(use_enable doc docs)
-	)
-	unset _JAVA_OPTIONS
-	export bashcompdir="$(get_bashcompdir)" # defaults to /etc if not found in pkg-config
-	export CARGO_HOME="${ECARGO_HOME}"
-	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
-}
-
-src_compile() {
-	# races in makefile
-	emake -j1 #nowarn
-}
-
-src_install() {
-	default
-	rm -v "${ED}/usr/bin/itw-modularjdk.args" || die
-	rename -v '.bash' '' "${ED}/usr/share/bash-completion/completions/"*.bash || die
-	rename -v 'javaws' 'itweb-javaws' "${ED}/usr/share/man/man1/"javaws.1* || die
-	mv -v "${ED}/usr/share/bash-completion/completions/"{javaws,itweb-javaws} || die
-	sed -i 's/javaws/itweb-javaws/g' \
-		"${ED}/usr/share/bash-completion/completions/itweb-javaws" || die
-
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	# we want to override cargo.eclass' src_test
-	:
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
index 238bb9080267..186bb18591b3 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="doc"
 
 # tests require ton of java deps we don't have packaged/working
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8.ebuild
deleted file mode 100644
index 563512e65b91..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.8.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-README_GENTOO_SUFFIX="-r2"
-CRATES="dunce-0.1.1"
-
-inherit autotools bash-completion-r1 cargo readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="https://github.com/AdoptOpenJDK/IcedTea-Web"
-SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="doc"
-
-# tests require ton of java deps we don't have packaged/working
-# but rust tests pass.
-RESTRICT="test"
-
-BDEPEND="
-	app-arch/zip
-	sys-devel/bc
-	virtual/jdk:1.8
-	virtual/pkgconfig
-	virtual/rust
-	doc? ( sys-devel/bc )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-java-0.2.0
-	>=virtual/jre-1.8
-"
-
-S="${WORKDIR}/IcedTea-Web-${P}"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-src_prepare() {
-	eapply_user
-	sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
-	eautoreconf
-	cargo_gen_config
-}
-
-src_configure() {
-	xdg_environment_reset
-	# some functionality (tagsoup rhino) is disabled, because dev-java is
-	# unmaintained and a lot of things simply does not build anymore.
-	# native plugins also disabled, modern browsers no longer support it.
-	local myconf=(
-		--disable-native-plugin
-		--program-transform-name='s/^javaws$/itweb-javaws/'
-		--with-java="${EPREFIX}/usr/bin/java"
-		--with-jdk-home="${EPREFIX}/etc/java-config-2/current-system-vm"
-		--with-itw-libs=DISTRIBUTION
-		--without-rhino
-		--without-tagsoup
-		$(use_enable doc docs)
-	)
-	unset _JAVA_OPTIONS
-	export bashcompdir="$(get_bashcompdir)" # defaults to /etc if not found in pkg-config
-	export CARGO_HOME="${ECARGO_HOME}"
-	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
-}
-
-src_compile() {
-	# races in makefile
-	emake -j1 #nowarn
-}
-
-src_install() {
-	default
-	rm -v "${ED}/usr/bin/itw-modularjdk.args" || die
-	rename -v '.bash' '' "${ED}/usr/share/bash-completion/completions/"*.bash || die
-	rename -v 'javaws' 'itweb-javaws' "${ED}/usr/share/man/man1/"javaws.1* || die
-	mv -v "${ED}/usr/share/bash-completion/completions/"{javaws,itweb-javaws} || die
-	sed -i 's/javaws/itweb-javaws/g' \
-		"${ED}/usr/share/bash-completion/completions/itweb-javaws" || die
-
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	# we want to override cargo.eclass' src_test
-	:
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}