gentoo resync : 16.09.2020

4 files changed, 114 insertions, 1 deletions

diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 8aa014ff96ad..c98fe7c74e27 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,11 +1,15 @@
 AUX README.gentoo-r1 2328 BLAKE2B 3a9e2be2a241eeebe501c3c97d55c9bd65b3bb1c0b33abeed13dcea238f4c981e3aa173cb385cb15ea184e1ec2d696e630b8b1c497daadb2a79b3e8e287b4600 SHA512 bac787d49827e651fa9a87a2d8a8a64fb714282f569474ebf69712bd2a329c12f7d6fed2b015467c857b66cc0c9e10e7e60ab2186de00f8f3ac6e72353b76628
+AUX README.gentoo-r2 452 BLAKE2B 81347eaa073b22f2b4ddb8c07dbdc07bbe81b2f848c2e86db295b5ee86f133e5c5c98997b7089f78850cdab38fc841647144474efd95c21d079223062dd9a9cc SHA512 0a844f4b180cfb447e267d9783a50f7785bb3458b5fa04e92b74ace3412b9af0f326adfe92929a3166fdfb37f6ee03553f7b7f097f14eab1c7927d25f5d722db
 AUX icedtea-web-1.6-javadoc.patch 463 BLAKE2B 8c6bd88fb3255acfebf91e764bdf4f1677a12d7ea03dbcdd47514ab2d1b240cbc810b8e670c1bb472176323b346ee3a5ddf9aa359bbc1771848334357ad0cb25 SHA512 faa9b4cd96bd6658a9f55ebf7a5f3b75db65a6a813489739df2b8e903bc62cab2cf222a936a52230ff91943263e3ccc303ed7abe4fe8da7bf89a2eed95b3e66d
 AUX icedtea-web-1.6-launchers.patch 3136 BLAKE2B b11e4cb0c8c53e8509e68d30bc3190d8846e742e725cc4918fa08979102bca5d6ef643bf6a524f596a0ed9e0d98722227824bd39f1e84859c4680fc17228b057 SHA512 585a8e12a438f884f6b3c24aacb04a7330bf65388c18a51697c17041f5dfa3df3a24474d5d6b2dc43886dafabf0a05e525ef40ac8247c726797750dcb25d5d92
 AUX icedtea-web-1.6-no-hg.patch 2254 BLAKE2B 9939f85cc1234056de045ca8d85f256e5315d0c603a5ec8a2dc026b62a1ee1fdc142db832ebab32cea698a17172257e3eb88f427f966f9e385ba626bd257550d SHA512 22e30347bbb759b60b954acafb8a920e23f673915e89eb13ad9917b6669e8059d52aacb0b90874427376730840e8ed954b14e2de65e8b594a10616b999863523
 AUX icedtea-web-1.6-respect-ldflags.patch 667 BLAKE2B 215247a834785e592d66717d9c88bc4c04a5adb93bb026460ca1bf729a692cb675a950e17a665086aa6b3699ef9406fe70d26c5455d44eccd7b6dd542a0f0a58 SHA512 23903931c48e47cd78d1d73cf2bd5e06249e26939bbef4f41f09d3c3d69d0418e65fe83be542807452ed41bebfd88d2081d731f03dfbd4950495fc16dc9edb1e
 AUX icedtea-web-1.6-unused-libs.patch 697 BLAKE2B ea140038785a4954ebfbc8dac7e547b34527c845acf285b4ed1a4c66cbfd48a815391c9662e9a19b7f699199c8d37c160c9452af6e192f9e3c3af8e240d6cbe7 SHA512 215242b418159a8ab3d1523f1ef0765d40212feb572441719a830251fc602620f29a254a5734ab08a6b7a902bc1f27060bbf638826e2291305966edfd3062b74
+DIST dunce-0.1.1.crate 4311 BLAKE2B 07b775c2e79d6414af5854282fdfbba26ac4675207f840cf627a33c7bdbca163283466011c641d62646fa77f8623f1f7143b5e3d87c34e0b9840e4807eea2df8 SHA512 3fa16c1d6d78374e6360b9e2349516859b617ac5532ade34359d952002a1fb6d5e70f27ce2c9b3d6e230c753218fcf6e9b3973161bf1f8dd9c08152fbda2f5ad
 DIST icedtea-web-1.6.1.tar.gz 1776222 BLAKE2B e6141303b24e3b4a3a5568562f34c4a512250a1e16234c455d8ca04030324e11eb20134cd352d36c5d2c27769911558e0b739525bba9a58acf892fa5e7bb2b14 SHA512 dae39818f74a098289acd0736d27c2e68b10b603a3fb0a180cf4b6444345cbe71ab1ba77dfb198f053f9567bb18aa96de09049c3b595b3d292d142a7ae7d3ef9
 DIST icedtea-web-1.6.2.tar.gz 1824557 BLAKE2B 897155b528a873b2e0166f47973136c5ccc640fa9da26c934dc93deebacf2b2d714cd70943fc4f7eb2c596542e97656d844638dbd12f407f917d30c9cd75f4d7 SHA512 32c9618a575bf05d3fbe5fec3f8429d55036acde70bf7ccf40b59e14eba775d1f561640acbf673b1737a8c5c3a8eadb74e8f1bef525cfa6060e3f1968d45b3f7
+DIST icedtea-web-1.8.4.tar.gz 2358591 BLAKE2B a62a88cfce49f473a0ab768ca386c4733d69fd3b603b29a8d5e7478b33030e2d016a0577bfc0fa4657bb0b3f99a2524d1b46cad7a8e4f97c1404eff5ca218613 SHA512 d155ec6ed9a007b2c59fd09fed9f4005a79640016ae62287eab7076c05b5ddd56d07b0ff86babf732f1bb82653fc0f7cf434550eabdaac8d666e64feabe4f890
 EBUILD icedtea-web-1.6.1-r1.ebuild 2245 BLAKE2B 86e91baf340e3ac8fd2e88dbc16b3f0d04565a0a5011167be5487676c3821b142b4b187167ee4eebd519310e61c8facfc680413cc3e1bb347f66b08ab4bd020f SHA512 37c9aefae8a58b59e455ae6614d6e57367f5f461f3f71c0bb1cdb8d5988fc3b513ec2977a953af7b1f20e0e4a8322413d8f8dd8feecb576768ec1624d99b8255
 EBUILD icedtea-web-1.6.2.ebuild 2110 BLAKE2B b0d8c5d7f7fda90e25f842f7da8e8676cb0bf8ff19d7eeae886679901fe8a919b1189439a55572c8dcad59a05f82b1a8ab383a5d5472656ffb0b059e107989fe SHA512 06b66744888ae211123c107ec2e012442872481e9d0897e1d505028b48ee13d4279b7acb8a8e5e0fb93d79700784ac880700e470be61776e393ebb40bbf32067
-MISC metadata.xml 653 BLAKE2B 4b0309721007539cdfcfc155039efd0dfdf2bcfccb1673cc4c930ee4267e73b5aa1c29b777a139dda6bb1c804fe827160366f59709843e9a03f66ecad41b3c8d SHA512 0b0cc5e6a5226dce345c2ebc01df0459ebaf4dc37d5241748bcba81d80e0429f599ab41d7a3e7020c581eb0c40825f07ad37e5340dbf643240ebb9830c0d500c
+EBUILD icedtea-web-1.8.4-r1.ebuild 2369 BLAKE2B c3ee179fa847cea338038e91a46455e1ee430060eb67cad4626b60aaa1c0697abfb4807686a53dea8e48e64a10bd09836ce36d98df8f5057cf888a2a5b14ba1f SHA512 740f82359a81a92ee26d1aa91a950676b7d514a32f7b8f23c980aed783e22a23c7ce1869b1497f05f238a2d2df88e898c5a349ffa808b6680a062f2f6335ad67
+MISC metadata.xml 742 BLAKE2B 77af156387b358bd5d7193c7ff3d1860ad18dd4f3b65eb2a4437f4278222b61dcd821e3ac680e49f49e28cffac46a880d6b1820bafca47a82ee6f27e4accc70e SHA512 10f58fcaced19937c90c9fbf9b23bb7d8cea129d14261d95c9d8cff24ffa0faa52435ff34577636eb9fd7257e62f71c4f93f856cb9d3af19b0226eb9a0c01f64
diff --git a/dev-java/icedtea-web/files/README.gentoo-r2 b/dev-java/icedtea-web/files/README.gentoo-r2
new file mode 100644
index 000000000000..4644f988e7e1
--- /dev/null
+++ b/dev-java/icedtea-web/files/README.gentoo-r2
@@ -0,0 +1,14 @@
+Browser plugin
+--------------
+
+The IcedTea browser plugin (NPPlugin) is no longer available,
+as modern browsers no longer support this plugin format.
+
+JVM selection
+-------------
+
+By default, Web Start uses the JVM
+selected via eselect environment variable.
+Note that this doesn't have to be an IcedTea. Openjdk will also work.
+The choice can be overridden using the itweb-settings program.
+Simply blank out the field to restore the default behaviour.
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
new file mode 100644
index 000000000000..297c3d95ea68
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 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
+
+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
+	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() {
+	# 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/metadata.xml b/dev-java/icedtea-web/metadata.xml
index 50b2caefc775..ebaf03b08ffb 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
 		<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">AdoptOpenJDK/IcedTea-Web</remote-id>
+	</upstream>
 </pkgmetadata>