JAVA_PKG_STRICT cleanups and migrate to splitted ant.

Package-Manager: portage-2.1.2.3

3 files changed, 37 insertions, 25 deletions

diff --git a/dev-java/glazedlists/ChangeLog b/dev-java/glazedlists/ChangeLog
index 91394affe3d0..ea22c0754bb3 100644
--- a/dev-java/glazedlists/ChangeLog
+++ b/dev-java/glazedlists/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/glazedlists
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/ChangeLog,v 1.9 2007/03/02 19:18:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/ChangeLog,v 1.10 2007/04/14 20:59:01 betelgeuse Exp $
+
+  14 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  glazedlists-1.5.0.ebuild:
+  JAVA_PKG_STRICT cleanups and migrate to splitted ant.
 
   02 Mar 2007; nixnut <nixnut@gentoo.org> glazedlists-1.5.0.ebuild:
   Stable on ppc wrt bug 154366
diff --git a/dev-java/glazedlists/Manifest b/dev-java/glazedlists/Manifest
index 7dd4e30808fe..04424cee3e04 100644
--- a/dev-java/glazedlists/Manifest
+++ b/dev-java/glazedlists/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX glazedlists-1.5.0-build.xml.patch 3122 RMD160 a149cfbc8ae1ca0276765034b1431e9228fc0433 SHA1 d1cf9a7cd862db1a4a99d0f32081defd8fb730c2 SHA256 159592d2d18c7204d5ef1ad04eb3b6d2d6040f0a5501b61cce775aaad378997a
 MD5 70a79e37579ae9bfbfcbe705d105db87 files/glazedlists-1.5.0-build.xml.patch 3122
 RMD160 a149cfbc8ae1ca0276765034b1431e9228fc0433 files/glazedlists-1.5.0-build.xml.patch 3122
@@ -7,14 +10,14 @@ 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-1.5.0.ebuild 1421 RMD160 31eaa2ef5de77249c87e515ef8a583799a8a709b SHA1 d411ecf84f14034c7299f8954f1193027f66623c SHA256 348e126c5cbbf6c5b79f78cb140be841a2ee3062a897e9a69dc61506a11198d4
-MD5 cf2b5d51e93f44ac937d4251897aad39 glazedlists-1.5.0.ebuild 1421
-RMD160 31eaa2ef5de77249c87e515ef8a583799a8a709b glazedlists-1.5.0.ebuild 1421
-SHA256 348e126c5cbbf6c5b79f78cb140be841a2ee3062a897e9a69dc61506a11198d4 glazedlists-1.5.0.ebuild 1421
-MISC ChangeLog 1662 RMD160 07558d253fe07a8ec7b7253c44959173070dadeb SHA1 4ac4299b809d4db95306ef2918c97f15842cfb3d SHA256 ccb1353e2170449de2e55632be0046e03fc048682c5a0e73cf8b5a0e35c3d63d
-MD5 5beb5344c0c762d6fd7b8d469f75df3b ChangeLog 1662
-RMD160 07558d253fe07a8ec7b7253c44959173070dadeb ChangeLog 1662
-SHA256 ccb1353e2170449de2e55632be0046e03fc048682c5a0e73cf8b5a0e35c3d63d ChangeLog 1662
+EBUILD glazedlists-1.5.0.ebuild 1434 RMD160 f52c0122c559594690835ae0a367c279962557f6 SHA1 16210aadc29dd8a86dfb83720841b0fc087cb397 SHA256 1807f46978d97c050f27626cdf3bd34c7d12fd5fb5733323fa8d47ca5f843d52
+MD5 24c0b545fe03a19dd8c2d1903783e25a glazedlists-1.5.0.ebuild 1434
+RMD160 f52c0122c559594690835ae0a367c279962557f6 glazedlists-1.5.0.ebuild 1434
+SHA256 1807f46978d97c050f27626cdf3bd34c7d12fd5fb5733323fa8d47ca5f843d52 glazedlists-1.5.0.ebuild 1434
+MISC ChangeLog 1805 RMD160 f37772930b4db39fdb4743581de3b3a4d5ec9b0c SHA1 49f41f9f22e25b1f88a89b4350077637993107fc SHA256 01741920f46281a26b84e4918946ed5325960e57ad168f6fbb4a85e11152f654
+MD5 7d9ed6ccf4e043d2526abe5bf15dca53 ChangeLog 1805
+RMD160 f37772930b4db39fdb4743581de3b3a4d5ec9b0c ChangeLog 1805
+SHA256 01741920f46281a26b84e4918946ed5325960e57ad168f6fbb4a85e11152f654 ChangeLog 1805
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -22,3 +25,10 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGIUCXcxLzpIGCsLQRAkGHAJwLANBSyKOxgMVoYEpRlSZ58M+GowCfQYoz
+zTfiMec4aV9tLXW684+c8ao=
+=IKIH
+-----END PGP SIGNATURE-----
diff --git a/dev-java/glazedlists/glazedlists-1.5.0.ebuild b/dev-java/glazedlists/glazedlists-1.5.0.ebuild
index 9c9e7782315f..a15e1b047285 100644
--- a/dev-java/glazedlists/glazedlists-1.5.0.ebuild
+++ b/dev-java/glazedlists/glazedlists-1.5.0.ebuild
@@ -1,31 +1,31 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/glazedlists-1.5.0.ebuild,v 1.7 2007/03/02 19:18:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/glazedlists-1.5.0.ebuild,v 1.8 2007/04/14 20:59:01 betelgeuse Exp $
 
-# java-ant-2 not needed - build.xml sets source/target properly
-inherit java-pkg-2 eutils
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 eutils java-ant-2
 
 DESCRIPTION="A toolkit for list transformations"
-HOMEPAGE="http://publicobject.com/${PN}/"
+HOMEPAGE="http://publicobject.com/glazedlists/"
 # there's also 1.5 source available, potential java5 useflag
 SRC_URI="https://${PN}.dev.java.net/files/documents/1073/26115/${P}-source_java14.zip"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="doc source test"
+IUSE=""
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4
-	test? (
-		dev-java/junit
-		dev-java/ant
-	)
-	!test? ( dev-java/ant-core )
+	test? ( || ( dev-java/ant-junit dev-java/ant-tasks ) )
 	app-arch/unzip"
 S="${WORKDIR}"
 
 # tests need X otherwise fail
 RESTRICT="test"
 
+#Patch takes care of this
+JAVA_PKG_BSFIX="off"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -42,19 +42,17 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
-	eant jar $(use_doc docs)
-}
+EANT_DOC_TARGET="docs"
 
 src_test() {
-	eant test
+	ANT_TASKS="ant-junit" eant test
 }
 
 src_install() {
 	java-pkg_newjar "${PN}_java14.jar"
 	if use doc; then
-		dohtml readme.html
-		java-pkg_dohtml -r docs/api
+		dohtml readme.html || die
+		java-pkg_dojavadoc docs/api
 	fi
 	use source && java-pkg_dosrc "source/ca"
 }