NM: Cleanup superseded ebuilds.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

24 files changed, 42 insertions, 603 deletions

diff --git a/dev-java/json-simple/ChangeLog b/dev-java/json-simple/ChangeLog
index c90297ef2bbd..8ab2259dcefd 100644
--- a/dev-java/json-simple/ChangeLog
+++ b/dev-java/json-simple/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/json-simple
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/ChangeLog,v 1.15 2012/03/09 14:22:44 ranger Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/ChangeLog,v 1.16 2014/06/17 11:17:56 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/extra-constructors-from-azureus.patch,
+  -json-simple-1.0_pre20080420.ebuild:
+  NM: Cleanup superseded ebuilds.
 
   09 Mar 2012; Brent Baude <ranger@gentoo.org> json-simple-1.1.ebuild:
   Marking json-simple-1.1 ppc64 for bug 399999
@@ -60,4 +65,3 @@
   +json-simple-20080420.ebuild:
   Initial addition. Thanks to serkan for the original ebuild which was then
   improved by me.
-
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 7810611f90e5..8f59bc65cb61 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1,9 +1,6 @@
 AUX build.xml 1524 SHA256 4dc2f58cb9611dbe1e03aee77fa48c17b98f3da93b91ac8655bda5468cf6f8c8 SHA512 c06b51024910a3351bcd3329d8c62238b0fc6231a5e25581037eff139080ace0339ac7c54a51a56229a5097c05d68b879abbd9ef59abe07a631a2f32ee6912aa WHIRLPOOL ce87ffc8433c54ddf2c750f2cb5aec8c96d822378517c5d7fb311a74fa90bf34fdcc2a3d944ea5d37398fb9d0354da73993bd0b564cd2520e2c569339884c739
-AUX extra-constructors-from-azureus.patch 1225 SHA256 c5a09c8248c7d221cd280bb059bc556adf0d6de03acacc60ae53a93c53de303b SHA512 003b326c36b978c92eaa52810e8ae4748c04a2593519f571a43bac09fd7dac2d922bcce721a3a413ef79ae331a961c801f667b943c3573186474078af177b66a WHIRLPOOL 721b1946479274aa5a9ad9a8d130841d823e1e9e7cbe4c8b7d50ad6b8b3deb851b163b73727bce695424d670b4f658bc4f75b6c6b181633b8634dcfca13871fc
 AUX json-simple-1.1-extra-constructors-from-azureus.patch 1943 SHA256 4d2721add0dae5abfaa5d2b31be61dff88e72db1b69e4f3b8c8263b4541673be SHA512 603d6f580e4e546a0eb230b521416b7d5409ec896359f4ccf5755adf79bd666da9cb0b1496b58439323b1c8cc18ebf5f550e3c1fd4894ba85b89aa2854584380 WHIRLPOOL e684a75b848dc98274f267f1814627a7ac1de92e81587db27a2ea454207a6a68db25c3466a5f7c367f4096f964f62792548552f4774c85b01ad055968eaa5d5d
 DIST json_simple-1.1-all.zip 44814 SHA256 007568a235ed018142756080e73ec7582af83bd90bbdc227489d186e1529ccf7 SHA512 02a5300456dbe2a1b5331b247ad964237d11d2281b35351f1f7bed6867eaf5bb6fb07ca1a50f87e30cd93221c5119e8b5f6f273357ab5fcfeda164ec119c0404 WHIRLPOOL f1169a8a52349a65469c8ef5ea61fbde469ebd30fdb57b591b0148e2244edb1f78ef99b5d79bc66e4cbfcced3f74436cbbd71e0463aa5b5e6737e81eccea1c82
-DIST json_simple-20080420.zip 50835 SHA256 0942dabbf8bea388caf6c1cbb550dbbabfa9e359fb2a9e980d660b572c3a0077 SHA512 504fd23eff9bd269017af193b08b84122a5c9c779e45ce0eaddc3c4574a94de54089a36f8562dadbe6bd7382d14ca0b262bc751589973c63f4df6c826e1f087e WHIRLPOOL 4131e04367114e19836e703f00b718e07a4f2371a91a578e8ece7c11b48c187853db5f3b52d4f3234039dd7e35634b0ca930380b5713765de7e42f6819f0c187
-EBUILD json-simple-1.0_pre20080420.ebuild 1080 SHA256 13741fb298b680b544b8c7e53656318e8f8a9f3dbfde4fc57d74007466d239bb SHA512 07ca619734a835fb8ed7d74773c25e8ef9f894e9f38a95fda99234bbd14cb6476ae35b54e5f16aa5a370c68a4f6f6cd14fb31a13eaa9a740ac179701dbe0507d WHIRLPOOL 7f837bf7876dde72bb3a6412f80ff95ff51bdba722f1e653eb72f1abb47e8e1fb9596d7994bb09d1a966757a255c007148bae82c668835cebf4222b723610cfb
 EBUILD json-simple-1.1.ebuild 1124 SHA256 1e40c72273f21746e8f5270d0cf4a6b3b7c7ada386cd2ea15221f10c42a35149 SHA512 09ba49e8d4d18f18aaaa3e9a241ce9c38c9f08c2858ef4b5bf27b53d68e4538dc79724ef7d61bd19ddaa9e9258289ef660f0e0e7e14477cbdc655f22469edae9 WHIRLPOOL ccdff3864fd7b06d148bc8c3fbaf0e7ec18c0e03e3f3bc70733c88a3bccaa0a96bf44a7fcdee2b300415dee90ce31e66527ee946e73706a4bd893eb43f48cdd2
-MISC ChangeLog 2366 SHA256 981f071247386f07bfb2002bb43b45ebb73b2ae38644212f66fe4cd8d00db55a SHA512 76ef7a1e0ad48d02fe75727118aa9a19eab4b763e5e72f69b4d863e98ab4541430efb110d032645f29847a826b8f224123992cf85d8bbb205dd98a564d70a7ab WHIRLPOOL 58ae828ffe467475ea67ebcaabe43e0145886261a0024335f05400d066bfdf30e26d94fc8e1e9cef20202b9b63b537993f11111d0d73217b191aaeb9608de25f
+MISC ChangeLog 2534 SHA256 0df3dba82f8fa7b5b3b25c74c2f935a6661b39114a336a65e2d4a71b09c840da SHA512 9d8b8803ac939fa0af6bdf9cd738ae7e9af18781ad2685c199cea2837b42af122f5c53ae846308b33fce2cf9022b621d0e3466915b6ef9806e969c506c785cad WHIRLPOOL 15c92e9821c9bcd281d642f58757f4092046b8eb1ef68e8f82e26119f7fb562eb3307cebe49be328b145e68d323ca71253529bcbfd6f3d2392709e04ee571987
 MISC metadata.xml 806 SHA256 c51e2b9d2b5ce72e1d68dbc77485908963dfdeecd21deff79cb13c69729b5f1c SHA512 5572fcb2db653171d5ed13bcaa8c074fe7b5c1cd550f834ce4778f7de83d6057c0618f02d8ce3310ccf20b7e7dd9309fdb8dccc2d97e37ea54d1fc5dc80c015a WHIRLPOOL ce7f7cd3dbb5281d94ef2490d66715397705e11186a59c5b402fb74a6e90dc8fa986b08ab6282eff52ac376ee6baa288d95252cfac6a7860ae9864e61ef3b2f3
diff --git a/dev-java/json-simple/files/extra-constructors-from-azureus.patch b/dev-java/json-simple/files/extra-constructors-from-azureus.patch
deleted file mode 100644
index 9393944179ac..000000000000
--- a/dev-java/json-simple/files/extra-constructors-from-azureus.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- work/json_simple/src/org/json/simple/JSONArray.java	2006-04-16 04:04:24.000000000 +0300
-+++ work/json_simple/src/org/json/simple/JSONArray.java	2007-06-04 17:43:56.000000000 +0300
-@@ -12,6 +13,18 @@
-  * @author FangYidong<fangyidong@yahoo.com.cn>

-  */

- public class JSONArray extends ArrayList {

-+	public JSONArray() {

-+		super();

-+	}

-+

-+	public JSONArray(java.util.Collection arg0) {

-+		super(arg0);

-+	}

-+

-+	public JSONArray(int initialCapacity) {

-+		super(initialCapacity);

-+	}

-+

- 	public String toString(){

- 		ItemList list=new ItemList();

- 		

---- work/json_simple/src/org/json/simple/JSONObject.java	2006-04-16 11:26:38.000000000 +0300
-+++ work/json_simple/src/org/json/simple/JSONObject.java	2007-06-04 17:43:56.000000000 +0300
-@@ -13,6 +13,22 @@
-  */

- public class JSONObject extends HashMap{

- 	

-+	public JSONObject() {

-+		super();

-+	}

-+

-+	public JSONObject(int initialCapacity, float loadFactor) {

-+		super(initialCapacity, loadFactor);

-+	}

-+

-+	public JSONObject(int initialCapacity) {

-+		super(initialCapacity);

-+	}

-+

-+	public JSONObject(Map arg0) {

-+		super(arg0);

-+	}

-+

- 	public String toString(){

- 		ItemList list=new ItemList();

- 		Iterator iter=entrySet().iterator();

diff --git a/dev-java/json-simple/json-simple-1.0_pre20080420.ebuild b/dev-java/json-simple/json-simple-1.0_pre20080420.ebuild
deleted file mode 100644
index 15f9e2d60207..000000000000
--- a/dev-java/json-simple/json-simple-1.0_pre20080420.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/json-simple/json-simple-1.0_pre20080420.ebuild,v 1.1 2011/09/25 09:21:35 serkan Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Java toolkit for JSON"
-HOMEPAGE="http://www.json.org"
-
-MY_PN="${PN/-/_}"
-# Bad usptream not having versioned releases
-# orig SRC_URI="http://www.json.org/java/${MY_PN}.zip"
-SRC_URI="mirror://gentoo/${MY_PN}-20080420.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/extra-constructors-from-azureus.patch"
-	rm -rv build lib || die
-	cp -v "${FILESDIR}/build.xml" . || die
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-EANT_BUILD_TARGET="dist"
-
-src_install() {
-	java-pkg_dojar dist/lib/*.jar
-	dodoc README.txt || die
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/jtds/ChangeLog b/dev-java/jtds/ChangeLog
index 40ba61ba8c39..b4f92cb5eb8d 100644
--- a/dev-java/jtds/ChangeLog
+++ b/dev-java/jtds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jtds
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.33 2012/12/26 19:13:33 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.34 2014/06/17 11:19:24 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -files/1.2.4-buildxml.patch,
+  -jtds-1.2.4.ebuild, -jtds-1.2.5.ebuild:
+  NM: Cleanup superseded ebuilds.
 
   26 Dec 2012; Jeff Horelick <jdhore@gentoo.org> jtds-1.2.5-r1.ebuild:
   marked x86 per bug 440314
diff --git a/dev-java/jtds/Manifest b/dev-java/jtds/Manifest
index 63e33933181b..bad61b65f436 100644
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX 1.2.4-buildxml.patch 1009 SHA256 79cb55d1a57b7d6d1f89ace77ddf71a3248ac213adb1e2059d7ebc2d4701fa88 SHA512 6cbee0e153ee66a5f7120ab297784093e4719b057d91fa3e4c36ce63066b71e06509c46b4aa07973675c7c08dd1e9915859344936be1fe9a510c93975202da1d WHIRLPOOL d4f04d37d4c23550d80f31844258f8e408e14e9d22586314bc54e206b0cb5ef94936174b49dec1dd64578b36e46a4aafaa3ea587ae44d63da3fc592d5d053ae9
 AUX jtds-1.2.5-build.xml.patch 1009 SHA256 79cb55d1a57b7d6d1f89ace77ddf71a3248ac213adb1e2059d7ebc2d4701fa88 SHA512 6cbee0e153ee66a5f7120ab297784093e4719b057d91fa3e4c36ce63066b71e06509c46b4aa07973675c7c08dd1e9915859344936be1fe9a510c93975202da1d WHIRLPOOL d4f04d37d4c23550d80f31844258f8e408e14e9d22586314bc54e206b0cb5ef94936174b49dec1dd64578b36e46a4aafaa3ea587ae44d63da3fc592d5d053ae9
 AUX jtds-1.3.0-build.xml.patch 285 SHA256 995cf012aca97c6908186b3a96723d965a9dd17e5e3f5fc3730dd56da46bc6ab SHA512 9ec6a3e92d33ebe5bb62cd25814729b3f95ee1fc4ff9aa72257fc26106d469de431d60f40972f61c2bc193d8b6f7c2ba181f00f11361d6f79b78aa530b34f1bd WHIRLPOOL 84df412ddf7f46a702408c56894d787bab3ae2f32b4bc9fe5aab815f0075e24f3cbfdbbca415c3f9729902a7cf950ed4b3ef496de5910f90ed3dc95f93f137cc
-DIST jtds-1.2.4-src.zip 3875862 SHA256 a47e8ae732287a3e693a0663e221bac1b71ba4548754b246ad827bd2cda748cf SHA512 99f82f247db4b7a9af9d0942e9adf561ff71224a43df38fc4faaa81b04186a6aa770e761678a144fbb22ac3c43c2b535922a214e64ac262c367976bee411ea4e WHIRLPOOL b9ab5fad3cce280b9501ff353e530626c7e146e4e0300888069cf9de901280e859cfe36ec50da2a458b101021940ffb073ecf09eadaa3cad352f49598a203c65
 DIST jtds-1.2.5-src.zip 3953955 SHA256 d86c7244826543d2f2f9cdc1d50888003596c1ec18f30808b21627e8889e9114 SHA512 d2b496a7aac4e4c9c0e164c1514d2d21392024903e1376b13fa6a3396d045a1bfc6a085b2beb1202703a6b6e59e8b534bc82508fcb58c71a25b6a13a3d051eda WHIRLPOOL b5e88e6cdb00f797de1d824a7581d693111d4d746ce6d5a709934ce00befbed4fb4c3b248448715bdf27691c33d8f1cca8ca270e942eb27907cd2567e919084d
 DIST jtds-1.3.0-src.zip 3377646 SHA256 9f500d9eb243e87ef16fbec3909d297b7261893a298646223c9722162ab43c75 SHA512 a07b0a69ecf055a6b2fac0a0cdf3f7562fefb7c4e4c65eed96cc9b667a66b4b4a0de543d904d8a9871031e181c0e75c450afb2f01bfb7a504d1abcd9776216e9 WHIRLPOOL 65707009909715fdfbdcc54b0345c657ec226810414b7d5a3fa08ec04b5eaa11950901221f5934a0e81739cfba70d004368dd7e2a95125d93d981204bd67072e
-EBUILD jtds-1.2.4.ebuild 1099 SHA256 cc8a33dafdc68ddb864fd391395837a7564182c8fe155c32b5125ae86c1973dc SHA512 bd9e970b73ef2149d87c2d5139ee73531d117f64846d46476929cac7702c3929b062b171c0b19f9918cc87a1d7a5fec0b567d7525bffcfe2744da9593102d6f8 WHIRLPOOL b80b049341ecd68efcf71ff7572be5ad85d7c4e64e963e5f1285224e312c0fb78b4389c84c5c58526bc3318cf770a034ab97b1f37dc26011fd020dd8caf555ea
 EBUILD jtds-1.2.5-r1.ebuild 1129 SHA256 6e369dd8a7a1dcd859c5db37986e106efb24f9e962219521ad6b85e98d1b3748 SHA512 aec43bf96b1de8070673e6cf8712dbe177ca97d8f88858191576ab6d1bf23ecb2ec60148f3bcd363d79e0380791760e9036ff8569d498ff43b183d7404679be0 WHIRLPOOL 9b71478600806076ca03777462ee75aa5e112bf7b6d40899b9e1c6aa77dd5007368990e35aa3bd1176d1d9366497ca0e31668ba226597dfc79749dacab41bfc6
-EBUILD jtds-1.2.5.ebuild 1076 SHA256 f2f42caa15f0fbbf1c207e14ee2f23c7b03f5d1ed413ec81ff196e17ef84ba1a SHA512 9df49f6d8dd501eea895af2fd241882a76c6097ee656c7e75bd46a6742c5787678e91db46678019f268cb3de1fb33d68ef4bfc27950c5357b3c0a56b2523b128 WHIRLPOOL c73d9750d74316f6a110b9c0bd8f297866d891fcdc697f3fb56f63622990cbbe81f45454fc4a04200f02f89d7080ea56ee9796200649f3559ad9925e70d86f8f
 EBUILD jtds-1.3.0.ebuild 1101 SHA256 b9685a1a77738daa071dd91a951a4a2ee658463feb050ff5bd152b7bc7076635 SHA512 3787f33ca16130fbc22bb827bd29ce80760d7e25e33e2d29ca5e3ccd86a90fbadd131840555baf8b3c4b9cfe9d7d2f1c88569b422515ccd2584ab600877aa6a1 WHIRLPOOL a051a179e6e22b667d40e8d6c088030122d0e2e457b742352346d13acaf31a47a1ab03a934997f50c3f7958f3fdd70530ae863400ef6b603fcfbd0afd469b946
-MISC ChangeLog 4909 SHA256 ecd994e93f24ab6541056f714a682c554bf40285e8fed37394fb61b9b96e6bc2 SHA512 ab1a83f7578c3774d97afbf5751c92e408a8056afb4821cb359576be1ac74d71e69d3111f30db19e5d2017a6880c556e24bd64c4c180a1c825b02dee8de544ef WHIRLPOOL e2b8648b254c7e910187d7278dfe32829465c6b4d8664dd0cfe1bac0b0108e61d9600352972177b6fddd59b6bdd52eab04d8570e6fedb9485757631feb64f565
+MISC ChangeLog 5062 SHA256 f976aa943c8f2387e86a42802980bf77b0c11bad9af836ecafb0a744321ce7fe SHA512 fd161897b1175f82bfea68547a6f5ebfdbedb1d74d2b2df70a78f3fe23d14a4040222d53c24c6524764aed0c73e29a1ee691931c9aa72b668fcbc5328233ba2f WHIRLPOOL 47c987b87bf9c648600d2cb737f42ebad87027d3d14115cba066c72b3b47f8a18b688eacbc6fcf44e955128f5531ba4f7011868119bb8bd2fb2d98b28348f73c
 MISC metadata.xml 723 SHA256 465dd20f6c462d27f6ea146e8e74123b9fcb70d59476e7f2be93f5b32d71d47a SHA512 f6c39c65fde1f2ef766ddf6a3574fb9fe96122e8789d870678b416755c7497b648e72ff98d12c940fc69392c065eee5d2b3a6b2e7b4e48f89af1d0da32c2d810 WHIRLPOOL 0173482879a754497fee42fbb3247aa6dfc2dd13756866741aee23637cf6a7a1218501e640b646ccf28fe38d3a0a58ec5e006129ca49187442d679892a349463
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCgAGBQJQ20xeAAoJEPUd7O0j6ekArWEH/jQ/vBRnlP2yLJbgm3PX3Zx7
-y9ASgO4KvlFhOyxOqEGqTQqC1rHNvIMBM+CqbkP0ct9KGIWNOkJlMzedNrlw7NY4
-JFph+MuxbSsC6khKKNuH4NRbE8tPhPzcw/97gZxKuHTC7cmzkJi13lnmcM7JiGjr
-v2jJ6kLJxyIiMhNe6eQJny+QLFybTtuLVGJnvSJx3JdBxwnceYK2TKBsHOT1km21
-769lxJmf+1iMIrZSqVbv93/24JC9Vrj4PEv4Fp28vRX7MPFE42jBy3rmdCcmd6C8
-KDCM6lw24jP5tbhgSeM/FTXLc/QaniI+ngpbGKYcYgnKl/86mzqsLNPnyEFfXE8=
-=9lYU
------END PGP SIGNATURE-----
diff --git a/dev-java/jtds/files/1.2.4-buildxml.patch b/dev-java/jtds/files/1.2.4-buildxml.patch
deleted file mode 100644
index 333197fbb4c2..000000000000
--- a/dev-java/jtds/files/1.2.4-buildxml.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- build.xml.orig	2009-11-07 18:55:41.000000000 +0100
-+++ build.xml	2009-11-07 18:58:17.000000000 +0100
-@@ -75,13 +75,13 @@
-     </junit>

-   </target>

- 

--  <target name="dist" depends="clean,compile,javadoc">

-+  <target name="jar" depends="compile">

-     <mkdir dir="${dist}"/>

-     <!-- Runtime jar -->

-     <jar basedir="${build}/classes"

-          excludes="net/sourceforge/jtds/test/*.class"

-          includes="**/*"

--         jarfile="${build}/${ant.project.name}-${version}.jar">

-+         jarfile="${build}/${ant.project.name}.jar">

-         <manifest>

-             <attribute name="Implementation-Title" value="jTDS JDBC Driver"/>

-             <attribute name="Implementation-Version" value="${version}"/>

-@@ -92,6 +92,10 @@
-             <attribute name="Main-Class" value="net.sourceforge.jtds.jdbc.Driver"/>

-         </manifest>

-     </jar>

-+    
-+    </target>
-+    
-+    <target name="dist" depends="jar">

- 

-     <!-- Source package -->

-     <copy todir="${dist}/tmp/doc">

diff --git a/dev-java/jtds/jtds-1.2.4.ebuild b/dev-java/jtds/jtds-1.2.4.ebuild
deleted file mode 100644
index da9ac164f2a1..000000000000
--- a/dev-java/jtds/jtds-1.2.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2.4.ebuild,v 1.6 2011/08/07 11:59:16 xarthisius Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-HOMEPAGE="http://jtds.sourceforge.net"
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="amd64 x86"
-COMMON_DEPEND="
-	=dev-java/jcifs-1*
-	dev-java/junit:0"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPEND}
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEPEND}"
-
-S=${WORKDIR}
-IUSE=""
-
-# Would need a running server
-RESTRICT="test"
-
-java_prepare() {
-	epatch "${FILESDIR}/1.2.4-buildxml.patch"
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from jcifs-1.1
-	#TODO: don't always build tests
-	java-pkg_jar-from junit
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-
-	dodoc CHANGELOG README* || die "Failed to install docs."
-	use doc && java-pkg_dojavadoc build/doc
-	use source && java-pkg_dosrc "${S}"/src/main/*
-}
diff --git a/dev-java/jtds/jtds-1.2.5.ebuild b/dev-java/jtds/jtds-1.2.5.ebuild
deleted file mode 100644
index 5aadc941794f..000000000000
--- a/dev-java/jtds/jtds-1.2.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2.5.ebuild,v 1.4 2011/08/07 11:59:16 xarthisius Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-HOMEPAGE="http://jtds.sourceforge.net"
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="amd64 x86"
-COMMON_DEPEND="
-	=dev-java/jcifs-1*"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPEND}
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEPEND}"
-
-S=${WORKDIR}
-IUSE=""
-
-# Would need a running server
-RESTRICT="test"
-
-java_prepare() {
-	epatch "${FILESDIR}/1.2.4-buildxml.patch"
-
-	rm -vr ./src/test/net/sourceforge/jtds/test || die
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from jcifs-1.1
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-
-	dodoc CHANGELOG README* || die "Failed to install docs."
-	use doc && java-pkg_dojavadoc build/doc
-	use source && java-pkg_dosrc "${S}"/src/main/*
-}
diff --git a/dev-java/jupidator/ChangeLog b/dev-java/jupidator/ChangeLog
index 882d4366936c..01e963596403 100644
--- a/dev-java/jupidator/ChangeLog
+++ b/dev-java/jupidator/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jupidator
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jupidator/ChangeLog,v 1.11 2012/04/13 18:45:08 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jupidator/ChangeLog,v 1.12 2014/06/17 11:20:00 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -jupidator-0.3.0.ebuild:
+  NM: Cleanup superseded ebuilds.
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> jupidator-0.6.0.ebuild:
   Move EAPI assignment to top of ebuild, bug 411875.
@@ -43,4 +46,3 @@
   20 Dec 2008; Serkan Kaba <serkan@gentoo.org> +metadata.xml,
   +jupidator-0.2.0.ebuild:
   Initial commit as a dependency of jubler.
-
diff --git a/dev-java/jupidator/Manifest b/dev-java/jupidator/Manifest
index c4a9914ef450..4b7573c3e910 100644
--- a/dev-java/jupidator/Manifest
+++ b/dev-java/jupidator/Manifest
@@ -1,6 +1,4 @@
-DIST jupidator.0.3.0.tar.bz2 202191 SHA256 ff25fc71f5c93b0e2e2c697cacc918bb208557bd7e9fd9cafc9c7b4421d87d77 SHA512 d627eef76b68cbe965dfbf3ab7c65c8621716278248c3fcc461ec88e061e6816b920d43b2e8f5d351255c19ad1027da64053bc2ed1c3e1aba727b74ac02be291 WHIRLPOOL e1cf7ff06ed358141209bfb932d472091c4cc91d88480db6c7cdc580d63b49c55adfe6c2739efe41529b800ecf0ec23c59e358435aeb554978121e667941770c
 DIST jupidator.0.6.0.tar.bz2 253170 SHA256 00213313f794363cc3b4dd8c335cb35cc8582d0d56d72cb941b3edc8f2b94580 SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415 WHIRLPOOL f8625ac738c610c1b3ed60f05a140b0e7367d97189bc27e70666886879c1da74117df360b938718861a4f8a52fdea7e8ed8355b68b33fb459272145481a3f45a
-EBUILD jupidator-0.3.0.ebuild 1204 SHA256 3028f252da95ff5643058535f89aee0614f09732980ed66dc6402a96bb2f91aa SHA512 4c80d6b0a3247e073a951a592eba7d227b3aac1ef4d32ae569e6be3434bbac7052ca88fedd4a1ad3d80799c906a120f795de4448d70e5c150e67025d4f5a9d54 WHIRLPOOL bbaca4e39838371d53f87c597b421f9c4e2f9894fe3371b25886d8a98aaad760545f57c2a105a10400997b0af4fe37f30ea4c85878559c4af9cf4f8ffc14c4c3
 EBUILD jupidator-0.6.0.ebuild 1198 SHA256 bb4c46bdb7accad4aed1570dd01882b99e6cf40c50c41fc047f8ba9c0e6ec0be SHA512 00b1f83fc01aee248eb60f5d4745797021069810c8fb77f729af5413c09fc0de2334365dbd8940d2f338bae06e925a88c0ecad7fc571a8ecae760b8bbcab1f2e WHIRLPOOL c52f1114e97fa244234f8f5b085fd2a61278aecf9b558415e491bbf12fbb0d7131f5cdf2e284ea8199ca2e1c1b60690188d14337c3fa7bfc6eed0978a65b9399
-MISC ChangeLog 1491 SHA256 5bba7b592d95d1506eddde54c815307cbe0a19faaa0c04c13e349176afe7637b SHA512 00ab8cfbbb6cbfa816bbb2d88f1c8798657b21e11c85eb5028e5f63a4a2af3d30c855dce152cd0d0c370c57a516185f52ef4745ec58d363a3401ee14d433af2e WHIRLPOOL b97926d6d21c653183e8ee6daa6535d1c31081137f07216b6cbb5a28e49832a0ba17145d93e70cca4e927d8dd26cf8977619b4c04088b0712ce22329fd53a362
+MISC ChangeLog 1600 SHA256 f38fbb113b0e74731829d4d208b0aba46b4512e998c06cfbf60de953719cd6ea SHA512 d110fd59d266ab3e57d5233a6e64abcf2a993f8b375d3c1f8d1a31123ca015bb86c8ab6b9b51a8bea11a4d6ed02643e91bc0fd8dce6ed4fd0d2811e21e143524 WHIRLPOOL 87af6924d8ae2bf66c52276af2734e9960de77e74aa7f42cc594850efeef3f6b53080f05709e5ffeea055a53fd963b148a1dbf9cfc233aa00d5f130f32a15058
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
diff --git a/dev-java/jupidator/jupidator-0.3.0.ebuild b/dev-java/jupidator/jupidator-0.3.0.ebuild
deleted file mode 100644
index 21030fdc1a2c..000000000000
--- a/dev-java/jupidator/jupidator-0.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jupidator/jupidator-0.3.0.ebuild,v 1.3 2009/07/05 15:37:04 maekke Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Jupidator is a library/tool in Java for automatic updating of applications"
-HOMEPAGE="http://www.sourceforge.net/projects/jupidator"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/ant-core"
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-core
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	rm -v dist/*.jar || die
-	rm -v src/java/com/panayotis/jupidator/i18n/*.class || die
-	rm -rv src/java/org/apache/tools/bzip2 || die
-	#Bundled ant classes
-	java-ant_rewrite-classpath nbproject/build-impl.xml
-}
-
-src_compile() {
-	eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)" $(use nls && echo i18n) compile jar
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	use doc && java-pkg_dohtml -r dist/doc
-	use source && java-pkg_dosrc src/java/com
-}
diff --git a/dev-java/jvyamlb/ChangeLog b/dev-java/jvyamlb/ChangeLog
index e174209face4..3fa046bbe55d 100644
--- a/dev-java/jvyamlb/ChangeLog
+++ b/dev-java/jvyamlb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jvyamlb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyamlb/ChangeLog,v 1.8 2010/01/03 21:16:23 fauli Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyamlb/ChangeLog,v 1.9 2014/06/17 11:20:50 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -jvyamlb-0.2.2.ebuild:
+  NM: Cleanup superseded ebuilds.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org> jvyamlb-0.2.5.ebuild:
   Transfer Prefix keywords
@@ -30,4 +33,3 @@
   16 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org> +metadata.xml,
   +jvyamlb-0.2.2.ebuild:
   Added ebuild by Chewi from java-overlay, with some fixes from me
-
diff --git a/dev-java/jvyamlb/Manifest b/dev-java/jvyamlb/Manifest
index 4db43a080cc0..776d7526d8d8 100644
--- a/dev-java/jvyamlb/Manifest
+++ b/dev-java/jvyamlb/Manifest
@@ -1,6 +1,4 @@
-DIST jvyamlb-src-0.2.2.tar.gz 1146249 SHA256 59a6a2975ad7515e68016fdb088b13013f739f9c7c348658f8eb6fb4beee459e SHA512 d7a2a58c2057b517bc5207430527f6804e0bce31197e1fe627af09e40d2166a43f5a7068631605d3c71ba23ee9c7f40e20ec2ad52359afc905c196185681afbf WHIRLPOOL 64279f97e5ed7a921b01264bda014dd30d53ecae6c63a1f3e00c5f8d10876493dc8514565039f3366ba9fd8a679cce8d19316282c15699d8c626347eadcea576
 DIST jvyamlb-src-0.2.5.tar.gz 1767828 SHA256 49294affa1a43dbd169c0f983575b4ed4b15e02079740115bd4c9cf9401c8793 SHA512 1e853ff957b888d706a4d264aac4573cf4aced02604e2679d5871f3a92c016136a7fb73adf5d5c0be0cea9f28b4bc6faf11abc0334fe2f96a251a7d9cc228711 WHIRLPOOL 150906b115fa76e0837422d5b139721a072e6ccfda376a9958bc8c7731cdb2c4142fedadd2148bd4cfc35314c8177b34c32819b7716ba212544f4c84543669f1
-EBUILD jvyamlb-0.2.2.ebuild 1050 SHA256 ea911d04083e925b82ee7a77e96aef76f2ab7f3bc59cafaf34a92c67ead769a2 SHA512 4ce36aa3d66f7012eaf91f2dee67dc34449f01dd25e81cdb39fb3b4bf4cc449b5328cfafe229f78c3fc73772cbbf0900b41fd93787e764c65cf87578ea8c92aa WHIRLPOOL 2c64cd88bf75b4849a9fa2abe840def010638b6464eb15a20f75c4ae6b2b357c9248703d7efaf92a7d8cdb4a6ca567167fe7be78c13aa40e9a7822c2a7433477
 EBUILD jvyamlb-0.2.5.ebuild 1124 SHA256 542d186673fdf65c8033017029f0d9ff64976eb1412c9eb46b42dcf86a9ec6df SHA512 0545fb62bbfb5ee78d00c964480095929512e0db1f22b8eb8d939ba6075cbdd87e1c089b4b0071cc5b08dda9e25642ddb65f92a3c90687d4a418b4e721a66d17 WHIRLPOOL 577a80b5d20751a0f24c521487e579d0183f3b1238e879f73f192a53d5015701746d407b348e5d06be0ebe2652c4018ecb926538ee741afe2b59bf96c884b3e1
-MISC ChangeLog 1153 SHA256 495615f4ee523718bf979fe617042b76bbb9d81fa27cc9200cd725c1a1c3e862 SHA512 c2e4620799dc83121fa94a175ad60264932742645e4e233e30c9171e40eda6db4a1af240de8e1ba4b101293a059ee25a5c5587c8556dc67bbd7a13561158bc99 WHIRLPOOL 0e409dce1693ebce7c76dd039cf6a7200ba5f4046ac6e3bff9ccc4b01a79dd11b7011a82728398877298ee48352cd881d010bd89c8a2f9dde30669fff08dc000
+MISC ChangeLog 1258 SHA256 06208b1302a550244903efc48040750b30979ef34f91dd433cfef024e81d1714 SHA512 e1492ec030007ac0052789321a4f32b6fce975886aca78ee11b6fe1567461e4705b749cff1f7012680ea3c75c39897864fc01c1c48ea7306e36ceba18ecf4d69 WHIRLPOOL 999fe5e9ca368e083a26cad6cec8e35d1b89ab1af7005ffa0dd6b6b10225c42f0bb682123bdc1d954d75272e0ebc7ffeb7346335516dfb6fc0b88d26835efab4
 MISC metadata.xml 297 SHA256 66f129ea59439fdfdac4ef63a16bd9cb7296d150f6a7fd3d705483ddfb54d750 SHA512 be71eb8a26ad004b6b048d667f2f612605c0563543514a40655db80881dbf5ca16427526084300f9446745fd1a1771cfa760cf055785077bffe50436310c6c21 WHIRLPOOL 3707e59f264d4a7c8114a4c96467c4ee6a6174937ff122d77979f4a3b9e2e74ebe5bbba04942c14d0d2e849aedced5257bd32cb22ddffcfe47af4f25fddc96e7
diff --git a/dev-java/jvyamlb/jvyamlb-0.2.2.ebuild b/dev-java/jvyamlb/jvyamlb-0.2.2.ebuild
deleted file mode 100644
index fa45d8ffc218..000000000000
--- a/dev-java/jvyamlb/jvyamlb-0.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyamlb/jvyamlb-0.2.2.ebuild,v 1.2 2009/01/05 22:02:16 maekke Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source test"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JvYAMLb, YAML processor extracted from JRuby"
-HOMEPAGE="http://code.google.com/p/jvyamlb/"
-SRC_URI="http://jvyamlb.googlecode.com/files/jvyamlb-src-${PV}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/bytelist:0
-	dev-java/joda-time:0"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="bytelist joda-time"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -fv lib/*.jar || die
-
-	# Don't do tests unnecessarily.
-	sed -i 's:depends="test":depends="compile":' build.xml
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/libmatthew-java/ChangeLog b/dev-java/libmatthew-java/ChangeLog
index b05c083d70ea..47992f1bba5b 100644
--- a/dev-java/libmatthew-java/ChangeLog
+++ b/dev-java/libmatthew-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/libmatthew-java
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/ChangeLog,v 1.18 2012/05/29 10:06:52 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/ChangeLog,v 1.19 2014/06/17 11:22:34 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/libmatthew-java-0.7.1-makefile-fixes.patch,
+  -libmatthew-java-0.7.1.ebuild, -libmatthew-java-0.7.2.ebuild:
+  NM: Cleanup superseded ebuilds.
 
   29 May 2012; Naohiro Aota <naota@gentoo.org>
   files/libmatthew-java-0.7.2-makefile-fixes.patch,
@@ -83,4 +88,3 @@
   +files/libmatthew-java-0.7.1-makefile-fixes.patch, +metadata.xml,
   +libmatthew-java-0.7.1.ebuild:
   Initial ebuild. Fixes bug #161680.
-
diff --git a/dev-java/libmatthew-java/Manifest b/dev-java/libmatthew-java/Manifest
index d55e54bcd4ef..b80bd596fb3e 100644
--- a/dev-java/libmatthew-java/Manifest
+++ b/dev-java/libmatthew-java/Manifest
@@ -1,9 +1,5 @@
-AUX libmatthew-java-0.7.1-makefile-fixes.patch 2288 SHA256 e7e215791193681ae3baa0612c4d9bcc5ef32dbd605eec137926aa81a70000e9 SHA512 2649c2147cd6e4cc0bfcc6aa944108c02a34787e945bff3517722dca9fb40518926991e836d60deb687ac1fce9f0c4411f96aa63095dd84206ccccc1b0dff047 WHIRLPOOL 45c3a36b909c7836567a8252bb5e721783e3d243ab976cd7aef2e5e56b4f137c685dce78be47f10ee1be79857d3e240d6683bb8629a646645629560ed3281555
 AUX libmatthew-java-0.7.2-makefile-fixes.patch 2545 SHA256 8f771431c745595c42426a1d7b339e323e34c21aa7d6a342f70dea531490e0cb SHA512 698883f9f0a6485c7d751c70441d0791ddeb78260eceeefff1661983d04d81960c652f9dd64522cd3431981549689b8c9d3051674da5b0871124c912b4d9e3f3 WHIRLPOOL 636640657809835b41ed89f71d7aa878fea7330f6c5dd25f155885db6d1c9225f12752959607c39dd0dc290a7032845c4057ef8ba2c02e01a6feaabf317f1f9b
-DIST libmatthew-java-0.7.1.tar.gz 35894 SHA256 003c44be21859d1495c0571e249ce17edd5ac58636f67b6a8bc4f395a6c7e6a2 SHA512 7eaa098d1ff2bf41241dcd9884bcbae67f4b6ba0aafa9551a2e78db440f26a8dc37bdff416dfca0f217d6acec98c37d26a8d79e7f3bc1db7832cc68e5d2810a5 WHIRLPOOL ca691478dac0e85c4f416430ef466a5694d71d9624b9a1fbadc3660c656e4e88ab980b5536b1a6ed6fbe6a910cb5774a0860e9f75215880ee196fe76b59989c1
 DIST libmatthew-java-0.7.2.tar.gz 40601 SHA256 9f48a00caa8c9731d7056346ba72445ebca508e17715e32e310aee45ef36ed03 SHA512 d4a0024fb17221dff4d787b83fd5d9b4a189db0b3110291066f037dc33c009d479a3b94ec8d7c00ab5a39731ec8015dba212f367a858f4329e9d203325fec02a WHIRLPOOL 772118df8f11ddba8fd89ec1b29af63a3414a9e681b52bab591c1a57866b6cafa5efbfe248f1e3270b675bb07fdcb07a9ae05a748e45154d9fffbe2fb5887958
-EBUILD libmatthew-java-0.7.1.ebuild 1445 SHA256 be88a10b3e30fcd6b65e7a04e0d22d8361cedd22e580bdfe8828187242516bd0 SHA512 484834f6df23d30895d21ddb805356eeecbd1aeaeb0de24ae9baa5dbbee645170bdd7a179f8a824591f58dd7755589ea6b3c9b0050ce9ba8589669f423e3480c WHIRLPOOL 33f77d7732b57f21b1cb25fbeb39ccb525e1a5bbccbed28547a0c102fc7ca216bd0a3510bc97b84fb89f935d840df674f586a401acb13a7772f736e1608fb2ca
 EBUILD libmatthew-java-0.7.2-r1.ebuild 1428 SHA256 0693196ba115783e085454adee217a46110afc0873fdb740e5520da4a15c03ae SHA512 a697ea5a6dbac5c49443e28ad99dbf2bfbd738f7a33a1328ce086784a9360a5b5d34610ec0ca16191c2d1b4ad6f003c99ec834d99209247b236f635cd8c15ae3 WHIRLPOOL ec59f8ce89706d3a045de94d09faf028a64c16b64ba942d6687c4ec4f58f8086ca780c564999937ba07c013535a7eac313d95521d8e8a0f7cce86712fffcbfee
-EBUILD libmatthew-java-0.7.2.ebuild 1444 SHA256 1f6b652ece39f3b3f4a3668a9a13e35e7dacf50d9bf2d71b17ce4d9f02483f36 SHA512 5f672668ffb04573c8f9735b4ef03ac8c9ee93a6b91ddaecaad78595ed9bf50fb445a62db33dc861012fc173693ed5fcc0f7da725f5e468bf9783bb24ff0cc91 WHIRLPOOL ae75f080fdd5e71cab551162fa15963486350d9a2b5fab18996c3911fc9bf699c2f244302579e836fbf3e08bb88d8452139cf53ebe2e9c40bce5b254c4711b34
-MISC ChangeLog 3025 SHA256 0fdae2f3594b9eafa9dd0c82077a541ccf24c37a0429063a864699643035d5e7 SHA512 c4e0e2c23fe887a20384a461294a2facb1bff0ab198b327096e2edbae18951acfb8f555e8ac7bece7e9662f7dfe94ca627d4c7b5c034b68b553def691622265d WHIRLPOOL caf7b039261094e5ee012780940dce08b70fad28095748dee33d4746db1fa102186f8339d3fd296a141aa0d480304920628edda9339808db518fdc506ce47b45
+MISC ChangeLog 3224 SHA256 e96a69d7c128856beddca0359e4ddd5ec937b6ffbce9a195cc21cbe455eb7b51 SHA512 793ae7e6946fa02ecec1149a6fd03af10facbbf47d2f3ad3762c9e55070277f10bda2dce47ae66971739a9c0a64c97b51197136f68a0a5f24d0d73e6f9c97da7 WHIRLPOOL ef5207347239765e3fdc45c0cabe1e20d184f0071da15a0cdc67d0766dc6795077d0e9eaa0ee4de7c80711b657457ddd3e96fcb57635156b63e75d96adad0f37
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
diff --git a/dev-java/libmatthew-java/files/libmatthew-java-0.7.1-makefile-fixes.patch b/dev-java/libmatthew-java/files/libmatthew-java-0.7.1-makefile-fixes.patch
deleted file mode 100644
index 0901c40408a0..000000000000
--- a/dev-java/libmatthew-java/files/libmatthew-java-0.7.1-makefile-fixes.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Nur libmatthew-java-0.7.1/Makefile libmatthew-java-0.7.1_patched/Makefile
---- libmatthew-java-0.7.1/Makefile	2008-06-23 00:59:13.000000000 +0300
-+++ libmatthew-java-0.7.1_patched/Makefile	2008-07-19 16:02:43.000000000 +0300
-@@ -6,20 +6,19 @@
- CC?=gcc
- LD?=ld
- PPFLAGS+=-C -P
--CFLAGS+=-fpic -Wall -Os -pedantic -std=c99 -Werror
-+CFLAGS+=-fPIC -Wall -pedantic -std=c99
- GCJFLAGS+=-fjni
- JCFLAGS+=-source 5.0
--INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-+INCLUDES=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
- JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
- 
- LDVER?=$(shell ld -v | cut -d' ' -f1)
- UNAME?=$(shell uname -s)
- 
- ifeq ($(LDVER),GNU)
--LDFLAGS+=-fpic -shared -lc 
--else
--LDFLAGS+=-lc
-+LDFLAGS+=-fpic -shared
- endif
-+LDLIBS=-lc
- 
- PREFIX?=/usr/local
- JARDIR?=$(PREFIX)/share/java
-@@ -57,12 +56,7 @@
- io-$(IOVER).jar: .classes
- 	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class)
- unix-$(UNIXVER).jar: .classes
--ifeq ($(DEBUG),enable)
--	echo "Class-Path: $(JARDIR)/debug-$(DEBUG).jar" > Manifest
--else
--	echo "Class-Path: " > Manifest
--endif
--	(cd classes; $(JAR) cfm ../$@ ../Manifest cx/ath/matthew/unix/*class)
-+	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/unix/*class)
- 
- hexdump-$(HEXVER).jar: .classes
- 	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class)
-@@ -70,7 +64,7 @@
- %.o: %.c %.h
- 	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
- lib%.so: %.o
--	$(LD) $(LDFLAGS) -o $@ $<
-+	$(LD) $(LDFLAGS) -o $@ $< $(LDLIBS)
- unix-java.h: .classes
- 	$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream
- cgi-java.h: .classes
-@@ -85,11 +79,11 @@
- 	tar zcf $@ libmatthew-java-$(MATTVER)
- 
- debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
--	make .enabledebug
-+	$(MAKE) .enabledebug
- 	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
- 	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
- debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
--	make .disabledebug
-+	$(MAKE) .disabledebug
- 	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
- 	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
- .enabledebug: cx/ath/matthew/debug/Debug.jpp 
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild
deleted file mode 100644
index 8a00cd00b5a1..000000000000
--- a/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild,v 1.7 2009/01/23 17:53:58 ranger Exp $
-
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 flag-o-matic toolchain-funcs
-
-DESCRIPTION="A selection of libraries for Java"
-HOMEPAGE="http://www.matthew.ath.cx/projects/java/"
-SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-makefile-fixes.patch
-	rm -v "${S}"/cx/ath/matthew/debug/Debug.java || die "rm failed"
-}
-
-src_compile() {
-	LDFLAGS="$(raw-ldflags)" \
-	CC=$(tc-getCC) LD=$(tc-getLD) INCLUDES="$(java-pkg_get-jni-cflags)" \
-		emake -j1 JARDIR=/usr/share/libmatthew-java/lib JCFLAGS="$(java-pkg_javac-args)" all $(usev doc) || die "emake failed"
-}
-
-src_install() {
-	java-pkg_newjar cgi-0.5.jar cgi.jar
-	java-pkg_newjar debug-disable-1.1.jar debug-disable.jar
-	java-pkg_newjar debug-enable-1.1.jar debug-enable.jar
-	java-pkg_newjar hexdump-0.2.jar hexdump.jar
-	java-pkg_newjar io-0.1.jar io.jar
-	java-pkg_newjar unix-0.5.jar unix.jar
-	java-pkg_doso libcgi-java.so
-	java-pkg_doso libunix-java.so
-	dodoc INSTALL changelog README || die
-	use source && java-pkg_dosrc cx/
-	use doc && java-pkg_dojavadoc doc
-}
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2.ebuild
deleted file mode 100644
index 14d5a8a6f2dc..000000000000
--- a/dev-java/libmatthew-java/libmatthew-java-0.7.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.2.ebuild,v 1.5 2010/05/28 19:31:15 josejx Exp $
-
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 flag-o-matic toolchain-funcs
-
-DESCRIPTION="A selection of libraries for Java"
-HOMEPAGE="http://www.matthew.ath.cx/projects/java/"
-SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-makefile-fixes.patch
-	rm -v "${S}"/cx/ath/matthew/debug/Debug.java || die "rm failed"
-}
-
-src_compile() {
-	LDFLAGS="$(raw-ldflags)" \
-	CC=$(tc-getCC) LD=$(tc-getLD) INCLUDES="$(java-pkg_get-jni-cflags)" \
-		emake -j1 JARDIR=/usr/share/libmatthew-java/lib JCFLAGS="$(java-pkg_javac-args)" all $(usev doc) || die "emake failed"
-}
-
-src_install() {
-	java-pkg_newjar cgi-0.5.jar cgi.jar
-	java-pkg_newjar debug-disable-1.1.jar debug-disable.jar
-	java-pkg_newjar debug-enable-1.1.jar debug-enable.jar
-	java-pkg_newjar hexdump-0.2.jar hexdump.jar
-	java-pkg_newjar io-0.1.jar io.jar
-	java-pkg_newjar unix-0.5.jar unix.jar
-	java-pkg_doso libcgi-java.so
-	java-pkg_doso libunix-java.so
-	dodoc INSTALL changelog README || die
-	use source && java-pkg_dosrc cx/
-	use doc && java-pkg_dojavadoc doc
-}
diff --git a/dev-java/nailgun/ChangeLog b/dev-java/nailgun/ChangeLog
index 4081bfda098d..879af27e15a5 100644
--- a/dev-java/nailgun/ChangeLog
+++ b/dev-java/nailgun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/nailgun
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/ChangeLog,v 1.12 2012/12/16 14:51:37 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/ChangeLog,v 1.13 2014/06/17 11:24:08 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -files/0.7.1-Makefile.patch,
+  -nailgun-0.7.1.ebuild:
+  NM: Cleanup superseded ebuilds.
 
   16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due retirement, #169737
diff --git a/dev-java/nailgun/Manifest b/dev-java/nailgun/Manifest
index 4558bd3ebad7..d9fa7e321193 100644
--- a/dev-java/nailgun/Manifest
+++ b/dev-java/nailgun/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 0.7.1-Makefile.patch 332 SHA256 c52dfea4b4ed38d0e11879c395ef6ed32741f9def6e33448739bc809b194c985 SHA512 593c83e1938213d8090b35dec77d0d372cf2b0a967529b621d58ff743626a4c99da63099db59a66606a10ae98e2d39b20c84b4240045c59455f6700bb89c4efb WHIRLPOOL 389a167315b5ed9cb5a10f8ae88ef375f9511fa6d20c24e6fdfc0045b50ab69386eb79dbb6baa2c7311ba3e2a085cd9acace65c6eed2506870a0d2af2ebd2935
 AUX 0.7.1-r1-Makefile.patch 584 SHA256 5c32be621e0e70568a87b18fec8d0d289b27dcd4386cda7e9e9ba98e9323cda4 SHA512 818cb35a65902cf325d06c85c4a1d896784e90cb6a770e70b3df55b8e9661c6b4d83ad46c6e8cfc99c4e6d572f1e496ccaccd514b24fc6029211b1fa2cc89de9 WHIRLPOOL 9582c72851c753b5e6a9ccdcc95f383dd1585be1a09bbd80c857573d241b7f3601ac837925f5443c57855bcfff84f56746da50902777ca2261d819aeba824863
 DIST nailgun-src-0.7.1.zip 1489813 SHA256 2942760e68fabab1afc3bc447545cb532ae7bd6e779ca4af8b3163d629076e72 SHA512 51867248179487b042f3fe93585390b972d1d95928f92fc6b342c3ae663696b251fcd074c8042c6ae129947105e2203cb256a987b46dd8499bb3964302f1ccae WHIRLPOOL 7c24f82a260eaef397fc694f5e15abfe86c2463d644366bf4d59904cf632e301ec5c9f26d0a63aff4491c196bbf3b8dfa612862e59d488eaf3af6076abacd1d8
 EBUILD nailgun-0.7.1-r1.ebuild 1748 SHA256 5a09f05f503d5f98a611854c56fe813971efa11fee37d5029179dc4e5d76f9f8 SHA512 a4f02a74084d54d5d81b020ad4f88d004aa8dffcb755220989fdec7ad54aae68ab90d82f6ff1ba75edab893364857a7f5fa31ea1185437a4d9958ee0b5a0c3d6 WHIRLPOOL 697bb81cf9b891ba5f9c4a3b743b1ca0f5bc992b3e4d2675c9cd242a63da1c1bf8ade545a17c84a98727f3adfe080c57e7a256640ea7957698e12e4417d5ed4d
-EBUILD nailgun-0.7.1.ebuild 1740 SHA256 dd6d813519e1fd178162a1f1c5fc4f97c7500f7143120dc23685692e6dc341dd SHA512 a4f4fb71d4099e5f3c855a9384191dbf6c48e76a013f1002d539e7885fbc08f75413bdfb4b819d877b57e149dd94d1905645f422babc21202aaf23773175cf3f WHIRLPOOL 518332179ac9829504e95fb2d04da3a118a05dddcd433383821fc46628b5737ebc29cfb14f8cb0f5d12461e34c512b9bc318d069acd8baaca127add0cad9162d
-MISC ChangeLog 1652 SHA256 13959c932a159391233336d50c30420f8cdd0967ca3f9cbffa57e3de182c1555 SHA512 8982d14c3887c6d0d2ba8b44b68ea81cfcfd7d7b6d988ccd690b8ef2208f931ba5061c9f1827ddc7a9d3d4c82e53ac68d9a19ebc3024da3a71ac9d42c82953bf WHIRLPOOL cd0df5aba941a43d5fd47ae7a13d38ecb9c953c11059a144e616b2b8e366cfe4bbdd2236c2c31d3fa0c6a6ec53443036d3084c71c49b4f613802853cdce9dd6e
+MISC ChangeLog 1789 SHA256 e1f746399a1e3925f659f9c7ab6fd3c1efb0ba93ec56e0c30e1181c41fb7b619 SHA512 fadf48b9fea6b94961bbdf4a7876b726625b682cdf82e0a581d2b674703828b15e05ff85ba1bf2891b628f7181c4b732b6d82846ba5f09cf94f7164c0dc03a6a WHIRLPOOL 70cd326fdebaf05b073aa33779796d62ff9ffb7deac1f92506eefd5c0ed8f6b6a333b371f015f6d261dc0d566525f5e86d195b50537caaa4dded713645730fe5
 MISC metadata.xml 474 SHA256 10a8eb25ec6d2b77fb14f6f35778ff95ad48336d3c4d4258a92d2bd68b9b9be4 SHA512 08222ebecc9fb0a1f4f5c0824cddf9311bfb121345311812cc286a0e5d993cd465ca6749cca920ce03b953af86869b36988edda9f91811706344008ca55c3679 WHIRLPOOL 532eeb243f05b927bec54be14a5fe82d58cd254e95679a7fe37e2d050e9c85aa3772160bdec35393f1c7b210c5c61902b647e54593678f4971af1c395032449f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDN3/oACgkQCaWpQKGI+9TmzgCbBSQtRz6RM35G/tbrsHks2KTR
-ybsAn1RPdORNUG79nVLPR5IAPCoo3+nt
-=95iD
------END PGP SIGNATURE-----
diff --git a/dev-java/nailgun/files/0.7.1-Makefile.patch b/dev-java/nailgun/files/0.7.1-Makefile.patch
deleted file mode 100644
index fe489d46ede9..000000000000
--- a/dev-java/nailgun/files/0.7.1-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	2009-08-07 23:44:55.000000000 +1200
-+++ Makefile	2009-08-07 23:45:43.000000000 +1200
-@@ -5,9 +5,8 @@
- #
- # Marty Lamb
- 
--CC=gcc
- WIN32_CC=/usr/local/mingw32/bin/mingw32-gcc
--CFLAGS=-Wall -pedantic -s -O3
-+CFLAGS+=-Wall
- 
- ng: src/c/ng.c
- 	@echo "Building ng client.  To build a Windows binary, type 'make ng.exe'"
diff --git a/dev-java/nailgun/nailgun-0.7.1.ebuild b/dev-java/nailgun/nailgun-0.7.1.ebuild
deleted file mode 100644
index 59c07bd3d869..000000000000
--- a/dev-java/nailgun/nailgun-0.7.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/nailgun-0.7.1.ebuild,v 1.10 2011/08/05 16:08:14 ulm Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="a client, protocol, and server for running Java apps without incurring the JVM startup overhead"
-HOMEPAGE="http://martiansoftware.com/nailgun/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="test"
-
-RDEPEND=">=virtual/jre-1.4
-	!app-editors/ng"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/java-getopt:1
-	dev-java/bcel:0
-	dev-java/jakarta-oro:2.0
-	dev-java/log4j:0
-	app-arch/unzip
-	dev-java/junit:0
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-#need jcoverage
-RESTRICT="test"
-
-java_prepare() {
-	rm -vf ng* beansh
-	find . -iname '*.jar' -delete
-
-	epatch "${FILESDIR}/${PV}-Makefile.patch"
-
-	sed -i '/<arg line="ng.exe/d' build.xml || die
-	sed -i 's/depends="test"/depends="compile"/' build.xml || die
-
-	java-pkg_jar-from --into tools/lib --build-only java-getopt-1 \
-		gnu.getopt.jar java-getopt-1.0.10.jar
-	java-pkg_jar-from --into tools/lib --build-only junit junit.jar
-	java-pkg_jar-from --into tools/lib --build-only bcel bcel.jar \
-		bcel-5.1.jar
-	java-pkg_jar-from --into tools/lib --build-only jakarta-oro-2.0 \
-		jakarta-oro.jar jakarta-oro-2.0.8.jar
-	java-pkg_jar-from --into tools/lib --build-only log4j log4j.jar \
-		log4j-1.2.8.jar
-}
-
-src_test() {
-	WANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	dobin ng
-	# Should we have a dolauncher?
-
-	java-pkg_newjar "dist/${P}.jar"
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/java/prod/*
-}