Version bumps

Package-Manager: portage-2.1.2.4

11 files changed, 475 insertions, 5 deletions

diff --git a/dev-java/jdbc-postgresql/ChangeLog b/dev-java/jdbc-postgresql/ChangeLog
index ec0ba798db8a..8b6b8ab0f113 100644
--- a/dev-java/jdbc-postgresql/ChangeLog
+++ b/dev-java/jdbc-postgresql/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/jdbc-postgresql
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.10 2007/02/18 10:20:29 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.11 2007/04/21 20:06:59 fordfrog Exp $
+
+*jdbc-postgresql-8.2_p505 (21 Apr 2007)
+*jdbc-postgresql-8.1_p409 (21 Apr 2007)
+*jdbc-postgresql-8.0_p319 (21 Apr 2007)
+
+  21 Apr 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/jdbc-postgresql-8.0_p319-build.xml.patch,
+  +files/jdbc-postgresql-8.1_p409-build.xml.patch,
+  +files/jdbc-postgresql-8.2_p505-build.xml.patch,
+  +jdbc-postgresql-8.0_p319.ebuild, +jdbc-postgresql-8.1_p409.ebuild,
+  +jdbc-postgresql-8.2_p505.ebuild:
+  Version bumps
 
   18 Feb 2007; nixnut <nixnut@gentoo.org> jdbc-postgresql-8.2_p504.ebuild:
   Stable on ppc wrt bug 160569
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 243b3ae682ce..2f4bd72edfc9 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -2,33 +2,60 @@ AUX jdbc-postgresql-8.0_p318-build.xml.patch 1814 RMD160 3281bd8bb2c9461ca099169
 MD5 bfaea274a39fadeb2793f9d1736aabd6 files/jdbc-postgresql-8.0_p318-build.xml.patch 1814
 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 files/jdbc-postgresql-8.0_p318-build.xml.patch 1814
 SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10 files/jdbc-postgresql-8.0_p318-build.xml.patch 1814
+AUX jdbc-postgresql-8.0_p319-build.xml.patch 1814 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 SHA1 bd89239484c1459c1219ea34ee6c5af1cea8cf4a SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10
+MD5 bfaea274a39fadeb2793f9d1736aabd6 files/jdbc-postgresql-8.0_p319-build.xml.patch 1814
+RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 files/jdbc-postgresql-8.0_p319-build.xml.patch 1814
+SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10 files/jdbc-postgresql-8.0_p319-build.xml.patch 1814
 AUX jdbc-postgresql-8.1_p408-build.xml.patch 1814 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 SHA1 bd89239484c1459c1219ea34ee6c5af1cea8cf4a SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10
 MD5 bfaea274a39fadeb2793f9d1736aabd6 files/jdbc-postgresql-8.1_p408-build.xml.patch 1814
 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 files/jdbc-postgresql-8.1_p408-build.xml.patch 1814
 SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10 files/jdbc-postgresql-8.1_p408-build.xml.patch 1814
+AUX jdbc-postgresql-8.1_p409-build.xml.patch 1814 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 SHA1 bd89239484c1459c1219ea34ee6c5af1cea8cf4a SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10
+MD5 bfaea274a39fadeb2793f9d1736aabd6 files/jdbc-postgresql-8.1_p409-build.xml.patch 1814
+RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 files/jdbc-postgresql-8.1_p409-build.xml.patch 1814
+SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10 files/jdbc-postgresql-8.1_p409-build.xml.patch 1814
 AUX jdbc-postgresql-8.2_p504-build.xml.patch 1814 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 SHA1 bd89239484c1459c1219ea34ee6c5af1cea8cf4a SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10
 MD5 bfaea274a39fadeb2793f9d1736aabd6 files/jdbc-postgresql-8.2_p504-build.xml.patch 1814
 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 files/jdbc-postgresql-8.2_p504-build.xml.patch 1814
 SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10 files/jdbc-postgresql-8.2_p504-build.xml.patch 1814
+AUX jdbc-postgresql-8.2_p505-build.xml.patch 1814 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 SHA1 bd89239484c1459c1219ea34ee6c5af1cea8cf4a SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10
+MD5 bfaea274a39fadeb2793f9d1736aabd6 files/jdbc-postgresql-8.2_p505-build.xml.patch 1814
+RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 files/jdbc-postgresql-8.2_p505-build.xml.patch 1814
+SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10 files/jdbc-postgresql-8.2_p505-build.xml.patch 1814
 DIST postgresql-jdbc-8.0-318.src.tar.gz 423674 RMD160 2c4c6fa27b2d2724c979c19ce939b0827242ea71 SHA1 1bd308db0b69f66a0d195f91c1fb58ffa5891557 SHA256 77438f6b5a60008d364fcc3dc66a0f65f3180924ceb63e3c518bf80477d20454
+DIST postgresql-jdbc-8.0-319.src.tar.gz 424163 RMD160 dddd56ba7490069ec1916b2e12aca7b4303294bb SHA1 eca459271e86c1b7ac2d3cbc03a3efff35a795e6 SHA256 5e864f623b0b54364acc23f8a96c183ff48ca996eee31567b162e7fb88e80001
 DIST postgresql-jdbc-8.1-408.src.tar.gz 485140 RMD160 6ad6b1326326745251feca44dea66cbaa0d6d841 SHA1 3a6145ce19be7ad5a8f331952a3789b9cee94f30 SHA256 99b6dbcc37e14aab2530093447fb8858600e52526f9cdc2af0db678ee179150b
+DIST postgresql-jdbc-8.1-409.src.tar.gz 486385 RMD160 2639591481f19e81f075399f4d3031274df15a86 SHA1 3f63093d12755e18c1aa2a3373f3315f9da3d32f SHA256 614e7edba46f1bdc0816385e0bbc589383b9dc75010bb05f952ad42585fe4304
 DIST postgresql-jdbc-8.2-504.src.tar.gz 482124 RMD160 5c47ee886bb1e7b056ee83d9eb59826cffb7bd47 SHA1 5be1fc49fb0990f2bff6919c4f88827de9d5b791 SHA256 a432864026e6018bc7871f5042456ac280895719fb07ce92a9ffa64564517fba
+DIST postgresql-jdbc-8.2-505.src.tar.gz 498495 RMD160 2ad97701cd481d76c6ec4339524037b99738a351 SHA1 082c5135ff98b46cd2b089ca0f04fb66a4ee9ffb SHA256 76bf2aa5ead0d043d81df1c31db9f654e6eb9d80fa9e8a97fb7432950a8197b6
 EBUILD jdbc-postgresql-8.0_p318.ebuild 2755 RMD160 9ce3eb206cbd7510cf5a6b9f8b02706556c388c4 SHA1 e8421f4a28642534ea57829055ade8ad64f7d2c5 SHA256 dd8e5bc1ac52239309ff18ea91376d1d35bdd51e0dc060668d890102060a9917
 MD5 aa3a51bacd7c858c969a3e2be574f92f jdbc-postgresql-8.0_p318.ebuild 2755
 RMD160 9ce3eb206cbd7510cf5a6b9f8b02706556c388c4 jdbc-postgresql-8.0_p318.ebuild 2755
 SHA256 dd8e5bc1ac52239309ff18ea91376d1d35bdd51e0dc060668d890102060a9917 jdbc-postgresql-8.0_p318.ebuild 2755
+EBUILD jdbc-postgresql-8.0_p319.ebuild 2760 RMD160 4271119c642f1a9a85df3b25012c10174d8958dd SHA1 584018b3c2575d0466c25449f018bb8d6c05ae92 SHA256 0f1a4da7f5b6b9a55bab5506bdc466ab6726dfdd90716194307eebcc4f2a4755
+MD5 6fc2284cd6ac258ee97e6b4bb20c64dd jdbc-postgresql-8.0_p319.ebuild 2760
+RMD160 4271119c642f1a9a85df3b25012c10174d8958dd jdbc-postgresql-8.0_p319.ebuild 2760
+SHA256 0f1a4da7f5b6b9a55bab5506bdc466ab6726dfdd90716194307eebcc4f2a4755 jdbc-postgresql-8.0_p319.ebuild 2760
 EBUILD jdbc-postgresql-8.1_p408.ebuild 2755 RMD160 5693caeccf837cf85232d74e6dfb96e10ed61285 SHA1 605d93bc1cd1fa94a1bf28037573a87b0af23303 SHA256 384cbb893a2f048216ef9a7576b791c983790d921fc5133b29c13599bf7c4fb5
 MD5 5f3b15a6fab1cba3c8eb60b40b41f443 jdbc-postgresql-8.1_p408.ebuild 2755
 RMD160 5693caeccf837cf85232d74e6dfb96e10ed61285 jdbc-postgresql-8.1_p408.ebuild 2755
 SHA256 384cbb893a2f048216ef9a7576b791c983790d921fc5133b29c13599bf7c4fb5 jdbc-postgresql-8.1_p408.ebuild 2755
+EBUILD jdbc-postgresql-8.1_p409.ebuild 2760 RMD160 1e4a0ed66421881cef15e1a438b3e35d68fce967 SHA1 753cd1fd07d8e04e013bd8faff5fe81377a780bb SHA256 f9a398724d2a677e78cbd249da1f49cf1a3cf8624a310fda3570f9bbc4d46e27
+MD5 67831cbf5898b68adf6c17d209a4c37c jdbc-postgresql-8.1_p409.ebuild 2760
+RMD160 1e4a0ed66421881cef15e1a438b3e35d68fce967 jdbc-postgresql-8.1_p409.ebuild 2760
+SHA256 f9a398724d2a677e78cbd249da1f49cf1a3cf8624a310fda3570f9bbc4d46e27 jdbc-postgresql-8.1_p409.ebuild 2760
 EBUILD jdbc-postgresql-8.2_p504.ebuild 2555 RMD160 4228c86b05f3df609e5f2afb32b6151f600c28ee SHA1 d9e050e615054506f90c18c13c7c102c190c21ce SHA256 80c39356bdcd47dd1e74406a32d503d219e0743ddfe6ae04061de964fa1f5b15
 MD5 e045d2ec394c9b42405f80ee952cc50d jdbc-postgresql-8.2_p504.ebuild 2555
 RMD160 4228c86b05f3df609e5f2afb32b6151f600c28ee jdbc-postgresql-8.2_p504.ebuild 2555
 SHA256 80c39356bdcd47dd1e74406a32d503d219e0743ddfe6ae04061de964fa1f5b15 jdbc-postgresql-8.2_p504.ebuild 2555
-MISC ChangeLog 1611 RMD160 56828c87862f3a4e17555db6df0a85f9c96ff8ca SHA1 04a1930e18111ca5b9e9095643ef8168d181bb9b SHA256 b3119e3b6c14d603246639b6b860ae1610e323607285781d6b17c7a27cac1181
-MD5 d143cb574d083c6fc75651516ad3c773 ChangeLog 1611
-RMD160 56828c87862f3a4e17555db6df0a85f9c96ff8ca ChangeLog 1611
-SHA256 b3119e3b6c14d603246639b6b860ae1610e323607285781d6b17c7a27cac1181 ChangeLog 1611
+EBUILD jdbc-postgresql-8.2_p505.ebuild 2563 RMD160 46e9cae2bd4a2313f981fc805e210ebda92aa86a SHA1 28c42b5e1038abea41c83a79b6f9f1fd68f5cd9a SHA256 74992101a35ed2278af3c565505f6f5f80260d09d96072bd1f2955acf2733dfb
+MD5 e431610d104ec21f8970b4695ea7826d jdbc-postgresql-8.2_p505.ebuild 2563
+RMD160 46e9cae2bd4a2313f981fc805e210ebda92aa86a jdbc-postgresql-8.2_p505.ebuild 2563
+SHA256 74992101a35ed2278af3c565505f6f5f80260d09d96072bd1f2955acf2733dfb jdbc-postgresql-8.2_p505.ebuild 2563
+MISC ChangeLog 2062 RMD160 c4801e6c20fb041facb91dbd642a91d486eb2f22 SHA1 7a3851b82341ea6fba15d7c5381458b2acbfad79 SHA256 16fd0fc42a8155605aaea5b1ca781640a0954d05ac67c72b0197d89a6f5f7928
+MD5 b49b825f53ccffdc83c9f5dd263d955b ChangeLog 2062
+RMD160 c4801e6c20fb041facb91dbd642a91d486eb2f22 ChangeLog 2062
+SHA256 16fd0fc42a8155605aaea5b1ca781640a0954d05ac67c72b0197d89a6f5f7928 ChangeLog 2062
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -36,9 +63,18 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 5a29b37147ca3affdc3b3047175e3c84 files/digest-jdbc-postgresql-8.0_p318 283
 RMD160 bc19345fc8915cc64fed27d1d7d4bbac19a30d92 files/digest-jdbc-postgresql-8.0_p318 283
 SHA256 51377aa0057026cc3526258b57845cc6b30670fe876d6b2f616445b0315c8d80 files/digest-jdbc-postgresql-8.0_p318 283
+MD5 097098ad431f7b8047a9cef2792ca2b8 files/digest-jdbc-postgresql-8.0_p319 283
+RMD160 05036433a5094e43e5e292882e32226a7c8435b1 files/digest-jdbc-postgresql-8.0_p319 283
+SHA256 9eaf8c39533fcb379003158d94eb5ffebd4980133a21939da301a332a169c2ee files/digest-jdbc-postgresql-8.0_p319 283
 MD5 1c916e73abb310f89e9669a5dcc63efc files/digest-jdbc-postgresql-8.1_p408 283
 RMD160 9975b4decf095db322be04d2ff4cb59d28504418 files/digest-jdbc-postgresql-8.1_p408 283
 SHA256 5bbdfa2129c22534ac9d266847628e980f3e5d563b19baa49a9b36ef83c3754f files/digest-jdbc-postgresql-8.1_p408 283
+MD5 4b0aa5f9015ebc90cfb2a386e78853bf files/digest-jdbc-postgresql-8.1_p409 283
+RMD160 802fc3309a84c80d32d3c5ba2941fe7d24cfcbfe files/digest-jdbc-postgresql-8.1_p409 283
+SHA256 d64dc8fa9711cf3a8ef2a55df1f5e72b0171b891e9524d70dce8dc661ec6aec3 files/digest-jdbc-postgresql-8.1_p409 283
 MD5 246b3543a747a6f046673549ac94ec7d files/digest-jdbc-postgresql-8.2_p504 283
 RMD160 1e56f6fd92345f1582e89c1f9d13417cbcfb623d files/digest-jdbc-postgresql-8.2_p504 283
 SHA256 1a6dfecd078ad2c37590b64d58aa7b4cad49e49deb484e43f67ed562a93bb9dc files/digest-jdbc-postgresql-8.2_p504 283
+MD5 f122057c6e9ce9c848dfcee864ce88be files/digest-jdbc-postgresql-8.2_p505 283
+RMD160 42d5e94fb1541e23a06d4e8d4491540b49ef427a files/digest-jdbc-postgresql-8.2_p505 283
+SHA256 c14aaa606c22035f828df2ae3077d8f3d5cf8c27e68393fedd255ce5a4264425 files/digest-jdbc-postgresql-8.2_p505 283
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
new file mode 100644
index 000000000000..8022f10251e6
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p319
@@ -0,0 +1,3 @@
+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.1_p409 b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p409
new file mode 100644
index 000000000000..512e794ce677
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p409
@@ -0,0 +1,3 @@
+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.2_p505 b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.2_p505
new file mode 100644
index 000000000000..43f151ef810d
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.2_p505
@@ -0,0 +1,3 @@
+MD5 2dc5f3b2204f1b47372f21da9f81920a postgresql-jdbc-8.2-505.src.tar.gz 498495
+RMD160 2ad97701cd481d76c6ec4339524037b99738a351 postgresql-jdbc-8.2-505.src.tar.gz 498495
+SHA256 76bf2aa5ead0d043d81df1c31db9f654e6eb9d80fa9e8a97fb7432950a8197b6 postgresql-jdbc-8.2-505.src.tar.gz 498495
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
new file mode 100644
index 000000000000..e5e43df2e3d2
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.0_p319-build.xml.patch
@@ -0,0 +1,37 @@
+--- 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
new file mode 100644
index 000000000000..e5e43df2e3d2
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.1_p409-build.xml.patch
@@ -0,0 +1,37 @@
+--- 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.2_p505-build.xml.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.2_p505-build.xml.patch
new file mode 100644
index 000000000000..e5e43df2e3d2
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.2_p505-build.xml.patch
@@ -0,0 +1,37 @@
+--- 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_p319.ebuild
new file mode 100644
index 000000000000..5e3251875c78
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p319.ebuild
@@ -0,0 +1,103 @@
+# 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.1 2007/04/21 20:06:59 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="~x86 ~ppc ~amd64"
+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 )
+	!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"
+
+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
+
+	mkdir lib
+	cd lib
+	java-pkg_jar-from --build-only junit
+}
+
+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_install() {
+	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
+
+	if use_doc; then
+		java-pkg_dojavadoc build/publicapi
+		java-pkg_dohtml build/doc/pgjdbc.html
+	fi
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins ${S}/example/*
+		java-pkg_newjar jars/postgresql-examples.jar jdbc-postgresql-examples.jar
+	fi
+
+	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"
+
+	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_p409.ebuild
new file mode 100644
index 000000000000..b7bb0f227e2a
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p409.ebuild
@@ -0,0 +1,103 @@
+# 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.1 2007/04/21 20:06:59 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="~x86 ~ppc ~amd64"
+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 )
+	!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"
+
+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
+
+	mkdir lib
+	cd lib
+	java-pkg_jar-from --build-only junit
+}
+
+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_install() {
+	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
+
+	if use_doc; then
+		java-pkg_dojavadoc build/publicapi
+		java-pkg_dohtml build/doc/pgjdbc.html
+	fi
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins ${S}/example/*
+		java-pkg_newjar jars/postgresql-examples.jar jdbc-postgresql-examples.jar
+	fi
+
+	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"
+
+	ANT_TASKS="ant-junit" eant test
+}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p505.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p505.ebuild
new file mode 100644
index 000000000000..56a274cee173
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p505.ebuild
@@ -0,0 +1,96 @@
+# 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_p505.ebuild,v 1.1 2007/04/21 20:06:59 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-db/postgresql )"
+RDEPEND=">=virtual/jre-1.4"
+
+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
+
+	mkdir lib
+	cd lib
+	java-pkg_jar-from --build-only junit
+}
+
+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_install() {
+	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
+
+	if use_doc; then
+		java-pkg_dojavadoc build/publicapi
+		java-pkg_dohtml build/doc/pgjdbc.html
+	fi
+
+	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"
+
+	ANT_TASKS="ant-junit" eant test
+}