gentoo resync : 04.01.2018

5 files changed, 44 insertions, 3 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 5ae69d92c3b3..4379383adc66 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
index 35b6e3d9092f..d013f3a4e03e 100644
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@@ -1,6 +1,8 @@
 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
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/app-eselect/eselect-java/eselect-java-0.4.0.ebuild b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
new file mode 100644
index 000000000000..044f59fce6eb
--- /dev/null
+++ b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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.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"
+
+RDEPEND="
+	!app-eselect/eselect-ecj
+	!app-eselect/eselect-maven
+	!<dev-java/java-config-2.2
+	app-admin/eselect"
+
+src_prepare() {
+	default
+	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-php/Manifest b/app-eselect/eselect-php/Manifest
index 8cc95cc631f5..93ed1fc5240a 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -5,6 +5,6 @@ AUX php-fpm.conf 29 BLAKE2B 505e957038315f8668a558f91eac2ad8ae6bc3e87db238001042
 DIST eselect-php-0.9.2.tar.xz 48356 BLAKE2B 9ad886b78c0a0ca71c1082d9265f28b1f9ea46dddfd52ad1a1ebb1a4d008954a59baf4cf69705e9b527fff64e8dfa3b25a2d522e2455e2e9ce550e917112ee58 SHA512 ebf4c9039aaa3ffad79dee181b5cd77f144a4b1b49d80291b290377b7ca5a9618d8b18922f0624e646c4d80266c58199bb936a7b8dd5d2e2bdc296099f583edf
 DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e
 EBUILD eselect-php-0.9.2.ebuild 1956 BLAKE2B e8381990bdafaccd7a2f5dbc117af2309089d2bf92901b0b31552c1351b584a6c46a68b50a4fc4497c3e3b9a9a342a38a6660d645a69a56312326bfc423fd393 SHA512 5ae4cb205892103b1ccbd809d07f46ebcb64587663ca4bddb47bc194992f8b208b41852cd3d639421fd9c14fc070df083b44017bfa68f09c06e3865bd04416a5
-EBUILD eselect-php-0.9.4-r5.ebuild 1391 BLAKE2B aff14f4c53af6ba803db7f14fdc099d268c49dfc620e1297e9dbca97ecfe5edd57a8760b25cd1d5444d7bf47dc631892583d852ac4f0b753e5ea1322fd535123 SHA512 484a404cd9d651c8f465cd9b5345d20cb24e0388a3ecfa48e990d95e645bacc1d1dc0c2ac391f8629fb61866f5b06f4b941905b888353907934f51cd5354d35e
+EBUILD eselect-php-0.9.4-r5.ebuild 1390 BLAKE2B c79782438fe1100cbf08b7276c392d48a2296f360c709be937c2c2e582d405f15d85a51e411a2483bf078da77f43427fa42f5d78303324edd2675ad0a23f042b SHA512 53e96d89dcc0a42a25e0cef997495203666608bd874ec5ce9f1653577639f07b4e32739fb6f259f9a2f06500af7d17b9ddb9ced2c49390855d7e87eaaef8b576
 EBUILD eselect-php-9999.ebuild 1306 BLAKE2B 45c8551979e6c5cd4623cfbd77aff888462ddd18121892b6891459e2281581382c0c6738370f859f5dbd21fcf7ead4056afd78de587b8387bc79cefd689d88b3 SHA512 9982c8bda294445cf3496da2d58f0126278924165cf66967d31628a2eb907c258e50d460e3c1daf5b9c042386730452d2c02a096d1f45c86d10c6538e8afeec7
 MISC metadata.xml 387 BLAKE2B 956f8e21e799bd346de09b2814c359c3c28a37dcad3bf42a11e58e33acfe26354069fce71e3ecb687dac83e176500c2127cb8dda5651e083e27aad92cb385862 SHA512 80a043e0836a1ac58120f1471e997face2f60117e3a83d490ad259a05cfdc39098c457573e3550c9fc3a7712f28b9faacd427c076e8f46ed3476e42f58f8f1b5
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
index 707e524cc3eb..cae791d37dc7 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="fpm apache2"
 
 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.