Drop unused version.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

11 files changed, 43 insertions, 263 deletions

diff --git a/dev-java/hamcrest-core/ChangeLog b/dev-java/hamcrest-core/ChangeLog
index 9e0434ea613c..4d26bbeacae4 100644
--- a/dev-java/hamcrest-core/ChangeLog
+++ b/dev-java/hamcrest-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/hamcrest-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/ChangeLog,v 1.23 2015/07/11 09:21:22 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/ChangeLog,v 1.24 2015/07/20 21:28:21 chewi Exp $
+
+  20 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  -files/hamcrest-1.2-empty_generator.patch,
+  -files/hamcrest-1.2-no_source_in_jar.patch,
+  -files/hamcrest-core-1.2-fix_javadoc.patch, -hamcrest-core-1.2.ebuild:
+  Drop unused version.
 
   11 Jul 2015; James Le Cuirot <chewi@gentoo.org> hamcrest-core-1.1.ebuild:
   Drop java on ia64.
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 4c5f6db79f0f..f557077146d2 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,35 +1,30 @@
 -----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 1250 SHA256 a97e17f1ed6a24365e989bfb4bd97ab4347ee1ae9da8025120aa712fe1fd9b01 SHA512 4589ec93dc752db201f277443a058dd710098b5ea1c25fca458e197ec6363460ea364a7bd56afe18b3790649c3d6951d91c2b23b30c06e02706827f65a55c95c WHIRLPOOL d761093955fe9208ea4a1907d6a2ac14f893413c66a347199d7fa6cbaa042250992a8df91c62c36dbb66a06574229d689b0d05454e4d688d70fe75365e73e6c9
-EBUILD hamcrest-core-1.2.ebuild 1747 SHA256 8a626efc8f4441e7c546e06c79ce17eba4b749e5aaadd829dfa1547a67f3741c SHA512 937b4497bb99770b5f2df9a7ca005fef2ae61059782f96f82299baf11a5c64e4d4299a5e8e5e93b12fdc9414c14cdb1a60f3a1665b61ae371b66e7c40cadfff3 WHIRLPOOL 0003c3f5087682e619fb201d1b535453df7775cff91eced441c90d6f5da51ddc8222f82d76c894660e3af1ad73f520ae2a511791d19012337f7529d03bfb41ca
 EBUILD hamcrest-core-1.3.ebuild 1653 SHA256 b3aa2ccefc1d15ace89c81255bbe5aa0e9703183e7cee19b6beda90a737d6840 SHA512 6babe94e1bd3e03e029e34755f9a876eca457753236cb05a6a47bbc37e6f0f42a7d95ff25930c0f478f5b5e224993ec19d86258f5a2c38f29986c7e291c08e2f WHIRLPOOL 46a1e5a3f0abd9cc1697a348f209d5499981070fce62096cf2cc817043c475e9002e6c6d1ceef91d0238de2825caf2c5f600000a8f214fd5014fb554b43337c2
-MISC ChangeLog 3317 SHA256 74d20830569b186a52a4f54475caa44a7003ae2371c7cc6273189f00fdeb7ba1 SHA512 9de229a8160296157024020ad3770317d4846bce8550d04bec03750269eed5bc107aef201b161320f61307e439ae3842447e85e62014204dfabced50d4ee4ee8 WHIRLPOOL c196a8cb4602670619478d51d3d43bf8ae5effdcf0eeb679a986b6c28fbbc96e4499b8703ea00517c8a942e7c3b950368c40759dcbcd4cac6806afc288461b85
+MISC ChangeLog 3555 SHA256 dae96de408d6d208b20171285dcdec46453227abc7e28206e8ed251ece1b005c SHA512 4020c953f47518cf3374b18da7382b8dc793bf6c4a91ebb0f5a6da2c095979292e67ff779eea45846ba0f92aeb1e60e84b6b468dc17f78ce115e55ab9f549ccd WHIRLPOOL be26717e779878edd3e6b94722b254e20281b28f123d03340bc51e824d286baad90400e11884ddddb4d4018d33cbfcc8a12a27664afb78b3c96d97233c8ebb65
 MISC metadata.xml 236 SHA256 71511720e664e95baa90512d184442865ed781fbe0da912aa8a487c34abcccc2 SHA512 e73981759865d8ba33c8daa1efce4fd7ce9f43c51be36dab5844d61a9b77971f7f1f3a55aa8760dfdc3786cb0326a1881729fbcb27117b20a346feff0e5c5a19 WHIRLPOOL 0d339941313b1f7418b2c390ffec6d33826be4779291272d5fae172ef634a80ed6206bc4a0120de7fcfcff45bc87175b10154bf81ae404bff773308f7cb28896
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVoOATXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVrWf2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kalIP/RjBkAWmR5r0LlXAIjj8kg6n
-SMyAvCymKNFARTH01+8RCjZRsSsSFcJykdc9ZN2qOOiaalp/z/wrK1MDIG4FaLXo
-Y7KLeOJxbyIHkIR+Q7ot4tRM81dy/51wtM2OjzKB5OzALANSf8sN3X5iATNwPN60
-FBB4x0uPoGalaAKTMggO5GOjyILjzPJzwR6kDIKPfjF/yBoNXMZ/Ne7JLqNLXTse
-TALg2/bcOy6iQPb0FJJEZGrzFmfEd6fByj+EMaQ02eGqLNbIOk4TpBA/l/vTq415
-REUHW+qT9Bvccvk1pwhhi/kSHp8nNWv6fIXpoLWtuiscbSrUCxuTDEdJhYR4OGGv
-4mNs3EwQ50EdSA1a5/04JIc0grUAA5DsRlBfm7tl/DEmFeZpna56o7KvLeyKkLdO
-0dEW+0naB9xNZHYdXhngXsn2OA+D7b4argUf3rTpxHgQei/7lim/8RhsxGRLJv4D
-Tyq7C+kynljQ+rwv+Izy66bY57DswO8S+AGoqGumkZQVH5LLDewVmVSMXWEuvphG
-USTPfF3P8KmHFYnytYF/326/kJTp+AyLvP4G+2TfipZ0vfewMLA96I1PPUEanITn
-kiv7QFZ8Job5uX9jPbAQCAPBxnt3m9rBlB+pjX9aGSA4yPIUpC6R5HtH6Xq4+lO6
-occO4dnNYX7zmnVI9lKP
-=4DFe
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kUHkP/Axm5DcvzjMSGSLg3QUG5F/d
+K4FKrKGcn/LlnR56XZrQExW7AChJJZeQ7/OxRJBvbG30h3KeyZF0CL+oVaS+5Oi5
+ibDcMRJFCr1Wd4115jKRjCLRKQLGJMQe9pfajuUsl/yUoNyQ3O9nfeQ6Bs7pZjMt
+SssSoK5r1Q3aPnI9biXI1IIHEzduU2WfPsA646t6rSuEnETF/vU/u26xs7IfXFio
+6zUB7Y5AOHRcctsPbuVX8kHwzfDJRAgzzXYFDJ0BNgJFLWa+vwiaVjll6QKahIT6
++bcB5yaxG9upQvFuA/A9S9zyVsWgsuWqu3D3knD7vIBUzRkZjsgAPUOsrtDMFsJ0
+b5Wb73/mT4WFdOtdJmfhK/TjIuicvJH5dmNOMw9/DRX9aQ+xPB3WFwk7ksiORScC
+KwmnkrvAYJ09jPF04QUqimcCIM1hczVcqfSrAVX8Lou0NNi3Pp7n8/XQIYQn0tkz
+j+1pHdpLujdRCaNX5NKG1GFPdC4ya87vGSTEMrowIF2G+76JLJHIB1/ABM5DH78y
+2JPryBHKcjSjDT0a17hT+vXIG1MpBWRKUC3h3n5Lho40/20KXp1xFDPCOVic9w2R
+a8ymAvBHmyf/c6EcLG/5YePyxGwSMG/UItj1WZHl+P9iT+FC+gZN4HUIEuWMYSdq
+B7RG/OuiD/kWbKfuGwGU
+=biGc
 -----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
deleted file mode 100644
index 536f2c26cfc2..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-1.2-empty_generator.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
deleted file mode 100644
index 8d8ad9dbc66b..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-1.2-no_source_in_jar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-core-1.2-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.2-fix_javadoc.patch
deleted file mode 100644
index 93ede3572ba0..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.2-fix_javadoc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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/hamcrest-core-1.2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild
deleted file mode 100644
index e03d517b3104..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 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.3 2014/08/10 20:14:08 slyfox 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 ~amd64-fbsd"
-
-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-generator/ChangeLog b/dev-java/hamcrest-generator/ChangeLog
index 59b24181410c..a9dd257e0a3f 100644
--- a/dev-java/hamcrest-generator/ChangeLog
+++ b/dev-java/hamcrest-generator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/hamcrest-generator
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/ChangeLog,v 1.11 2015/07/11 09:21:24 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/ChangeLog,v 1.12 2015/07/20 21:29:54 chewi Exp $
+
+  20 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  -files/hamcrest-1.2-no_source_in_jar.patch,
+  -files/hamcrest-generator-1.2-no_jarjar.patch, -hamcrest-generator-1.2.ebuild:
+  Drop unused version.
 
   11 Jul 2015; James Le Cuirot <chewi@gentoo.org> hamcrest-generator-1.1.ebuild,
   hamcrest-generator-1.2.ebuild:
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index 8393b5a64076..8b46c2d0c2d9 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -2,33 +2,29 @@
 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 1428 SHA256 cd10e2b8564292db2a06e19ce3ca7d188b168c5720199037953f1980939cfc50 SHA512 9934de2668e92cd1cbf6036db6e14fbedff92c064e56d3a58353ec49c9ecf6e4ba031e7394b6df9f589d64ff46cb9644cfc2e3782f424decbcc4e270a0894aef WHIRLPOOL 9bb1c392822a62688c2000a524cf6f3bea4ea95c793f13ed660e0b878f6da1a8b3b8234e3a1240d4a9cac2361c3a092d9dff5abdcd1e92e6207dedaeb052b3ab
-EBUILD hamcrest-generator-1.2.ebuild 1503 SHA256 08972825344e2de365893577e56202df01a2cb8d0f5d331f1efdcb66f4093a80 SHA512 de5404fd2314702c5ca389fb694f7689ff23621f2d4da3996b2993fb65be53efbd51e347baa4bcdea9cc91871b042b430cfdfe9598f2beff5616442498cc69be WHIRLPOOL 72879e89d11ee84f5cad51023a101e7fd8d38ea227a127e033114bf54b07795050f0f3d2ba463663a5ee53d181504e258a4eb9c4af846a9af18c0ec133cb0a84
 EBUILD hamcrest-generator-1.3-r1.ebuild 1481 SHA256 226da481b8ea45e994434320164071f97e2c9703663af37c133ed020c6dd48f5 SHA512 ca09f99e645502b3fa7ae45dabcbe12c7a3677378520546421aa3395eedb811a0bd5f142cc6f0699b5304d4c563797a1a868cddf907129f3363258b532fad5cc WHIRLPOOL d1138bbda523053b8752fccd6f58c63fe51ec242b76055d8c6d97a06a652c96272a2b8e026e12f8f3f689d7ea72b7354157d1c8ebe155fedab5883167099511c
-MISC ChangeLog 2089 SHA256 53f065f281f9ba9193a12026b43e45997be60b92ab252fdff5a2da3c7c00fafb SHA512 805c2f08e021d7276ff602fea2bd911e57740b8e5dda946991f760887cccaf96f37036ee67883ffdf08b76bf13bf289a2ccc049019232d7ac5231a4e371b87c5 WHIRLPOOL 9d3a2c48a91aca550785ec03785e85d39c655c1259a0255a97a1bf804ef2fc348e5bd9285b73d36f80e1e1e3ae60966d5a88146766dea345f137c73fe197e186
+MISC ChangeLog 2290 SHA256 728e3dbf1a89ec64c39d9fd54985b3d017ccfb853b673d641e465e0483d9c1d3 SHA512 b370dec3472e98eb19d757a8f8a8fb1be304c2743533a947219f506a95d6ff57355ff29355013cc88dec3f844e29fa14ddca36b32d4ab29a0942ae4b0eea86b4 WHIRLPOOL f3390652e7c8a14e70665cce0eb144624604170f5a8e14792b8351d37843ebdf76178f9d6f6ec48baaa84c6c228ab2bc1334947c4c04b2af58975f99484de41c
 MISC metadata.xml 236 SHA256 71511720e664e95baa90512d184442865ed781fbe0da912aa8a487c34abcccc2 SHA512 e73981759865d8ba33c8daa1efce4fd7ce9f43c51be36dab5844d61a9b77971f7f1f3a55aa8760dfdc3786cb0326a1881729fbcb27117b20a346feff0e5c5a19 WHIRLPOOL 0d339941313b1f7418b2c390ffec6d33826be4779291272d5fae172ef634a80ed6206bc4a0120de7fcfcff45bc87175b10154bf81ae404bff773308f7cb28896
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVoOAVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVrWhTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kasIP+wb3Jio8hoCvATU0C7JFmmCi
-NviJMwn/k0KC1nWKf0jv/5ksRp3M6OhYRLeyBZtxacNy94TJzN6XIrdLWIq8nTfG
-Tyuyg4TdbdWpsatKRfzv1rWBVPhy0tkIvqSHglw+9PMkOWQyyOLW+AUxnjg9kR9l
-+2s9+PGCLFRmCMAvqrOzm/d0QdsslSv6BSyXabPx2auHmQl0WzIPWlFGL0fF7FVF
-uCM82Q3+U8dYaIzL8+80iJjXoRGvgqVTwuQdEhuVznJD5AU50T5KjpW7nyxDKhbA
-zawmI8zeL4CW9WUo8aLnjYrbxJaD1Rq9J7je2tjm0+zflgv5lVG2mytDrFzFTJIr
-rlUOAtD3xIt3nx0wCY+QdOmkf8X+FHAgKkz8EjLy4SpjEUro5q29c3h9oK0Pqkta
-dpVXiX/X4DtPFuEnSoFr6p7ZLVdnisRtFbeMFMe0+0nKcChZYMu6qcUe3D2oQdvU
-TpVClJgG+7UZx8KMFw8Dp8Bx43Ln2fsDUJHPTKDrAQDn81i8lWITGnVPnxeqkwK8
-QpFrb9A/j3k5w8Zvl6r4gyryYQhvuOq9tBsQTTJcKAvixeTjjoTMJ5QdK6fF4Los
-MlP8nz74RfX7J4NaSbN1iD643llnyrq3xNTQ82gfJ7cE+p8oVUDkRL07FT0es1xV
-O+i50YgvwGaNaRDFlhxh
-=82V+
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kBMMP/jYe7t3T7QS1//HOKXRy8+ME
+ZC2PqfNwg3eisz1c1u9GWYj42t8BjgImHeWF3EMSdajvdO1ju6Zz4y87hGPuoj1T
+Megbjenn1JlteOfE9BnyNZzxuYFxm45ANOmiUwg5QuGmKBBApbxZijZcQfMHxP1A
+PJtjdDH/gB8Khj3XlGUc2nGpt+3X7dgZcXRi7C3CIrWczFOKhhzytq385sBt2AJu
+nWHVtaqUQgkK7e+vhN23MJFKrObbzddXyERW1mnR5t9xHchvQp5lnrafrw3C2VqM
+CVuUNSy1Ywt9lKuunT89luitPG3axm9/IWFj9Nhray3DqaTPBrucPSqhJA0UbEXS
+5YDhCfq2VJgAj38SMdkYrSSykNXVMLY8oS6tL64ylgQlea27QLzXbOtSWSePSIxD
+43H59v77rIdyNeXLhAw4JLDcj84LtRsNMIsNAh+fKlbgicaOUddnA00NXQz6JKNi
+OvKtiAoUKiqSfZeHlaL2+jWmn/anYwCHGhl0C4H/R70mf93nVmhtbuHsGAmBHaOi
+steMEC+gSnvRGMlVWNOKVHcgjgkrETYalxe/AdhbUTsW+RTlpdOC6fmHBjwaSP0b
+yLYnavjHENl/in5hdbWtWMPIyzJr80YNNlxJNu7+73HDsWapQKN8dRwE8VDz7kGy
+BeWg/D1SptGymvtrTRh3
+=uWU3
 -----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
deleted file mode 100644
index 8d8ad9dbc66b..000000000000
--- a/dev-java/hamcrest-generator/files/hamcrest-1.2-no_source_in_jar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 2c9aa41cb0c7..000000000000
--- a/dev-java/hamcrest-generator/files/hamcrest-generator-1.2-no_jarjar.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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/hamcrest-generator-1.2.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild
deleted file mode 100644
index 376b212c7164..000000000000
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 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.3 2015/07/11 09:21:24 chewi 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 ~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_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
-}