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/hamcrest-library | |
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/hamcrest-library')
-rw-r--r-- | dev-java/hamcrest-library/Manifest | 2 | ||||
-rw-r--r-- | dev-java/hamcrest-library/files/1.1-remove-targets.patch | 113 | ||||
-rw-r--r-- | dev-java/hamcrest-library/files/1.3-remove-targets.patch | 47 | ||||
-rw-r--r-- | dev-java/hamcrest-library/hamcrest-library-1.1.ebuild | 53 | ||||
-rw-r--r-- | dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild | 53 | ||||
-rw-r--r-- | dev-java/hamcrest-library/metadata.xml | 9 |
6 files changed, 277 insertions, 0 deletions
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest new file mode 100644 index 000000000000..780ede82b9f7 --- /dev/null +++ b/dev-java/hamcrest-library/Manifest @@ -0,0 +1,2 @@ +DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011 +DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9 diff --git a/dev-java/hamcrest-library/files/1.1-remove-targets.patch b/dev-java/hamcrest-library/files/1.1-remove-targets.patch new file mode 100644 index 000000000000..08affbce634d --- /dev/null +++ b/dev-java/hamcrest-library/files/1.1-remove-targets.patch @@ -0,0 +1,113 @@ +diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml +index f819d3d..b24dea0 100644 +--- a/hamcrest-1.1/build.xml ++++ b/hamcrest-1.1/build.xml +@@ -23,48 +23,11 @@ +
+ <target name="generator"
+ description="Build code generator tool">
+- <java-to-jar srcdir="hamcrest-generator/src/main/java"
+- destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
+- classpath="
+- lib/generator/qdox-1.6.1.jar;
+- "/>
+- <taskdef name="jarjar"
+- classname="com.tonicsystems.jarjar.JarJarTask"
+- classpath="lib/generator/jarjar-1.0rc3.jar"/>
+- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
+- about it's existence. Uses JarJar to place classes under a different package
+- to prevent conflict. -->
+- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
+- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
+- <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
+- <rule pattern="com.thoughtworks.qdox.**"
+- result="org.hamcrest.generator.qdox.@1"/>
+- </jarjar>
+ </target>
+
+ <target name="core"
+ depends="generator"
+ description="Build core Hamcrest library">
+- <java-to-jar srcdir="hamcrest-core/src/main/java"
+- destjar="build/hamcrest-core-${version}.jar"/>
+- <!-- Generate one class with all static imports -->
+- <mkdir dir="build/temp/hamcrest-core/generated-code"/>
+- <java classname="org.hamcrest.generator.config.XmlConfigurator"
+- fork="yes"
+- failonerror="yes"
+- classpath="
+- build/hamcrest-core-${version}.jar;
+- build/hamcrest-generator-${version}.jar;
+- ">
+- <arg value="core-matchers.xml"/>
+- <arg value="hamcrest-core/src/main/java"/>
+- <arg value="org.hamcrest.CoreMatchers"/>
+- <arg value="build/temp/hamcrest-core/generated-code"/>
+- </java>
+- <!-- Append to core jar -->
+- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
+- destjar="build/hamcrest-core-${version}.jar"
+- classpath="build/hamcrest-core-${version}.jar"/>
+ </target>
+
+ <target name="library"
+@@ -94,16 +57,16 @@ + classpath="build/hamcrest-core-${version}.jar"/>
+ </target>
+
+- <target name="text" +- depends="core, library" +- description="Build text pattern matcher"> +- <java-to-jar srcdir="hamcrest-text/src/main/java" +- destjar="build/hamcrest-text-${version}.jar" +- classpath=" +- build/hamcrest-core-${version}.jar; +- build/hamcrest-library-${version}.jar"/> +- </target> +- ++ <target name="text"
++ depends="core, library"
++ description="Build text pattern matcher">
++ <java-to-jar srcdir="hamcrest-text/src/main/java"
++ destjar="build/hamcrest-text-${version}.jar"
++ classpath="
++ build/hamcrest-core-${version}.jar;
++ build/hamcrest-library-${version}.jar"/>
++ </target>
++
+ <target name="integration"
+ depends="core, library"
+ description="Build integration with external tools">
+@@ -121,7 +84,7 @@ + destjar="build/hamcrest-unit-test-${version}.jar"
+ classpath="
+ build/hamcrest-core-${version}.jar;
+- build/hamcrest-library-${version}.jar; ++ build/hamcrest-library-${version}.jar;
+ build/hamcrest-text-${version}.jar;
+ build/hamcrest-integration-${version}.jar;
+ build/hamcrest-generator-${version}.jar"/>
+@@ -164,7 +127,7 @@ + <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
+ <zipfileset src="build/hamcrest-core-${version}.jar"/>
+ <zipfileset src="build/hamcrest-library-${version}.jar"/>
+- <zipfileset src="build/hamcrest-text-${version}.jar"/> ++ <zipfileset src="build/hamcrest-text-${version}.jar"/>
+ <zipfileset src="build/hamcrest-generator-${version}.jar"/>
+ <zipfileset src="build/hamcrest-integration-${version}.jar"/>
+ </jar>
+@@ -221,7 +184,7 @@ +
+ <packageset dir="hamcrest-core/src/main/java"/>
+ <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
+- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/> ++ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
+ <packageset dir="hamcrest-integration/src/main/java"/>
+ <packageset dir="build/generated-code"/>
+
+@@ -261,4 +224,4 @@ + </sequential>
+ </macrodef>
+
+-</project> ++</project>
diff --git a/dev-java/hamcrest-library/files/1.3-remove-targets.patch b/dev-java/hamcrest-library/files/1.3-remove-targets.patch new file mode 100644 index 000000000000..6923b0bcc68e --- /dev/null +++ b/dev-java/hamcrest-library/files/1.3-remove-targets.patch @@ -0,0 +1,47 @@ +diff --git a/build.xml b/build.xml +index 1cfd4fb..185c563 100644 +--- a/build.xml ++++ b/build.xml +@@ -12,42 +12,9 @@ + </target>
+
+ <target name="generator" description="Build code generator tool">
+- <java-to-jar srcdir="hamcrest-generator/src/main/java"
+- modulename="hamcrest-generator-nodeps"
+- classpath="lib/generator/qdox-1.12.jar"/>
+-
+- <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
+- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
+- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
+- <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
+- <zipfileset src="lib/generator/qdox-1.12.jar"/>
+- <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
+- </jarjar>
+- <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
+ </target>
+
+ <target name="core" depends="generator" description="Build core Hamcrest library">
+- <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>
+-
+- <!-- Generate one class with all static imports -->
+- <mkdir dir="build/temp/hamcrest-core/generated-code"/>
+-
+- <java classname="org.hamcrest.generator.config.XmlConfigurator"
+- fork="yes"
+- failonerror="yes"
+- classpath="
+- build/hamcrest-core-${version}.jar;
+- build/hamcrest-generator-${version}.jar;
+- ">
+- <arg value="core-matchers.xml"/>
+- <arg value="hamcrest-core/src/main/java"/>
+- <arg value="org.hamcrest.CoreMatchers"/>
+- <arg value="build/temp/hamcrest-core/generated-code"/>
+- </java>
+- <!-- Append to core jar -->
+- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
+- modulename="hamcrest-core"
+- classpath="build/hamcrest-core-${version}.jar"/>
+ </target>
+
+ <target name="library"
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild new file mode 100644 index 000000000000..9d69e81fe71c --- /dev/null +++ b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 java-ant-2 + +MY_PN=${PN/-library} +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Core library of matchers for building test expressions" +HOMEPAGE="http://code.google.com/p/${MY_PN}/" +SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +CDEPEND=" + dev-java/hamcrest-core:${SLOT} + dev-java/hamcrest-generator:${SLOT} + dev-java/qdox:1.6 +" +DEPEND=">=virtual/jdk-1.5 + userland_GNU? ( sys-apps/findutils ) + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.5 + ${CDEPEND}" + +JAVA_ANT_REWRITE_CLASSPATH="true" +JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar" +EANT_GENTOO_CLASSPATH="hamcrest-generator,hamcrest-core,qdox-1.6" +EANT_BUILD_TARGET="library" +EANT_EXTRA_ARGS="-Dversion=${PV}" +EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar" + +java_prepare() { + # remove core+generator target as they are already built. + epatch "${FILESDIR}/${PV}-remove-targets.patch" + + find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files" +} + +src_install() { + java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar + + use source && java-pkg_dosrc ${PN}/src/main/java/org +} diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild new file mode 100644 index 000000000000..dc4eb70ce350 --- /dev/null +++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 java-ant-2 + +MY_PN=${PN/-library} +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Core library of matchers for building test expressions" +HOMEPAGE="http://code.google.com/p/${MY_PN}/" +SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz" + +LICENSE="BSD-2" +SLOT="${PV}" +KEYWORDS="amd64 x86" + +CDEPEND=" + dev-java/hamcrest-generator:${SLOT} + dev-java/hamcrest-core:${SLOT} + dev-java/qdox:1.12 +" +DEPEND=">=virtual/jdk-1.6 + userland_GNU? ( sys-apps/findutils ) + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +JAVA_ANT_REWRITE_CLASSPATH="true" +JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar" +EANT_GENTOO_CLASSPATH="hamcrest-generator-${SLOT},hamcrest-core-${SLOT},qdox-1.12" +EANT_BUILD_TARGET="library" +EANT_EXTRA_ARGS="-Dversion=${PV}" +EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar" + +java_prepare() { + # remove core+generator target as they are already built. + epatch "${FILESDIR}/${PV}-remove-targets.patch" + + find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files" +} + +src_install() { + java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar + + use source && java-pkg_dosrc ${PN}/src/main/java/org +} diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml new file mode 100644 index 000000000000..314c8dd8ca46 --- /dev/null +++ b/dev-java/hamcrest-library/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>java</herd> + <upstream> + <remote-id type="google-code">hamcrest</remote-id> + </upstream> +</pkgmetadata> + |