From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CDEA13835A for ; Wed, 23 Jun 2021 08:13:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95A9EE0858; Wed, 23 Jun 2021 08:13:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EABDE0858 for ; Wed, 23 Jun 2021 08:13:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B08C33D3C5 for ; Wed, 23 Jun 2021 08:13:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93C577B6 for ; Wed, 23 Jun 2021 08:13:10 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1624435981.8c4cf16616599f1ae4d5f336a5f1b264e9a1855e.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jdbc-postgresql/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild X-VCS-Directories: dev-java/jdbc-postgresql/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 8c4cf16616599f1ae4d5f336a5f1b264e9a1855e X-VCS-Branch: master Date: Wed, 23 Jun 2021 08:13:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3724673e-2de7-4e0f-a302-83e2aa2b6584 X-Archives-Hash: e42026d13bc47302a524b23d52816318 commit: 8c4cf16616599f1ae4d5f336a5f1b264e9a1855e Author: Miroslav Šulc gentoo org> AuthorDate: Wed Jun 23 07:54:44 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jun 23 08:13:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4cf166 dev-java/jdbc-postgresql: eapi7, java 1.8, updated deps Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> ....ebuild => jdbc-postgresql-9.4_p1206-r1.ebuild} | 32 ++++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) 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 similarity index 80% rename from dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild rename to dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild index cb6986cc677..b5bfb41864b 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 '/