RESTRICT test because the upstream zip does not include a file needed to run them.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686

3 files changed, 27 insertions, 12 deletions

diff --git a/dev-java/ant-ivy/ChangeLog b/dev-java/ant-ivy/ChangeLog
index 38a62de1497b..930b30620b75 100644
--- a/dev-java/ant-ivy/ChangeLog
+++ b/dev-java/ant-ivy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-ivy
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-ivy/ChangeLog,v 1.4 2007/03/01 13:34:48 betelgeuse Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-ivy/ChangeLog,v 1.5 2008/07/12 15:58:36 betelgeuse Exp $
+
+  12 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  ant-ivy-1.3.1-r1.ebuild:
+  RESTRICT test because the upstream zip does not include a file needed to
+  run them.
 
   01 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> -ant-ivy-1.3.1.ebuild:
   Cleanup.
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 763f10001d11..3c768a1672ad 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ivy-1.3.1-noresolve.patch 371 RMD160 b4b1aafae6623404fd6470f794934bb5c4f2f501 SHA1 d6abed9e2aa33e000025afb29e702cceffd6950d SHA256 6b5e0bca2d2c777f4a8a3b78976be9ca737ebcb9e1a40099113acc9a1e568a01
 AUX ivy-1.3.1-tasks.patch 593 RMD160 d01857a47ba65ea09709c5e7cfe4dd7478144ed5 SHA1 d0513091f2440d5edd06628d49f515216ef1be78 SHA256 835bd1b695bb5e19d9481251aaafd529b54032b98e1bdf847a84884902c4a4cb
 DIST ivy-1.3.1-src.zip 1302693 RMD160 9a344ee8ba78d34ec9ee2fc35e1a56b4096560ad SHA1 c60df175739052d6acb47a21bbd6214f1895aa7c SHA256 2a4653de892b739f8dfbf21403bfbf49c7febe9fb5a3d855cd9ad4bb29964fa0
-EBUILD ant-ivy-1.3.1-r1.ebuild 1477 RMD160 26463b6a0ed357f14e2d9ded77dfcc146a706e4a SHA1 d195861f0f33bb87b0a4f192131897fe1df2e2dd SHA256 95ffd31050e752ac9593bd1c501c67e741a545fcad5f3fef3b8ce5c02db12d80
-MISC ChangeLog 825 RMD160 921ffebaba5491dcff9b0193eb8089029d2d528b SHA1 22915473660bace0acedc84482d57d013cb7b606 SHA256 4b191a99701ef36e72fa71357325df945e39c7d4d2857ee7e5861f2ccd95fc23
+EBUILD ant-ivy-1.3.1-r1.ebuild 1550 RMD160 89c727368e9089f7166bf3ec3f0cdfdedae4e20a SHA1 b5153232dc97599a22630df271bbf4bc088e8cef SHA256 59dfe40a369709ac4a4c5fa81617dd7c1c78a3ca24586aab2fbb725d2ebda8b1
+MISC ChangeLog 993 RMD160 6ecd3438e68f606e4285d5ae3ddd300dee5e1380 SHA1 73668e15658f1f7ce7c957c0465441123365923a SHA256 73379832813ad8cedae75520eda2bb82baa1bd46e5de2182e65824b306b97fe7
 MISC metadata.xml 577 RMD160 7b73bf734668528919731e5630aec46aaf2566ee SHA1 9ddd4852f963bf48aa4a9b8511aa2081ae1d1614 SHA256 7009fb41885befd40b3e2d36f9ebba67212d18db2397173e156fa46f5b3064ac
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh41LcACgkQcxLzpIGCsLRbhwCfSvS1vVp2F9rnkB4wDyqZFklC
+EQUAn3Zleh5RETobjnb90rUmc0+0qEKR
+=tSG+
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
index f05278d7699f..d3d6e0a98365 100644
--- a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild,v 1.1 2007/03/01 13:33:42 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild,v 1.2 2008/07/12 15:58:36 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -25,7 +25,6 @@ COMMON_DEP="
 DEPEND="
 	>=virtual/jdk-1.4
 	app-arch/unzip
-	source? ( app-arch/zip )
 	${COMMON_DEP}"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
@@ -42,11 +41,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${MY_P}-noresolve.patch"
 	epatch "${FILESDIR}/${MY_P}-tasks.patch"
 
-	mkdir ${S}/lib
-	cd ${S}/lib
-	java-pkg_jar-from commons-cli-1,commons-httpclient-3,commons-logging,ant-core,jakarta-oro-2.0
+	mkdir "${S}/lib"
+	java-pkg_jar-from --into lib commons-cli-1,commons-httpclient-3,commons-logging,ant-core,jakarta-oro-2.0
 
-	cd ${S}
 	java-ant_bsfix_one build.xml
 }
 
@@ -58,6 +55,9 @@ src_install() {
 	use source && java-pkg_dosrc src/java/*
 }
 
+RESTRICT="test" # fail because of a missing file
+
 src_test() {
-	eant test || die "Junit tests failed"
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant test || die "Junit tests failed"
 }