summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2007-04-02 18:51:10 +0000
committerVlastimil Babka <caster@gentoo.org>2007-04-02 18:51:10 +0000
commit2a3f8a622494331a744272f6f089d13f54ac32fb (patch)
tree6cbdcb625a9e9fb5f7bcfb5c705967d0b611a06f /dev-java/commons-dbcp
parentUnmask ffmpeg2theora-0.18. WFM. (diff)
downloadgentoo-2-2a3f8a622494331a744272f6f089d13f54ac32fb.tar.gz
gentoo-2-2a3f8a622494331a744272f6f089d13f54ac32fb.tar.bz2
gentoo-2-2a3f8a622494331a744272f6f089d13f54ac32fb.zip
Change the order of jdk dependencies.
(Portage version: 2.1.2.3)
Diffstat (limited to 'dev-java/commons-dbcp')
-rw-r--r--dev-java/commons-dbcp/ChangeLog6
-rw-r--r--dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index aae97c33ce4e..bafcae4112f3 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/commons-dbcp
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.28 2007/04/02 15:11:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.29 2007/04/02 18:51:10 caster Exp $
+
+ 02 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+ commons-dbcp-1.2.1-r1.ebuild:
+ Change the order of jdk dependencies.
02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
commons-dbcp-1.2.1-r1.ebuild:
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
index 6807d594770c..92c6c397d740 100644
--- a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.6 2007/04/02 15:11:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.7 2007/04/02 18:51:10 caster Exp $
JAVA_PKG_IUSE="doc source"
@@ -16,8 +16,8 @@ RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
# FIXME doesn't like API changes with Java 1.6
DEPEND="|| (
- =virtual/jdk-1.4*
=virtual/jdk-1.5*
+ =virtual/jdk-1.4*
)
${COMMON_DEP}"
LICENSE="Apache-2.0"