Added dev-java/hamcrest-generator-{1.2,1.3} to the Portage tree, dependency of hamcrest-core-{1.2,1.3} which is a dependency of the new junit. Fixes bug #287760.

(Portage version: 2.1.12.4/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

7 files changed, 180 insertions, 0 deletions

diff --git a/dev-java/hamcrest-generator/ChangeLog b/dev-java/hamcrest-generator/ChangeLog
new file mode 100644
index 000000000000..1a4d83f93cca
--- /dev/null
+++ b/dev-java/hamcrest-generator/ChangeLog
@@ -0,0 +1,15 @@
+# ChangeLog for dev-java/hamcrest-generator
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/ChangeLog,v 1.1 2013/06/15 19:54:51 tomwij Exp $
+
+*hamcrest-generator-1.3 (15 Jun 2013)
+*hamcrest-generator-1.2 (15 Jun 2013)
+
+  15 Jun 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/hamcrest-1.2-no_source_in_jar.patch,
+  +files/hamcrest-generator-1.2-no_jarjar.patch,
+  +files/hamcrest-generator-1.3-no_jarjar.patch, +hamcrest-generator-1.2.ebuild,
+  +hamcrest-generator-1.3.ebuild, +metadata.xml:
+  Added dev-java/hamcrest-generator-{1.2,1.3} to the Portage tree, dependency of
+  hamcrest-core-{1.2,1.3} which is a dependency of the new junit. Fixes bug
+  #287760.
diff --git a/dev-java/hamcrest-generator/files/hamcrest-1.2-no_source_in_jar.patch b/dev-java/hamcrest-generator/files/hamcrest-1.2-no_source_in_jar.patch
new file mode 100644
index 000000000000..8d8ad9dbc66b
--- /dev/null
+++ b/dev-java/hamcrest-generator/files/hamcrest-1.2-no_source_in_jar.patch
@@ -0,0 +1,13 @@
+--- build.xml	2009-09-28 06:16:14.000000000 -0500
++++ build.xml.nosrcinjar	2009-09-28 06:16:03.000000000 -0500
+@@ -236,10 +236,6 @@
+                 </classpath>
+             </javac>
+             <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>
+-            <!-- Put Java source in Jars for user's convenience. -->
+-            <copy todir="build/temp/@{destjar}.contents">
+-                <fileset dir="@{srcdir}"/>
+-            </copy>
+             <jar jarfile="@{destjar}">
+                 <fileset dir="build/temp/@{destjar}.contents"/>
+             </jar>
diff --git a/dev-java/hamcrest-generator/files/hamcrest-generator-1.2-no_jarjar.patch b/dev-java/hamcrest-generator/files/hamcrest-generator-1.2-no_jarjar.patch
new file mode 100644
index 000000000000..2c9aa41cb0c7
--- /dev/null
+++ b/dev-java/hamcrest-generator/files/hamcrest-generator-1.2-no_jarjar.patch
@@ -0,0 +1,21 @@
+--- build.xml.orig	2009-11-03 13:53:40.000000000 -0600
++++ build.xml	2009-11-03 13:54:11.000000000 -0600
+@@ -28,18 +28,6 @@
+                      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"
diff --git a/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch b/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch
new file mode 100644
index 000000000000..6cd74732c2c0
--- /dev/null
+++ b/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch
@@ -0,0 +1,16 @@
+--- a/build.xml	2012-07-02 21:14:09.000000000 +0200
++++ b/build.xml	2013-06-15 21:39:55.005813436 +0200
+@@ -16,13 +16,6 @@
+                      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>

+ 

diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild
new file mode 100644
index 000000000000..60893f5bbc19
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild,v 1.1 2013/06/15 19:54:51 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Code generator for Hamcrest's 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 ~ia64 ~ppc ~ppc64 ~x86"
+
+CDEPEND="dev-java/qdox:1.6"
+
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( sys-apps/findutils )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+EANT_BUILD_TARGET="generator"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+
+java_prepare() {
+	# Don't include source in JAR.  If a Gentoo user wants the source the source
+	# USE flag will be enabled.
+	epatch "${FILESDIR}/hamcrest-1.2-no_source_in_jar.patch"
+	epatch "${FILESDIR}/${P}-no_jarjar.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
+
+	# These jars must be symlinked.  Specifying them using gentoo.classpath
+	# does not work.
+	java-pkg_jar-from --into lib/generator qdox-1.6 qdox.jar qdox-1.6.1.jar
+}
+
+src_install() {
+	java-pkg_newjar build/temp/${PN}-${PV}-nodeps.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3.ebuild
new file mode 100644
index 000000000000..d6e46b2d9dc3
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/hamcrest-generator-1.3.ebuild,v 1.1 2013/06/15 19:54:51 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Code generator for Hamcrest's 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 ~ppc ~x86"
+
+CDEPEND="dev-java/qdox:1.12"
+
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( sys-apps/findutils )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+EANT_BUILD_TARGET="generator"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+
+java_prepare() {
+	# Don't include source in JAR.  If a Gentoo user wants the source the source
+	# USE flag will be enabled.
+	epatch "${FILESDIR}/${P}-no_jarjar.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
+
+	# These jars must be symlinked.  Specifying them using gentoo.classpath
+	# does not work.
+	java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-generator/metadata.xml b/dev-java/hamcrest-generator/metadata.xml
new file mode 100644
index 000000000000..3157d41caefc
--- /dev/null
+++ b/dev-java/hamcrest-generator/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>
+	<upstream>
+		<remote-id type="google-code">hamcrest</remote-id>
+	</upstream>
+</pkgmetadata>