summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2010-10-17 10:09:12 +0000
committerFabio Erculiani <lxnay@gentoo.org>2010-10-17 10:09:12 +0000
commitefa2abeae1cf97ced4105a0faec4363d200382c5 (patch)
tree5682b6303cf66b859979be1401421250ecb92115 /app-admin/389-admin-console
parenttweak jdk/jre RDEPEND (diff)
downloadgentoo-2-efa2abeae1cf97ced4105a0faec4363d200382c5.tar.gz
gentoo-2-efa2abeae1cf97ced4105a0faec4363d200382c5.tar.bz2
gentoo-2-efa2abeae1cf97ced4105a0faec4363d200382c5.zip
tweak jdk/jre RDEPEND
(Portage version: 2.2_rc91/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/389-admin-console')
-rw-r--r--app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild4
-rw-r--r--app-admin/389-admin-console/ChangeLog6
2 files changed, 7 insertions, 3 deletions
diff --git a/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild b/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild
index 703570958ca5..dd0537f7fa43 100644
--- a/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild
+++ b/app-admin/389-admin-console/389-admin-console-1.1.4-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/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild,v 1.1 2010/10/15 13:25:01 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild,v 1.2 2010/10/17 10:09:12 lxnay Exp $
EAPI="2"
@@ -23,7 +23,7 @@ IUSE=""
COMMON_DEP="dev-java/jss:3.4
dev-java/ldapsdk:4.1
>=dev-java/idm-console-framework-1.1"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jdk-1.5 )
${COMMON_DEP}"
DEPEND="sys-apps/sed
>=virtual/jdk-1.5
diff --git a/app-admin/389-admin-console/ChangeLog b/app-admin/389-admin-console/ChangeLog
index 1e809000d998..854903e01d92 100644
--- a/app-admin/389-admin-console/ChangeLog
+++ b/app-admin/389-admin-console/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/389-admin-console
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/ChangeLog,v 1.3 2010/10/15 13:25:01 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/ChangeLog,v 1.4 2010/10/17 10:09:12 lxnay Exp $
+
+ 17 Oct 2010; Fabio Erculiani <lxnay@gentoo.org>
+ 389-admin-console-1.1.4-r1.ebuild:
+ tweak jdk/jre RDEPEND
*389-admin-console-1.1.4-r1 (15 Oct 2010)