gentoo resync : 15.12.2019

5 files changed, 11 insertions, 11 deletions

diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index a05029cb22ec..49b5859365ba 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -4,10 +4,10 @@ DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b01
 DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
 DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667
 DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
-EBUILD commons-lang-2.0-r3.ebuild 860 BLAKE2B c75078eb5c4b40727ebb7d8767158b6458c3de3e6d7220a32f5426b5d8bc388ddd6f27d036cd5e009c92bd8dd13a6cc5b1bac91ce28402c5f66a2a3e3c1c40cb SHA512 a5343eb554e885fa53d92f388538917d7138ebc083799ddd4b341003ac16fca1df0d756deb0c04f93cb7443458063e697a8d7ca802761f0a5593210a7aefb830
-EBUILD commons-lang-2.6-r1.ebuild 855 BLAKE2B e6c3f943bb7a61064323748ec99c54e44acef2ac7899c864dcc554e66d23a7463d4e1e6e786a3145ebae636bb976896d26a038fedca3c5c195d64139ef8d0e02 SHA512 b3a1a0c9eea0742c8803046880b91784c87d0719bc38121246d143b3de1f1a04ef9ec775692b2862833a0f07f565af1dbd16f750cc439e2a6d69de9d7a455d40
+EBUILD commons-lang-2.0-r3.ebuild 853 BLAKE2B b3b1ef307f8f400e60549b30742f950e9768eb9f98f05221906fc911e66e75c5c29e4e5dd852c689923becb69ae02a126948d630992942adf5f6397290f9930d SHA512 8474d22076ad123848ad765100b5f84c0a76d74980451c6a2fe983bb7bbff5b5ec28968e86cb422dd07390af4eb6b0bdb0db7d904cc46a514a1fb835887517e8
+EBUILD commons-lang-2.6-r1.ebuild 841 BLAKE2B d21f73d96b0335a1048056fd0c1570e8f0961f4a9f9bc820fd41cf68e34cf85fad1d8aa3585a3d4437e585c727abb5b91dc4da04b59c26f9fd297e29c3e5671f SHA512 2a47b5444859beed98e249fd48d06c6c97178503607a740e2265d95da062d8fb6ee139edac3f76ed00bd7d44f7a8d7c18525fb2300b83195ff1f441297e0030a
 EBUILD commons-lang-3.1.ebuild 841 BLAKE2B 1de87e9c73eea5aebd3891889025b5a81107ae54d6e8b3e456d66a9519cb87e90412ef16680cdefb06451320bfe021d490b1e42a4d205b9927676a5af2e8e012 SHA512 95de6c0c16b0b07def8cd4d698ec9ab5e79cb2715c658e95be67d9b7f3c28c04f47c5649edfa71be51026fcfa98c618e5283fa031ebcd621a1700dbe1d539c98
-EBUILD commons-lang-3.3.2.ebuild 1112 BLAKE2B 1b45826fa5fb04a270fd93c0b3526223d48fe32289f8a3c9d02b5c99b2997f65eff7d542700c13aafc68cb5c95e7af7cc8d9b7b74840d5a7d4b6c1fe715e3e2f SHA512 dba87629c9c5234c6b29604aa1401a52933644f901005c17f8a3eb4bd68fe5b6b5bc9c45096b7822e95aaedb292cc835604ec31b817c4babcde442cd2e4f11b6
-EBUILD commons-lang-3.4.ebuild 1110 BLAKE2B 3be8caf7bab320369e1ae456305abd79faaed94979835c7677f4c81019ccc0e7ea67fdbafbf839cf1c831cd8ba92730621350357db3f8e01cb84333ce62a0541 SHA512 c59defe42c47944e7ed60ae9bb3d6b52cf9e942617f1191f5f7cb8947b1995ab4e4c8db6cb26d1b1fa6f6edd1da1b355648b5f75ee782c6e8256b1a7d929ab2d
+EBUILD commons-lang-3.3.2.ebuild 1111 BLAKE2B fecd7695bede1dbaf79d944466678d0671bfa248979e52264c05201aca89db664fd9c21e15f242662dc0908d73eee16bad165dd8a028e8c571fe505042b4433b SHA512 3d50c00b2e0c6795a454a39c0fd3ff9651a04c8243cb1ebc208835a5b2e929857af153870cf2ad7ed097630a422fc0734b059ea06aad3aa0c2b5ee36e76864f9
+EBUILD commons-lang-3.4.ebuild 1109 BLAKE2B 7106a50e065ec2be273259cee1f7b3af8646cddbb7c5bcbe859a16f0b8bcd68c5e63d0f323b7437b2df8eb6361397a69917e2b612409885fae3d643f496578ce SHA512 5789acfafd94d8d5cba8a8dc7748007f86147835eb08968d6083fc7c407ef7ae9849a21f42f53d8f226577d322798ab80c9341ae870f69c10d4b44bd400287a0
 EBUILD commons-lang-3.6.ebuild 957 BLAKE2B 70397b21b4bbb9e46bfcd3a2f9731486a94efcb9ef3a24f5000e3d7140c153d94782c4d630291c11c7b2da0e23017ef0a472d422ef1927d8cee89821fd1ac22c SHA512 15abf5f5fb7c29fcaf85e6fda4fd64f6352a88e4547839e00aa75dfe4f284a9ae37ea5efcfd557486f1f857c2a92c0c2dfd274b05ad6b1914172ee367d739c13
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
index be7a4b9bb238..6fe664f4a31a 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -26,7 +26,7 @@ java_prepare() {
 src_install() {
 	java-pkg_newjar dist/${P}.jar ${PN}.jar
 
-	dodoc RELEASE-NOTES.txt || die
+	dodoc RELEASE-NOTES.txt
 	java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
 	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/*
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index b108cd7918ee..0d01911f7fb3 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -28,8 +28,8 @@ JAVA_ANT_ENCODING="ISO-8859-1"
 
 src_install() {
 	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
-	dodoc RELEASE-NOTES.txt NOTICE.txt || die
-	dohtml *.html || die
+	dodoc RELEASE-NOTES.txt NOTICE.txt
+	dohtml *.html
 	use doc && java-pkg_dojavadoc target/apidocs
 	use source && java-pkg_dosrc src/main/java/*
 }
diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
index d25470181c51..40adb7c1f814 100644
--- a/dev-java/commons-lang/commons-lang-3.3.2.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.3.2.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"
@@ -28,7 +28,7 @@ RDEPEND=">=virtual/jre-1.6"
 LICENSE="Apache-2.0"
 SLOT="3.3"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-RESTRICT="ppc? ( test ) ppc64? ( test )"
+RESTRICT+=" ppc? ( test ) ppc64? ( test )"
 
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild
index b6f7bc8b459c..d614bf91c656 100644
--- a/dev-java/commons-lang/commons-lang-3.4.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.4.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
@@ -28,7 +28,7 @@ RDEPEND=">=virtual/jre-1.6"
 LICENSE="Apache-2.0"
 SLOT="3.4"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-RESTRICT="ppc? ( test ) ppc64? ( test )"
+RESTRICT+=" ppc? ( test ) ppc64? ( test )"
 
 S="${WORKDIR}/${MY_P}-src"