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

Package-Manager: portage-2.2_rc43/cvs/Linux x86_64

4 files changed, 25 insertions, 19 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/Manifest b/dev-java/jdbc-postgresql/Manifest
index 879985afab2e..41f44249a622 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,9 +1,9 @@
 DIST postgresql-jdbc-8.3-603.src.tar.gz 521517 RMD160 3cebe6aab292d8dbbf003f6ef1036938a991f1a1 SHA1 3d0e17b3bb21c91e62ae7370a95e7f70ea1f062d SHA256 d7fa28a6f059887ae8d692c0e8a8befac688b3755ac6f46ab07e2119018e4f2d
 DIST postgresql-jdbc-8.3-604.src.tar.gz 527620 RMD160 6f9ebd2515a3927cb06c09b992e9012ff579d43a SHA1 74f68090b0520815c332e623ebb50a1e9897ba00 SHA256 116445d6810fe3c140acddebacb9b3929a5c56a5e02ea1e63934d95e2aa61aed
 DIST postgresql-jdbc-8.3-605.src.tar.gz 527780 RMD160 8f61fd727bd9fce683f77ce207e4df08f8e52d8d SHA1 19238eb3820250a03953673c095fb9a8d037851b SHA256 32300e4a6214239393c37a1062c736223cd6a87e606474f49e9e026ff1b4d01c
-EBUILD jdbc-postgresql-8.3_p603-r1.ebuild 2467 RMD160 d0035b63dbedddd05238783ec3d97550f007adf1 SHA1 a51584998c94ef0af8bda7aea5c907e0d572fb3e SHA256 5d69526e87bf22c85d9d69277d9898e14e2a36e3da3dc6873400bc3e12e5cc42
+EBUILD jdbc-postgresql-8.3_p603-r1.ebuild 2520 RMD160 d49cf5e7c68e5d169a975db508985be8eefe20e0 SHA1 3e8485135374e6e13f2e52b34c3710e5f4549602 SHA256 b20b0a1d0fe7e1701720a4fc3682591c69ce22c218a0260c80ab01f41b50cc7d
 EBUILD jdbc-postgresql-8.3_p603.ebuild 2222 RMD160 8171271fb5ff9bb28e5a78f79c1ad76efd5ac774 SHA1 07bd1500fcb64a41bd38e5229ee5cf17aceb0f16 SHA256 fa7536312b67894070b1154afc347daac323ea70acc157df048ca91bac853bb7
-EBUILD jdbc-postgresql-8.3_p604.ebuild 2387 RMD160 112c63c7a9bbf7891d09a918544315d397f02a90 SHA1 29fb514b3b6cd612084a2fd5a74c57199f730db3 SHA256 21209d69bfd8726702d2b73175535ef519f7cc6fc795fc65985a81802a3fbf1b
+EBUILD jdbc-postgresql-8.3_p604.ebuild 2408 RMD160 22a8640f18233c681876d0200a3f723fc001fa38 SHA1 9506b7f7358980e22ae7cd3a10cd03323200c133 SHA256 cc8ea5c58e34794a547f85a3fa9c969b32e2db1c13753f5d72bb35875f1938ba
 EBUILD jdbc-postgresql-8.3_p605.ebuild 2098 RMD160 e284e794c1f633a7a5832a22ca6f0c6c865b337e SHA1 ac9baa0feadd0d0f25bc9823be7b3b409129add9 SHA256 01ea69c8be302b24b27416fae3d9c4a219dee8ef37f272268bdf94f0f705902a
-MISC ChangeLog 5036 RMD160 3c74432a2d167717c12e3937002121fbc0294faf SHA1 318c38d47d4e01cbacb12f2da116d35f7d6d3675 SHA256 721bea26883e4ff80ff65b87b6fb539e1954b990802e373bd62b6f9d0d31d10f
+MISC ChangeLog 5279 RMD160 ae2138648f348f47fa000f05c5f3172be44f010f SHA1 e6c01eb387e9ad74bdd0ba173ff3be03c351b5cf SHA256 6f911dea831bf26b8ed8e8461ac1b0e3557a55617e6c5295b056b91b1c2d6e11
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
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
 }