gentoo resync : 15.12.2019

4 files changed, 10 insertions, 7 deletions

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index bbbff6d57b9b..7d3e7576d225 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,7 +1,7 @@
 AUX commons-collections-3.2.1-Java-8.patch 7059 BLAKE2B c2dd3d388b15cd61224e96eb8b380f881ad4629ce58082c1b80cb843372741f10eaa4f3a71689a3f7817d7a702a82ef61dc7634187992fb03b2a8730262035ff SHA512 1007c9c46944c4b0104b0b13c4c2acdfc9791274019b20bd38b95769095843e4be1ee29d81ff61517d9a7d9b2ad5bd77c92a2f25ebe3bab68f9a04d3a986a44d
 DIST commons-collections-3.2.1-src.tar.gz 609930 BLAKE2B 547b785b82e16f1c318fafb5761292c5fe8beb57dd4a4881cc16ef7df7328df279713442cd1fc4a64fad0d84457c06d5536c084fd8084f62495ce44bfde19a34 SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
-EBUILD commons-collections-3.2.1-r1.ebuild 1728 BLAKE2B 56dd7214eff19ebe391363a1c1066ab234290a458ee8943e5e13838cf41f6eca68abd6e9a31e62bc8e2c4285c628afdda809c2b6544080ba13b2ee54498d12dd SHA512 dea746396617ff3b693f444056ab157510980f191567d09910005352d51c0b3807d7a2c91897125da8a9a5608a35991898f41ad77d7948082ab100d7f64f15e3
-EBUILD commons-collections-3.2.1-r2.ebuild 1294 BLAKE2B a61b2884d319cc5c648ce5133d57a87f6d95128094d344adf4f206e5eacb3e925e370adeb958adaf8f41bac4a7d9b73a2010c3477dfb175cc487db9b6e822db4 SHA512 bccd79f3babd4416a1cdd0d27f3c6540258c61a395a261af024f84622f01f8bfcd3d0a3bcccff8f392a3a921637e40709dee12e1812f87f3533ab35b45be3cb8
-EBUILD commons-collections-4.1.ebuild 1182 BLAKE2B c127dfbfc2dcab974143e7efb1a5eee63e2472b81f2a75b8eff8d011d8b6528e023326aec74de1447bec9acdfb330e91ee19b949941dd33939333965291eb7c2 SHA512 e55765f2d3896a45f064cbaecb05b90d5a8bc9004055ca22629428b6778c62584a0ce3264cd3285edbcd5cfe7ce10559cd24f202b55d6e2a718948142a717605
+EBUILD commons-collections-3.2.1-r1.ebuild 1745 BLAKE2B cf353fe324ea17e1c9213fd3c894d279b0fca09563500528e4bdf13488aa07cf489e6b666b2787efcc8416a1e0e10dfe66f5395775359f906130a267760917b4 SHA512 94aa87794739723dd4323c5ec86d47365a9587c0896e5d446089ed9f9979e119b807e2b9d32fa9e3d305944fc075aa7efbb3c4a898004fc39475963347809bde
+EBUILD commons-collections-3.2.1-r2.ebuild 1318 BLAKE2B 09af538d0f2f8e5fff792965299b1246e6e9df01118c6023770c7b8cd208941eb9dd105ce1635a2e868c87766c7f3754d0dcfee210a402a56bb662c76c23c26f SHA512 e5c5fc51fecdd033dc9dcf261285e2bda153f682b837dbb2ea115f05a2e1d41947e1a32f80d9c539faca63192a812cee2427eb3e56beeb481fa4a4a0177e89c1
+EBUILD commons-collections-4.1.ebuild 1206 BLAKE2B 595e0add9f94d0a7c452625e6f550455dfebf209dbe0d9561f6b4537ce9c8e87077af889d7a79d4a412de7e56cc1606b3fc9cba2e4fdcd7ab2b609c8643ead52 SHA512 78b082d24ce429ab517e85148d7bdb66506a1224469ad6e9cdb160542ca2a5d4397c27cccf82398d5e2add638451007b77fca1588f36fd9201ab1f25db6865ca
 MISC metadata.xml 325 BLAKE2B af3d8863d79f6cb8290734821ff82fbff7b65ec3d017f7f530e5c74d745d94f4a15713fa06b24b7e3dcd092dedc10f6642a0a480ee13e916bbd5895c52f1fab0 SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index accce8f13e04..9d19658925d7 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	test-framework? (
@@ -62,7 +63,7 @@ src_install() {
 		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
 			${PN}-testframework.jar
 
-	dodoc README.txt || die
+	dodoc README.txt
 	java-pkg_dohtml *.html || die
 	if use doc; then
 		java-pkg_dojavadoc build/docs/apidocs
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
index 50ad9b9cf0a5..2c5e6d18421e 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index bd84b509220a..6a1080bb83c2 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=virtual/jdk-1.7