Version bump to 1.2 and 1.3, needed for new junit. Fixes bug #287763, contributed by Daniel Solano Gómez.

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

9 files changed, 290 insertions, 5 deletions

diff --git a/dev-java/hamcrest-core/ChangeLog b/dev-java/hamcrest-core/ChangeLog
index f3affceba877..ffcf17ca4ddc 100644
--- a/dev-java/hamcrest-core/ChangeLog
+++ b/dev-java/hamcrest-core/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-java/hamcrest-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/ChangeLog,v 1.14 2013/06/14 19:48:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/ChangeLog,v 1.15 2013/06/15 21:00:35 tomwij Exp $
+
+*hamcrest-core-1.2 (15 Jun 2013)
+*hamcrest-core-1.3 (15 Jun 2013)
+
+  15 Jun 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/hamcrest-1.2-empty_generator.patch,
+  +files/hamcrest-1.2-no_source_in_jar.patch,
+  +files/hamcrest-1.3-empty_generator.patch,
+  +files/hamcrest-core-1.2-fix_javadoc.patch,
+  +files/hamcrest-core-1.3-fix_javadoc.patch, +hamcrest-core-1.2.ebuild,
+  +hamcrest-core-1.3.ebuild:
+  Version bump to 1.2 and 1.3, needed for new junit. Fixes bug #287763,
+  contributed by Daniel Solano Gómez.
 
   14 Jun 2013; Alexis Ballier <aballier@gentoo.org> hamcrest-core-1.1.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 789ad7dc49a2..812d2e3ca37f 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,14 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX hamcrest-1.2-empty_generator.patch 1243 SHA256 fb6e39cbadc9f71e396686f156ed1955305efd54963aa116bbd361e83354cc40 SHA512 63c5158ce703f4eff7e119d3fdefb9bf8d785ba6134f96588694b9e76505960ea2e927adb9dd44628643f2b0c66c9a339df9ea157cd0adbccdc4b03b63f42e49 WHIRLPOOL 996f7450c89835a5f34fc7d2f53229bec1aea000e26848a25511639b63ec2fd68dc80e10dbcbec4e88feef4c557b67be4de4cb89839992db8cb9a969e43c5aec
+AUX hamcrest-1.2-no_source_in_jar.patch 582 SHA256 7633f189219a8fa9eac1739ec4213620b0d9d70f689585afa852ac6b378eb1bd SHA512 77a1009697342e0803a8ed2bb1333976a5b6d63c5755b2f9a1fcf8a6893401694392a6a56594c24cd2cb4fa8a9930638cd41cb66700d42b1c4a9c644da0e4e52 WHIRLPOOL afe9d68604bfea4049561a3291104eb7700662c9ff5eb2aa2b28a064d9a3f993a8142ce7668e3caf781bd63539a2a84e6774ee871964feef0ab4147ef8148ef2
+AUX hamcrest-1.3-empty_generator.patch 1227 SHA256 ceda6816ac536c2c24402098a7308cede442d842e3b3bf1c2ef9ef1b33e7a24b SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5 WHIRLPOOL 866ec50119d39aec33eb028972654aea4d39ea4b892f89a9c391ce90c290261b094d890e78cb61b6d6771b73b5e8c521abae79d7e0faa9371c8d1697db34eead
+AUX hamcrest-core-1.2-fix_javadoc.patch 1520 SHA256 68631185b772f5e2198904d20c3609384b99e544168dcc11ee248c401eb9333f SHA512 118cc0f1b13064fa79fc98426d97295625900b06f647f4fc52055b8eea9766a1d445a72622f474109ccd691ece3ec8f472113da12f20279ffd1f882b6eb08e88 WHIRLPOOL d86973433e66842ad8e4246844a6673322e019ee6c272f86019124956610ec72d0e92d2d5520290e63d8a21ce0a22116740635e6ccea0fe22fbdf1e9df653c7a
+AUX hamcrest-core-1.3-fix_javadoc.patch 3036 SHA256 b1b8118d90ae9470067cbf9c248d69b390ad4d90952d1438444b31223a4cfba9 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3 WHIRLPOOL cf2290d474ca6382421cda70186fbc2fc34f27f11bef40242cf77096bccb6b4529367f33175e742ca4e5772d08c332c32ffb98a735c323c9196309e5f4ad0546
 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-core-1.1.ebuild 1260 SHA256 4622328ecfad052da4fc8f4b496ab3c944b4b40d8c9bf81f811168bb5dbec88e SHA512 d9fb0230c121a4bb5ac06219351583be3efde5afd7427a5ef4b18d2ec6abfbce7eb2baef427211062c36c9d0722c5820afea46deb43f780d5f8f31821eda071d WHIRLPOOL bd6acf9389fb270b4f8e684921a4bf786e9b07582e694c2550605e0fe630be33183914e2100937643cd5c9e5658f8abbce0cef2ab12be66e68499a54a4c594fe
-MISC ChangeLog 1868 SHA256 07235bde7097326d8927d30160439d00a1b5c77f6eb3632b0be5afd26df116ef SHA512 862e5e75461d2aacdb13a7717069ea2f973ea93c43f8b27a7e330d76bdaeed27dfbf31fac6c0721e9cc00c73640dc73412402022a694ea6ec0e10f160627b4d8 WHIRLPOOL 8d5cd84f113f811a1596139332a363c923f0346f718f63679a03ff4d0171cb0e018f6ba38863fa71190cfa22dc40d46164b1684ff84f881ed7e683e0d5e40872
+EBUILD hamcrest-core-1.2.ebuild 1736 SHA256 3f79545ff315b40523658f4816d98bbe37466a071d6d9eafa9ab1ca9b5b032b1 SHA512 38136db7f7870cb54fb190c03c30bc125a0e9ca2c635c875f9a7f28b973ebd03e4ef12ff3f0df3a248e58010efbaf2eb1cf19838115b2c44c25165221d4a89f5 WHIRLPOOL 5f536bc821b265e55c79c798b8c427ea92549fda550c4c78bc6d4e47aa0e8ed0e0e9f5fede0bedfb549c429bed04a1c0aea022973b920b10fbaa388211b6b4a5
+EBUILD hamcrest-core-1.3.ebuild 1606 SHA256 ca521ad20487e0c348a17a6cdb30a7943b7c821d6d45e7ec6500189dd6395162 SHA512 a854e19f9ec57561bf5632739a60aff2636a26ef65a8272af7b5bbe5f5434f5ac0cbe4196e1f58384d8f92cedf9876ea4f3c2cc03d5e04cdbe54643ae085a858 WHIRLPOOL 17a7e81676723dcae1d8f57772e6c36fc6f645a9aa9d8a834d973a11a0e50f7882401f84292d2dac4708f4dd3db4b90bbf1fcbbb75c33f48de2cff2019421d37
+MISC ChangeLog 2376 SHA256 1278cc88ae7102b05e574868e5ddb49c8a36c21bb26f35acfdcf135d36436d14 SHA512 86aeff7ea7dbafbe1cf8780bae7427eaee155fe87e6a5da17569c5a8fbe22a1c2d24f59f32a735c8f2df743437c35ab6f5205a2f455f1fd428d4b2d84754241b WHIRLPOOL 879346d440d4aa491217ffd803c5d1fccd49f6ba908fe310ee2b3f78642907561a8b7bb69e263c993ea618e7d8a6b09f9e0cec506ec0586556483cedab69cb17
 MISC metadata.xml 236 SHA256 71511720e664e95baa90512d184442865ed781fbe0da912aa8a487c34abcccc2 SHA512 e73981759865d8ba33c8daa1efce4fd7ce9f43c51be36dab5844d61a9b77971f7f1f3a55aa8760dfdc3786cb0326a1881729fbcb27117b20a346feff0e5c5a19 WHIRLPOOL 0d339941313b1f7418b2c390ffec6d33826be4779291272d5fae172ef634a80ed6206bc4a0120de7fcfcff45bc87175b10154bf81ae404bff773308f7cb28896
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG7c6QACgkQvFcC4BYPU0pHrQCghARUUJukkoY1uwAzNVxswDlG
-hMEAmweW597kuD8AsiqQdvWM7emrZjEJ
-=ufD3
+iQEcBAEBCAAGBQJRvNVhAAoJEJWyH81tNOV9dpEIALYXhzB9a4GN9iTq19vOePy7
+3iu/uIQNoiMm5fZ/njkQ+8TWrVOS2lwjKceF34EAH/rbGJXEUYoNZKGc8LrE099K
+9NHcxtSp3ihcnA3Gcge948jp+5DLm/XI1exP977WbvyztfZwpB2E9dVMWRnmrFGB
+jZ8tgbUPQ/3ic5a9R1V+WApEXAywgoK9qmGfvHJufrmCRUshBbXPPMgd+dD358IY
+eLIncEvF9G/8bjrEtW3mPZXEWGEGyUzbw2N6nswVwPc/lBJIS7zpZxbnT+J9g3v4
+KmcoQSWy1iIDSaFhFRSRXWZgaIzEiXlbDR6k8X7nDj/XlGu0ACVCJ42Tr4llNCE=
+=8NeN
 -----END PGP SIGNATURE-----
diff --git a/dev-java/hamcrest-core/files/hamcrest-1.2-empty_generator.patch b/dev-java/hamcrest-core/files/hamcrest-1.2-empty_generator.patch
new file mode 100644
index 000000000000..536f2c26cfc2
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-1.2-empty_generator.patch
@@ -0,0 +1,26 @@
+--- build.xml.orig	2009-09-28 06:24:43.000000000 -0500
++++ build.xml	2009-09-28 09:04:33.000000000 -0500
+@@ -23,23 +23,6 @@
+ 
+     <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"
diff --git a/dev-java/hamcrest-core/files/hamcrest-1.2-no_source_in_jar.patch b/dev-java/hamcrest-core/files/hamcrest-1.2-no_source_in_jar.patch
new file mode 100644
index 000000000000..8d8ad9dbc66b
--- /dev/null
+++ b/dev-java/hamcrest-core/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-core/files/hamcrest-1.3-empty_generator.patch b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
new file mode 100644
index 000000000000..709bca62c02d
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
@@ -0,0 +1,21 @@
+--- a/build.xml	2012-07-02 21:14:09.000000000 +0200
++++ b/build.xml	2013-06-15 22:00:19.919038284 +0200
+@@ -12,18 +12,6 @@
+     </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">

diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.2-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.2-fix_javadoc.patch
new file mode 100644
index 000000000000..93ede3572ba0
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.2-fix_javadoc.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig	2009-09-28 06:24:43.000000000 -0500
++++ build.xml	2009-10-04 13:00:14.000000000 -0500
+@@ -194,29 +194,17 @@
+         </tar>
+     </target>
+ 
+-	<target name="javadoc" depends="library">
++	<target name="javadoc" depends="core">
+ 		<mkdir dir="build/javadoc"/>
+-		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
+-			overview="overview.html">
++		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes">
+ 			
+-            <classpath>
+-                <fileset dir="lib/integration">
+-                    <include name="*.jar"/>
+-                </fileset>
+-            </classpath>
+-
+-			<packageset dir="hamcrest-core/src/main/java"/>
+-			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
+-			<packageset dir="hamcrest-integration/src/main/java"/>
+-			<packageset dir="build/generated-code"/>
++			<packageset dir="hamcrest-core/src/main/java" excludes="org/hamcrest/internal"/>
++			<packageset dir="build/temp/hamcrest-core/generated-code"/>
+ 			
+ 			<group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
+ 			<group title="Matcher Library" packages="org.hamcrest.*"/>
+-			<group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
+ 			
+ 			<link offline="false" href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
+-			<link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
+-			<link offline="false" href="http://junit.sourceforge.net/javadoc_40/"/>
+ 		</javadoc>
+ 	</target>
+ 
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
new file mode 100644
index 000000000000..4f210ca3380a
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
@@ -0,0 +1,49 @@
+--- a/build.xml	2013-06-15 22:29:44.445548674 +0200
+++- b/build.xml	2013-06-15 22:30:45.098876635 +0200
+@@ -132,30 +132,15 @@
+     </target>

+ 

+     <target name="javadoc" description="build javadoc jars">

+-        <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>

+         <java-to-javadoc-jar modulename="hamcrest-core"/>

+-        <java-to-javadoc-jar modulename="hamcrest-library"/>

+-        <java-to-javadoc-jar modulename="hamcrest-integration"/>

+-        <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>

+ 

+         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"

+                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"

+-                 windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">

++                 windowtitle="Hamcrest" source="1.6" failonerror="yes">

+-            <classpath>

+-                <fileset dir="lib/integration">

+-                    <include name="*.jar"/>

+-                </fileset>

+-            </classpath>

+             <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>

+-            <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>

+-            <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>

+             

+             <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>

+             <group title="Matcher Library" packages="org.hamcrest.*"/>

+-            <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>

+-            

+-            <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>

+-            <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>

+         </javadoc>

+         <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">

+             <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>

+@@ -302,14 +287,7 @@
+                      destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"

+                      windowtitle="Hamcrest" source="1.6" failonerror="yes">

+                 <classpath>

+-                    <fileset dir="lib/integration">

+-                        <include name="*.jar"/>

+-                    </fileset>

+-                    <fileset file="lib/generator/qdox-1.12.jar"/>

+                     <fileset file="build/hamcrest-core-${version}.jar"/>

+-                    <fileset file="build/hamcrest-library-${version}.jar"/>

+-                    <fileset file="build/hamcrest-generator-${version}.jar"/>

+-                    <fileset file="build/hamcrest-integration-${version}.jar"/>

+                 </classpath>

+             </javadoc>

+             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild
new file mode 100644
index 000000000000..1eb3e7cc5e40
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild,v 1.1 2013/06/15 21:00:35 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+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 ~ppc ~x86"
+
+DEPEND=">=virtual/jdk-1.5
+	~dev-java/hamcrest-generator-${PV}
+	userland_GNU? ( sys-apps/findutils )"
+
+RDEPEND=">=virtual/jre-1.5"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+
+EANT_BUILD_TARGET="core"
+
+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"
+
+	# Empty out the contents of the generator target; it has already been built.
+	epatch "${FILESDIR}/hamcrest-1.2-empty_generator.patch"
+
+	# Fix problems with Javadoc target.
+	epatch "${FILESDIR}/hamcrest-core-1.2-fix_javadoc.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+
+	local cp="build/${P}.jar"
+	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
+	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use doc && java-pkg_dojavadoc build/javadoc/
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
new file mode 100644
index 000000000000..a4cf7ed7a5d4
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild,v 1.1 2013/06/15 21:00:35 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+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 ~ppc ~x86"
+
+DEPEND=">=virtual/jdk-1.5
+	~dev-java/hamcrest-generator-${PV}
+	userland_GNU? ( sys-apps/findutils )"
+
+RDEPEND=">=virtual/jre-1.5"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+
+EANT_BUILD_TARGET="core"
+
+java_prepare() {
+	# Empty out the contents of the generator target; it has already been built.
+	epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
+
+	# Fix problems with Javadoc target.
+	epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+
+	local cp="build/${P}.jar"
+	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
+	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}