gentoo resync : 09.03.2018

5 files changed, 2 insertions, 138 deletions

diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
index d013f3a4e03e..961c2804a116 100644
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@@ -1,8 +1,3 @@
-DIST eselect-java-0.2.0.tar.bz2 13353 BLAKE2B 9fbc647329194ce61970ed7315ddbb22311ca3a58a370c2e4e5a693f8d085d01251b54ba586ea0cd9c5cbd5d0fa93db1054b955a4be53ab59ffce767aa878c9b SHA512 376c72317461c743dd91f8576cff7b1279b8f1672aa878c492ec3ed0da5f3c8d25cbb5fd4d9120109a01466dadbd049fb75d642187c850676d939925bcb55fdd
-DIST eselect-java-0.3.0.tar.bz2 13434 BLAKE2B 0a9f69f3ad75174bc49f2ada6aafac9c7135c151cb06e8a37cf60095a1bd323c5e7bd99752269c7674af9c1b67cc061778fdf8e49c8a02f2e90ec9bb623058b9 SHA512 d874d1d20d3920d16d5812b2aa28455f9166c6590b711e2bd49b1632e164be18f177eec5f5f2814391966ca3b710aab21b44d29afead2148cc7d0ed90841f9d8
 DIST eselect-java-0.4.0.tar.xz 13412 BLAKE2B da3df5c342b1632d1cc597909283cfcb7cb71d4bff04c2aa3253110f06b8addc5121efe1a50409f2b297c70c4f816a385a0199e68821acb6c48e3065d3097b37 SHA512 a1bdb2554e4dc78d980cab80591f6e0c537f983ae78d2ca98bda8f5292cf749fa5a9983dc51c6576176566f2fcc255ca40b04c26bd1b5d7f1db2d12b76048567
-EBUILD eselect-java-0.2.0-r1.ebuild 1422 BLAKE2B 1e714b50a1074d69fb8f0a4ca75daa1b4f9547c5aea1991a64bed70e3a8f6d1f0569770c3835189f74c89881afba857005b244a11f709d8d30576dde223a5ef1 SHA512 2d0ba4ba0d5fae0ab05112ab1f83f789f89a10b23787716a0b83f5901b4db0f2736294f75578e0a56089ef53e90bfed897f159faa19b1f0e61303180987b78de
-EBUILD eselect-java-0.2.0.ebuild 1213 BLAKE2B 5bc8f810f4aebcddbe80f57916a7da3205ff7afd749714ad232071cfb1b98416bea889ddc8d0c899da8c81bdf922813b98a26571b27e38da7e521c725828233d SHA512 a6fd1d0654bd5e74547e7d4d6053a0070b712eea372b82e9012a61e69aae258e60661ad0c00d308a7873714f66f6ca5bb435e8f43ae7710c206906096d22286c
-EBUILD eselect-java-0.3.0.ebuild 1437 BLAKE2B 33adee87bb34fea80eafc86328f50fb1660c274ab5bf559f31c19fe678466b183a46b317ad88b49b42e0d9d62ec3a6a7cc35f9143d53f2b394acad5d26c6a1c6 SHA512 b1be8dc5dead93e6b4363ddef6f0561faf75ac1c5dead5e6ddb68aca397f36d71ac2015a03141a26528877b4a639c88e80b3ee938c9084810aa692ca64f8ed68
-EBUILD eselect-java-0.4.0.ebuild 1221 BLAKE2B f9a09e4adc95dddfb03c88a5bdf7424c0b493d0e24cd9dfc1d4aa602ab6dd8b744cef0c3564a7d1fe967fa97e00dbb99ed8baad915acfa87ee37f8d2e14c3c69 SHA512 a888a2641d48de535de7d64fc5779bfd68346b408024a7e07190612a2efbfab0bdcaa495b824b1af4af7955c0e2766ae275e39c2943845d735e21197b165604d
+EBUILD eselect-java-0.4.0.ebuild 1218 BLAKE2B 54fce6af63f039aaaae41e3de9eb42368844f996e43cd516bb16b5cd9da81c2d836a28cb121156a60a2770916c146b4b2155f6053690ce06985921e82f332287 SHA512 87b63b6d4a179224bffa364c4c759fbe29121315bd4a2991bd086dacaa80a335f72c33db9c8752d2429f2521be1bfdc402857609f415cfb69561a3e1c7b5dd67
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/app-eselect/eselect-java/eselect-java-0.2.0-r1.ebuild b/app-eselect/eselect-java/eselect-java-0.2.0-r1.ebuild
deleted file mode 100644
index 1f1de54d8ea0..000000000000
--- a/app-eselect/eselect-java/eselect-java-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="A set of eselect modules for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	!app-eselect/eselect-ecj
-	!app-eselect/eselect-maven
-	!<dev-java/java-config-2.2
-	app-admin/eselect"
-
-src_prepare() {
-	eautoreconf
-
-	# Bug 549498: "eselect XXX show" should never send output to stderr.
-	sed -i \
-		-e '/^do_show.. {$/,/^}$/{ /echo/s,>&2$,, }' \
-		"${S}"/src/modules/maven.eselect.in \
-		"${S}"/src/modules/ecj.eselect.in
-}
-
-pkg_postinst() {
-	local REMOVED=0
-
-	rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
-	rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
-
-	if [[ "${REMOVED}" = 1 ]]; then
-		elog "The eselect java-nsplugin module has been removed and your configuration"
-		elog "has been cleaned up. From now on, you may only install either Oracle or"
-		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
-		elog "Oracle VM. See the README installed with icedtea-web for more details."
-	fi
-}
diff --git a/app-eselect/eselect-java/eselect-java-0.2.0.ebuild b/app-eselect/eselect-java/eselect-java-0.2.0.ebuild
deleted file mode 100644
index 2c5ac069d7bb..000000000000
--- a/app-eselect/eselect-java/eselect-java-0.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="A set of eselect modules for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	!app-eselect/eselect-ecj
-	!app-eselect/eselect-maven
-	!<dev-java/java-config-2.2
-	app-admin/eselect"
-
-src_prepare() {
-	eautoreconf
-}
-
-pkg_postinst() {
-	local REMOVED=0
-
-	rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
-	rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
-
-	if [[ "${REMOVED}" = 1 ]]; then
-		elog "The eselect java-nsplugin module has been removed and your configuration"
-		elog "has been cleaned up. From now on, you may only install either Oracle or"
-		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
-		elog "Oracle VM. See the README installed with icedtea-web for more details."
-	fi
-}
diff --git a/app-eselect/eselect-java/eselect-java-0.3.0.ebuild b/app-eselect/eselect-java/eselect-java-0.3.0.ebuild
deleted file mode 100644
index eb44bc261fc2..000000000000
--- a/app-eselect/eselect-java/eselect-java-0.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A set of eselect modules for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	!app-eselect/eselect-ecj
-	!app-eselect/eselect-maven
-	!<dev-java/java-config-2.2
-	app-admin/eselect"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# Bug 549498: "eselect XXX show" should never send output to stderr.
-	sed -i \
-		-e '/^do_show.. {$/,/^}$/{ /echo/s,>&2$,, }' \
-		"${S}"/src/modules/maven.eselect.in \
-		"${S}"/src/modules/ecj.eselect.in
-}
-
-pkg_postinst() {
-	local REMOVED=0
-
-	rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
-	rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
-
-	if [[ "${REMOVED}" = 1 ]]; then
-		elog "The eselect java-nsplugin module has been removed and your configuration"
-		elog "has been cleaned up. From now on, you may only install either Oracle or"
-		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
-		elog "Oracle VM. See the README installed with icedtea-web for more details."
-	fi
-}
diff --git a/app-eselect/eselect-java/eselect-java-0.4.0.ebuild b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
index 044f59fce6eb..9826dca5a463 100644
--- a/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!app-eselect/eselect-ecj