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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DBB4B15802E for ; Fri, 28 Jun 2024 08:19:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 073A5E2A29; Fri, 28 Jun 2024 08:19:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA791E2A29 for ; Fri, 28 Jun 2024 08:19:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 225FB335D0F for ; Fri, 28 Jun 2024 08:19:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6C6C154E for ; Fri, 28 Jun 2024 08:19:33 +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: <1719562692.a9424fa1be6f07568daeab73b9bb819b0a97e93c.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild dev-db/hsqldb/hsqldb-1.8.1.3-r5.ebuild X-VCS-Directories: dev-db/hsqldb/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: a9424fa1be6f07568daeab73b9bb819b0a97e93c X-VCS-Branch: master Date: Fri, 28 Jun 2024 08:19:33 +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: 629106a2-d176-40f0-9d0a-69a500f5cbdb X-Archives-Hash: e742c4b26119b44cd63d76595b7c2300 commit: a9424fa1be6f07568daeab73b9bb819b0a97e93c Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Jun 28 06:12:48 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jun 28 08:18:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9424fa1 dev-db/hsqldb: avoid to install hsqldbtest.jar Closes: https://bugs.gentoo.org/896402 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/37329 Signed-off-by: Miroslav Šulc gentoo.org> .../{hsqldb-1.8.1.3-r4.ebuild => hsqldb-1.8.1.3-r5.ebuild} | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r5.ebuild similarity index 98% rename from dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild rename to dev-db/hsqldb/hsqldb-1.8.1.3-r5.ebuild index b41ee414d576..be250b19dc31 100644 --- a/dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild +++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r5.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -11,8 +11,9 @@ MY_PV=$(ver_rs 1- '_') MY_P="${PN}_${MY_PV}" DESCRIPTION="The leading SQL relational database engine written in Java" -HOMEPAGE="http://hsqldb.org" +HOMEPAGE="https://hsqldb.org" SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.zip" +S="${WORKDIR}/${PN}" LICENSE="BSD GPL-2" SLOT="0" @@ -34,8 +35,6 @@ PATCHES=( "${FILESDIR}/${P}-java7.patch" ) -S="${WORKDIR}/${PN}" - HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar HSQLDB_HOME=/var/lib/hsqldb @@ -90,7 +89,7 @@ src_test() { } src_install() { - java-pkg_dojar lib/hsql*.jar + java-pkg_dojar lib/hsql{db{,util},tool,jdbc}.jar if use doc; then dodoc doc/*.txt