commit: a9424fa1be6f07568daeab73b9bb819b0a97e93c Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Jun 28 06:12:48 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/37329 Signed-off-by: Miroslav Šulc <fordfrog <AT> 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
