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, 186 insertions, 11 deletions

diff --git a/dev-java/hamcrest-library/ChangeLog b/dev-java/hamcrest-library/ChangeLog
index 6cf13f1435ec..e302fbd262b3 100644
--- a/dev-java/hamcrest-library/ChangeLog
+++ b/dev-java/hamcrest-library/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/hamcrest-library
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-library/ChangeLog,v 1.2 2013/09/11 16:22:37 ercpe Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-library/ChangeLog,v 1.3 2014/02/28 17:36:12 ercpe Exp $
+
+*hamcrest-library-1.1 (28 Feb 2014)
+
+  28 Feb 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/1.1-remove-targets.patch, +hamcrest-library-1.1.ebuild:
+  Backported ebuild to 1.1 (:0) as a dependency of jmock:2
 
 *hamcrest-library-1.3-r1 (11 Sep 2013)
 
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index d4f44ce6f816..788a53777ec1 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.1-remove-targets.patch 5177 SHA256 cbffb208e62cfb0c4105725a47d2f78579f176df146abca2c7e422ad38335290 SHA512 21a54ecd3d5f9b1cfdf2ab5eb739640db4cb29ada67bdcbc77a5281e5f901b2318cefb4d791af71ed49a22f028d9ee54f2234e52a6455ff854e9a9083a81a526 WHIRLPOOL 8e394de05d0a3e7e0b14927a6a691c7147c58e63b8060cd646d30efe95506820d4f048746a05a12b9038744b0ea8c7b96ea9c1a9108ee25155a56915daaadc5d
 AUX 1.3-remove-targets.patch 2263 SHA256 724757809ec22f8aab0d28fd087824080ecdd413691821e245347d1b9159728b SHA512 e403068cba91964dc7895c111a292a135ad27790da480c8779961075de559163052fa8ca5a997d3cfc278455ab3b8051bd3d4eb069f850dad2780a7ca974e551 WHIRLPOOL 8fa20fa573d29499c3c026edf3d834a98ef31725d01128fffa46caf7c23f6a14f487fb05e2691766fbd3c54fc45b5f866cb6b81321ee8fecf8b3699b731f9de8
+DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
 DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
+EBUILD hamcrest-library-1.1.ebuild 1447 SHA256 cb4995ea7ee1319a76dd162945fb66dca483f661df9db10b493d63539634ba10 SHA512 5c7758db1bd13eba50e6d8dfd4821dc6556cbffe0a55075492c4443353d50d8ff34a03fc707af01b319bb8b51983e51ab728b581a25316f1106e7feda1cad3dc WHIRLPOOL 59f94be797729edf9b1c1f4ed3b23ac29c921e2063fd0bbecd7c09cc1f83cd278e53d013b83968a46899fcfcf48f3dfec445da037fba7f1798081e451ac20cab
 EBUILD hamcrest-library-1.3-r1.ebuild 1472 SHA256 5a6154101f12f39a15298a4232cdf0d09b34c7f00052a7a5dec21852210fa2cc SHA512 816ae071327eead736c3ac689398b36351950dbae5b931a2cc451ddfadceacd1ae2b3c6e67fd772c19494adc3eb2820492538e8a82e9fee47d0a1d2a690dfb27 WHIRLPOOL 8f8fc6f2a7488f770d693ab1bfd593b3826efb2ba0dbf1451f20248f9dd224d82db056c8e36ced956e3eeb78a362233858b6b7e5454d1475bfab8b156163d12f
-MISC ChangeLog 709 SHA256 e82de037c716276ef459f6ec2de78e82e042f607531dc870453297d369991417 SHA512 acd46b50bc43c7cd4ed0653e2f5d0706966cb10dceeca3a2a17f6280df6efae0d73ef15ae0cdfe4499abd0764d5ea192b100c91c9e9736f942397628e8b49625 WHIRLPOOL d4673c51067d2a8574bde2b3216f3bfa64b9518b029b9f5d616b5005a4108665ef35069599ff9ae685bb177014bbb026fc69e9a3720df6f60edda9f20e9e7162
+MISC ChangeLog 920 SHA256 478b9ed2aff17b0e20cb3651556cc499a2470c9b1ff92cf1d30b1341d379d07d SHA512 3d9cbd94891dffb240e01d673fdf4199b1c210fe9daf3fbf81aaa5fc422bf812ff809f48e826c6ed67fb979647dfeeaa8a5e0162900617d39d1e536e3e7d5c1d WHIRLPOOL 4878ed992d67e7e29401bfd8aa33161cd9b99c5d6273c4a46e287c562e2a944c7b39642124b607137d914c142dd1d84f2cc9532cfa95784f753827442c23be6e
 MISC metadata.xml 237 SHA256 a541129c0d29d968904091d796f9cd402b101b267852d0bc960b185ba4332814 SHA512 2b004dbf04b7ad8e87cb9c2df63b13ae24ae932d5c40ae77fa611224208685861d80897aa81340dfb6aac371654faed2b9c1137b993fb57e8836e8bf9379f31f WHIRLPOOL 9db94a57aff76817bb360a4cdbba5977062ea043d3b714e3f50451ab3a2cbfec8e3d8daa9b1ef78ff7f952b3f508283a49d695565743bce7c56bcd023d87340a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSMJjPAAoJEKCEBkJ3xQHtutIH/2caQZ1yw7U+ojZ7rcXpP09F
-e2uBfkxfDJ1l/kyNVlQCTjct+OEXN1PcfQDDPhkGsfrQ1Hfbc1016DYwu+eRkqGk
-5Y80RHcdsRY/mtNpL9hhrWdKV+Q3kGUYeHdQbVCek6igcuZDxhg6c+wBFnIVyNTI
-G2rXOjMAp0AJSMmDjBghG/nvpJueaG3Fe5Rqd2WW5EroDo+YYzNz4O53L4jS9JsU
-sTDNL9QQ7TJlzAaBozNnuOIV6sOpwrzI1xafqO2eVsOL1MNI0RHLVSRQJx9S3joX
-Im99qj9p3cQi+ZV8CHUKLfFoarytjBD6vjb43Y/1OUxLzL5jj2GwTggMZAKmwdg=
-=J92V
+iQEcBAEBCAAGBQJTEMkNAAoJEKCEBkJ3xQHt7sYH+wZV/NcMTljRjfmOiMMx4fG/
+JvBiKFhZrVu2p91DUwKzwNqTbyh1+1jR1yzSsB1eY1Df+tFu/GpHnhV7X8LaAzrv
+Z+l46VYkjxHN7+zYSU1gYaQquKccIqiE7qxtKWIHG1p+MTuiOTAcCswmW+XJtzqM
+4xHpzKE/vuVT06+kNquzHcWLYTKmf4jHaTqmyWZRSfAny4tW8YOw2tQ97JjBuCsw
+8wK2Px4ovAmNkL95iLR5ibN/8FHhrHBGH6OnHXWmGrQFR3XLkpalr1UF8uBizIKf
+6uAO0DxuxDmdkk34wPh8H13s3fTIUF3inpgtcGZr24rMt6bWuAtZ4zJE9Cb3tmE=
+=8Qyz
 -----END PGP SIGNATURE-----
diff --git a/dev-java/hamcrest-library/files/1.1-remove-targets.patch b/dev-java/hamcrest-library/files/1.1-remove-targets.patch
new file mode 100644
index 000000000000..08affbce634d
--- /dev/null
+++ b/dev-java/hamcrest-library/files/1.1-remove-targets.patch
@@ -0,0 +1,113 @@
+diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
+index f819d3d..b24dea0 100644
+--- a/hamcrest-1.1/build.xml
++++ b/hamcrest-1.1/build.xml
+@@ -23,48 +23,11 @@
+ 

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

+@@ -94,16 +57,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 +84,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 +127,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 +184,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 +224,4 @@
+         </sequential>

+     </macrodef>

+ 

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

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
new file mode 100644
index 000000000000..adbf641eeaf9
--- /dev/null
+++ b/dev-java/hamcrest-library/hamcrest-library-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-library/hamcrest-library-1.1.ebuild,v 1.1 2014/02/28 17:36:12 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN=${PN/-library}
+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="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/hamcrest-core:${SLOT}
+	dev-java/hamcrest-generator:${SLOT}
+	dev-java/qdox:1.6
+"
+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-generator,hamcrest-core,qdox-1.6"
+EANT_BUILD_TARGET="library"
+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/${PN/core/library}-${PV}.jar ${PN/core/library}.jar
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}