diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/commons-collections | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/commons-collections')
5 files changed, 299 insertions, 0 deletions
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest new file mode 100644 index 000000000000..0eb13b01eea7 --- /dev/null +++ b/dev-java/commons-collections/Manifest @@ -0,0 +1 @@ +DIST commons-collections-3.2.1-src.tar.gz 609930 SHA256 9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0 WHIRLPOOL ec31406560a1156e8e8780e3cc1d5be2b614b26e8dc3c04a80ee758d4d42c353c2eaf6f5f41057d3f9735063cb81143005bd63d7b552b73f1e2acc5fa644766d 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..b20947a640b5 --- /dev/null +++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +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 + 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-3.2.1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1.ebuild new file mode 100644 index 000000000000..6e9154277fe5 --- /dev/null +++ b/dev-java/commons-collections/commons-collections-3.2.1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-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" + +COMMON_DEP="test-framework? ( =dev-java/junit-3.8* )" +DEPEND=">=virtual/jdk-1.4 + test? ( dev-java/ant-junit ) + ${COMMON_DEP}" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" + +S="${WORKDIR}/${P}-src" + +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:
diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml new file mode 100644 index 000000000000..e6724cbe148d --- /dev/null +++ b/dev-java/commons-collections/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>java</herd> + <use> + <flag name="test-framework">Install the test framework</flag> + </use> +</pkgmetadata> |