summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2009-11-17 16:59:45 +0000
committerVlastimil Babka <caster@gentoo.org>2009-11-17 16:59:45 +0000
commitbf638e9d885a09f86c9f9146e2a31e404fd54970 (patch)
tree3b51e0331ecd6e73ddd9708bb0de27399d051d9d /dev-java/metadata-extractor
parentRestrict tests because they fail with a 1.5+ JDK and we want to remove 1.4. (diff)
downloadgentoo-2-bf638e9d885a09f86c9f9146e2a31e404fd54970.tar.gz
gentoo-2-bf638e9d885a09f86c9f9146e2a31e404fd54970.tar.bz2
gentoo-2-bf638e9d885a09f86c9f9146e2a31e404fd54970.zip
Fix the deps which pulled 3 versions of jdk with USE=test
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/metadata-extractor')
-rw-r--r--dev-java/metadata-extractor/ChangeLog6
-rw-r--r--dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild7
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-java/metadata-extractor/ChangeLog b/dev-java/metadata-extractor/ChangeLog
index 73212acb3458..b59085d4dcf7 100644
--- a/dev-java/metadata-extractor/ChangeLog
+++ b/dev-java/metadata-extractor/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/metadata-extractor
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/ChangeLog,v 1.13 2009/01/31 13:46:36 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/ChangeLog,v 1.14 2009/11/17 16:59:45 caster Exp $
+
+ 17 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+ metadata-extractor-2.2.2-r2.ebuild:
+ Fix the deps which pulled 3 versions of jdk with USE=test
*metadata-extractor-2.2.2-r3 (31 Jan 2009)
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 28f9e6c9de93..fa60ce4c4079 100644
--- 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
+# Copyright 1999-2009 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.4 2008/03/11 15:47:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild,v 1.5 2009/11/17 16:59:45 caster Exp $
inherit java-pkg-2 java-ant-2
@@ -13,8 +13,7 @@ KEYWORDS="x86 ~ppc amd64"
IUSE="test"
DEPEND="
- !test? ( >=virtual/jdk-1.4 )
- test? ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
+ || ( =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"