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.

Package-Manager: portage-2.1.12.4/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

8 files changed, 203 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/Manifest b/dev-java/hamcrest-generator/Manifest
new file mode 100644
index 000000000000..8911fe2da6df
--- /dev/null
+++ b/dev-java/hamcrest-generator/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX hamcrest-1.2-no_source_in_jar.patch 582 SHA256 7633f189219a8fa9eac1739ec4213620b0d9d70f689585afa852ac6b378eb1bd SHA512 77a1009697342e0803a8ed2bb1333976a5b6d63c5755b2f9a1fcf8a6893401694392a6a56594c24cd2cb4fa8a9930638cd41cb66700d42b1c4a9c644da0e4e52 WHIRLPOOL afe9d68604bfea4049561a3291104eb7700662c9ff5eb2aa2b28a064d9a3f993a8142ce7668e3caf781bd63539a2a84e6774ee871964feef0ab4147ef8148ef2
+AUX hamcrest-generator-1.2-no_jarjar.patch 1009 SHA256 6e7b831025efe2a11a3143c5a0de783df75bde3b48eb6691e6c00698ca47a585 SHA512 4800d2fc19b5a3c8895d30af4e5f08f178c7fcb7e7543c3244766774de09db098e78e6721d0b13ebc2850828c620f4e52064b94893aba0b9411752923e7a341b WHIRLPOOL 51c215032abc1df088e2d4cec9d5238510c2175867abac6f3a3d8a4f946648d3de55f1531139476f1fac0ef25f84d06706db83e0bbc44a4bcc3f81102414a62f
+AUX hamcrest-generator-1.3-no_jarjar.patch 982 SHA256 051f59732a3fcf28c6fad3e6fec025446d29e28d890c7145963b072777281146 SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f WHIRLPOOL c0bd0ac82c66cb061e3be7490d6942d4336c6864f39b8fd8c2ae01d38166e272195e50faf56c7b30a9a6974839db8405c2e3638aacf6fd91700d3d2c99fe4d1c
+DIST hamcrest-1.2.tgz 1824622 SHA256 461fcf87afbf85f0879c283ec59810433797dc9f3040b7c2d58494da4aaf2a94 SHA512 e211fee64ef8acce48d2ae572a669fcb1f5e7d05c4ec5d1149a7d42ad64fabd655b24da1a328028cbcc12ef1500907c416513af08168c7b3c22999a00998336e WHIRLPOOL c16fec727dd38ee0e5ee4ae938ba57f6e7b648359df41a99573f65a436dff5601f404e035bdd205baa293581970bb4b0355cfe8fc03f212185f88ef29a2175cd
+DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
+EBUILD hamcrest-generator-1.2.ebuild 1498 SHA256 7815d4ddb7029755f48fc9740c734ed4fc0ca5431b56979141753cd173cc023e SHA512 3f330778f00ce604d9320f15dd28caa1bf6303868e19839d2d9a39bb51a909ce2e6a50afcd7b6af3fc005d8307a952d0499e56ee7a0d61673df4c71a8d59c8ad WHIRLPOOL 69f54f6ec715fbcf12f76319069e672568fee930626125c7048408d0ede25e576e4683ef53a99ffe8d39b13d31dd5aa87d406fe9cf6fd7aceec305665529aebd
+EBUILD hamcrest-generator-1.3.ebuild 1423 SHA256 0d122b4b3877e450c9a00c2c7993036486abf32f24f846de2bdddd9ca3dc5db0 SHA512 295fb3d4f6fa9c0bb2530a7c33196d22fef09d99c7235cf18855c109aa92151f20c6539b732db13c91d3b60d6e6a07033786bdcbe6a7b5213996d08c2fce35e2 WHIRLPOOL 6ba1d3d0623d5f579599cb702c78aae2c9070e08f70c4a0a5ee658e651ca350d7c9f9f3c10c35fbd50bc346f19054aeaba0bc47df73d075e68d84d84580133ce
+MISC ChangeLog 744 SHA256 00b09f6b6bba169ba7e31d5369356793bb686f4af26c0bf20f42e7c88ad3bfd2 SHA512 7b71bafc057506f5981549efcb906db96e8024cb62ab5ad7036cab2c2c507652a605d1eab1f53789ced0fb16a4deb4fb1080d40a4af4d53ee294c5164cbbbac4 WHIRLPOOL c65385e4fa35dd3596a974f09649d495a534d5704fea0819d8a400de598c637178779d84b74135a7c36b359b00c157bb4861dcbd2fe8265eb17f45bb5e7c7ba8
+MISC metadata.xml 236 SHA256 71511720e664e95baa90512d184442865ed781fbe0da912aa8a487c34abcccc2 SHA512 e73981759865d8ba33c8daa1efce4fd7ce9f43c51be36dab5844d61a9b77971f7f1f3a55aa8760dfdc3786cb0326a1881729fbcb27117b20a346feff0e5c5a19 WHIRLPOOL 0d339941313b1f7418b2c390ffec6d33826be4779291272d5fae172ef634a80ed6206bc4a0120de7fcfcff45bc87175b10154bf81ae404bff773308f7cb28896
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRvMX7AAoJEJWyH81tNOV91v4H/AvQQZru/DFYKtLTTxTf5TWY
+FQyrGheSeeEYgk/XcZTjY4zllUaBrgEgCbIQT6qoYyU29cXKGqwhBoz0shCgNsuV
+XpXx5Pu4/rloHyjXeRMp8ymNE9G6MEGw4GnYs8nIyPbe93syd3ZDDbHMn1GfLa3N
+jdeB0JuxBnOxCYRq166dqUA1VnD3aySAz7GJPJggHIfpN89IHdHKGNdzl0tXn5Av
+oh43hTOcPIceNKBQvacU63K6F6GKhR7p3zJebio8q5nZwP5wDSjKZ7ren4bP0QPN
+DHvkYTZ9HFvti60lYNGpTM7QG+WEgYMmpWDAIqdWrz1qZ1DY/IvGIFVFUy0x03M=
+=RM2w
+-----END PGP SIGNATURE-----
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>