Cleanup.

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

3 files changed, 7 insertions, 85 deletions

diff --git a/dev-java/jdbc-postgresql/ChangeLog b/dev-java/jdbc-postgresql/ChangeLog
index 5a37b414d3dd..cbd86d6508ed 100644
--- a/dev-java/jdbc-postgresql/ChangeLog
+++ b/dev-java/jdbc-postgresql/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2010/06/17 19:56:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.41 2010/06/30 20:48:03 caster Exp $
+
+  30 Jun 2010; Vlastimil Babka <caster@gentoo.org>
+  jdbc-postgresql-8.3_p605.ebuild, -jdbc-postgresql-8.4_p701.ebuild:
+  Cleanup.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org>
   jdbc-postgresql-8.3_p603.ebuild, jdbc-postgresql-8.3_p605.ebuild,
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild
index 7cc0eefc3156..09d3a7e8a820 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.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.3_p605.ebuild,v 1.5 2010/06/17 19:56:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild,v 1.6 2010/06/30 20:48:03 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
@@ -17,7 +17,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="ppc"
 IUSE="java6 test"
 
 DEPEND=">=dev-java/java-config-2.0.31
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild
deleted file mode 100644
index 93fec2a3703c..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.5 2010/06/17 19:56:30 patrick 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="java6 test"
-
-DEPEND=">=dev-java/java-config-2.0.31
-	java6? ( =virtual/jdk-1.6* )
-	!java6? ( =virtual/jdk-1.5* )
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		dev-java/ant-junit
-		dev-db/postgresql-server
-	)"
-RDEPEND="java6? ( >=virtual/jre-1.6 )
-	!java6? ( >=virtual/jre-1.5 )"
-
-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
-}
-
-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
-}