Remove unused versions, leave versions left for just one arch on its respective keyword only, in order to remove Sun 1.4 java.

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

4 files changed, 12 insertions, 92 deletions

diff --git a/dev-java/jdbc-postgresql/ChangeLog b/dev-java/jdbc-postgresql/ChangeLog
index 828a314b9392..691a4cb62e22 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.28 2009/11/02 21:56:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.29 2009/11/17 14:50:54 caster Exp $
+
+  17 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  jdbc-postgresql-8.3_p603.ebuild, jdbc-postgresql-8.3_p603-r1.ebuild,
+  -jdbc-postgresql-8.3_p604.ebuild:
+  Remove unused versions, leave versions left for just one arch on its
+  respective keyword only, in order to remove Sun 1.4 java.
 
   02 Nov 2009; Markus Meier <maekke@gentoo.org>
   jdbc-postgresql-8.3_p605.ebuild:
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 2a8ba31ec1b0..b66d3d041b18 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-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.6 2009/10/06 19:45:05 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603-r1.ebuild,v 1.7 2009/11/17 14:50:54 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@@ -15,7 +15,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="ppc"
 IUSE="java5 java6 test"
 
 DEPEND=">=dev-java/java-config-2.0.31
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild
index 75c58416c421..7918f23b11c0 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.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.ebuild,v 1.2 2008/05/21 15:58:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild,v 1.3 2009/11/17 14:50:54 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@@ -15,7 +15,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~x86-fbsd"
 IUSE="java5 test"
 
 DEPEND=">=dev-java/java-config-2.0.31
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p604.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p604.ebuild
deleted file mode 100644
index a6e994962716..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p604.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.2 2009/10/06 19:45:05 caster Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="http://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="java5 java6 test"
-
-DEPEND=">=dev-java/java-config-2.0.31
-	java6? ( =virtual/jdk-1.6* )
-	!java6? ( java5? ( =virtual/jdk-1.5* ) )
-	!java6? ( !java5? ( =virtual/jdk-1.4* ) )
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		dev-java/ant-junit
-		virtual/postgresql-server
-	)"
-RDEPEND="java6? ( >=virtual/jre-1.6 )
-	!java6? ( java5? ( >=virtual/jre-1.5 ) )
-	!java6? ( !java5? ( >=virtual/jre-1.4 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use java5 && use java6 ; then
-		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
-}
-
-EANT_DOC_TARGET="publicapi"
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc"
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml"
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'password'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "http://gentoo-wiki.com/HOWTO_Configure_Postgresql"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
-}
-
-src_install() {
-	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html || die
-	fi
-
-	use source && java-pkg_dosrc org
-}