Restrict running tests to 1.4 - 1.6 because they need com.sun classes.

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/metadata-extractor/ChangeLog b/dev-java/metadata-extractor/ChangeLog
index 1fa716553991bd98c77792b455b53016cfd555b3..2843b29282522f8f048592c946a75bd844953f04 100644 (file)
--- a/dev-java/metadata-extractor/ChangeLog
+++ b/dev-java/metadata-extractor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/metadata-extractor
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/ChangeLog,v 1.11 2008/01/10 23:10:39 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/ChangeLog,v 1.12 2008/03/11 15:47:43 betelgeuse Exp $
+
+  11 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
+  metadata-extractor-2.2.2-r2.ebuild:
+  Restrict running tests to 1.4 - 1.6 because they need com.sun classes.
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org>
   metadata-extractor-2.2.2-r2.ebuild:

diff --git a/dev-java/metadata-extractor/Manifest b/dev-java/metadata-extractor/Manifest
index 47239c42a11198eab3b9446555b93de1d2b4f841..efdbfbdc72c16bc98e74ba0e7256afeaf6bcefbc 100644 (file)
--- a/dev-java/metadata-extractor/Manifest
+++ b/dev-java/metadata-extractor/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST metadata-extractor-2.2.2-src.jar 3936358 RMD160 772f975acdad30357295d0dc4afdf316144c2024 SHA1 783b30f347ce89efe3f84da3cd106e0fa4a5f6f1 SHA256 38f8b12418afde99286b9b7c86158eb4fd2c47a23ed4af025af77bae301e1783
-EBUILD metadata-extractor-2.2.2-r2.ebuild 1162 RMD160 e15399677f440dcce3fd3bbc4929717786e779aa SHA1 11ad580e0560c51ab92feb057537e730fa331be1 SHA256 b2307a968054ad0a5e91709486db3a2b780a01c357f0bfe837d8904856104ae3
-MISC ChangeLog 1705 RMD160 31e8f6a547fe4b9e8ef5acba29e602208e08f8eb SHA1 90c9f752554c1aab69b01a10ebeb6d276ad60f0c SHA256 347e8ca0a90cfa6175d1ac3b351b2e25f48e36d727fa1fe938c0efb936db4173
+EBUILD metadata-extractor-2.2.2-r2.ebuild 1256 RMD160 77dd7811e6502413941d3195161ea9773001c818 SHA1 ffc355567ddd3411e816754d932fa2cb21e5de47 SHA256 04ad1cefc38c030bbb4fa79c157dfc50afbb5b19f56c37911625a4ac893d3013
+MISC ChangeLog 1874 RMD160 5b4aca3239a7fd08036886bce05f65171c964fd9 SHA1 166d12afbc0a37349f2f449544fcc7dba06ebb7e SHA256 40b2a7aac2c536596c273d2a691f3743d97fbfb93694252bf2966239f1ab15b3
 MISC metadata.xml 363 RMD160 924507584ecded991a0a21959054ac3552d9e936 SHA1 523071c991448dbd8d6147a37fd04dbca4ca716a SHA256 5f79ff97b49035cdcac571169c99213709de8e5d5e178e4465b7aa156e8a7912
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH1qmkcxLzpIGCsLQRAl1JAJ9wfCRyN32FjNRv25oJ6JXdC+gvrwCfZyY7
+3wo5zEXcgLwgPmDjDcPDcbo=
+=1SGs
+-----END PGP SIGNATURE-----

diff --git a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
index 461011dd197583c6139968b15f95d5f2f645e233..28f9e6c9de93318a9af7e3c3ee759b009ec23d8f 100644 (file)
--- a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
+++ b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild,v 1.3 2008/01/10 23:10:39 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild,v 1.4 2008/03/11 15:47:43 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -12,9 +12,11 @@ SLOT="0"
 KEYWORDS="x86 ~ppc amd64"
 IUSE="test"
 
-DEPEND=">=virtual/jdk-1.4
-       dev-java/ant-core
-       =dev-java/junit-3.8*"
+DEPEND="
+       !test? ( >=virtual/jdk-1.4 )
+       test? ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
+       =dev-java/junit-3.8*
+       app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"
 S=${WORKDIR}/
 
@@ -26,9 +28,8 @@ src_unpack() {
        java-pkg_jar-from --build-only --into lib/ junit junit.jar
 }
 
-src_compile() {
-       eant dist-binaries
-}
+EANT_DOC_TARGET=""
+EANT_BUILD_TARGET="dist-binaries"
 
 src_install() {
        dodoc ReleaseNotes.txt