diff options
Diffstat (limited to 'dev-java/jdbc-postgresql')
| -rw-r--r-- | dev-java/jdbc-postgresql/Manifest | 10 | ||||
| -rw-r--r-- | dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild | 79 | ||||
| -rw-r--r-- | dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild | 79 | ||||
| -rw-r--r-- | dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild | 79 | ||||
| -rw-r--r-- | dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild | 102 | ||||
| -rw-r--r-- | dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild (renamed from dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild) | 32 |
6 files changed, 21 insertions, 360 deletions
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest index 6afbdddcfcf6..e41929813986 100644 --- a/dev-java/jdbc-postgresql/Manifest +++ b/dev-java/jdbc-postgresql/Manifest @@ -1,13 +1,5 @@ AUX jdbc-postgresql-9.4_p1201-remove-osgi.patch 1629 BLAKE2B f358ab6ac9296ade9eb7603dc03367f984622207c259df68c3029464197b47e052b69a369889e174cc0543d51a1d07c4134e8530bab0e80de4d5f38e79557486 SHA512 dcb831f6828980b5ada1158cb80c2e5c8d6921b24b69cd0f40faec9b8d41bdaa468ca995e4a804282b816ab8b0120e371e5f21a2aff7fee6068f13affc6b097a AUX jdbc-postgresql-9.4_p1204-remove-sspi.patch 6853 BLAKE2B 243b64279b501b417a5570d41010decd4edb55ca11a14c1a927698ee3795b2d7e7fc9c5c6fcd95b6210bd26c3938795fcbbce1b1c4dafe259197b0db8eb60701 SHA512 17d6a1514fc824008c8f0464c4af30d038a379ade44120dc24d8f9a4f495393c6e75e82f8e9da1e51c6d22c2301ec83a842d0db6e22842661b4dda97b8335dc6 -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 -EBUILD jdbc-postgresql-9.2_p1003.ebuild 1978 BLAKE2B 16e40127eb5113a26752cb5d1cf2fa3fe2894dca80ebaf892fd61793622b89f44aee644b238e9b4e643ec7abb6d7056bbbd9082bb409dc14c193dd7f92e47a52 SHA512 38cba94f33f11c6c22b68cd759e7514f1013a4c247f489e8239f3eed56051b8295604a5bfeaefe76a5aca6226cba32c4033b6761c5efcc1632cb20714218d8d8 -EBUILD jdbc-postgresql-9.2_p1004.ebuild 1981 BLAKE2B 2ccb65c367ac2e25fc03dc69d85e403482ce409352b3aa4b1218ef7849b121b3e989bc0d4029c7129a0fa2ec90731bcb81f3a2a5e8c6a135ab369290bfd188d0 SHA512 d010e27b8d0f51fe5802116e2c27f97940d94228b16e5b4a118f0293008db55b0650cb1aedb3b3097cdca2101d7fddfc62bf3b87ede36e655491018948145f12 -EBUILD jdbc-postgresql-9.3_p1100.ebuild 1981 BLAKE2B 2ccb65c367ac2e25fc03dc69d85e403482ce409352b3aa4b1218ef7849b121b3e989bc0d4029c7129a0fa2ec90731bcb81f3a2a5e8c6a135ab369290bfd188d0 SHA512 d010e27b8d0f51fe5802116e2c27f97940d94228b16e5b4a118f0293008db55b0650cb1aedb3b3097cdca2101d7fddfc62bf3b87ede36e655491018948145f12 -EBUILD jdbc-postgresql-9.4_p1205.ebuild 3124 BLAKE2B 8b5b72bfbbba3782ff4a0aabe03541ea05ace2f3e3b7d35f20e97a9c4e2fcb5a2e30b50154d735d34c3c551859b21db60113774f60e38a46d5c80c269e384513 SHA512 54b5fbe624175d7a236deb5e9628dee50a55d15f0892dbd52655a3cd02f8a5dcf43c418427bf239e591e5e53cf9eb93a64db729ac071892d08d5dec96ce2c9f5 -EBUILD jdbc-postgresql-9.4_p1206.ebuild 3121 BLAKE2B bd1845f1b0531fc35514783f37047221d836363144981b45c86bdcbe75ccf3edc2bbbdb0587f747052a8b6083cb4684a1b000a8da9cb75372dadcad824b6302c SHA512 d14f17263ec87a5a70978b6c53be2612777dadd20800c6c1e08da803f9fbba471906d868bb516c3e337155dc0461efa721795adcddd5fd006674e9931eeac829 +EBUILD jdbc-postgresql-9.4_p1206-r1.ebuild 3412 BLAKE2B 96f494807dcc52edbe1475d49af9a951873ad01647f44132ae0c370d84b9cd623091a2177ed99d25dec3a78252ea57c1e31b98da68ba6eb9e301cd2e8ea319b7 SHA512 bd1a037439f9e6995fe525a5a5ee6b2f89ff727e1741c92d9798676960aa6777c1d80d0046cac6557291a700c6a10c9de46729b0f878f20af5d55aac19d274e4 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild deleted file mode 100644 index 49c60a72aeab..000000000000 --- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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="https://jdbc.postgresql.org/download/${MY_P}.tar.gz" -HOMEPAGE="https://jdbc.postgresql.org/" - -LICENSE="POSTGRESQL" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - >=virtual/jdk-1.6 - doc? ( - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - ) - test? ( - dev-java/ant-junit - dev-db/postgresql[server] - )" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src" - -java_prepare() { - find -name "*.class" -type f -exec rm -v {} + || die -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_DOC_TARGET="publicapi" - -src_compile() { - 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" - 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 "https://wiki.gentoo.org/wiki/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 -} diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild deleted file mode 100644 index e5cff42377a1..000000000000 --- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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="https://jdbc.postgresql.org/download/${MY_P}.tar.gz" -HOMEPAGE="https://jdbc.postgresql.org/" - -LICENSE="POSTGRESQL" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - >=virtual/jdk-1.6 - doc? ( - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - ) - test? ( - dev-java/ant-junit - dev-db/postgresql[server] - )" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src" - -java_prepare() { - find -name "*.class" -type f -exec rm -v {} + || die -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_DOC_TARGET="publicapi" - -src_compile() { - 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" - 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 "https://wiki.gentoo.org/wiki/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 -} diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild deleted file mode 100644 index e5cff42377a1..000000000000 --- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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="https://jdbc.postgresql.org/download/${MY_P}.tar.gz" -HOMEPAGE="https://jdbc.postgresql.org/" - -LICENSE="POSTGRESQL" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - >=virtual/jdk-1.6 - doc? ( - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - ) - test? ( - dev-java/ant-junit - dev-db/postgresql[server] - )" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src" - -java_prepare() { - find -name "*.class" -type f -exec rm -v {} + || die -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_DOC_TARGET="publicapi" - -src_compile() { - 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" - 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 "https://wiki.gentoo.org/wiki/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 -} 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 |