Backported ebuild to 1.1 (:0) as a dependency of jmock:2

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 166 insertions, 17 deletions

diff --git a/dev-java/hamcrest-generator/ChangeLog b/dev-java/hamcrest-generator/ChangeLog
index da44003e8083..7b251cbbd73d 100644
--- a/dev-java/hamcrest-generator/ChangeLog
+++ b/dev-java/hamcrest-generator/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2013/10/20 16:32:30 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/ChangeLog,v 1.10 2014/02/28 17:34:39 ercpe Exp $
+
+*hamcrest-generator-1.1 (28 Feb 2014)
+
+  28 Feb 2014; Johann Schmitz <ercpe@gentoo.org> +files/1.1-build.xml.patch,
+  +hamcrest-generator-1.1.ebuild:
+  Backported ebuild to 1.1 (:0) as a dependency of jmock:2
 
   20 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   hamcrest-generator-1.3-r1.ebuild:
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index bffc9f4a1e47..80e6c46c15fb 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,29 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX 1.1-build.xml.patch 4213 SHA256 502dfc4ec61895dbe63b6d629880b7298f0f9d745ffb706710d019f70b63c873 SHA512 a4b9bcf15588f41ba39ca5f2d9ab70ee1a19eb295904b4da96f3bf66ad83ca14b38f0866de6689e8f1a2cca0530c90301e2ec7d7a172e880f51be34251a3b18a WHIRLPOOL f10871319cc957a95fc8759ecc89c22e8f721cea7c2cf366b7212cbc1c23c2110a81d73c01a76f92111ec251dd9316fc28ae4896908daf2331aed0183d61241d
 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.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
 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.1.ebuild 1434 SHA256 fa2a396f9a1c99a1d3557f89a0457e7b48b94f1e60e8a6841a2bc75261327706 SHA512 69006dafb8e9db47f6e13f1cee9fa335f9a2c1b2e405a45ff1784c95b349326c5c2f9eab2286ec032d191f7c87e3e6d95fcae9f129ac43c60d1c169bb4a00332 WHIRLPOOL 8ee70a75d3f5210a892dbbfd4d1a2c4121be58b928f14690d26bfe21a70409b7b518b9a28c933bba0bc02464cb7f378be805ee8fe61595a6f5dc5db16f7762d9
 EBUILD hamcrest-generator-1.2.ebuild 1512 SHA256 92c6cff9a24362b2582a4d497a9ea86a4bf05a3f5a13782a2c67ae783177ee2d SHA512 b3224a48f5a872769f368fac8fe4c1326316dc9759730701cac562917edf7621ce0668e4c8139d71b4f149187ddec133c495271d1bc91f2989ee57eba014c91a WHIRLPOOL 6deae4a6851f3d7a8ff902907f2877b8b79ccf12bc0223b6e7510fdb34f22aae44245dfe3569e47bc55c73f56f9e40510e7ffebef1de5a94bbbfbb9bb727b8cf
 EBUILD hamcrest-generator-1.3-r1.ebuild 1481 SHA256 226da481b8ea45e994434320164071f97e2c9703663af37c133ed020c6dd48f5 SHA512 ca09f99e645502b3fa7ae45dabcbe12c7a3677378520546421aa3395eedb811a0bd5f142cc6f0699b5304d4c563797a1a868cddf907129f3363258b532fad5cc WHIRLPOOL d1138bbda523053b8752fccd6f58c63fe51ec242b76055d8c6d97a06a652c96272a2b8e026e12f8f3f689d7ea72b7354157d1c8ebe155fedab5883167099511c
-MISC ChangeLog 1740 SHA256 2a1b4107b3283457efa3a2289261a0f4ce88b506f5713e4087486716cd22ebff SHA512 07e34c40126e971eb9abe58fc0029f0afe41cf6eb3b2c83fad2bfe008786351ab5f74f709b01ea238128260bada7c75248026f7471a91e521e574c87138c76cc WHIRLPOOL 4dffe26c738aab5dffc393abd92bcd3235f05b8715ef6739806595d6d6a405f2122a10dc3e4bae3c91f7c50b8c0b069ea2cb8d46dcd8c3d59474df217fa688ea
+MISC ChangeLog 1953 SHA256 44599b7ab2fbd21673493e968023313c71ef354bd3f7849417f92dd78d984017 SHA512 bd7624ca9a2a4639314c882d2ead88ecf12a1eb0016d67b8a4c3fd65d4988cf00979da42e3ce5ce72b83af22f0d63e2deeec52f4f8689f416418488c4bf34ed7 WHIRLPOOL 8d88c697b449ed2a8d49ebfe0f56114d142135a973ac061d881828589c5a394b151e93af498c353d4460e564de44a4fb623b6605bd24cfa939a6bf5cecd264f1
 MISC metadata.xml 236 SHA256 71511720e664e95baa90512d184442865ed781fbe0da912aa8a487c34abcccc2 SHA512 e73981759865d8ba33c8daa1efce4fd7ce9f43c51be36dab5844d61a9b77971f7f1f3a55aa8760dfdc3786cb0326a1881729fbcb27117b20a346feff0e5c5a19 WHIRLPOOL 0d339941313b1f7418b2c390ffec6d33826be4779291272d5fae172ef634a80ed6206bc4a0120de7fcfcff45bc87175b10154bf81ae404bff773308f7cb28896
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSZAWcAAoJELp701BxlEWfY5EQAKiVcvhCMpms0x8FjoUG0ST8
-+MPE12rL+4jeOsEq8ds/mc/D62YBfKo4mgWWyXeVSnMtB0H+U4d4HJvo1ZE9b9+G
-YeJ9Y8lbsCpZV5M9TrMZNfoT5SBD2oGlf40eV0PnnxOix2py0hf+C+DHxKS9GU+1
-7shhIyDhMzfqd4dDWJk5KDIIeKtl35u07M+r7YuSyX9JC3Blh4YU4I2Hw5ycL8fL
-nf4VLgS/6Lxh6CSD7Y7jm49bAdsHhRxURGMe6wZWjiCLTgmanGIj+YX0yXCclICA
-UjgBXfpFW8JYYvCEaBxOjpJ0MFkW/LFmhosn7Q7115YXz0RFhDbof7GjyJ4c9pGf
-K5MABNye98iieOTcNbsGTCZRgRiDqLYWcxJJHoJKb+xNyBq4gODQ19IvLkGXNrNm
-WgLqe0Uxvqt3nC6n0DWhNRti+CuiP82YUDaXTJSbDTIaN3hsaQy3WjrHsGGv9Bny
-/xk2f8eAz44lSPdnU4TbiRJZ1yiyaJkRfaWa9AuaJOAHYfDA2jQijLepZ0eRbirT
-cLHG6s4lT67gMQ84TVLkliw47iDfZ6AU4NaykSOiKbgSjZPrfsRDcfx6sc0nPthe
-jbi9Hz+GjG4SRd0BIirsl11/PzNiJmwXQVOJAv+9dUXa/bQ+O/7vNiqctTnvpZJG
-/73DQ27zrOFXeMYBhJ1f
-=o5kz
+iQEcBAEBCAAGBQJTEMiwAAoJEKCEBkJ3xQHtUm0H/1ptffcOLqNikjY2zggGZiu1
+ObCIuTeUK3qp0pMMU8elv7pXxhg8vlw285vGGnBZbITskDvFV6h0A3hBa7dvgI6f
+QuFAjvkAa0BrcL1y2YR+uPCWNEi/CqL0UXMIcPqiPexUUAlBSWy7y3tUGohH0lpR
+yLJ+SzgE5lnYIjkIVQ0b1W3Ctz+iXSg3HAbhrmOd7CVd0MWhdLv5lQZilvGuil7z
+SbHb/FMXNEEpcJuTa1tJFenSerQvfK7ICl67v8OCV5/1g53t2QnY23IeR96hKvJF
+4xGZ9fb2LiChFfGue80LAUov8Xh00ujvjiey7/EpXvtGZ2kr18sZRSKPWoMpldY=
+=Xzkt
 -----END PGP SIGNATURE-----
diff --git a/dev-java/hamcrest-generator/files/1.1-build.xml.patch b/dev-java/hamcrest-generator/files/1.1-build.xml.patch
new file mode 100644
index 000000000000..c8f087ba8f12
--- /dev/null
+++ b/dev-java/hamcrest-generator/files/1.1-build.xml.patch
@@ -0,0 +1,93 @@
+diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
+index f819d3d..18fba83 100644
+--- a/hamcrest-1.1/build.xml
++++ b/hamcrest-1.1/build.xml
+@@ -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"

+@@ -94,16 +82,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 +109,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 +152,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 +209,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"/>

+ 			

+@@ -251,14 +239,10 @@
+                 </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>

+         </sequential>

+     </macrodef>

+ 

+-</project>
++</project>

diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
new file mode 100644
index 000000000000..b072e745ec53
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 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.1.ebuild,v 1.1 2014/02/28 17:34:39 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+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="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+
+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_TEST_TARGET="unit-test"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/temp/${PN}-${PV}-nodeps.jar"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}-build.xml.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
+}