Fix building of testcases with -source 1.4, correct ant dependency for USE=test and add --build-only for junit jar-from. Test still restricted because it fails headless. Remove 0.9.6 as nothing uses it.

(Portage version: 2.1.2_rc2-r2)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 51 deletions

diff --git a/dev-java/glazedlists/Manifest b/dev-java/glazedlists/Manifest
index caff8079470a..6db18dc59c4e 100644
--- a/dev-java/glazedlists/Manifest
+++ b/dev-java/glazedlists/Manifest
@@ -2,27 +2,23 @@ AUX glazedlists-1.5.0-build.xml.patch 3122 RMD160 a149cfbc8ae1ca0276765034b1431e
 MD5 70a79e37579ae9bfbfcbe705d105db87 files/glazedlists-1.5.0-build.xml.patch 3122
 RMD160 a149cfbc8ae1ca0276765034b1431e9228fc0433 files/glazedlists-1.5.0-build.xml.patch 3122
 SHA256 159592d2d18c7204d5ef1ad04eb3b6d2d6040f0a5501b61cce775aaad378997a files/glazedlists-1.5.0-build.xml.patch 3122
-DIST glazedlists-0.9.6-source.zip 499821
+AUX glazedlists-1.5.0-tests.patch 430 RMD160 cbbab60dc3a933fef5833eca0e8b46779c0dd69d SHA1 552c21c9d544891d09812298896128153936d50a SHA256 62b36a37c19539d313b5a1653cfc7907df3483483c1d475e3dfab30c97f260eb
+MD5 560a7e3e34030438093516e8806321f7 files/glazedlists-1.5.0-tests.patch 430
+RMD160 cbbab60dc3a933fef5833eca0e8b46779c0dd69d files/glazedlists-1.5.0-tests.patch 430
+SHA256 62b36a37c19539d313b5a1653cfc7907df3483483c1d475e3dfab30c97f260eb files/glazedlists-1.5.0-tests.patch 430
 DIST glazedlists-1.5.0-source_java14.zip 466926 RMD160 136cdb9c4275ab5b59f3581bff2434bb10209c4c SHA1 5d03247d7c51caf726f04c01ed012fc87b8de9eb SHA256 de9867224252fac85833d6ad7c2452160208a89386345a628f84e38d27bee445
-EBUILD glazedlists-0.9.6.ebuild 1063 RMD160 bd9ec7f07065aa278a67c9f565d025c2bb58c86b SHA1 5473fb606760eb49c4d408179fe03a9bf52993e1 SHA256 651d876f494fee4354b5c0e1e25a45eb6d6270ac9d1f3185f11f08f33e4637f0
-MD5 264e96207097c4e5cc04c57278feedf8 glazedlists-0.9.6.ebuild 1063
-RMD160 bd9ec7f07065aa278a67c9f565d025c2bb58c86b glazedlists-0.9.6.ebuild 1063
-SHA256 651d876f494fee4354b5c0e1e25a45eb6d6270ac9d1f3185f11f08f33e4637f0 glazedlists-0.9.6.ebuild 1063
-EBUILD glazedlists-1.5.0.ebuild 1329 RMD160 04ce4e039fee8dc3dd0369042c4198b6da28cd7e SHA1 e3b247b92b0206059fa9ef780d478c48233bc63c SHA256 48d8164735ee997aa65b327599a25f27e6014ad87a076b17519d03fe9f0bab1f
-MD5 47a372e738be0f611a8c1f53f9a945d6 glazedlists-1.5.0.ebuild 1329
-RMD160 04ce4e039fee8dc3dd0369042c4198b6da28cd7e glazedlists-1.5.0.ebuild 1329
-SHA256 48d8164735ee997aa65b327599a25f27e6014ad87a076b17519d03fe9f0bab1f glazedlists-1.5.0.ebuild 1329
-MISC ChangeLog 805 RMD160 ef77f7117b122c3a594955680ba62f4798ca7a00 SHA1 2190092f4df0c97703088559e866379df29c27bb SHA256 4017a366d464e17eb1534de5da0476bcd47b94ebccc764cabd64575d8ddfeb24
-MD5 7b5680290c33d33627c77cd183eb1ca1 ChangeLog 805
-RMD160 ef77f7117b122c3a594955680ba62f4798ca7a00 ChangeLog 805
-SHA256 4017a366d464e17eb1534de5da0476bcd47b94ebccc764cabd64575d8ddfeb24 ChangeLog 805
+EBUILD glazedlists-1.5.0.ebuild 1412 RMD160 8f4db72d397aa42a056118c50795ec1ab01be18d SHA1 0e8bc40d9fc04d18a8e13534aaefd85ecd8c9c19 SHA256 b25a89f3df8f708aec6736fb0a5568a42ac9dc32f6e6038ed1654a7124df56b8
+MD5 1bf14ad41148f1237930e548f852a7a0 glazedlists-1.5.0.ebuild 1412
+RMD160 8f4db72d397aa42a056118c50795ec1ab01be18d glazedlists-1.5.0.ebuild 1412
+SHA256 b25a89f3df8f708aec6736fb0a5568a42ac9dc32f6e6038ed1654a7124df56b8 glazedlists-1.5.0.ebuild 1412
+MISC ChangeLog 1161 RMD160 dc1898335bd6b03e47bb5dc655862c22c53ea481 SHA1 ca8a4b1699c7674af482bc0f0131beeb86442598 SHA256 7364a7267e998ace21d256140311126e319ddbe3fcd07b17ba7b4a9258b36c08
+MD5 fc43646a43beedc21fb652f34f519a55 ChangeLog 1161
+RMD160 dc1898335bd6b03e47bb5dc655862c22c53ea481 ChangeLog 1161
+SHA256 7364a7267e998ace21d256140311126e319ddbe3fcd07b17ba7b4a9258b36c08 ChangeLog 1161
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 cee8e95e1a46c1daaae4e98ab1bb4757 files/digest-glazedlists-0.9.6 73
-RMD160 79a8a5283b73b0f6aea73f30d615a910f17fd0fb files/digest-glazedlists-0.9.6 73
-SHA256 dcfee5f8cd4c51cdf43c3b74eda81198cd1b254a8b2fded30e8e3c417fcbc8ec files/digest-glazedlists-0.9.6 73
 MD5 f02d5ddb53ddb931f8836700c9b97c83 files/digest-glazedlists-1.5.0 286
 RMD160 b047ed22622f053e5d789fdd709c8261d869b382 files/digest-glazedlists-1.5.0 286
 SHA256 a14f326c1d862beb3da2872b35500e68c0c7da8d35d9f9749f3b64167cd03955 files/digest-glazedlists-1.5.0 286
diff --git a/dev-java/glazedlists/files/digest-glazedlists-0.9.6 b/dev-java/glazedlists/files/digest-glazedlists-0.9.6
deleted file mode 100644
index fbaf83e0f7ef..000000000000
--- a/dev-java/glazedlists/files/digest-glazedlists-0.9.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0852ec2e402c3f947904793dab991005 glazedlists-0.9.6-source.zip 499821
diff --git a/dev-java/glazedlists/glazedlists-0.9.6.ebuild b/dev-java/glazedlists/glazedlists-0.9.6.ebuild
deleted file mode 100644
index edb4d4ab01b2..000000000000
--- a/dev-java/glazedlists/glazedlists-0.9.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/glazedlists-0.9.6.ebuild,v 1.6 2005/10/07 21:08:40 betelgeuse Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A toolkit for list transformations"
-HOMEPAGE="http://publicobject.com/glazedlists/"
-SRC_URI="https://glazedlists.dev.java.net/files/documents/1073/13000/${P}-source.zip"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc jikes source" # junit
-RESTRICT="nomirror"
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	app-arch/unzip
-	jikes? ( >=dev-java/jikes-1.21 )"
-	#junit? ( dev-java/junit )"
-S=${WORKDIR}
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	#use junit && antflags="${antflags} test"
-	use doc && antflags="${antflags} docs"
-	ant ${antflags} || die "compile problem"
-}
-src_install() {
-	java-pkg_dojar glazedlists.jar
-	use doc && java-pkg_dohtml docs && dohtml readme.html
-	use source && java-pkg_dosrc source
-}