summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-06-30 20:51:00 +0000
committerVlastimil Babka <caster@gentoo.org>2010-06-30 20:51:00 +0000
commitc2a0ec623e728ee0af0a8fb73aa6d12b7fb41c9e (patch)
treec9ba92f7380bb3ba0555340ac112e4f66398fd16 /dev-java
parentCleanup. (diff)
downloadgentoo-2-c2a0ec623e728ee0af0a8fb73aa6d12b7fb41c9e.tar.gz
gentoo-2-c2a0ec623e728ee0af0a8fb73aa6d12b7fb41c9e.tar.bz2
gentoo-2-c2a0ec623e728ee0af0a8fb73aa6d12b7fb41c9e.zip
Remove java6 USE flag and make it mandatory.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jdbc-jaybird/ChangeLog6
-rw-r--r--dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild12
-rw-r--r--dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild10
3 files changed, 14 insertions, 14 deletions
diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index 03569f857142..da60d9758c05 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.32 2010/03/20 18:00:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.33 2010/06/30 20:51:00 caster Exp $
+
+ 30 Jun 2010; Vlastimil Babka <caster@gentoo.org>
+ jdbc-jaybird-2.1.5-r1.ebuild, jdbc-jaybird-2.1.5-r2.ebuild:
+ Remove java6 USE flag and make it mandatory.
*jdbc-jaybird-2.1.6 (20 Mar 2010)
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
index 3a557823008a..54e112934dfc 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.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-jaybird/jdbc-jaybird-2.1.5-r1.ebuild,v 1.3 2009/11/10 14:34:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild,v 1.4 2010/06/30 20:51:00 caster Exp $
JAVA_PKG_IUSE="doc source examples test"
@@ -13,14 +13,12 @@ SRC_URI="mirror://sourceforge/firebird/${At}.zip"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
-IUSE="java6"
+IUSE=""
-RDEPEND="java6? ( >=virtual/jre-1.6 )
- !java6? ( >=virtual/jre-1.5 )
+RDEPEND=">=virtual/jre-1.6
dev-java/ant-core
dev-java/log4j"
-DEPEND="java6? ( =virtual/jdk-1.6* )
- !java6? ( =virtual/jdk-1.5* )
+DEPEND="=virtual/jdk-1.6*
app-arch/unzip
dev-java/ant-core
dev-java/log4j
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild
index 68c6616bcd3d..609859468457 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.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/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild,v 1.2 2010/01/10 10:12:42 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild,v 1.3 2010/06/30 20:51:00 caster Exp $
JAVA_PKG_IUSE="doc source examples test"
@@ -13,14 +13,12 @@ SRC_URI="mirror://sourceforge/firebird/${At}.zip"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="jni java6"
+IUSE="jni"
-RDEPEND="java6? ( >=virtual/jre-1.6 )
- !java6? ( >=virtual/jre-1.5 )
+RDEPEND=">=virtual/jre-1.6
dev-java/ant-core
dev-java/log4j"
-DEPEND="java6? ( =virtual/jdk-1.6* )
- !java6? ( =virtual/jdk-1.5* )
+DEPEND="=virtual/jdk-1.6*
app-arch/unzip
dev-java/ant-core
dev-java/log4j