gentoo resync : 28.04.2021

8 files changed, 272 insertions, 250 deletions

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 98809818ae7e..e6205ee455ef 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
+AUX commons-collections-3.2.2-fixes.patch 9913 BLAKE2B 0582b3c2e06275ddc75fdaf051ef5fec6cb6c95b3ffae77b08bd093e3b3e7a140e040c20a9be24e06d03a492325db94c21e69a4ae9fcb4e8099ee7bc30059b70 SHA512 88850bd1db483348d5c35c593e79f38de46f362aa124dea91e47940b9eeadef7d9ae9e7d34978d55bc4e51091c34ae862b33ca4710c71ffdc92840c2429b05f1
+DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
-EBUILD commons-collections-3.2.1-r1.ebuild 1734 BLAKE2B 624b691c7e76da723412a8f5bad7afe669e1cc28a162aba5dfe212368c4564872055c6b70efeecaf83d0ac4d8ddd96a55a69c1ab7d8abe7b027b848a93a22476 SHA512 b8a51864fbab75f24f7ed488d7ca627dd2682f791f8791e65cbb8300f66734a95a633759b6d4403ff830ba4c76c825c2323452a2cb51f720a464c9d49d6ada89
-EBUILD commons-collections-3.2.1-r2.ebuild 1307 BLAKE2B a565fa83dc992131050b2352a193ae4ff7d2f0d13575469db234631e37ef960a468be139b01a5fc366eea98f7ff44286840bc4408372785ef328826fe48c7ae2 SHA512 c7eb3febfa99cae218849a1a41b126712b4cbac056fec501afba305b6bce2b24671d273dfeeb2a900bf87c774820a07aa739c24872c9434e04ee8f49a9b7d259
-EBUILD commons-collections-4.1.ebuild 1206 BLAKE2B 595e0add9f94d0a7c452625e6f550455dfebf209dbe0d9561f6b4537ce9c8e87077af889d7a79d4a412de7e56cc1606b3fc9cba2e4fdcd7ab2b609c8643ead52 SHA512 78b082d24ce429ab517e85148d7bdb66506a1224469ad6e9cdb160542ca2a5d4397c27cccf82398d5e2add638451007b77fca1588f36fd9201ab1f25db6865ca
-MISC metadata.xml 325 BLAKE2B af3d8863d79f6cb8290734821ff82fbff7b65ec3d017f7f530e5c74d745d94f4a15713fa06b24b7e3dcd092dedc10f6642a0a480ee13e916bbd5895c52f1fab0 SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645
+EBUILD commons-collections-3.2.2.ebuild 1378 BLAKE2B ca87bc67d684eae78f9816803456c1ef52cc0d3571514dba7cf2d8017f9ce72bddd35a0de681b4c33b0db1bb9e37f3e5a85cc4620819c8bcd98a70f308fc38a0 SHA512 ba6ec8a82736e39dfd41681e87e6587edd163be81ea5f80b56a37e529b7d681292627a308373ac8d2330bfd69206dd54fe1c04c34b4e63cd6255bef712042d2b
+EBUILD commons-collections-4.1-r1.ebuild 1270 BLAKE2B ee4a69564f0ad2d4f979759965d7ca0970417c905321793fec8556180e24f171f1e24fa22cef2887ca784c2c3cde2ecd6444ac96ef9634752da2f823a68e5ecc SHA512 3670396e8c20eb9e7ec040ad4b926f805279fcdd002dbfe441742cedadbad0dbb81c81544056381bcd96d3c6fef40be08197744b422bd92685eec90e4a2d41ea
+EBUILD commons-collections-4.1.ebuild 1261 BLAKE2B f307b979f9614cefe6d4f5eea916abb9591b277f16118b6cdc76a9425eda268845f8cc7860f990d0007449b9ca5d19fbeaf560569a814ace95f79297bfce5f40 SHA512 ef8287e70b9d9995365f24db5f98232207e21c05726eaf27cdd223dc1da52c154addbd0c2bd7bb1f79b2c79a5d90748fa7c2af3ff9e236dc0d1664f5e4039a99
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
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
deleted file mode 100644
index 3db3f7201fd2..000000000000
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test-framework"
-RESTRICT="!test? ( test )"
-
-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
-	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-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 9dac8440d36b..6d32a5a18a44 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-collections:commons-collections:3.2.2"
 
 inherit java-pkg-2 java-ant-2 java-utils-2
 
@@ -13,22 +14,24 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/junit:0
 		dev-java/ant-junit:0
-	)
-	>=virtual/jdk-1.6"
+	)"
 
-RDEPEND=">=virtual/jre-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P}-src"
 
-PATCHES=( "${FILESDIR}/${P}-Java-8.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-fixes.patch"
+)
 
 src_prepare() {
 	default
@@ -37,7 +40,7 @@ src_prepare() {
 src_compile() {
 	local antflags
 	if use test; then
-		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars --build-only junit)"
 	fi
 	eant jar $(use_doc) ${antflags}
 }
diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
new file mode 100644
index 000000000000..1f0821a89031
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-collections4:4.1"
+
+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="https://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	test? (
+		dev-java/easymock:3.2
+		dev-java/junit:4
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+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/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index 6a1080bb83c2..3cb523c4cd89 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-collections4:4.1"
 
 inherit java-pkg-2 java-pkg-simple
 
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
deleted file mode 100644
index 1a5ebe241f76..000000000000
--- a/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- 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/files/commons-collections-3.2.2-fixes.patch b/dev-java/commons-collections/files/commons-collections-3.2.2-fixes.patch
new file mode 100644
index 000000000000..24a7bb2d709c
--- /dev/null
+++ b/dev-java/commons-collections/files/commons-collections-3.2.2-fixes.patch
@@ -0,0 +1,201 @@
+diff --git a/build.xml b/build.xml
+index d6282d0..ea4c7b7 100644
+--- a/build.xml
++++ b/build.xml
+@@ -154,8 +154,7 @@
+              
+     <!-- NOTE: A jar built using JDK1.4 is incompatible with JDK1.2 -->
+     <jar    jarfile="${build.jar.name}"
+-            basedir="${build.classes}"
+-           manifest="${build.conf}/MANIFEST.MF"/>
++            basedir="${build.classes}"/>
+   </target>
+ 
+ <!-- ====================================================================== -->
+diff --git a/src/java/org/apache/commons/collections/MultiHashMap.java b/src/java/org/apache/commons/collections/MultiHashMap.java
+index 7fec9af..53470d1 100644
+--- a/src/java/org/apache/commons/collections/MultiHashMap.java
++++ b/src/java/org/apache/commons/collections/MultiHashMap.java
+@@ -331,7 +331,7 @@ public class MultiHashMap extends HashMap implements MultiMap {
+      * @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;
+diff --git a/src/java/org/apache/commons/collections/MultiMap.java b/src/java/org/apache/commons/collections/MultiMap.java
+index be9455b..60375a6 100644
+--- a/src/java/org/apache/commons/collections/MultiMap.java
++++ b/src/java/org/apache/commons/collections/MultiMap.java
+@@ -66,7 +66,7 @@ public interface MultiMap extends Map {
+      * @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);
+ 
+     //-----------------------------------------------------------------------
+     /**
+diff --git a/src/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
+index 9e3e02d..65bffe9 100644
+--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java
++++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
+@@ -197,7 +197,7 @@ public class MultiKeyMap
+      * @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];
+diff --git a/src/java/org/apache/commons/collections/map/MultiValueMap.java b/src/java/org/apache/commons/collections/map/MultiValueMap.java
+index f44999b..fb1a4d1 100644
+--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java
++++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java
+@@ -153,7 +153,7 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap {
+      * @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;
+diff --git a/src/test/org/apache/commons/collections/TestMultiHashMap.java b/src/test/org/apache/commons/collections/TestMultiHashMap.java
+index eca833a..9d47438 100644
+--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java
++++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java
+@@ -217,7 +217,7 @@ public class TestMultiHashMap extends AbstractTestMap {
+         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 @@ public class TestMultiHashMap extends AbstractTestMap {
+         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 @@ public class TestMultiHashMap extends AbstractTestMap {
+         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 @@ public class TestMultiHashMap extends AbstractTestMap {
+         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);
+     }
+ 
+diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
+index dfde362..8287f33 100644
+--- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
++++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
+@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject {
+         verify();
+ 
+         try {
+-            array = collection.toArray(null);
++            array = collection.toArray((Object[]) null);
+             fail("toArray(null) should raise NPE");
+         } catch (NullPointerException e) {
+             // expected
+diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
+index b1ee3d0..9845721 100644
+--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
++++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
+@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestIterableMap {
+             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/src/test/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
+index b9a5ac8..3138a83 100644
+--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
++++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
+@@ -161,7 +161,7 @@ public class TestMultiValueMap extends TestCase {
+         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);

+@@ -187,7 +187,7 @@ public class TestMultiValueMap extends TestCase {
+         assertEquals(4, map.totalSize());

+         map.remove("A");

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

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

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

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

+     }

+     

+@@ -204,7 +204,7 @@ public class TestMultiValueMap extends TestCase {
+         assertEquals(2, map.size());

+         map.remove("A");

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

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

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

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

+     }

+     

+@@ -227,7 +227,7 @@ public class TestMultiValueMap extends TestCase {
+         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"));

+     }

+@@ -338,11 +338,11 @@ public class TestMultiValueMap extends TestCase {
+         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);

+     }

+ 

diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index 3e4d58fc9fa2..37998bf40746 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -5,7 +5,4 @@
     <email>java@gentoo.org</email>
     <name>Java</name>
   </maintainer>
-  <use>
-    <flag name="test-framework">Install the test framework</flag>
-  </use>
 </pkgmetadata>