diff options
Diffstat (limited to 'dev-db/hsqldb')
| -rw-r--r-- | dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild (renamed from dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild) | 43 | ||||
| -rw-r--r-- | dev-db/hsqldb/metadata.xml | 2 |
2 files changed, 23 insertions, 22 deletions
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild index 4a22787f84f7..8c19f12a1155 100644 --- a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild +++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 JAVA_PKG_IUSE="doc source test" -inherit eutils user versionator java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 -MY_PV=$(replace_all_version_separators _ ) +MY_PV=$(ver_rs 1- '_') MY_P="${PN}_${MY_PV}" DESCRIPTION="The leading SQL relational database engine written in Java" @@ -16,17 +16,23 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" CDEPEND=" - java-virtuals/servlet-api:2.5" + acct-group/hsqldb + acct-user/hsqldb + dev-java/jakarta-servlet-api:4" RDEPEND="${CDEPEND} - >=virtual/jre-1.5" + virtual/jre:1.8" DEPEND="${CDEPEND} - >=virtual/jdk-1.5 - app-arch/unzip + virtual/jdk:1.8 test? ( dev-java/junit:0 )" +BDEPEND="app-arch/unzip" + +PATCHES=( + "${FILESDIR}/resolve-config-softlinks.patch" + "${FILESDIR}/${P}-java7.patch" +) S="${WORKDIR}/${PN}" @@ -34,13 +40,11 @@ HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar HSQLDB_HOME=/var/lib/hsqldb pkg_setup() { - enewgroup hsqldb - enewuser hsqldb -1 /bin/sh /dev/null hsqldb - java-pkg-2_pkg_setup } -java_prepare() { +src_prepare() { + default rm -v lib/*.jar || die sed -i -r \ @@ -51,9 +55,6 @@ java_prepare() { eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null - epatch "${FILESDIR}/resolve-config-softlinks.patch" - epatch "${FILESDIR}/${P}-java7.patch" - mkdir conf sed -e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${EPREFIX//\//\\/}${HSQLDB_JAR//\//\\/}/g" \ -e "s/^SERVER_HOME=.*$/SERVER_HOME=${EPREFIX//\//\\/}\/var\/lib\/hsqldb/g" \ @@ -76,7 +77,7 @@ JAVA_ANT_REWRITE_CLASSPATH="yes" EANT_BUILD_XML="build/build.xml" EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil" EANT_DOC_TARGET="javadocdev" -EANT_GENTOO_CLASSPATH="servlet-api-2.5" +EANT_GENTOO_CLASSPATH="jakarta-servlet-api-4" src_test() { java-pkg_jar-from --into lib junit @@ -93,8 +94,8 @@ src_install() { if use doc; then dodoc doc/*.txt - dohtml -r doc/zaurus - dohtml -r doc/src + docinto html + dodoc -r doc/{src,zaurus} fi use source && java-pkg_dosrc src/* @@ -104,7 +105,7 @@ src_install() { # Put init, configuration and authorization files in /etc doinitd "${FILESDIR}/hsqldb" doconfd conf/hsqldb - dodir /etc/hsqldb +# dodir /etc/hsqldb insinto /etc/hsqldb # Change the ownership of server.properties and sqltool.rc # files to hsqldb:hsqldb. (resolves Bug #111963) diff --git a/dev-db/hsqldb/metadata.xml b/dev-db/hsqldb/metadata.xml index 90ae84e29855..9273705004bc 100644 --- a/dev-db/hsqldb/metadata.xml +++ b/dev-db/hsqldb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>java@gentoo.org</email> |