diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-04-28 19:39:26 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-04-28 19:39:26 +0000 |
| commit | 517df0baf81cb05f02770cdbb0f220438705910d (patch) | |
| tree | 16a7b0804d8ff99f2bdf658c13379443db23ba03 /dev-java/jdbc-jaybird | |
| parent | Migrated to generation 2. (diff) | |
| download | gentoo-2-517df0baf81cb05f02770cdbb0f220438705910d.tar.gz gentoo-2-517df0baf81cb05f02770cdbb0f220438705910d.tar.bz2 gentoo-2-517df0baf81cb05f02770cdbb0f220438705910d.zip | |
Prefer virtual/jdk-1.5 over virtual/jdk-1.4.
(Portage version: 2.1.2.5)
Diffstat (limited to 'dev-java/jdbc-jaybird')
| -rw-r--r-- | dev-java/jdbc-jaybird/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog index f74d48456cb5..d0054623dab8 100644 --- a/dev-java/jdbc-jaybird/ChangeLog +++ b/dev-java/jdbc-jaybird/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jdbc-jaybird # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.14 2007/01/26 16:19:38 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.15 2007/04/28 19:39:26 betelgeuse Exp $ + + 28 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> + jdbc-jaybird-2.1.0-r1.ebuild: + Prefer virtual/jdk-1.5 over virtual/jdk-1.4. 26 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org> jdbc-jaybird-1.5.6.ebuild, jdbc-jaybird-2.0.1.ebuild, diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild index a6023e4c37b6..ecbde3b3fd4e 100644 --- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild +++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild,v 1.3 2007/01/26 16:19:38 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild,v 1.4 2007/04/28 19:39:26 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source examples test" inherit eutils java-pkg-2 @@ -11,20 +13,18 @@ SRC_URI="mirror://sourceforge/firebird/${At}.zip" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc examples jni source test" +IUSE="jni" -RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5 ) +RDEPEND=">=virtual/jre-1.4 dev-java/log4j" -DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5 ) +DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) app-arch/unzip dev-java/log4j jni? ( dev-java/cpptasks ) test? ( dev-java/junit dev-java/ant - ) - !test? ( dev-java/ant-core ) - source? ( app-arch/zip )" + )" S="${WORKDIR}/client-java" |