summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-02-12 08:50:46 +0000
committerVlastimil Babka <caster@gentoo.org>2010-02-12 08:50:46 +0000
commitb46e53941f105bc677dcdf6a09f11c6a5046850c (patch)
tree0f8995accc5406f5c4922513517651ecde7e26bf /dev-java
parentVersion bump. (diff)
downloadgentoo-2-b46e53941f105bc677dcdf6a09f11c6a5046850c.tar.gz
gentoo-2-b46e53941f105bc677dcdf6a09f11c6a5046850c.tar.bz2
gentoo-2-b46e53941f105bc677dcdf6a09f11c6a5046850c.zip
Remove java5 flag.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jdbc-postgresql/ChangeLog6
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild12
2 files changed, 10 insertions, 8 deletions
diff --git a/dev-java/jdbc-postgresql/ChangeLog b/dev-java/jdbc-postgresql/ChangeLog
index 7d69d278e7c9..f09bde37543b 100644
--- a/dev-java/jdbc-postgresql/ChangeLog
+++ b/dev-java/jdbc-postgresql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/jdbc-postgresql
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.32 2010/01/22 11:16:05 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.33 2010/02/12 08:50:46 caster Exp $
+
+ 12 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+ jdbc-postgresql-8.3_p603.ebuild:
+ Remove java5 flag.
22 Jan 2010; Vlastimil Babka <caster@gentoo.org>
-jdbc-postgresql-8.3_p603-r1.ebuild:
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild
index 7918f23b11c0..de6e2aac6009 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild,v 1.3 2009/11/17 14:50:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild,v 1.4 2010/02/12 08:50:46 caster Exp $
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
@@ -16,11 +16,10 @@ HOMEPAGE="http://jdbc.postgresql.org/"
LICENSE="POSTGRESQL"
SLOT="0"
KEYWORDS="~x86-fbsd"
-IUSE="java5 test"
+IUSE="test"
DEPEND=">=dev-java/java-config-2.0.31
- !java5? ( =virtual/jdk-1.4* )
- java5? ( =virtual/jdk-1.5* )
+ =virtual/jdk-1.5*
doc? (
dev-libs/libxslt
app-text/docbook-xsl-stylesheets
@@ -32,8 +31,7 @@ DEPEND=">=dev-java/java-config-2.0.31
dev-java/ant-junit
virtual/postgresql-server
)"
-RDEPEND="!java5? ( >=virtual/jre-1.4 )
- java5? ( >=virtual/jre-1.5 )"
+RDEPEND=">=virtual/jre-1.5"
S="${WORKDIR}/${MY_P}"