Version bumps

(Portage version: 2.1.2.4)

10 files changed, 435 insertions, 1 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/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
+}