reinit the tree, so we can have metadata

5 files changed, 298 insertions, 0 deletions

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
new file mode 100644
index 000000000000..7e6822dbbfec
--- /dev/null
+++ b/dev-java/commons-collections/Manifest
@@ -0,0 +1,8 @@
+AUX commons-collections-3.2.1-Java-8.patch 7059 SHA256 8173d805f8abcb0a712355ab420ab0fac9c37445c1491bf49f508ae525df5b46 SHA512 1007c9c46944c4b0104b0b13c4c2acdfc9791274019b20bd38b95769095843e4be1ee29d81ff61517d9a7d9b2ad5bd77c92a2f25ebe3bab68f9a04d3a986a44d WHIRLPOOL eeaeaf74e238827cce6e2eb75a16a9c15df937da6b4eaa6eac950f71ed28dca10485d2d7f483e415b5946aa26e62c04d35f72d903fa644af28d8ca13443e51e7
+DIST commons-collections-3.2.1-src.tar.gz 609930 SHA256 9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0 WHIRLPOOL ec31406560a1156e8e8780e3cc1d5be2b614b26e8dc3c04a80ee758d4d42c353c2eaf6f5f41057d3f9735063cb81143005bd63d7b552b73f1e2acc5fa644766d
+DIST commons-collections4-4.1-src.tar.gz 704671 SHA256 94839a0620a0fb1999aa94d490cd8d6919f79dc206be33b722f856ffde862ecf SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b WHIRLPOOL 154bddba08d881303d888a6c195eceda7582677ac3cd0089d189b04b1d1673d9b7fa92e94c22298bc2ce3c12502ea731f51144ac22b7ff5ef9767c7bb2d816a0
+EBUILD commons-collections-3.2.1-r1.ebuild 1737 SHA256 e3415f85728a932d480756fa4e33b4f04c776be7b7a6214742c7a8160e7c5d20 SHA512 ff7744a20772372499ffa441da4da7484def6f715578c5376dfe2dc7b0e7e5e25899e653a4af57409aa8101a392520cae8159afbdf660bc41bfd7f192e123e26 WHIRLPOOL f79562ffb28d37a2fceb46e206617b50027a4569a8776a7feca5535133c171ff06c78cd136648fb4857e8f5da47a5c997da11a4ee8626ce448a076ad693e0a4a
+EBUILD commons-collections-4.1.ebuild 1179 SHA256 c38bac8b1db1a031f6f306028c8f4fa969f6c4263bf8c6102244a751e0568485 SHA512 559c778ec39cbcad397664094bf4ba3e7f52e6331cb8a069ee3205c24f75d2a270f822e83edf07591083d14845b68ce59fd4e9fa0c9ad56ca7a49bc1b494f77a WHIRLPOOL 83b47c64a42125dc849262e7c6d9aa91a1f45d36b960346e486e74e9c8b916161afc0b7720e4a1b3f901fed56b0af3df56e4be66cda92a3c48354aed124f1368
+MISC ChangeLog 3980 SHA256 c3419b51e6c96047e1e2504f6204117e82ff5ff5ca36c9063c7e6377e49b9770 SHA512 6cba2399b1ddf6f3e854402b8910ee23ad3cd4652070db166364a769db9dde5197c71812dae4ccffed87e3f92cd32ed5e0190162baa8bec82571c367b43386d5 WHIRLPOOL be09df8fd94ecceb922ed96c5ffdc99d0c1764130400555aa5003f417f92cd50bb60056b1e2ecc3678ab0407c888db9fac842b5f4e6a748d8ea2a2b08a1c4fb3
+MISC ChangeLog-2015 8616 SHA256 ab01af3677b2632b4e8e8e13bcef4f0a57613679369ef4e5b9c31ebbaf36c375 SHA512 ca71fe5b5bfb936b76f7d76bdc4015f1224ddaf4f3cabff55576e2a5076fce7cbd611c7a9bab7f977f74b2a4f4ce4c2b8989f9d9491aade7608762801a8341e8 WHIRLPOOL 57e61aaf93c50ebc8651f4c3144a68dff63360fe970c6dfeada01f0394240b5762710d06b123c82b280db998cec4549bd91724c3051a3c9f4894818cc7928a16
+MISC metadata.xml 325 SHA256 fcde2fc011e89fddee53020f3c4975b61181814404c26988a0daaa8c0057e90e SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645 WHIRLPOOL 64e07c0e5b50ccaa0398381c80cd6fa93aae951977a68c3b982942f6b9f9411085e950d1bc856499e6f5afe879aa589a569ed28301d118b6161d3895def8d481
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
new file mode 100644
index 000000000000..626699b69f79
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-utils-2 eutils
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="http://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-framework"
+
+CDEPEND="
+	test-framework? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	# Check for VM version.
+	java-pkg_is-vm-version-ge 1.8
+	if [[ $? -eq 0 ]]; then
+		einfo "You are running a JVM greater or equal than version 1.8."
+		epatch "${FILESDIR}"/${P}-Java-8.patch
+	fi
+}
+
+src_compile() {
+	local antflags
+	if use test-framework; then
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+		#no support for installing two sets of javadocs via dojavadoc atm
+		#use doc && antflags="${antflags} tf.javadoc"
+	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-framework && \
+		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
+			${PN}-testframework.jar
+
+	dodoc README.txt || die
+	java-pkg_dohtml *.html || die
+	if use doc; then
+		java-pkg_dojavadoc build/docs/apidocs
+		#use test-framework && java-pkg_dojavadoc build/docs/testframework
+	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
new file mode 100644
index 000000000000..3f442ecfe0e9
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+SLOT="4"
+MY_P="${PN}${SLOT}-${PV}"
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="http://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/easymock:3.2
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${MY_P}-src"
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc RELEASE-NOTES.txt
+	docinto html
+	dodoc {DEVELOPERS-GUIDE,PROPOSAL}.html
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${DIR}/../resources:${PN}.jar:$(java-pkg_getjars easymock-3.2,junit-4)"
+	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*" ! -name "BulkTest.*")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch b/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch
new file mode 100644
index 000000000000..1a5ebe241f76
--- /dev/null
+++ b/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch
@@ -0,0 +1,160 @@
+--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java


++++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java


+@@ -153,7 +153,7 @@


+      * @param value the value to remove


+      * @return the value removed (which was passed in), null if nothing removed


+      */


+-    public Object remove(Object key, Object value) {


++    public Object removeMapping(Object key, Object value) {


+         Collection valuesForKey = getCollection(key);


+         if (valuesForKey == null) {


+             return null;


+--- a/src/java/org/apache/commons/collections/MultiHashMap.java


++++ b/src/java/org/apache/commons/collections/MultiHashMap.java


+@@ -331,7 +331,7 @@


+      * @param item  the value to remove


+      * @return the value removed (which was passed in), null if nothing removed


+      */


+-    public Object remove(Object key, Object item) {


++    public Object removeMapping(Object key, Object item) {


+         Collection valuesForKey = getCollection(key);


+         if (valuesForKey == null) {


+             return null;


+--- a/src/java/org/apache/commons/collections/MultiMap.java


++++ b/src/java/org/apache/commons/collections/MultiMap.java


+@@ -66,7 +66,7 @@


+      * @throws ClassCastException if the key or value is of an invalid type


+      * @throws NullPointerException if the key or value is null and null is invalid


+      */


+-    public Object remove(Object key, Object item);


++    public Object removeMapping(Object key, Object item);


+ 


+     //-----------------------------------------------------------------------


+     /**


+--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java


++++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java


+@@ -160,7 +160,7 @@


+         MultiValueMap one = new MultiValueMap();


+         Integer value = new Integer(1);


+         one.put("One", value);


+-        one.remove("One", value);


++        one.removeMapping("One", value);


+         


+         MultiValueMap two = new MultiValueMap();


+         assertEquals(two, one);


+@@ -186,7 +186,7 @@


+         assertEquals(4, map.totalSize());


+         map.remove("A");


+         assertEquals(3, map.totalSize());


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(2, map.totalSize());


+     }


+     


+@@ -203,7 +203,7 @@


+         assertEquals(2, map.size());


+         map.remove("A");


+         assertEquals(2, map.size());


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(2, map.size());


+     }


+     


+@@ -226,7 +226,7 @@


+         map.remove("A");


+         assertEquals(0, map.size("A"));


+         assertEquals(3, map.size("B"));


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(0, map.size("A"));


+         assertEquals(2, map.size("B"));


+     }


+@@ -327,11 +327,11 @@


+         map.put("A", "AA");


+         map.put("A", "AB");


+         map.put("A", "AC");


+-        assertEquals(null, map.remove("C", "CA"));


+-        assertEquals(null, map.remove("A", "AD"));


+-        assertEquals("AC", map.remove("A", "AC"));


+-        assertEquals("AB", map.remove("A", "AB"));


+-        assertEquals("AA", map.remove("A", "AA"));


++        assertEquals(null, map.removeMapping("C", "CA"));


++        assertEquals(null, map.removeMapping("A", "AD"));


++        assertEquals("AC", map.removeMapping("A", "AC"));


++        assertEquals("AB", map.removeMapping("A", "AB"));


++        assertEquals("AA", map.removeMapping("A", "AA"));


+         assertEquals(new MultiValueMap(), map);


+     }


+ 


+--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java


++++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java


+@@ -217,7 +217,7 @@


+         MultiHashMap one = new MultiHashMap();


+         Integer value = new Integer(1);


+         one.put("One", value);


+-        one.remove("One", value);


++        one.removeMapping("One", value);


+         


+         MultiHashMap two = new MultiHashMap();


+         assertEquals(two, one);


+@@ -269,7 +269,7 @@


+         assertEquals(4, map.totalSize());


+         map.remove("A");


+         assertEquals(3, map.totalSize());


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(2, map.totalSize());


+     }


+     


+@@ -292,7 +292,7 @@


+         map.remove("A");


+         assertEquals(0, map.size("A"));


+         assertEquals(3, map.size("B"));


+-        map.remove("B", "BC");


++        map.removeMapping("B", "BC");


+         assertEquals(0, map.size("A"));


+         assertEquals(2, map.size("B"));


+     }


+@@ -464,11 +464,11 @@


+         map.put("A", "AA");


+         map.put("A", "AB");


+         map.put("A", "AC");


+-        assertEquals(null, map.remove("C", "CA"));


+-        assertEquals(null, map.remove("A", "AD"));


+-        assertEquals("AC", map.remove("A", "AC"));


+-        assertEquals("AB", map.remove("A", "AB"));


+-        assertEquals("AA", map.remove("A", "AA"));


++        assertEquals(null, map.removeMapping("C", "CA"));


++        assertEquals(null, map.removeMapping("A", "AD"));


++        assertEquals("AC", map.removeMapping("A", "AC"));


++        assertEquals("AB", map.removeMapping("A", "AB"));


++        assertEquals("AA", map.removeMapping("A", "AA"));


+         assertEquals(new MultiHashMap(), map);


+     }


+ 


+--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java


++++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java


+@@ -197,7 +197,7 @@


+      * @param key2  the second key


+      * @return the value mapped to the removed key, null if key not in map


+      */


+-    public Object remove(Object key1, Object key2) {


++    public Object removeMultiKey(Object key1, Object key2) {


+         int hashCode = hash(key1, key2);


+         int index = map.hashIndex(hashCode, map.data.length);


+         AbstractHashedMap.HashEntry entry = map.data[index];


+--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java


++++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java


+@@ -315,10 +315,10 @@


+             switch (key.size()) {


+                 case 2:


+                 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1)));


+-                assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1)));


++                assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));


+                 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));


+                 assertEquals(size - 1, multimap.size());


+-                assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1)));


++                assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));


+                 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));


+                 break;


+                 case 3:


diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
new file mode 100644
index 000000000000..3e4d58fc9fa2
--- /dev/null
+++ b/dev-java/commons-collections/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="test-framework">Install the test framework</flag>
+  </use>
+</pkgmetadata>