Fixed bug #176638, removed old unstable versions

(Portage version: 2.1.2.5)

9 files changed, 27 insertions, 237 deletions

diff --git a/dev-java/jdbc-postgresql/ChangeLog b/dev-java/jdbc-postgresql/ChangeLog
index 8b6b8ab0f113..22e722c2bac9 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.11 2007/04/21 20:06:59 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.12 2007/05/01 08:23:16 fordfrog Exp $
+
+  01 May 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  -jdbc-postgresql-8.0_p318.ebuild, jdbc-postgresql-8.0_p319.ebuild,
+  -jdbc-postgresql-8.1_p408.ebuild, jdbc-postgresql-8.1_p409.ebuild,
+  jdbc-postgresql-8.2_p504.ebuild, jdbc-postgresql-8.2_p505.ebuild:
+  Fixed bug #176638, removed old unstable versions
 
 *jdbc-postgresql-8.2_p505 (21 Apr 2007)
 *jdbc-postgresql-8.1_p409 (21 Apr 2007)
diff --git a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p318 b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p318
deleted file mode 100644
index 148a98c22f82..000000000000
--- a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.0_p318
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bd3aa9d8b622132f332bdeb833f59b06 postgresql-jdbc-8.0-318.src.tar.gz 423674
-RMD160 2c4c6fa27b2d2724c979c19ce939b0827242ea71 postgresql-jdbc-8.0-318.src.tar.gz 423674
-SHA256 77438f6b5a60008d364fcc3dc66a0f65f3180924ceb63e3c518bf80477d20454 postgresql-jdbc-8.0-318.src.tar.gz 423674
diff --git a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p408 b/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p408
deleted file mode 100644
index cb0dcc9efa5e..000000000000
--- a/dev-java/jdbc-postgresql/files/digest-jdbc-postgresql-8.1_p408
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af1666b16b126d843e95656b1eef9295 postgresql-jdbc-8.1-408.src.tar.gz 485140
-RMD160 6ad6b1326326745251feca44dea66cbaa0d6d841 postgresql-jdbc-8.1-408.src.tar.gz 485140
-SHA256 99b6dbcc37e14aab2530093447fb8858600e52526f9cdc2af0db678ee179150b postgresql-jdbc-8.1-408.src.tar.gz 485140
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p318.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p318.ebuild
deleted file mode 100644
index c858cf746084..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p318.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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_p318.ebuild,v 1.2 2007/01/30 00:35:39 caster Exp $
-
-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="doc examples java5 source 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 )
-	source? ( app-arch/zip )
-	!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 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.0_p319.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p319.ebuild
index 5e3251875c78..4ccb5225e46b 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p319.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p319.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.1 2007/04/21 20:06:59 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.0_p319.ebuild,v 1.2 2007/05/01 08:23:16 fordfrog Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@@ -53,10 +53,6 @@ src_unpack() {
 	# 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() {
@@ -76,7 +72,7 @@ src_install() {
 
 	if use_doc; then
 		java-pkg_dojavadoc build/publicapi
-		java-pkg_dohtml build/doc/pgjdbc.html
+		dohtml build/doc/pgjdbc.html
 	fi
 
 	if use examples; then
@@ -99,5 +95,8 @@ src_test() {
 	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_p408.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p408.ebuild
deleted file mode 100644
index d23434c9ae33..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p408.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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_p408.ebuild,v 1.2 2007/01/30 00:35:39 caster Exp $
-
-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="doc examples java5 source 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 )
-	source? ( app-arch/zip )
-	!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 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
index b7bb0f227e2a..20dac6e8a23f 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p409.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p409.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.1 2007/04/21 20:06:59 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.1_p409.ebuild,v 1.2 2007/05/01 08:23:16 fordfrog Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@@ -53,10 +53,6 @@ src_unpack() {
 	# 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() {
@@ -76,7 +72,7 @@ src_install() {
 
 	if use_doc; then
 		java-pkg_dojavadoc build/publicapi
-		java-pkg_dohtml build/doc/pgjdbc.html
+		dohtml build/doc/pgjdbc.html
 	fi
 
 	if use examples; then
@@ -99,5 +95,8 @@ src_test() {
 	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_p504.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p504.ebuild
index cdcb4d1ce3b7..2a3bc2f34127 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p504.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p504.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.2_p504.ebuild,v 1.7 2007/02/18 10:20:29 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p504.ebuild,v 1.8 2007/05/01 08:23:16 fordfrog Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -53,10 +53,6 @@ src_unpack() {
 	# 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 junit
 }
 
 src_compile() {
@@ -76,7 +72,7 @@ src_install() {
 
 	if use_doc; then
 		java-pkg_dojavadoc build/publicapi
-		java-pkg_dohtml build/doc/pgjdbc.html
+		dohtml build/doc/pgjdbc.html
 	fi
 
 	use source && java-pkg_dosrc org
@@ -92,5 +88,8 @@ src_test() {
 	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_p505.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p505.ebuild
index 56a274cee173..542ed4a48f02 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p505.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p505.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.2_p505.ebuild,v 1.1 2007/04/21 20:06:59 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.2_p505.ebuild,v 1.2 2007/05/01 08:23:16 fordfrog Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@@ -53,10 +53,6 @@ src_unpack() {
 	# 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() {
@@ -76,7 +72,7 @@ src_install() {
 
 	if use_doc; then
 		java-pkg_dojavadoc build/publicapi
-		java-pkg_dohtml build/doc/pgjdbc.html
+		dohtml build/doc/pgjdbc.html
 	fi
 
 	use source && java-pkg_dosrc org
@@ -92,5 +88,8 @@ src_test() {
 	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
 }