Patch unused com.sun import away and put ppc(64) keywords back. Fixes bug #314647.

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

5 files changed, 29 insertions, 9 deletions

diff --git a/dev-java/jdbc-postgresql/ChangeLog b/dev-java/jdbc-postgresql/ChangeLog
index ffda9b3415d5..454419dcbf63 100644
--- a/dev-java/jdbc-postgresql/ChangeLog
+++ b/dev-java/jdbc-postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2010/04/11 12:38:42 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.38 2010/04/11 17:11:48 caster Exp $
+
+  11 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  jdbc-postgresql-8.4_p701.ebuild, jdbc-postgresql-8.4_p701-r1.ebuild,
+  +files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch:
+  Patch unused com.sun import away and put ppc(64) keywords back. Fixes bug
+  #314647.
 
   12 Apr 2010; Alistair Bush <ali_bush@gentoo.org>
   jdbc-postgresql-8.4_p701.ebuild, jdbc-postgresql-8.4_p701-r1.ebuild:
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index f85d66337c33..dfdcc53fc714 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,9 +1,10 @@
+AUX jdbc-postgresql-8.4_p701-stray-com.sun-import.patch 394 RMD160 d1b9a506cad77e3c9e7872d0f99773a07cc2e065 SHA1 6d79da44f1ee55a90fa9c1b8c44f5fe300c41a6c SHA256 7fd1dd75151bdaeba7cffecad1a9f06003aa371a5eea77c55fe22d4c399cdec3
 DIST postgresql-jdbc-8.3-603.src.tar.gz 521517 RMD160 3cebe6aab292d8dbbf003f6ef1036938a991f1a1 SHA1 3d0e17b3bb21c91e62ae7370a95e7f70ea1f062d SHA256 d7fa28a6f059887ae8d692c0e8a8befac688b3755ac6f46ab07e2119018e4f2d
 DIST postgresql-jdbc-8.3-605.src.tar.gz 527780 RMD160 8f61fd727bd9fce683f77ce207e4df08f8e52d8d SHA1 19238eb3820250a03953673c095fb9a8d037851b SHA256 32300e4a6214239393c37a1062c736223cd6a87e606474f49e9e026ff1b4d01c
 DIST postgresql-jdbc-8.4-701.src.tar.gz 551752 RMD160 26ce9d3b03aa9f6735dd94d378a6b573841bfb62 SHA1 719004934271a9238d16877b380eb37614077362 SHA256 d2748885b99b414fb2a1d68659b18effb87c9d3379181ad1f3d3e1e40cf61d90
 EBUILD jdbc-postgresql-8.3_p603.ebuild 2106 RMD160 8ca3c433074ec47fd81028399e967481df4e3f44 SHA1 c7a4cf95a7e8b28d18abb4b2255e4db94f2d4236 SHA256 d9801192f8b3bb430dcabaf60e6cee7ca1aff1b2ff809c46910f9d79e54fc72f
 EBUILD jdbc-postgresql-8.3_p605.ebuild 2166 RMD160 f7f3286cff322c1b991d5b9bba221552456dc5a1 SHA1 57f4f8bdc85a9857ffe857fd9afd8c2f347f488e SHA256 e7cb99df003838ed7d49ef98b94c20bfb1103cdaf0a38d6fb2c89049e88314c1
-EBUILD jdbc-postgresql-8.4_p701-r1.ebuild 2104 RMD160 da3f0fcd6fb60c27236f3a4b7081724e7733dbe3 SHA1 c2cd305d1f66d7cd4628708e7d84a6e9dfd0e150 SHA256 027a307e8ce1fa898a82853a7ff443acd26dad335f9490656103a25b053e719b
-EBUILD jdbc-postgresql-8.4_p701.ebuild 2157 RMD160 aea7881104f44cc19e018e2004b271a775f40f14 SHA1 6ee21ab84eef28fbb38ef639f8715c279b85ca70 SHA256 ed51c24c4867831ce3f83e94149c9d70f2a0ecaaeff1a304420f17a461eb4626
-MISC ChangeLog 6884 RMD160 cb80be10bab7781af03a87795d2d31decf736643 SHA1 1e7e2b8cef25d5e9d8f25dfbc1a16a1671999fee SHA256 470b3307b4eccc0521ed76213ec708e6d883c6ace72029d6b6343d4490caec67
+EBUILD jdbc-postgresql-8.4_p701-r1.ebuild 2150 RMD160 156d6fef6131aed851c52e4e5d75d66db96e70b4 SHA1 9575947aa1f39d5139a316ce5eac0506accbe8a3 SHA256 cda5c6ccec53d006080e0ed236b89b6f8721d01b11e287e0ca4ac6608b77242d
+EBUILD jdbc-postgresql-8.4_p701.ebuild 2235 RMD160 653e9ff4bef753ed3ea26c3fbc568a0de21876f6 SHA1 516f9a586532812692587eb43a150845cbf6f857 SHA256 a115ea711d297b53e5ff50cc4d0e31be50121bfdfd5cf491d742a29717ab81b1
+MISC ChangeLog 7154 RMD160 105573341153f6068e7aeabfb649e74e5ee36336 SHA1 7f42bd9c57d4ba26eacad638195de9dd78551e5a SHA256 d90ecd1ca3ba754b7e571799f87b928507855f08b6b27e1501e3ea9284da0e17
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch
new file mode 100644
index 000000000000..18921f3edcc1
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch
@@ -0,0 +1,10 @@
+--- org/postgresql/gss/MakeGSS.java.orig	2010-04-11 19:04:07.000000000 +0200
++++ org/postgresql/gss/MakeGSS.java	2010-04-11 19:04:14.000000000 +0200
+@@ -18,7 +18,6 @@
+ import java.io.IOException;
+ import java.sql.SQLException;
+ 
+-import com.sun.security.auth.callback.TextCallbackHandler;
+ import org.postgresql.core.PGStream;
+ import org.postgresql.core.Logger;
+ import org.postgresql.util.*;
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild
index a622c341debc..a5e00a169a57 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.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-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild,v 1.2 2010/04/11 12:38:42 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild,v 1.3 2010/04/11 17:11:48 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
@@ -17,12 +17,11 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND=">=dev-java/java-config-2.0.31
 	=virtual/jdk-1.6*
-	java-virtuals/jdk-with-com-sun
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
@@ -38,6 +37,8 @@ S="${WORKDIR}/${MY_P}"
 EANT_DOC_TARGET="publicapi"
 
 java_prepare() {
+	# bug 314647
+	epatch "${FILESDIR}/${P}-stray-com.sun-import.patch"
 	# needed for src_test
 	java-ant_rewrite-classpath
 }
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild
index 831a7cca829c..f98089f62a79 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.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-postgresql/jdbc-postgresql-8.4_p701.ebuild,v 1.3 2010/04/11 12:38:42 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild,v 1.4 2010/04/11 17:11:48 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
@@ -17,7 +17,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="java6 test"
 
 DEPEND=">=dev-java/java-config-2.0.31
@@ -39,6 +39,8 @@ S="${WORKDIR}/${MY_P}"
 EANT_DOC_TARGET="publicapi"
 
 java_prepare() {
+	# bug 314647
+	epatch "${FILESDIR}/${P}-stray-com.sun-import.patch"
 	# needed for src_test
 	java-ant_rewrite-classpath
 }