summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2010-10-17 10:10:27 +0000
committerFabio Erculiani <lxnay@gentoo.org>2010-10-17 10:10:27 +0000
commitf2e4e71ece389145a1852d7a8c9a46252e74d395 (patch)
tree6039199940bd12c0759d86582c655093df985104 /app-admin/389-ds-console
parentDrop to ~mips (diff)
downloadhistorical-f2e4e71ece389145a1852d7a8c9a46252e74d395.tar.gz
historical-f2e4e71ece389145a1852d7a8c9a46252e74d395.tar.bz2
historical-f2e4e71ece389145a1852d7a8c9a46252e74d395.zip
tweak jdk/jre RDEPEND
Package-Manager: portage-2.2_rc91/cvs/Linux x86_64
Diffstat (limited to 'app-admin/389-ds-console')
-rw-r--r--app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild4
-rw-r--r--app-admin/389-ds-console/ChangeLog6
2 files changed, 7 insertions, 3 deletions
diff --git a/app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild b/app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild
index 559868c4e07a..d2143f7f5168 100644
--- a/app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild
+++ b/app-admin/389-ds-console/389-ds-console-1.2.3-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-ds-console/389-ds-console-1.2.3-r1.ebuild,v 1.3 2010/07/11 10:07:05 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild,v 1.4 2010/10/17 10:07:00 lxnay Exp $
EAPI="2"
@@ -25,7 +25,7 @@ COMMON_DEP="dev-java/jss:3.4
dev-java/ldapsdk:4.1
>=dev-java/idm-console-framework-1.1
net-nds/389-ds-base"
-RDEPEND=">=virtual/jre-1.6
+RDEPEND="|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 )
${COMMON_DEP}"
DEPEND="sys-apps/sed
>=virtual/jdk-1.6
diff --git a/app-admin/389-ds-console/ChangeLog b/app-admin/389-ds-console/ChangeLog
index 82457863bdc3..c406044a497e 100644
--- a/app-admin/389-ds-console/ChangeLog
+++ b/app-admin/389-ds-console/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/389-ds-console
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/389-ds-console/ChangeLog,v 1.6 2010/07/11 10:06:12 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-ds-console/ChangeLog,v 1.7 2010/10/17 10:07:00 lxnay Exp $
+
+ 17 Oct 2010; Fabio Erculiani <lxnay@gentoo.org>
+ 389-ds-console-1.2.3-r1.ebuild:
+ tweak jdk/jre RDEPEND
11 Jul 2010; Fabio Erculiani <lxnay@gentoo.org>
389-ds-console-1.2.3-r1.ebuild: