+++ /dev/null
-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 @@
- \r
- <target name="generator"\r
- description="Build code generator tool">\r
-- <java-to-jar srcdir="hamcrest-generator/src/main/java"\r
-- destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"\r
-- classpath="\r
-- lib/generator/qdox-1.6.1.jar;\r
-- "/>\r
-- <taskdef name="jarjar"\r
-- classname="com.tonicsystems.jarjar.JarJarTask"\r
-- classpath="lib/generator/jarjar-1.0rc3.jar"/>\r
-- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care\r
-- about it's existence. Uses JarJar to place classes under a different package\r
-- to prevent conflict. -->\r
-- <jarjar jarfile="build/hamcrest-generator-${version}.jar">\r
-- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>\r
-- <zipfileset src="lib/generator/qdox-1.6.1.jar"/>\r
-- <rule pattern="com.thoughtworks.qdox.**"\r
-- result="org.hamcrest.generator.qdox.@1"/>\r
-- </jarjar>\r
- </target>\r
- \r
- <target name="core"\r
- depends="generator"\r
- description="Build core Hamcrest library">\r
-- <java-to-jar srcdir="hamcrest-core/src/main/java"\r
-- destjar="build/hamcrest-core-${version}.jar"/>\r
-- <!-- Generate one class with all static imports -->\r
-- <mkdir dir="build/temp/hamcrest-core/generated-code"/>\r
-- <java classname="org.hamcrest.generator.config.XmlConfigurator"\r
-- fork="yes"\r
-- failonerror="yes"\r
-- classpath="\r
-- build/hamcrest-core-${version}.jar;\r
-- build/hamcrest-generator-${version}.jar;\r
-- ">\r
-- <arg value="core-matchers.xml"/>\r
-- <arg value="hamcrest-core/src/main/java"/>\r
-- <arg value="org.hamcrest.CoreMatchers"/>\r
-- <arg value="build/temp/hamcrest-core/generated-code"/>\r
-- </java>\r
-- <!-- Append to core jar -->\r
-- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"\r
-- destjar="build/hamcrest-core-${version}.jar"\r
-- classpath="build/hamcrest-core-${version}.jar"/>\r
- </target>\r
- \r
- <target name="library"\r
-@@ -94,16 +57,16 @@
- classpath="build/hamcrest-core-${version}.jar"/>\r
- </target>\r
- \r
-- <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"\r
-+ depends="core, library"\r
-+ description="Build text pattern matcher">\r
-+ <java-to-jar srcdir="hamcrest-text/src/main/java"\r
-+ destjar="build/hamcrest-text-${version}.jar"\r
-+ classpath="\r
-+ build/hamcrest-core-${version}.jar;\r
-+ build/hamcrest-library-${version}.jar"/>\r
-+ </target>\r
-+ \r
- <target name="integration"\r
- depends="core, library"\r
- description="Build integration with external tools">\r
-@@ -121,7 +84,7 @@
- destjar="build/hamcrest-unit-test-${version}.jar"\r
- classpath="\r
- build/hamcrest-core-${version}.jar;\r
-- build/hamcrest-library-${version}.jar;
-+ build/hamcrest-library-${version}.jar;\r
- build/hamcrest-text-${version}.jar;\r
- build/hamcrest-integration-${version}.jar;\r
- build/hamcrest-generator-${version}.jar"/>\r
-@@ -164,7 +127,7 @@
- <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">\r
- <zipfileset src="build/hamcrest-core-${version}.jar"/>\r
- <zipfileset src="build/hamcrest-library-${version}.jar"/>\r
-- <zipfileset src="build/hamcrest-text-${version}.jar"/>
-+ <zipfileset src="build/hamcrest-text-${version}.jar"/>\r
- <zipfileset src="build/hamcrest-generator-${version}.jar"/>\r
- <zipfileset src="build/hamcrest-integration-${version}.jar"/>\r
- </jar>\r
-@@ -221,7 +184,7 @@
- \r
- <packageset dir="hamcrest-core/src/main/java"/>\r
- <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>\r
-- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
-+ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>\r
- <packageset dir="hamcrest-integration/src/main/java"/>\r
- <packageset dir="build/generated-code"/>\r
- \r
-@@ -261,4 +224,4 @@
- </sequential>\r
- </macrodef>\r
- \r
--</project>
-+</project>\r
+++ /dev/null
-# 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="https://github.com/hamcrest"
-SRC_URI="https://${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
-}
projects / gentoo.git / commitdiff