* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2017-08-26 17:13 Michał Górny
0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2017-08-26 17:13 UTC (permalink / raw
To: gentoo-commits
commit: 5a2f7651c6ce011c3baee902ea0ca373debff353
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 16:51:37 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 17:13:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2f7651
dev-db/hsqldb: [QA] Use relative symlink target(s)
dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
index 98628665547..e71cb3f4b01 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
@@ -126,8 +126,8 @@ src_install() {
# Create symlinks to authorization files in the server home dir
# (required by the hqldb init script)
insinto "${HSQLDB_HOME}"
- dosym /etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties"
- dosym /etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc"
+ dosym ../../../etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties"
+ dosym ../../../etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc"
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2018-02-16 21:16 Michał Górny
0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2018-02-16 21:16 UTC (permalink / raw
To: gentoo-commits
commit: c204d718c4f080483507af7804dc7f874416f30c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 21:16:12 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 21:16:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c204d718
dev-db/hsqldb: Remove *-fbsd keywords, no Java there anymore
dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
index e71cb3f4b01..3a136fca231 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
CDEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2018-08-20 9:45 Patrice Clement
0 siblings, 0 replies; 18+ messages in thread
From: Patrice Clement @ 2018-08-20 9:45 UTC (permalink / raw
To: gentoo-commits
commit: e5cb657df1275a9273bc4474b3444586003e2a70
Author: Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Sun Aug 12 16:47:07 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Aug 20 09:45:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cb657d
dev-db/hsqldb: update links in comments.
Closes: https://github.com/gentoo/gentoo/pull/9548
dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
index 3a136fca231..4a22787f84f 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -64,8 +64,8 @@ java_prepare() {
cp "${FILESDIR}/sqltool.rc" conf/ || die
# Missing source file - needed for tests
- # http://hsqldb.cvs.sourceforge.net/*checkout*/hsqldb/hsqldb-dev/src/org/hsqldb/lib/StringComparator.java?revision=1.1&pathrev=hsqldb_1_8_0_10
- # https://sourceforge.net/tracker/index.php?func=detail&aid=2008754&group_id=23316&atid=378131
+ # https://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/trunk/src/org/hsqldb/lib/StringComparator.java
+ # https://sourceforge.net/p/hsqldb/bugs/815/
cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die
cp "${FILESDIR}/TestBug1191815.java" src/org/hsqldb/test/ || die
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2021-06-16 8:48 Miroslav Šulc
0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2021-06-16 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 445177b3b45bfa32086c1f1ee2a81b652032bcd9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 16 08:48:37 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 08:48:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445177b3
dev-db/hsqldb: switched 1.8.1.3-r3 to the latest tomcat-servlet-api
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
index 58cc09009c5..52c9e1b3c18 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
CDEPEND="
acct-group/hsqldb
acct-user/hsqldb
- java-virtuals/servlet-api:2.5"
+ dev-java/tomcat-servlet-api:4.0"
RDEPEND="${CDEPEND}
virtual/jre:1.8"
DEPEND="${CDEPEND}
@@ -77,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="tomcat-servlet-api-4.0"
src_test() {
java-pkg_jar-from --into lib junit
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2021-06-16 8:48 Miroslav Šulc
0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2021-06-16 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 97d306d62fb91543d5ebaa02f6eab427d6290c59
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Jun 13 13:22:40 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 08:42:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d306d6
dev-db/hsqldb: min java 1.8
fails with 1.8:*
Bug: https://bugs.gentoo.org/784380
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21226
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild | 174 +++++++++++++++++++++++++++++++++
1 file changed, 174 insertions(+)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
new file mode 100644
index 00000000000..58cc09009c5
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=$(ver_rs 1- '_')
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="The leading SQL relational database engine written in Java"
+HOMEPAGE="http://hsqldb.org"
+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"
+
+CDEPEND="
+ acct-group/hsqldb
+ acct-user/hsqldb
+ java-virtuals/servlet-api:2.5"
+RDEPEND="${CDEPEND}
+ virtual/jre:1.8"
+DEPEND="${CDEPEND}
+ 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}"
+
+HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
+HSQLDB_HOME=/var/lib/hsqldb
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+ default
+ rm -v lib/*.jar || die
+
+ sed -i -r \
+ -e "s#/etc/sysconfig#${EPREFIX}/etc/conf.d#g" \
+ bin/hsqldb || die
+
+ java-pkg_filter-compiler jikes
+
+ eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null
+
+ 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" \
+ -e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \
+ -e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \
+ src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb || die
+ cp "${FILESDIR}/server.properties" conf/ || die
+ cp "${FILESDIR}/sqltool.rc" conf/ || die
+
+ # Missing source file - needed for tests
+ # https://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/trunk/src/org/hsqldb/lib/StringComparator.java
+ # https://sourceforge.net/p/hsqldb/bugs/815/
+ cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die
+ cp "${FILESDIR}/TestBug1191815.java" src/org/hsqldb/test/ || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+# EANT_BUILD_XML used also in src_prepare
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil"
+EANT_DOC_TARGET="javadocdev"
+EANT_GENTOO_CLASSPATH="servlet-api-2.5"
+
+src_test() {
+ java-pkg_jar-from --into lib junit
+ eant -f ${EANT_BUILD_XML} jartest
+ cd testrun/hsqldb || die
+ ./runTest.sh TestSelf || die "TestSelf hsqldb tests failed"
+ # TODO. These fail. Investigate why.
+ #cd "${S}/testrun/sqltool" || die
+ #CLASSPATH="${S}/lib/hsqldb.jar" ./runtests.bash || die "sqltool test failed"
+}
+
+src_install() {
+ java-pkg_dojar lib/hsql*.jar
+
+ if use doc; then
+ dodoc doc/*.txt
+ docinto html
+ dodoc -r doc/{src,zaurus}
+ fi
+ use source && java-pkg_dosrc src/*
+
+ echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
+ doenvd "${T}"/35hsqldb
+
+ # Put init, configuration and authorization files in /etc
+ doinitd "${FILESDIR}/hsqldb"
+ doconfd conf/hsqldb
+# dodir /etc/hsqldb
+ insinto /etc/hsqldb
+ # Change the ownership of server.properties and sqltool.rc
+ # files to hsqldb:hsqldb. (resolves Bug #111963)
+ use prefix || insopts -m0600 -o hsqldb -g hsqldb
+ doins conf/server.properties
+ use prefix || insopts -m0600 -o hsqldb -g hsqldb
+ doins conf/sqltool.rc
+
+ # Install init script
+ dodir "${HSQLDB_HOME}/bin"
+ keepdir "${HSQLDB_HOME}"
+ exeinto "${HSQLDB_HOME}/bin"
+ doexe bin/hsqldb
+
+ # Make sure that files have correct permissions
+ use prefix || chown -R hsqldb:hsqldb "${ED}${HSQLDB_HOME}"
+ chmod o-rwx "${ED}${HSQLDB_HOME}"
+
+ # Create symlinks to authorization files in the server home dir
+ # (required by the hqldb init script)
+ insinto "${HSQLDB_HOME}"
+ dosym ../../../etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties"
+ dosym ../../../etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc"
+}
+
+pkg_postinst() {
+ ewarn "If you intend to run Hsqldb in Server mode and you want to create"
+ ewarn "additional databases, remember to put correct information in both"
+ ewarn "'server.properties' and 'sqltool.rc' files."
+ ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3."
+ ewarn "UNIX Quick Start' in the Hsqldb docs for more information)"
+ echo
+ elog "Example:"
+ echo
+ elog "${EPREFIX}/etc/hsqldb/server.properties"
+ elog "============================="
+ elog "server.database.1=file:xdb/xdb"
+ elog "server.dbname.1=xdb"
+ elog "server.urlid.1=xdb"
+ elog
+ elog "${EPREFIX}/etc/hsqldb/sqltool.rc"
+ elog "======================"
+ elog "urlid xdb"
+ elog "url jdbc:hsqldb:hsql://localhost/xdb"
+ elog "username sa"
+ elog "password "
+ echo
+ elog "Also note that each hsqldb server can serve only up to 10"
+ elog "different databases simultaneously (with consecutive {0-9}"
+ elog "suffixes in the 'server.properties' file)."
+ echo
+ ewarn "For data manipulation use:"
+ ewarn
+ ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
+ ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
+ ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
+ ewarn " --rcFile ${EPREFIX}/var/lib/hsqldb/sqltool.rc <dbname>"
+ echo
+ elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
+ elog "and Using Hsqldb' in the Hsqldb docs at:"
+ elog " http://hsqldb.org/web/hsqlDocsFrame.html"
+ elog "If you intend to run it in the Server mode, it is suggested to add the"
+ elog "init script to your start-up scripts, this should be done like this:"
+ elog " \`rc-update add hsqldb default\`"
+ echo
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2021-07-17 7:44 Agostino Sarubbo
0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2021-07-17 7:44 UTC (permalink / raw
To: gentoo-commits
commit: ac175d0591de88b3f6598194f5118c90761fe6f1
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 07:43:38 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 07:43:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac175d05
dev-db/hsqldb: x86 stable wrt bug #798432
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
index 52c9e1b3c18..af2617dc5ac 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
acct-group/hsqldb
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2021-07-17 23:18 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-07-17 23:18 UTC (permalink / raw
To: gentoo-commits
commit: 36bd75e218ffe5e19dc6ac483ebe3912238b97f1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 23:17:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 23:17:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36bd75e2
dev-db/hsqldb: Stabilize 1.8.1.3-r3 ppc64, #798432
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
index af2617dc5ac..3424ac6b3eb 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
acct-group/hsqldb
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2021-07-19 18:36 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-07-19 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 0ff702c2897e8bd53b37b9df068ce73603b0f03b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 19 18:34:35 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 18:34:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff702c2
dev-db/hsqldb: Stabilize 1.8.1.3-r3 amd64, #798432
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
index 3424ac6b3eb..fa8ac660693 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
acct-group/hsqldb
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2021-07-19 19:26 Miroslav Šulc
0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2021-07-19 19:26 UTC (permalink / raw
To: gentoo-commits
commit: dbf8391c9c078b00fcf395c831cf2029bb9d3437
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 19 19:26:47 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 19:26:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf8391c
dev-db/hsqldb: removed obsolete 1.8.1.3-r2
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild | 173 ---------------------------------
1 file changed, 173 deletions(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
deleted file mode 100644
index 72bc62a9b03..00000000000
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
+++ /dev/null
@@ -1,173 +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 test"
-
-inherit epatch user versionator java-pkg-2 java-ant-2
-
-MY_PV=$(replace_all_version_separators _ )
-MY_P="${PN}_${MY_PV}"
-
-DESCRIPTION="The leading SQL relational database engine written in Java"
-HOMEPAGE="http://hsqldb.org"
-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=""
-
-CDEPEND="
- java-virtuals/servlet-api:2.5"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.5
- app-arch/unzip
- test? ( dev-java/junit:0 )"
-
-S="${WORKDIR}/${PN}"
-
-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() {
- rm -v lib/*.jar || die
-
- sed -i -r \
- -e "s#/etc/sysconfig#${EPREFIX}/etc/conf.d#g" \
- bin/hsqldb || die
-
- java-pkg_filter-compiler jikes
-
- 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" \
- -e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \
- -e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \
- src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb || die
- cp "${FILESDIR}/server.properties" conf/ || die
- cp "${FILESDIR}/sqltool.rc" conf/ || die
-
- # Missing source file - needed for tests
- # https://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/trunk/src/org/hsqldb/lib/StringComparator.java
- # https://sourceforge.net/p/hsqldb/bugs/815/
- cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die
- cp "${FILESDIR}/TestBug1191815.java" src/org/hsqldb/test/ || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-# EANT_BUILD_XML used also in src_prepare
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil"
-EANT_DOC_TARGET="javadocdev"
-EANT_GENTOO_CLASSPATH="servlet-api-2.5"
-
-src_test() {
- java-pkg_jar-from --into lib junit
- eant -f ${EANT_BUILD_XML} jartest
- cd testrun/hsqldb || die
- ./runTest.sh TestSelf || die "TestSelf hsqldb tests failed"
- # TODO. These fail. Investigate why.
- #cd "${S}/testrun/sqltool" || die
- #CLASSPATH="${S}/lib/hsqldb.jar" ./runtests.bash || die "sqltool test failed"
-}
-
-src_install() {
- java-pkg_dojar lib/hsql*.jar
-
- if use doc; then
- dodoc doc/*.txt
- dohtml -r doc/zaurus
- dohtml -r doc/src
- fi
- use source && java-pkg_dosrc src/*
-
- echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
- doenvd "${T}"/35hsqldb
-
- # Put init, configuration and authorization files in /etc
- doinitd "${FILESDIR}/hsqldb"
- doconfd conf/hsqldb
- dodir /etc/hsqldb
- insinto /etc/hsqldb
- # Change the ownership of server.properties and sqltool.rc
- # files to hsqldb:hsqldb. (resolves Bug #111963)
- use prefix || insopts -m0600 -o hsqldb -g hsqldb
- doins conf/server.properties
- use prefix || insopts -m0600 -o hsqldb -g hsqldb
- doins conf/sqltool.rc
-
- # Install init script
- dodir "${HSQLDB_HOME}/bin"
- keepdir "${HSQLDB_HOME}"
- exeinto "${HSQLDB_HOME}/bin"
- doexe bin/hsqldb
-
- # Make sure that files have correct permissions
- use prefix || chown -R hsqldb:hsqldb "${ED}${HSQLDB_HOME}"
- chmod o-rwx "${ED}${HSQLDB_HOME}"
-
- # Create symlinks to authorization files in the server home dir
- # (required by the hqldb init script)
- insinto "${HSQLDB_HOME}"
- dosym ../../../etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties"
- dosym ../../../etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc"
-}
-
-pkg_postinst() {
- ewarn "If you intend to run Hsqldb in Server mode and you want to create"
- ewarn "additional databases, remember to put correct information in both"
- ewarn "'server.properties' and 'sqltool.rc' files."
- ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3."
- ewarn "UNIX Quick Start' in the Hsqldb docs for more information)"
- echo
- elog "Example:"
- echo
- elog "${EPREFIX}/etc/hsqldb/server.properties"
- elog "============================="
- elog "server.database.1=file:xdb/xdb"
- elog "server.dbname.1=xdb"
- elog "server.urlid.1=xdb"
- elog
- elog "${EPREFIX}/etc/hsqldb/sqltool.rc"
- elog "======================"
- elog "urlid xdb"
- elog "url jdbc:hsqldb:hsql://localhost/xdb"
- elog "username sa"
- elog "password "
- echo
- elog "Also note that each hsqldb server can serve only up to 10"
- elog "different databases simultaneously (with consecutive {0-9}"
- elog "suffixes in the 'server.properties' file)."
- echo
- ewarn "For data manipulation use:"
- ewarn
- ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
- ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
- ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
- ewarn " --rcFile ${EPREFIX}/var/lib/hsqldb/sqltool.rc <dbname>"
- echo
- elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
- elog "and Using Hsqldb' in the Hsqldb docs at:"
- elog " http://hsqldb.org/web/hsqlDocsFrame.html"
- elog "If you intend to run it in the Server mode, it is suggested to add the"
- elog "init script to your start-up scripts, this should be done like this:"
- elog " \`rc-update add hsqldb default\`"
- echo
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2021-10-19 0:15 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-10-19 0:15 UTC (permalink / raw
To: gentoo-commits
commit: cc2e06c3cbae6b8d4ef103bcd99dc1eb40252b97
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 00:14:25 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 00:14:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc2e06c3
dev-db/hsqldb: Keyword 1.8.1.3-r3 arm64, #802609
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
index fa8ac660693..be9c505d1c2 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
acct-group/hsqldb
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2021-11-24 23:31 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-11-24 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 50e09c5689a44c8b4c3a8db3598aac9c57eb4111
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 23:31:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 23:31:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50e09c56
dev-db/hsqldb: Stabilize 1.8.1.3-r3 arm64, #822924
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
index be9c505d1c2e..618d6bc03d9b 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
acct-group/hsqldb
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2023-02-25 6:47 Miroslav Šulc
0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2023-02-25 6:47 UTC (permalink / raw
To: gentoo-commits
commit: 885d29a15f0a5c4e328e7bd1e3737fcdf4c9657d
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Feb 24 16:36:12 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 06:47:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885d29a1
dev-db/hsqldb: use jakarta-servlet-api instead of tomcat-servlet-api
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29506
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../hsqldb/{hsqldb-1.8.1.3-r3.ebuild => hsqldb-1.8.1.3-r4.ebuild} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild
similarity index 97%
rename from dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
rename to dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild
index 618d6bc03d9b..ead3e936c80c 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
CDEPEND="
acct-group/hsqldb
acct-user/hsqldb
- dev-java/tomcat-servlet-api:4.0"
+ dev-java/jakarta-servlet-api:4"
RDEPEND="${CDEPEND}
virtual/jre:1.8"
DEPEND="${CDEPEND}
@@ -77,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="tomcat-servlet-api-4.0"
+EANT_GENTOO_CLASSPATH="jakarta-servlet-api-4"
src_test() {
java-pkg_jar-from --into lib junit
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2024-06-28 8:19 Miroslav Šulc
0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2024-06-28 8:19 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2024-07-29 9:40 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2024-07-29 9:40 UTC (permalink / raw
To: gentoo-commits
commit: fec404bf14d1e358c4a9691cf47213867b5acf76
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 09:39:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 09:39:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec404bf
dev-db/hsqldb: Stabilize 2.7.3 x86, #936878
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/hsqldb/hsqldb-2.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-2.7.3.ebuild b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
index e0bb6b6b5a4a..7c75119d8e34 100644
--- a/dev-db/hsqldb/hsqldb-2.7.3.ebuild
+++ b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}/${PN}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
BDEPEND="
app-arch/unzip
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2024-07-29 9:40 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2024-07-29 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 9ab930827bb0e487d8b5044b74e7d0fe41fc83c1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 09:39:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 09:39:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab93082
dev-db/hsqldb: Stabilize 2.7.3 arm64, #936878
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/hsqldb/hsqldb-2.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-2.7.3.ebuild b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
index 7c75119d8e34..a2eccb2de484 100644
--- a/dev-db/hsqldb/hsqldb-2.7.3.ebuild
+++ b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}/${PN}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
BDEPEND="
app-arch/unzip
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2024-07-29 9:40 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2024-07-29 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 1a57bcdcc2ab2015362771ca90a5a8bae76c68af
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 09:39:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 09:39:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a57bcdc
dev-db/hsqldb: Stabilize 2.7.3 amd64, #936878
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/hsqldb/hsqldb-2.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-2.7.3.ebuild b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
index a2eccb2de484..6e599f8a6e07 100644
--- a/dev-db/hsqldb/hsqldb-2.7.3.ebuild
+++ b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}/${PN}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
BDEPEND="
app-arch/unzip
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2024-07-29 9:40 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2024-07-29 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 41cff4b6997cb0cbd140096228c44561df8da895
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 09:39:46 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 09:39:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41cff4b6
dev-db/hsqldb: Stabilize 2.7.3 ppc64, #936878
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/hsqldb/hsqldb-2.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/hsqldb/hsqldb-2.7.3.ebuild b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
index 6e599f8a6e07..3fef0b5b9daa 100644
--- a/dev-db/hsqldb/hsqldb-2.7.3.ebuild
+++ b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}/${PN}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
BDEPEND="
app-arch/unzip
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/
@ 2024-10-28 6:24 Miroslav Šulc
0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2024-10-28 6:24 UTC (permalink / raw
To: gentoo-commits
commit: 04f4339c7085e400682f00f8fba52285bdded0f3
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Oct 27 16:55:19 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 06:21:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f4339c
dev-db/hsqldb: add 2.7.4
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38836/commits/8b4f9a1b7c6467f2afc21597d91c6072d7f15e02
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-db/hsqldb/Manifest | 1 +
dev-db/hsqldb/hsqldb-2.7.4.ebuild | 181 ++++++++++++++++++++++++++++++++++++++
2 files changed, 182 insertions(+)
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 7d624437e929..5389b8a1ecbc 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1 +1,2 @@
DIST hsqldb-2.7.3.zip 11778622 BLAKE2B 9e7f6a0e0bdf8602c87ab770dcb43c17db9ae6dc5d50fda079a44a42b0ccb64a20f74d020b2dbedbbc6b6c6ee57acf062d2c74d53a7d34fe932dbd79b0cc86d0 SHA512 06825d5f1428630dae476d78de9e2c48834a34a8678adf0e6af594594c5e1a7efdf99e366add4f6bbc24136e6aaa8fcbf54bd7ff2f2c459c20f9f02f7415b70a
+DIST hsqldb-2.7.4.zip 11792951 BLAKE2B 5f3661914b1a3ab006462c4d456d4601a61fcc57f057e18031346696342e9f95ac123c410c604ca7ede89d5c0a2702dc1c988b9269f1319929dea6fb8c66cebb SHA512 632017aa0776bdfe2442399451474a996491aa4584e7536b4c42199f613c0d1267d931fdcbe06acfa49061fa18dff7c3e4a0063a5ecd40fff73b9959e9975801
diff --git a/dev-db/hsqldb/hsqldb-2.7.4.ebuild b/dev-db/hsqldb/hsqldb-2.7.4.ebuild
new file mode 100644
index 000000000000..c2a6424fcd29
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-2.7.4.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.hsqldb:hsqldb:${PV}"
+
+inherit java-pkg-2
+
+MY_PV="$(ver_cut 1-2)"
+MY_PV="${MY_PV//./_}"
+
+DESCRIPTION="HSQLDB - Lightweight 100% Java SQL Database Engine"
+HOMEPAGE="https://hsqldb.org"
+SRC_URI="https://downloads.sourceforge.net/project/hsqldb/hsqldb/hsqldb_${MY_PV}/${P}.zip"
+S="${WORKDIR}/${P}/${PN}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="
+ app-arch/unzip
+ >=dev-java/ant-1.10.14-r3:0
+"
+
+COMMON_DEPEND="
+ acct-group/hsqldb
+ acct-user/hsqldb
+"
+
+DEPEND="${COMMON_DEPEND}
+ dev-java/javax-servlet-api:3.1
+ >=virtual/jdk-11:*
+ test? (
+ >=dev-java/ant-1.10.14-r3:0[junit]
+ dev-java/junit:0
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ >=virtual/jre-11:*"
+
+DOCS=( readme.txt doc/{changelist_2_0,odbc,readme-docauthors}.txt )
+
+PATCHES=(
+ "${FILESDIR}/hsqldb-2.7.3-hsqldb.conf.patch"
+ "${FILESDIR}/hsqldb-2.7.3-hsqldb.init.patch"
+)
+
+HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
+HSQLDB_HOME=/var/lib/hsqldb
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean
+
+ # bin/hsqldb seems to have moved/renamed to sample/hsqldb.init
+ mv sample/hsqldb{.init,} || die
+
+ mkdir conf
+ # sample-hsqldb.cfg seems to have moved/renamed to sample/hsqldb.conf
+ mv sample/hsqldb.conf conf/hsqldb || die
+
+ cp "${FILESDIR}/server.properties" conf/ || die
+ cp "${FILESDIR}/sqltool.rc" conf/ || die
+}
+
+src_compile() {
+ local targets=( hsqldb hsqldbutil sqltool )
+ if use doc; then
+ mkdir doc-src/apidocs || die
+ cp doc{,-src}/apidocs/javadoc.css || die
+ rm -r doc/apidocs || die
+ targets+=( javadoc )
+ fi
+ use test && targets+=( preprocessor )
+ eant \
+ -f build/build.xml \
+ -Dservletapi.lib="$(java-pkg_getjars --build-only javax-servlet-api-3.1)" \
+ -Djavac.bootcp.override \
+ -Dant.java.iscjava11 \
+ -Dant.build.javac.source="11" \
+ -Dant.build.javac.target="11" \
+ "${targets[@]}"
+}
+
+src_test() {
+ mkdir -p test-src/org/hsqldb/{resources,jdbc/resources/{xml,sql},util/preprocessor} || die
+ eant -v \
+ -f build/test.xml \
+ -Dservletapi.lib="$(java-pkg_getjars --build-only javax-servlet-api-3.1)" \
+ -Djunit.jar="$(java-pkg_getjars --build-only junit)" \
+ -Djavac.bootcp.override \
+ -Dant.java.iscjava11 \
+ -Dant.build.javac.source="11" \
+ -Dant.build.javac.target="11" \
+ make.test.suite run.test.suite
+}
+
+src_install() {
+ java-pkg_dojar lib/{hsqldb{,util},sqltool}.jar
+
+ einstalldocs
+ use doc && java-pkg_dojavadoc doc/apidocs
+
+ use source && java-pkg_dosrc src/*
+
+ echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
+ doenvd "${T}"/35hsqldb
+
+ # Put init, configuration and authorization files in /etc
+ doinitd "${FILESDIR}/hsqldb"
+ doconfd conf/hsqldb
+ insinto /etc/hsqldb
+ # Change the ownership of server.properties and sqltool.rc
+ # files to hsqldb:hsqldb. (resolves Bug #111963)
+ use prefix || insopts -m0600 -o hsqldb -g hsqldb
+ doins conf/server.properties
+ use prefix || insopts -m0600 -o hsqldb -g hsqldb
+ doins conf/sqltool.rc
+
+ # Install init script
+ dodir "${HSQLDB_HOME}/bin"
+ keepdir "${HSQLDB_HOME}"
+ exeinto "${HSQLDB_HOME}/bin"
+ doexe sample/hsqldb
+
+ # Make sure that files have correct permissions
+ use prefix || chown -R hsqldb:hsqldb "${ED}${HSQLDB_HOME}" || die
+ chmod o-rwx "${ED}${HSQLDB_HOME}" || die
+
+ # Create symlinks to authorization files in the server home dir
+ # (required by the hqldb init script)
+ insinto "${HSQLDB_HOME}"
+ dosym ../../../etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties"
+ dosym ../../../etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc"
+}
+
+pkg_postinst() {
+ ewarn "If you intend to run Hsqldb in Server mode and you want to create"
+ ewarn "additional databases, remember to put correct information in both"
+ ewarn "'server.properties' and 'sqltool.rc' files."
+ ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3."
+ ewarn "UNIX Quick Start' in the Hsqldb docs for more information)"
+ echo
+ elog "Example:"
+ echo
+ elog "${EPREFIX}/etc/hsqldb/server.properties"
+ elog "============================="
+ elog "server.database.1=file:xdb/xdb"
+ elog "server.dbname.1=xdb"
+ elog "server.urlid.1=xdb"
+ elog
+ elog "${EPREFIX}/etc/hsqldb/sqltool.rc"
+ elog "======================"
+ elog "urlid xdb"
+ elog "url jdbc:hsqldb:hsql://localhost/xdb"
+ elog "username sa"
+ elog "password "
+ echo
+ elog "Also note that each hsqldb server can serve only up to 10"
+ elog "different databases simultaneously (with consecutive {0-9}"
+ elog "suffixes in the 'server.properties' file)."
+ echo
+ ewarn "For data manipulation use:"
+ ewarn
+ ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
+ ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
+ ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
+ ewarn " --rcFile ${EPREFIX}/var/lib/hsqldb/sqltool.rc <dbname>"
+ echo
+ elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
+ elog "and Using Hsqldb' in the Hsqldb docs at:"
+ elog " http://hsqldb.org/web/hsqlDocsFrame.html"
+ elog "If you intend to run it in the Server mode, it is suggested to add the"
+ elog "init script to your start-up scripts, this should be done like this:"
+ elog " \`rc-update add hsqldb default\`"
+ echo
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-10-28 6:24 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-19 19:26 [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-10-28 6:24 Miroslav Šulc
2024-07-29 9:40 Sam James
2024-07-29 9:40 Sam James
2024-07-29 9:40 Sam James
2024-07-29 9:40 Sam James
2024-06-28 8:19 Miroslav Šulc
2023-02-25 6:47 Miroslav Šulc
2021-11-24 23:31 Sam James
2021-10-19 0:15 Sam James
2021-07-19 18:36 Sam James
2021-07-17 23:18 Sam James
2021-07-17 7:44 Agostino Sarubbo
2021-06-16 8:48 Miroslav Šulc
2021-06-16 8:48 Miroslav Šulc
2018-08-20 9:45 Patrice Clement
2018-02-16 21:16 Michał Górny
2017-08-26 17:13 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox