Version bump.

(Portage version: 2.1.3.2)

12 files changed, 138 insertions, 230 deletions

diff --git a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p319 b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p319
deleted file mode 100644
index 8022f10251e6..000000000000
--- a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p319
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 38b8512663d898ef8d8c22a51d3c46c2 postgresql-jdbc-8.0-319.src.tar.gz 424163
-RMD160 dddd56ba7490069ec1916b2e12aca7b4303294bb postgresql-jdbc-8.0-319.src.tar.gz 424163
-SHA256 5e864f623b0b54364acc23f8a96c183ff48ca996eee31567b162e7fb88e80001 postgresql-jdbc-8.0-319.src.tar.gz 424163
diff --git a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p320 b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p320
new file mode 100644
index 000000000000..89a8d61a955d
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p320
@@ -0,0 +1,3 @@
+MD5 4c25c73828c5da0f1a8388f304f4ab38 postgresql-jdbc-8.0-320.src.tar.gz 425514
+RMD160 966fa59b398dbbaf9dbdf85f7e4099f60cbd6fa7 postgresql-jdbc-8.0-320.src.tar.gz 425514
+SHA256 2206bd735ee3dc188467d83d2a480412535a018bffd0411af9ed2ff2c29154f6 postgresql-jdbc-8.0-320.src.tar.gz 425514
diff --git a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p409 b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p409
deleted file mode 100644
index 512e794ce677..000000000000
--- a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p409
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 03f9bd20d05692c0d46c5cc03a35d102 postgresql-jdbc-8.1-409.src.tar.gz 486385
-RMD160 2639591481f19e81f075399f4d3031274df15a86 postgresql-jdbc-8.1-409.src.tar.gz 486385
-SHA256 614e7edba46f1bdc0816385e0bbc589383b9dc75010bb05f952ad42585fe4304 postgresql-jdbc-8.1-409.src.tar.gz 486385
diff --git a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p410 b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p410
new file mode 100644
index 000000000000..18079e8e6dce
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p410
@@ -0,0 +1,3 @@
+MD5 7434ac5244c74f87f07fcd038a330324 postgresql-jdbc-8.1-410.src.tar.gz 488493
+RMD160 90d73dc7b0451d39dc3aeae7951bf4cb5d3a647d postgresql-jdbc-8.1-410.src.tar.gz 488493
+SHA256 c52d928145c5c2df1179bc2b58aab53b67bde25b942b35b20833e490a7019614 postgresql-jdbc-8.1-410.src.tar.gz 488493
diff --git a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.2_p506 b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.2_p506
new file mode 100644
index 000000000000..7dafd7e5b06d
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.2_p506
@@ -0,0 +1,3 @@
+MD5 03a70fa9be032a63155982514590e9b4 postgresql-jdbc-8.2-506.src.tar.gz 501821
+RMD160 abdff521a24d3e065031eebfcbfa9fd0fd399442 postgresql-jdbc-8.2-506.src.tar.gz 501821
+SHA256 9c3c930cb4f32830b2fc543ade6d5f89f91df971d21da0c50c05d709245eae1a postgresql-jdbc-8.2-506.src.tar.gz 501821
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.0_p318-build.xml.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.0_p318-build.xml.patch
deleted file mode 100644
index e5e43df2e3d2..000000000000
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.0_p318-build.xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- build.xml.original	2006-12-09 00:20:02.000000000 +0100
-+++ build.xml	2006-12-09 17:08:35.000000000 +0100
-@@ -24,6 +24,8 @@
-   <property name="builddir" value="build" />
-   <property name="package" value="org/postgresql" />
-   <property name="debug" value="on" />
-+  <property name="junit" value="true" />
-+  <property name="junit.task" value="true" />
- 
-   <!-- default build parameters are in build.properties, these may be
-        overridden by local configuration settings in build.local.properties
-@@ -63,8 +65,6 @@
- 
-     <available property="datasourceclass" classname="javax.sql.DataSource"/>
-     <available property="ssl" classname="javax.net.ssl.SSLContext"/>
--    <available property="junit" classname="junit.framework.Test"/>
--    <available property="junit.task" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
- 
-     <condition property="datasource">
-       <isset property="datasourceclass" />
-@@ -386,7 +386,7 @@
-   <target name="testjar" depends="jar">
-     <fail message="JUnit could not be found in your classpath.  You must download and install it from http://junit.org to build and run the test suite." unless="junit" />
-     <mkdir dir="${builddir}/tests"/>
--    <javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
-+    <javac classpath="${basedir}/lib/junit.jar" srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
-       <include name="${package}/test/**" />
- 
-       <exclude name="${package}/test/jdbc2/optional/**" unless="jdbc2optionaltests" />
-@@ -482,7 +482,6 @@
-      <param name="base.dir" expression="${builddir}/doc/"/>
-      <param name="use.id.as.filename" expression="1" />
-    </xslt>
--   <delete file="${builddir}/doc/pgjdbc.html"/>
-   </target>
- 
-   <!-- Blah. Can't reference an external XML catalog until Ant 1.6.
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.0_p319-build.xml.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.0_p319-build.xml.patch
deleted file mode 100644
index e5e43df2e3d2..000000000000
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.0_p319-build.xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- build.xml.original	2006-12-09 00:20:02.000000000 +0100
-+++ build.xml	2006-12-09 17:08:35.000000000 +0100
-@@ -24,6 +24,8 @@
-   <property name="builddir" value="build" />
-   <property name="package" value="org/postgresql" />
-   <property name="debug" value="on" />
-+  <property name="junit" value="true" />
-+  <property name="junit.task" value="true" />
- 
-   <!-- default build parameters are in build.properties, these may be
-        overridden by local configuration settings in build.local.properties
-@@ -63,8 +65,6 @@
- 
-     <available property="datasourceclass" classname="javax.sql.DataSource"/>
-     <available property="ssl" classname="javax.net.ssl.SSLContext"/>
--    <available property="junit" classname="junit.framework.Test"/>
--    <available property="junit.task" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
- 
-     <condition property="datasource">
-       <isset property="datasourceclass" />
-@@ -386,7 +386,7 @@
-   <target name="testjar" depends="jar">
-     <fail message="JUnit could not be found in your classpath.  You must download and install it from http://junit.org to build and run the test suite." unless="junit" />
-     <mkdir dir="${builddir}/tests"/>
--    <javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
-+    <javac classpath="${basedir}/lib/junit.jar" srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
-       <include name="${package}/test/**" />
- 
-       <exclude name="${package}/test/jdbc2/optional/**" unless="jdbc2optionaltests" />
-@@ -482,7 +482,6 @@
-      <param name="base.dir" expression="${builddir}/doc/"/>
-      <param name="use.id.as.filename" expression="1" />
-    </xslt>
--   <delete file="${builddir}/doc/pgjdbc.html"/>
-   </target>
- 
-   <!-- Blah. Can't reference an external XML catalog until Ant 1.6.
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.1_p408-build.xml.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.1_p408-build.xml.patch
deleted file mode 100644
index e5e43df2e3d2..000000000000
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.1_p408-build.xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- build.xml.original	2006-12-09 00:20:02.000000000 +0100
-+++ build.xml	2006-12-09 17:08:35.000000000 +0100
-@@ -24,6 +24,8 @@
-   <property name="builddir" value="build" />
-   <property name="package" value="org/postgresql" />
-   <property name="debug" value="on" />
-+  <property name="junit" value="true" />
-+  <property name="junit.task" value="true" />
- 
-   <!-- default build parameters are in build.properties, these may be
-        overridden by local configuration settings in build.local.properties
-@@ -63,8 +65,6 @@
- 
-     <available property="datasourceclass" classname="javax.sql.DataSource"/>
-     <available property="ssl" classname="javax.net.ssl.SSLContext"/>
--    <available property="junit" classname="junit.framework.Test"/>
--    <available property="junit.task" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
- 
-     <condition property="datasource">
-       <isset property="datasourceclass" />
-@@ -386,7 +386,7 @@
-   <target name="testjar" depends="jar">
-     <fail message="JUnit could not be found in your classpath.  You must download and install it from http://junit.org to build and run the test suite." unless="junit" />
-     <mkdir dir="${builddir}/tests"/>
--    <javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
-+    <javac classpath="${basedir}/lib/junit.jar" srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
-       <include name="${package}/test/**" />
- 
-       <exclude name="${package}/test/jdbc2/optional/**" unless="jdbc2optionaltests" />
-@@ -482,7 +482,6 @@
-      <param name="base.dir" expression="${builddir}/doc/"/>
-      <param name="use.id.as.filename" expression="1" />
-    </xslt>
--   <delete file="${builddir}/doc/pgjdbc.html"/>
-   </target>
- 
-   <!-- Blah. Can't reference an external XML catalog until Ant 1.6.
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.1_p409-build.xml.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.1_p409-build.xml.patch
deleted file mode 100644
index e5e43df2e3d2..000000000000
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.1_p409-build.xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- build.xml.original	2006-12-09 00:20:02.000000000 +0100
-+++ build.xml	2006-12-09 17:08:35.000000000 +0100
-@@ -24,6 +24,8 @@
-   <property name="builddir" value="build" />
-   <property name="package" value="org/postgresql" />
-   <property name="debug" value="on" />
-+  <property name="junit" value="true" />
-+  <property name="junit.task" value="true" />
- 
-   <!-- default build parameters are in build.properties, these may be
-        overridden by local configuration settings in build.local.properties
-@@ -63,8 +65,6 @@
- 
-     <available property="datasourceclass" classname="javax.sql.DataSource"/>
-     <available property="ssl" classname="javax.net.ssl.SSLContext"/>
--    <available property="junit" classname="junit.framework.Test"/>
--    <available property="junit.task" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
- 
-     <condition property="datasource">
-       <isset property="datasourceclass" />
-@@ -386,7 +386,7 @@
-   <target name="testjar" depends="jar">
-     <fail message="JUnit could not be found in your classpath.  You must download and install it from http://junit.org to build and run the test suite." unless="junit" />
-     <mkdir dir="${builddir}/tests"/>
--    <javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
-+    <javac classpath="${basedir}/lib/junit.jar" srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
-       <include name="${package}/test/**" />
- 
-       <exclude name="${package}/test/jdbc2/optional/**" unless="jdbc2optionaltests" />
-@@ -482,7 +482,6 @@
-      <param name="base.dir" expression="${builddir}/doc/"/>
-      <param name="use.id.as.filename" expression="1" />
-    </xslt>
--   <delete file="${builddir}/doc/pgjdbc.html"/>
-   </target>
- 
-   <!-- Blah. Can't reference an external XML catalog until Ant 1.6.
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p319.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p320.ebuild
index f4257a76f2c8..691148e7eef5 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p319.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p320.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.0_p319.ebuild,v 1.3 2007/07/11 19:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p320.ebuild,v 1.1 2007/08/03 19:27:50 fordfrog Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@@ -21,37 +21,26 @@ IUSE="examples java5 test"
 DEPEND=">=dev-java/java-config-2.0.31
 	!java5? ( =virtual/jdk-1.4* )
 	java5? ( =virtual/jdk-1.5* )
-	doc? ( dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets )
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
 	!test? ( >=dev-java/ant-core-1.6 )
 	test? ( =dev-java/junit-3.8*
 		>=dev-java/ant-1.6
-		dev-db/postgresql )"
-RDEPEND=">=virtual/jre-1.4"
+		dev-java/ant-junit
+		dev-db/postgresql
+	)"
+RDEPEND="!java5? ( >=virtual/jre-1.4 )
+	java5? ( >=virtual/jre-1.5 )"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use java5; then
-		JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*"
-
-		# We must specify source/target versions because currently it is not
-		# correctly picked up from NV_DEPEND for build.xml rewrite
-		JAVA_PKG_WANT_SOURCE="1.5"
-		JAVA_PKG_WANT_TARGET="1.5"
-	else
-		JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
-	fi
-
-	java-pkg-2_pkg_setup
-}
-
 src_unpack() {
 	unpack ${A}
 
-	# patch to make junit test work + correction for doc target
 	cd ${S}
-	epatch ${FILESDIR}/${P}-build.xml.patch
+	java-ant_rewrite-classpath
 }
 
 src_compile() {
@@ -66,6 +55,19 @@ src_compile() {
 	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
 
@@ -83,19 +85,3 @@ src_install() {
 
 	use source && java-pkg_dosrc org
 }
-
-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"
-
-	mkdir lib
-	java-pkg_jar-from --into lib junit
-
-	ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p409.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p410.ebuild
index d59a1aac691a..c8f697a4e9ad 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p409.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p410.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1_p409.ebuild,v 1.3 2007/07/11 19:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p410.ebuild,v 1.1 2007/08/03 19:27:50 fordfrog Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@@ -21,37 +21,26 @@ IUSE="examples java5 test"
 DEPEND=">=dev-java/java-config-2.0.31
 	!java5? ( =virtual/jdk-1.4* )
 	java5? ( =virtual/jdk-1.5* )
-	doc? ( dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets )
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
 	!test? ( >=dev-java/ant-core-1.6 )
 	test? ( =dev-java/junit-3.8*
 		>=dev-java/ant-1.6
-		dev-db/postgresql )"
-RDEPEND=">=virtual/jre-1.4"
+		dev-java/ant-junit
+		dev-db/postgresql
+	)"
+RDEPEND="!java5? ( >=virtual/jre-1.4 )
+	java5? ( >=virtual/jre-1.5 )"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use java5; then
-		JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*"
-
-		# We must specify source/target versions because currently it is not
-		# correctly picked up from NV_DEPEND for build.xml rewrite
-		JAVA_PKG_WANT_SOURCE="1.5"
-		JAVA_PKG_WANT_TARGET="1.5"
-	else
-		JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
-	fi
-
-	java-pkg-2_pkg_setup
-}
-
 src_unpack() {
 	unpack ${A}
 
-	# patch to make junit test work + correction for doc target
 	cd ${S}
-	epatch ${FILESDIR}/${P}-build.xml.patch
+	java-ant_rewrite-classpath
 }
 
 src_compile() {
@@ -66,6 +55,19 @@ src_compile() {
 	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
 
@@ -83,19 +85,3 @@ src_install() {
 
 	use source && java-pkg_dosrc org
 }
-
-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"
-
-	mkdir lib
-	java-pkg_jar-from --into lib junit
-
-	ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p506.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p506.ebuild
new file mode 100644
index 000000000000..616e20c0998d
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p506.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2007 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.2_p506.ebuild,v 1.1 2007/08/03 19:27:50 fordfrog Exp $
+
+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 ~x86-fbsd"
+IUSE="java5 test"
+
+DEPEND=">=dev-java/java-config-2.0.31
+	!java5? ( =virtual/jdk-1.4* )
+	java5? ( =virtual/jdk-1.5* )
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	!test? ( >=dev-java/ant-core-1.6 )
+	test? (
+		=dev-java/junit-3.8*
+		>=dev-java/ant-1.6
+		dev-java/ant-junit
+		dev-db/postgresql
+	)"
+RDEPEND="!java5? ( >=virtual/jre-1.4 )
+	java5? ( >=virtual/jre-1.5 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	eant jar $(use_doc publicapi)
+
+	# 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
+	fi
+
+	use source && java-pkg_dosrc org
+}