gentoo resync : 13.01.2018

4 files changed, 74 insertions, 7 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 072004acf205..ea95ef618d40 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 817f7a10cc4a..fdb67c42e654 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -2,5 +2,6 @@ AUX commons-collections-3.2.1-Java-8.patch 7059 BLAKE2B c2dd3d388b15cd61224e96eb
 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 1738 BLAKE2B 833bacda17d6bfb63dcd247ab2334f477a209bd583f4b6d0b61e3bda9bdae43644fa1e9359b6414d7c2ba38c443e1aab6b4dbc406b19d6ae8d094d67fbed2508 SHA512 ae2dcd035e5c0e596efb656add167b5047b424f14546dedcfb0f52bd0a5bdc6e2a568211b0b57f57735eb018f8ce55f10087a0b43ddbbe3d1d5bb0be09dcd731
-EBUILD commons-collections-4.1.ebuild 1179 BLAKE2B 3c5afe7ab9aeb665fbc8335faaa560c29dcd923421821213ae889a9578197fdc3f371cc0815e6a6f9843dde4ddd24e4a6e9ae5571622f91e4e4e5cd0758a6e3c SHA512 559c778ec39cbcad397664094bf4ba3e7f52e6331cb8a069ee3205c24f75d2a270f822e83edf07591083d14845b68ce59fd4e9fa0c9ad56ca7a49bc1b494f77a
+EBUILD commons-collections-3.2.1-r2.ebuild 1304 BLAKE2B b2dfdf67c6912c8c9c277058a91595df2feb545d017cb686f9ba92f4a222f04990fd38a48242d8ae7efe86ca9f282d182f603b587bdf9d836d5251d7d576e660 SHA512 274ef26224a9a615c634cd75c86aa519df78ec0bc1dc35f0ca80f6213280454eaa67a33f9bcdd64e068bdda34e58529df8a9449b5cb24c720120b0f65a2f5025
+EBUILD commons-collections-4.1.ebuild 1182 BLAKE2B c127dfbfc2dcab974143e7efb1a5eee63e2472b81f2a75b8eff8d011d8b6528e023326aec74de1447bec9acdfb330e91ee19b949941dd33939333965291eb7c2 SHA512 e55765f2d3896a45f064cbaecb05b90d5a8bc9004055ca22629428b6778c62584a0ce3264cd3285edbcd5cfe7ce10559cd24f202b55d6e2a718948142a717605
 MISC metadata.xml 325 BLAKE2B af3d8863d79f6cb8290734821ff82fbff7b65ec3d017f7f530e5c74d745d94f4a15713fa06b24b7e3dcd092dedc10f6642a0a480ee13e916bbd5895c52f1fab0 SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645
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
new file mode 100644
index 000000000000..9c732bfc5386
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-utils-2
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	>=virtual/jdk-1.6"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=( "${FILESDIR}/${P}-Java-8.patch" )
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local antflags
+	if use test; then
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+	fi
+	eant jar $(use_doc) ${antflags}
+}
+
+src_test() {
+	if [[ "${ARCH}" = "ppc" ]]; then
+		einfo "tests are disabled on ppc"
+	else
+		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use test && \
+		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
+			${PN}-testframework.jar
+
+	java-pkg_dohtml *.html
+	if use doc; then
+		java-pkg_dojavadoc build/docs/apidocs
+	fi
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index 3f442ecfe0e9..bd84b509220a 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-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,21 +11,24 @@ SLOT="4"
 MY_P="${PN}${SLOT}-${PV}"
 
 DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="http://commons.apache.org/collections/"
+HOMEPAGE="https://commons.apache.org/collections/"
 SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
-RDEPEND=">=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
+DEPEND="
+	>=virtual/jdk-1.7
 	test? (
 		dev-java/easymock:3.2
 		dev-java/junit:4
 	)"
 
+RDEPEND="
+	>=virtual/jre-1.7"
+
 S="${WORKDIR}/${MY_P}-src"
+
 JAVA_SRC_DIR="src/main/java"
 
 src_install() {