Add patch to allow commons-collections to compile nicely with JDK >= 1.8 courtesy of Constantine E. Kozlov <tempor.demonius@gmail.com>. Fix bug 508056.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 241 insertions, 3 deletions

diff --git a/dev-java/commons-collections/ChangeLog b/dev-java/commons-collections/ChangeLog
index 9efab1fa672a..1aba97a2c2e8 100644
--- a/dev-java/commons-collections/ChangeLog
+++ b/dev-java/commons-collections/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-collections
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.59 2011/12/31 13:25:22 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.60 2015/06/21 11:19:31 monsieurp Exp $
+
+*commons-collections-3.2.1-r1 (21 Jun 2015)
+
+  21 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +commons-collections-3.2.1-r1.ebuild,
+  +files/commons-collections-3.2.1-Java-8.patch:
+  Add patch to allow commons-collections to compile nicely with JDK >= 1.8
+  courtesy of Constantine E. Kozlov <tempor.demonius@gmail.com>. Fix bug 508056.
 
   31 Dec 2011; Ralph Sennhauser <sera@gentoo.org>
   commons-collections-3.2.1.ebuild:
@@ -236,4 +244,3 @@
   31 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> commons-collections-2.0.ebuild files/digest-commons-collections-2.0 :
   Initial import.  Ebuild submitted by Adrian Almenar
   <aalmenar@conectium.com>.
-
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..4efb52273d89
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild,v 1.1 2015/06/21 11:19:31 monsieurp Exp $
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test-framework"
+
+CDEPEND="
+	test-framework? (
+		dev-java/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/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: