diff options
author | Vlastimil Babka <caster@gentoo.org> | 2010-04-05 23:50:45 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2010-04-05 23:50:45 +0000 |
commit | ed4da435df0b088ce9411b79386e256b6600f6b6 (patch) | |
tree | 376aacca93630b2e52b15d8d194186da54a11011 | |
parent | Version bump. Lots of fixes (channel layout, output caps, bps estimation etc.) (diff) | |
download | gentoo-2-ed4da435df0b088ce9411b79386e256b6600f6b6.tar.gz gentoo-2-ed4da435df0b088ce9411b79386e256b6600f6b6.tar.bz2 gentoo-2-ed4da435df0b088ce9411b79386e256b6600f6b6.zip |
Don't restrict dependency to 1.5 jdk for tests, since they are disabled anyway.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r-- | dev-java/icu4j/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/icu4j/icu4j-3.8.1-r1.ebuild | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog index 1b4c1feeaa78..6ef249207d0f 100644 --- a/dev-java/icu4j/ChangeLog +++ b/dev-java/icu4j/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icu4j # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.35 2010/03/20 13:49:49 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.36 2010/04/05 23:50:45 caster Exp $ + + 05 Apr 2010; Vlastimil Babka <caster@gentoo.org> icu4j-3.8.1-r1.ebuild: + Don't restrict dependency to 1.5 jdk for tests, since they are disabled + anyway. 20 Mar 2010; Pacho Ramos <pacho@gentoo.org> icu4j-4.0.1.1.ebuild: amd64 stable, bug 310181 diff --git a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild index 5299405fdffa..7bb66f808d34 100644 --- a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild +++ b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.8.1-r1.ebuild,v 1.5 2010/01/03 20:45:49 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.8.1-r1.ebuild,v 1.6 2010/04/05 23:50:45 caster Exp $ # We currently download the Javadoc documentation. # It could optionally be built using the Ant build file. @@ -27,12 +27,17 @@ RDEPEND=">=virtual/jre-1.4" # build.xml does file version detection that fails for 1.7 # http://bugs.gentoo.org/show_bug.cgi?id=213555 -DEPEND="test? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) ) - !test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) ) +DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) app-arch/unzip" +# test curently disabled +#DEPEND="test? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) ) +# !test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) ) + IUSE="doc test" +RESTRICT="test" + S="${WORKDIR}" src_unpack() { |