New ebuild for hamcrest-integration in all slots (:0, :1.2 and :1.3) wrt bug #287777.

This commit also solves bug #205489.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

9 files changed, 479 insertions, 0 deletions

diff --git a/dev-java/hamcrest-integration/ChangeLog b/dev-java/hamcrest-integration/ChangeLog
new file mode 100644
index 000000000000..ae70a4fa7e8f
--- /dev/null
+++ b/dev-java/hamcrest-integration/ChangeLog
@@ -0,0 +1,15 @@
+# ChangeLog for dev-java/hamcrest-integration
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-integration/ChangeLog,v 1.1 2014/03/02 16:26:05 ercpe Exp $
+
+*hamcrest-integration-1.3 (02 Mar 2014)
+*hamcrest-integration-1.2 (02 Mar 2014)
+*hamcrest-integration-1.1 (02 Mar 2014)
+
+  02 Mar 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/1.1-remove-targets.patch, +files/1.2-remove-targets.patch,
+  +files/1.3-remove-targets.patch, +hamcrest-integration-1.1.ebuild,
+  +hamcrest-integration-1.2.ebuild, +hamcrest-integration-1.3.ebuild,
+  +metadata.xml:
+  New ebuild for hamcrest-integration in all slots (:0, :1.2 and :1.3) wrt bug
+  #287777.  This commit also solves bug #205489.
diff --git a/dev-java/hamcrest-integration/Manifest b/dev-java/hamcrest-integration/Manifest
new file mode 100644
index 000000000000..ff3b496e00b3
--- /dev/null
+++ b/dev-java/hamcrest-integration/Manifest
@@ -0,0 +1,10 @@
+AUX 1.1-remove-targets.patch 6397 SHA256 7ed420e8fa49d886dff972545db1b5d5500f93c40761350cb64ea3123cfc7f85 SHA512 1364ec8449c7dc5965f1d94d7058063958693c1722a357a2175f284064f9a8a9bf0937a23a4436317ea5525fcb131f79476b891a3fdbe37b2e667c38883aad1c WHIRLPOOL 4987a2f8a90e4fc764cc333733da607d6e639e06a95b13568ed3d31a6ecdc6c836b763aea5802c0fe999c7120f041b6b5be51da762fca51bd9452a16aa63767b
+AUX 1.2-remove-targets.patch 3787 SHA256 20f28e07f474064159f7d68eeb581a2fd5ee1b496b7b4aff5be19fed5a67071a SHA512 7974aeeda26a8902e3bf26bbcc78b702fede363358758e21d02e6e4781fcba6ccba8d5986ab784f2b95cd98f700fe9a6a8a5cb31cd879ff537311ab25af12ca0 WHIRLPOOL 3aac3f1476506aa5f3757d01af3e05ca6482a1e645e9492e6a46ebd67d9d2417a0c389a809f3aef36d1a9bb87258fddf01ada275f3795dc94cdd824bf741ac02
+AUX 1.3-remove-targets.patch 3721 SHA256 b998aeaf914535d01802981fa7c7b0b94277c89dfeb5e22c83f677b156083ff9 SHA512 1af75ef60b6a6ac6a24d4725c548b34493968fd67d93c192867d9da6fa79c26a25ee68f1b2987008160100052d22aca5fde9440133566a55d630b241579f2463 WHIRLPOOL 30a4226f0edb0bdc5b184345c19db4cd37ce57aa25eb0b1b6e18e83d0f023ca64c62ecdd8887c08d9848efef99a1b5694bbecdd96a63981736b867d9ecb07ed9
+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-integration-1.1.ebuild 1295 SHA256 40341508bffc75013a683b9372b54022b4b554ba0c6fc4596f97d2c26b47a8e0 SHA512 b4051659bd30e88460912de19b9850ba7e4798a7c1105a8ef45779b6632af743f79a5e744e2dbb62ec162dbf58d8b678266696ab95bc349bd170ce005277f1d3 WHIRLPOOL 61635de5b7643bcc14d8fb1d766bb0dbf69bfcf6ec86be9c823920d7e6f25acce4198a3d4c422102731f3b109801ed12af46d51c2ffccc2ccb14a078d37a4fb9
+EBUILD hamcrest-integration-1.2.ebuild 1299 SHA256 101110558e8b05dc37a304e1f9867cd87e1b96564db8c86afc7b3798dced76ef SHA512 69e30b383e189e1a3f157781e38e53f03845f71282d248b63ecbdebf0631abb8e71a792f184668dce5820a008a7d0b2b6f02052ae93c2731d0e3d36df32025fb WHIRLPOOL 50e811dfcd486d4f01f61a4b5d36483f430b541640b0813395a4d2fd35afee26616ef6f13a382fdd9d36d27039c607ca3b31a0461704846503f02e61038d3f21
+EBUILD hamcrest-integration-1.3.ebuild 1299 SHA256 101110558e8b05dc37a304e1f9867cd87e1b96564db8c86afc7b3798dced76ef SHA512 69e30b383e189e1a3f157781e38e53f03845f71282d248b63ecbdebf0631abb8e71a792f184668dce5820a008a7d0b2b6f02052ae93c2731d0e3d36df32025fb WHIRLPOOL 50e811dfcd486d4f01f61a4b5d36483f430b541640b0813395a4d2fd35afee26616ef6f13a382fdd9d36d27039c607ca3b31a0461704846503f02e61038d3f21
+MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
diff --git a/dev-java/hamcrest-integration/files/1.1-remove-targets.patch b/dev-java/hamcrest-integration/files/1.1-remove-targets.patch
new file mode 100644
index 000000000000..384709aec667
--- /dev/null
+++ b/dev-java/hamcrest-integration/files/1.1-remove-targets.patch
@@ -0,0 +1,135 @@
+diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
+index f819d3d..6d4ea63 100644
+--- a/hamcrest-1.1/build.xml
++++ b/hamcrest-1.1/build.xml
+@@ -23,87 +23,28 @@
+ 

+     <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"

+             depends="generator"

+             description="Build core Hamcrest library">

+-        <java-to-jar srcdir="hamcrest-core/src/main/java"

+-                     destjar="build/hamcrest-core-${version}.jar"/>

+-        <!-- Generate one class with all static imports -->

+-        <mkdir dir="build/temp/hamcrest-core/generated-code"/>

+-        <java classname="org.hamcrest.generator.config.XmlConfigurator"

+-              fork="yes"

+-              failonerror="yes"

+-              classpath="

+-                build/hamcrest-core-${version}.jar;

+-                build/hamcrest-generator-${version}.jar;

+-              ">

+-            <arg value="core-matchers.xml"/>

+-            <arg value="hamcrest-core/src/main/java"/>

+-            <arg value="org.hamcrest.CoreMatchers"/>

+-            <arg value="build/temp/hamcrest-core/generated-code"/>

+-        </java>

+-        <!-- Append to core jar -->

+-        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"

+-                     destjar="build/hamcrest-core-${version}.jar"

+-                     classpath="build/hamcrest-core-${version}.jar"/>

+     </target>

+ 

+     <target name="library"

+             depends="core,generator"

+             description="Build library of matchers">

+-        <java-to-jar srcdir="hamcrest-library/src/main/java"

+-                     destjar="build/hamcrest-library-${version}.jar"

+-                     classpath="build/hamcrest-core-${version}.jar"/>

+-        <!-- Generate one class with all static imports -->

+-        <mkdir dir="build/temp/hamcrest-library/generated-code"/>

+-        <java classname="org.hamcrest.generator.config.XmlConfigurator"

+-              fork="yes"

+-              failonerror="yes"

+-              classpath="

+-                build/hamcrest-core-${version}.jar;

+-                build/hamcrest-generator-${version}.jar;

+-                build/hamcrest-library-${version}.jar;

+-              ">

+-            <arg value="matchers.xml"/>

+-            <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>

+-            <arg value="org.hamcrest.Matchers"/>

+-            <arg value="build/temp/hamcrest-library/generated-code"/>

+-        </java>

+-        <!-- Append to library jar -->

+-        <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"

+-                     destjar="build/hamcrest-library-${version}.jar"

+-                     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 +62,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 +105,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 +162,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"/>

+ 			

+@@ -261,4 +202,4 @@
+         </sequential>

+     </macrodef>

+ 

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

diff --git a/dev-java/hamcrest-integration/files/1.2-remove-targets.patch b/dev-java/hamcrest-integration/files/1.2-remove-targets.patch
new file mode 100644
index 000000000000..794fe7463251
--- /dev/null
+++ b/dev-java/hamcrest-integration/files/1.2-remove-targets.patch
@@ -0,0 +1,80 @@
+diff --git a/hamcrest-1.2/build.xml b/hamcrest-1.2/build.xml
+index bf7e50c..f552ae1 100644
+--- a/hamcrest-1.2/build.xml
++++ b/hamcrest-1.2/build.xml
+@@ -23,75 +23,16 @@
+ 
+     <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"
+             depends="generator"
+             description="Build core Hamcrest library">
+-        <java-to-jar srcdir="hamcrest-core/src/main/java"
+-                     destjar="build/hamcrest-core-${version}.jar"/>
+-        <!-- Generate one class with all static imports -->
+-        <mkdir dir="build/temp/hamcrest-core/generated-code"/>
+-        <java classname="org.hamcrest.generator.config.XmlConfigurator"
+-              fork="yes"
+-              failonerror="yes"
+-              classpath="
+-                build/hamcrest-core-${version}.jar;
+-                build/hamcrest-generator-${version}.jar;
+-              ">
+-            <arg value="core-matchers.xml"/>
+-            <arg value="hamcrest-core/src/main/java"/>
+-            <arg value="org.hamcrest.CoreMatchers"/>
+-            <arg value="build/temp/hamcrest-core/generated-code"/>
+-        </java>
+-        <!-- Append to core jar -->
+-        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
+-                     destjar="build/hamcrest-core-${version}.jar"
+-                     classpath="build/hamcrest-core-${version}.jar"/>
+     </target>
+ 
+     <target name="library"
+             depends="core,generator"
+             description="Build library of matchers">
+-        <mkdir dir="build/temp/hamcrest-library/generated-code"/>
+-        <java-to-jar srcdir="hamcrest-library/src/main/java"
+-                     destjar="build/hamcrest-library-${version}.jar"
+-                     classpath="build/hamcrest-core-${version}.jar"/>
+-        <!-- Generate one class with all static imports -->
+-        <java classname="org.hamcrest.generator.config.XmlConfigurator"
+-              fork="yes"
+-              failonerror="yes"
+-              classpath="
+-                build/hamcrest-core-${version}.jar;
+-                build/hamcrest-generator-${version}.jar;
+-                build/hamcrest-library-${version}.jar;
+-              ">
+-            <arg value="matchers.xml"/>
+-            <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
+-            <arg value="org.hamcrest.Matchers"/>
+-            <arg value="build/temp/hamcrest-library/generated-code"/>
+-        </java>
+-        <!-- Append to library jar -->
+-        <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
+-                     destjar="build/hamcrest-library-${version}.jar"
+-                     classpath="build/hamcrest-core-${version}.jar"/>
+     </target>
+ 
+     <target name="integration"
diff --git a/dev-java/hamcrest-integration/files/1.3-remove-targets.patch b/dev-java/hamcrest-integration/files/1.3-remove-targets.patch
new file mode 100644
index 000000000000..e534eddfb750
--- /dev/null
+++ b/dev-java/hamcrest-integration/files/1.3-remove-targets.patch
@@ -0,0 +1,74 @@
+diff --git a/hamcrest-1.3/build.xml b/hamcrest-1.3/build.xml
+index 1cfd4fb..396ebc5 100644
+--- a/hamcrest-1.3/build.xml
++++ b/hamcrest-1.3/build.xml
+@@ -12,69 +12,14 @@
+     </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">

+-        <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>

+-

+-        <!-- Generate one class with all static imports -->

+-        <mkdir dir="build/temp/hamcrest-core/generated-code"/>

+-

+-        <java classname="org.hamcrest.generator.config.XmlConfigurator"

+-              fork="yes"

+-              failonerror="yes"

+-              classpath="

+-                build/hamcrest-core-${version}.jar;

+-                build/hamcrest-generator-${version}.jar;

+-              ">

+-            <arg value="core-matchers.xml"/>

+-            <arg value="hamcrest-core/src/main/java"/>

+-            <arg value="org.hamcrest.CoreMatchers"/>

+-            <arg value="build/temp/hamcrest-core/generated-code"/>

+-        </java>

+-        <!-- Append to core jar -->

+-        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"

+-                     modulename="hamcrest-core"

+-                     classpath="build/hamcrest-core-${version}.jar"/>

+     </target>

+ 

+     <target name="library"

+             depends="core,generator"

+             description="Build library of matchers">

+-        <mkdir dir="build/temp/hamcrest-library/generated-code"/>

+-        <java-to-jar srcdir="hamcrest-library/src/main/java"

+-                     modulename="hamcrest-library"

+-                     classpath="build/hamcrest-core-${version}.jar"/>

+-        <!-- Generate one class with all static imports -->

+-        <java classname="org.hamcrest.generator.config.XmlConfigurator"

+-              fork="yes"

+-              failonerror="yes"

+-              classpath="

+-                build/hamcrest-core-${version}.jar;

+-                build/hamcrest-generator-${version}.jar;

+-                build/hamcrest-library-${version}.jar;

+-              ">

+-            <arg value="matchers.xml"/>

+-            <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>

+-            <arg value="org.hamcrest.Matchers"/>

+-            <arg value="build/temp/hamcrest-library/generated-code"/>

+-        </java>

+-        <!-- Append to library jar -->

+-        <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"

+-                     modulename="hamcrest-library"

+-                     classpath="build/hamcrest-core-${version}.jar"/>

+     </target>

+ 

+     <target name="integration" depends="core, library" description="Build integration with external tools">

diff --git a/dev-java/hamcrest-integration/hamcrest-integration-1.1.ebuild b/dev-java/hamcrest-integration/hamcrest-integration-1.1.ebuild
new file mode 100644
index 000000000000..63ceab821fb5
--- /dev/null
+++ b/dev-java/hamcrest-integration/hamcrest-integration-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-integration/hamcrest-integration-1.1.ebuild,v 1.1 2014/03/02 16:26:05 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN=${PN/-integration}
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Integration library of hamcrest"
+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 ~x86"
+
+CDEPEND="dev-java/hamcrest-core:${SLOT}
+		dev-java/qdox:1.6
+		dev-java/easymock:3.2
+		dev-java/jmock:1.0"
+
+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-core,qdox-1.6,easymock-3.2,jmock:1.0"
+EANT_BUILD_TARGET="integration"
+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/${P}.jar ${PN}.jar
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-integration/hamcrest-integration-1.2.ebuild b/dev-java/hamcrest-integration/hamcrest-integration-1.2.ebuild
new file mode 100644
index 000000000000..e0b3e0839da3
--- /dev/null
+++ b/dev-java/hamcrest-integration/hamcrest-integration-1.2.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-integration/hamcrest-integration-1.2.ebuild,v 1.1 2014/03/02 16:26:04 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN=${PN/-integration}
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Integration library of hamcrest"
+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 ~x86"
+
+CDEPEND="dev-java/hamcrest-core:${SLOT}
+		dev-java/qdox:1.6
+		dev-java/easymock:3.2
+		dev-java/jmock:1.0"
+
+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-core,qdox-1.6,easymock-3.2,jmock:1.0"
+EANT_BUILD_TARGET="integration"
+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/${P}.jar ${PN}.jar
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild b/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
new file mode 100644
index 000000000000..cc4ea9606f4c
--- /dev/null
+++ b/dev-java/hamcrest-integration/hamcrest-integration-1.3.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-integration/hamcrest-integration-1.3.ebuild,v 1.1 2014/03/02 16:26:04 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN=${PN/-integration}
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Integration library of hamcrest"
+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 ~x86"
+
+CDEPEND="dev-java/hamcrest-core:${SLOT}
+		dev-java/qdox:1.6
+		dev-java/easymock:3.2
+		dev-java/jmock:1.0"
+
+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-core,qdox-1.6,easymock-3.2,jmock:1.0"
+EANT_BUILD_TARGET="integration"
+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/${P}.jar ${PN}.jar
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-integration/metadata.xml b/dev-java/hamcrest-integration/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/hamcrest-integration/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+