Warn instead of error when both java5 and java6 are set. The java6 flag takes precedence with correct jdk/jre deps.

(Portage version: 2.2_rc43/cvs/Linux x86_64)

3 files changed, 22 insertions, 16 deletions

diff --git a/dev-java/jdbc-postgresql/ChangeLog b/dev-java/jdbc-postgresql/ChangeLog
index 992f3fc0179a..b5127e9ec139 100644
--- a/dev-java/jdbc-postgresql/ChangeLog
+++ b/dev-java/jdbc-postgresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc-postgresql
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.26 2009/10/03 21:12:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.27 2009/10/06 19:45:05 caster Exp $
+
+  06 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  jdbc-postgresql-8.3_p603-r1.ebuild, jdbc-postgresql-8.3_p604.ebuild:
+  Warn instead of error when both java5 and java6 are set. The java6 flag
+  takes precedence with correct jdk/jre deps.
 
 *jdbc-postgresql-8.3_p605 (03 Oct 2009)
 
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603-r1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603-r1.ebuild
index d57d3b0e9131..2a8ba31ec1b0 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603-r1.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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-r1.ebuild,v 1.5 2008/06/24 22:46:15 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603-r1.ebuild,v 1.6 2009/10/06 19:45:05 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@@ -20,8 +20,8 @@ IUSE="java5 java6 test"
 
 DEPEND=">=dev-java/java-config-2.0.31
 	java6? ( =virtual/jdk-1.6* )
-	java5? ( =virtual/jdk-1.5* )
-	!java5? ( !java6? ( =virtual/jdk-1.4* ) )
+	!java6? ( java5? ( =virtual/jdk-1.5* ) )
+	!java6? ( !java5? ( =virtual/jdk-1.4* ) )
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
@@ -34,15 +34,15 @@ DEPEND=">=dev-java/java-config-2.0.31
 		virtual/postgresql-server
 	)"
 RDEPEND="java6? ( >=virtual/jre-1.6 )
-	java5? ( >=virtual/jre-1.5 )
-	!java5? ( !java6? ( >=virtual/jre-1.4 ) )"
+	!java6? ( java5? ( >=virtual/jre-1.5 ) )
+	!java6? ( !java5? ( >=virtual/jre-1.4 ) )"
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if use java5 && use java6 ; then
-		eerror "You cannot use both 'java5' and 'java6' USE flags at the same time"
-		exit 1
+		ewarn "You enabled both 'java5' and 'java6' USE flags at the same time."
+		ewarn "The java6 flag takes precedence."
 	fi
 
 	java-pkg-2_pkg_setup
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p604.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p604.ebuild
index 2d88bb57d750..a6e994962716 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p604.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p604.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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_p604.ebuild,v 1.1 2009/05/06 21:52:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p604.ebuild,v 1.2 2009/10/06 19:45:05 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
@@ -22,8 +22,8 @@ IUSE="java5 java6 test"
 
 DEPEND=">=dev-java/java-config-2.0.31
 	java6? ( =virtual/jdk-1.6* )
-	java5? ( =virtual/jdk-1.5* )
-	!java5? ( !java6? ( =virtual/jdk-1.4* ) )
+	!java6? ( java5? ( =virtual/jdk-1.5* ) )
+	!java6? ( !java5? ( =virtual/jdk-1.4* ) )
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
@@ -33,16 +33,17 @@ DEPEND=">=dev-java/java-config-2.0.31
 		virtual/postgresql-server
 	)"
 RDEPEND="java6? ( >=virtual/jre-1.6 )
-	java5? ( >=virtual/jre-1.5 )
-	!java5? ( !java6? ( >=virtual/jre-1.4 ) )"
+	!java6? ( java5? ( >=virtual/jre-1.5 ) )
+	!java6? ( !java5? ( >=virtual/jre-1.4 ) )"
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if use java5 && use java6 ; then
-		eerror "You cannot use both 'java5' and 'java6' USE flags at the same time"
-		die "use only one of java5 and java6"
+		ewarn "You enabled both 'java5' and 'java6' USE flags at the same time."
+		ewarn "The java6 flag takes precedence."
 	fi
+
 	java-pkg-2_pkg_setup
 }