summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2009-11-07 23:47:43 +0000
committerVlastimil Babka <caster@gentoo.org>2009-11-07 23:47:43 +0000
commit41bb8b1d83b970727586769692455c2656e4d48d (patch)
tree1054f9c50ac0f709edf352cada9893c80b1da63e /dev-db/jxtray
parentClean up old revisions, bug #280906. (diff)
downloadgentoo-2-41bb8b1d83b970727586769692455c2656e4d48d.tar.gz
gentoo-2-41bb8b1d83b970727586769692455c2656e4d48d.tar.bz2
gentoo-2-41bb8b1d83b970727586769692455c2656e4d48d.zip
Change JDK dep to allow 1.6 as well.
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/jxtray')
-rw-r--r--dev-db/jxtray/ChangeLog7
-rw-r--r--dev-db/jxtray/jxtray-0.5-r4.ebuild6
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-db/jxtray/ChangeLog b/dev-db/jxtray/ChangeLog
index a7c1ab5aece9..030e03a9c145 100644
--- a/dev-db/jxtray/ChangeLog
+++ b/dev-db/jxtray/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/jxtray
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.32 2008/10/22 11:51:43 fordfrog Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.33 2009/11/07 23:47:43 caster Exp $
+
+ 07 Nov 2009; Vlastimil Babka <caster@gentoo.org> jxtray-0.5-r4.ebuild:
+ Change JDK dep to allow 1.6 as well.
22 Oct 2008; Miroslav Šulc <fordfrog@gentoo.org> jxtray-0.5-r4.ebuild:
Migrated to EAPI-1 and restricted to dev-java/poi:0 because of slotting
diff --git a/dev-db/jxtray/jxtray-0.5-r4.ebuild b/dev-db/jxtray/jxtray-0.5-r4.ebuild
index f1944943dee6..878a8eefea73 100644
--- a/dev-db/jxtray/jxtray-0.5-r4.ebuild
+++ b/dev-db/jxtray/jxtray-0.5-r4.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-db/jxtray/jxtray-0.5-r4.ebuild,v 1.8 2008/10/22 11:51:43 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r4.ebuild,v 1.9 2009/11/07 23:47:43 caster Exp $
EAPI="1"
inherit java-pkg-2 java-ant-2
@@ -27,7 +27,7 @@ COMMON_DEP="
!firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql:0 ) ) )"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+DEPEND=">=virtual/jdk-1.4
${COMMON_DEP}"
S="${WORKDIR}/${PN}-src-${PV}"