diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-03-20 16:15:11 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-03-20 16:15:11 +0000 |
| commit | d1c89410d51878791d1de3f96f5ecfd8a04eaf80 (patch) | |
| tree | fb15a972364d50390d414a17974186773a85c367 /dev-java/commons-dbcp | |
| parent | Modernize ebuild; respect CC (diff) | |
| download | gentoo-2-d1c89410d51878791d1de3f96f5ecfd8a04eaf80.tar.gz gentoo-2-d1c89410d51878791d1de3f96f5ecfd8a04eaf80.tar.bz2 gentoo-2-d1c89410d51878791d1de3f96f5ecfd8a04eaf80.zip | |
Remove slotted virtual dep in lieu of a "normal" one. We pull in at least
jdk/jre 6 since 7 is not stable yet in the tree.
Signed-off-by: monsieurp@gentoo.org
(Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 93491BB8)
Diffstat (limited to 'dev-java/commons-dbcp')
| -rw-r--r-- | dev-java/commons-dbcp/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/commons-dbcp/commons-dbcp-2.1.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog index 257c6ead4a68..6bb75095b58b 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-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.65 2015/03/20 15:34:23 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.66 2015/03/20 16:15:11 monsieurp Exp $ + + 20 Mar 2015; Patrice Clement <monsieurp@gentoo.org> commons-dbcp-2.1.ebuild: + Remove slotted virtual dep in lieu of a "normal" one. We pull in at least + jdk/jre 6 since 7 is not stable yet in the tree. *commons-dbcp-2.1 (20 Mar 2015) diff --git a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild index 2604eb39caf2..4ee9521eca49 100644 --- a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild +++ b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild,v 1.1 2015/03/20 15:34:23 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild,v 1.2 2015/03/20 16:15:11 monsieurp Exp $ EAPI=4 @@ -26,10 +26,10 @@ CDEPEND=">=dev-java/commons-logging-1.1.1 java-virtuals/transaction-api:0 dev-java/junit:4" DEPEND="${CDEPEND} - virtual/jdk:1.7 + >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 )" RDEPEND=" - virtual/jdk:1.7 + >=virtual/jdk-1.6 ${CDEPEND}" S="${WORKDIR}/${MY_P}" |