Adding metadata

3 files changed, 20 insertions, 118 deletions

diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 5b4efd711224..04c1f8e9ea24 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,5 +1 @@
-DIST postgresql-jdbc-9.2-1003.src.tar.gz 1843082 BLAKE2B 35f6e4738e5340373ccb3cbe516f2e8f4a391b6e200b88c6adff7112b28f077c6e4108329c962b98dd2ee21e9e3db81521a324b036cc5d0d6ec9859f660bce60 SHA512 f91d9617726722998a51275c625f6ea89dfe0ac7ce415cc6fa76302b13762bcf825cd61ec69d25d0199ca21de8a24286eeffb843ad59c06fd3049a289ac2b702
-DIST postgresql-jdbc-9.2-1004.src.tar.gz 1842921 BLAKE2B 4cf0cb6da5749a9da194b9174db82289c3521edb7b7fd57d112883c185e0b80fd6feb70852eb54d7fe53d439817643bc608e9cdb3a9d9b2d43fd134031c770e9 SHA512 6e218b7df3d772e4fb9053672f5f77f6012fe6e652a536dfe171408e957465520b05994d4fa13c4d478b595a55b8068da663b9f3dcb544a46fcf91d71ba8fdf5
-DIST postgresql-jdbc-9.3-1100.src.tar.gz 1852465 BLAKE2B a81f385ff23679a1e6b268b53ea72dda744c50d043d02fe50a88421c43561a8fc63c849a974e84e1f1caa93ab20c01cc58cc9abe96f5567f5ac626263f402126 SHA512 43968a62f9443739721016ede186b2f41fa6db2d1ef319cd65059f8715e90eda7c7f568995b293578c39e04d43085cfdfece587500f99ed1a49964c12d8c747a
-DIST postgresql-jdbc-9.4-1205.src.tar.gz 2028968 BLAKE2B d4f55bc7c173795202f9eed58a67effba747b56f8dc5aaeeb2941532b3d0ce3f66ed113c38af9c2c40998191fd15d2828d05a1b693eb13a78a3d39b9fe6667b5 SHA512 ebb46c0cfcabc34083e6f481bc97536fba98d082462670d39efdd75e6463f1286db6fa07cd35546c749e456f1c06fb1d022cbc9f5cace2a1b968fab76a57d281
 DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae350407fafeb23d9d4bdb130c17996373b4211e0d56d1a76bc5737401dc6fc6618d2a891943d096b0f60f0770ff6ce859ade3e7a178d SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
deleted file mode 100644
index d7200bc01043..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch 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="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="https://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		>=dev-db/postgresql-9.3[server]
-		dev-java/ant-junit
-		dev-java/junit:4
-		dev-java/xml-commons
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-RESTRICT="test" # Requires external postgresql server setup
-
-S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_DOC_TARGET="publicapi"
-
-java_prepare() {
-	# Strip build.xml of maven deps
-	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
-	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
-	sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
-	sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
-	sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
-
-	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
-	sed -i -e '/<include.*sspi/c\' build.xml || die
-	rm -vrf org/postgresql/sspi || die "Error removing sspi"
-	epatch "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
-
-	# FIXME @someone who cares: enable through osgi flag?
-	sed -i -e '/<include.*osgi/c\' build.xml || die
-	sed -i -e '/<test.*osgi/c\' build.xml || die
-	rm -vrf org/postgresql/osgi || die "Error removing osgi"
-	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
-	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
-
-	java-pkg_clean
-}
-
-src_compile() {
-	EANT_BUILD_TARGET="release-version jar"
-	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" || die
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml" || die
-	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 'test'"
-	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 "https://wiki.gentoo.org/wiki/PostgreSQL"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "junit-4,xml-commons")
-}
-
-src_install() {
-	java-pkg_newjar build/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
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild
index cb6986cc6773..b5bfb41864b6 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
-inherit epatch java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_PN="postgresql-jdbc"
 MY_PV="${PV/_p/-}"
@@ -20,28 +20,36 @@ SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
+# it does not compile with jdk 11, newer versions should be fine
+# BUILD FAILED
+# /var/tmp/portage/dev-java/jdbc-postgresql-9.4_p1206-r1/work/postgresql-jdbc-9.4-1206.src/build.xml:197: Unknown JDK version.
 DEPEND="
-	>=virtual/jdk-1.6
+	virtual/jdk:1.8
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
 	)
 	test? (
-		>=dev-db/postgresql-9.3[server]
-		dev-java/ant-junit
+		dev-db/postgresql[server]
+		dev-java/ant-junit:0
+		dev-java/hamcrest-core:1.3
 		dev-java/junit:4
-		dev-java/xml-commons
+		dev-java/xml-commons-resolver:0
 	)"
-RDEPEND=">=virtual/jre-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
 
 RESTRICT="test" # Requires external postgresql server setup
 
 S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
 
+HTML_DOCS=( build/doc/pgjdbc.html )
+
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_DOC_TARGET="publicapi"
 
-java_prepare() {
+src_prepare() {
+	default
+
 	# Strip build.xml of maven deps
 	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
 	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
@@ -52,14 +60,14 @@ java_prepare() {
 	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
 	sed -i -e '/<include.*sspi/c\' build.xml || die
 	rm -vrf org/postgresql/sspi || die "Error removing sspi"
-	epatch "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
+	eapply "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
 
 	# FIXME @someone who cares: enable through osgi flag?
 	sed -i -e '/<include.*osgi/c\' build.xml || die
 	sed -i -e '/<test.*osgi/c\' build.xml || die
 	rm -vrf org/postgresql/osgi || die "Error removing osgi"
 	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
-	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
+	eapply "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
 
 	java-pkg_clean
 }
@@ -87,7 +95,7 @@ src_test() {
 	einfo "You can find a general info on how to perform these steps at"
 	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
 
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "junit-4,xml-commons")
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "hamcrest-core-1.3,junit-4,xml-commons-resolver")
 }
 
 src_install() {
@@ -95,7 +103,7 @@ src_install() {
 
 	if use doc ; then
 		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html
+		einstalldocs
 	fi
 
 	use source && java-pkg_dosrc org