diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-04-11 17:11:48 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-04-11 17:11:48 +0000 |
| commit | 6ad18d922f82ae0e56baf722c2727a58449871dc (patch) | |
| tree | ac0f7cf44135ca3c4a2cb1a7ed1165a54262891c /dev-java/jdbc-postgresql | |
| parent | x86 stable wrt bug #308713 (diff) | |
| download | gentoo-2-6ad18d922f82ae0e56baf722c2727a58449871dc.tar.gz gentoo-2-6ad18d922f82ae0e56baf722c2727a58449871dc.tar.bz2 gentoo-2-6ad18d922f82ae0e56baf722c2727a58449871dc.zip | |
Patch unused com.sun import away and put ppc(64) keywords back. Fixes bug #314647.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jdbc-postgresql')
4 files changed, 25 insertions, 6 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/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 } |