gentoo auto-resync : 01:07:2024 - 08:00:50

5 files changed, 235 insertions, 0 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 75b09933e53a..ef482a11b732 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index e0245e367575..d3100f13df3f 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -2,9 +2,13 @@ AUX StringComparator.java 1986 BLAKE2B e86079c260e0732c8828626de3c3d1611376377c2
 AUX TestBug1191815.java 4112 BLAKE2B f8418d564f7489e3dd256e9783624ef66994875d2509ccd66972ed5704281ae9770df7f7521ec56ab66b44af142ff4a6a846fb9d04d768b2a0b2c5f78b9c6b7f SHA512 c37491e2fcea0b4ce6bd641ffe128deaa9a8e38533ec3e607415cb1325a975dd8317c212c0fbf9f42b25de7808869df6ac63dacd53c773455f5d2ca0a58f1f62
 AUX hsqldb 364 BLAKE2B 236ae5fff19eaf9c4aa184bf1228bd96c7841c8c1849d35d72be02d43b955be003c54a96fc9d792208a38c388609d3dce34a5ef1e2c36b9283dd69a545cc3e2d SHA512 6cd0a4a26739960536192a9dda36324e10a16e4ed51028515f07ca5542c68a9f13d9ee9456faf7f797071476747b2026cdf5872ebdf20c1fbfda1079c4164716
 AUX hsqldb-1.8.1.3-java7.patch 13842 BLAKE2B afb8a9ade41e830242cea603f0464462ef4abcf732b1e8ee0419925d37207579114baccf6862663ffe4c653f8954f5e64264729d66991c187690516fc8badb6a SHA512 b5e67c3a6e883b50ed74bbc18b81e5244b43161612d2114b645a16c1405c355555740daf8774a3347ae3721f607ca2eb7570117c1ca93ccbe925d34d4968b6e2
+AUX hsqldb-2.7.3-hsqldb.conf.patch 1285 BLAKE2B 380066dde2adb7f336bd14edf2c52c6bdb57c1f32a419649ec7a7d02c56cdd9cf19fce2978c944cd520759c5b9255c1bc44952bf5deb8c74b41e8e6861d9af8c SHA512 19124e4835b80e2bdb9c3db57ef1f8620fd8c4716205f7ddb22b5618b8eb6e298227131cc66c97c426f39734e0f04223b0b9b71a68b806232d7447a1c90d0fa2
+AUX hsqldb-2.7.3-hsqldb.init.patch 740 BLAKE2B 948afb9bb1404d34f767bebd2010fdea92d065c3fd645e0c2b9968a359e55f66af14a803fa02fbe7b417f6453ea875aa9cc67ae5eaa0700291e3765ba1979f40 SHA512 b6de0367e9f6da039976ae6ec81368fbf6982844d76377364b16a27c4d94d4f60c6b1792bcae65fa42f7febdf17b9b5c8dfd5bcc0064e345ba27b863d2d4ec74
 AUX resolve-config-softlinks.patch 846 BLAKE2B 257d552458e7d4b59d45fa6827e081dfc8101ddef1f9928551834c9ffecb36f43610422dc7c482eae201b210005ed839eafb4cbb7403ad66d619e638153abc58 SHA512 5510a6f70647bb50d4c8ef6c8341b8d4bf38119fd8849b4086b4548ef19abbbaaa12d552f5602bd91ec24e96d7c4ef51efd8e83b38a841f3276ac478bd2480f4
 AUX server.properties 686 BLAKE2B 6b4482dfe6187adada772cffb1a46e39bacd9fa8ca5501dd58414f9815dc6b118d3f9de909953f88f1055ae1984ef3f9aee479c339920bf182f31f4265cdb6f1 SHA512 c36a1d2e387762f96872d94bdb3a6a2af9edb949be9d33321f9ea4e3fb996baecff6fc3875b6bef8f73a54a6a1cedd71dcdf97c881819cb130b1a2b43ec7e842
 AUX sqltool.rc 560 BLAKE2B 5f5e4bd1e9fe9759c2e2d5b6b5274343caa5028b29cfa4597c3a3348a1b07e4540d608d3dea5b189cf471b85721f15018490a7e4f8c56cc48ce648a07f0b7a45 SHA512 80ce53ad07c2091113787cb41232e5900426b042dcc3f62157569588538ad26d471e5d17aac62052902789065efb01647bfbc3488ff3d0f3c9e3df513895f57c
+DIST hsqldb-2.7.3.zip 11778622 BLAKE2B 9e7f6a0e0bdf8602c87ab770dcb43c17db9ae6dc5d50fda079a44a42b0ccb64a20f74d020b2dbedbbc6b6c6ee57acf062d2c74d53a7d34fe932dbd79b0cc86d0 SHA512 06825d5f1428630dae476d78de9e2c48834a34a8678adf0e6af594594c5e1a7efdf99e366add4f6bbc24136e6aaa8fcbf54bd7ff2f2c459c20f9f02f7415b70a
 DIST hsqldb_1_8_1_3.zip 3170550 BLAKE2B 0664bfa259af5091e3e76ca804e9c9890457ecc982ab07ee37640dc713053fb63d6dd295e9db4adb5e5436fac6275745526d3e830dd84e5daa3a32162627dc76 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442
 EBUILD hsqldb-1.8.1.3-r5.ebuild 5454 BLAKE2B 25abc5fba32e684c75a79f0e7a55faa22f1f68f27353f5e15bc33a8e649f7a8642b6af93c503a606a567d528cce463b27893c6c62d7e8b199afbc7e7871de077 SHA512 0f433daf78cfaf5b8ce78510c4d58f9e99ab23bc3510615f39f355b163c40ba24a52343298a3343b878998df3a30222c51f3b691700542abd128ff6ccd98ca66
+EBUILD hsqldb-2.7.3.ebuild 5375 BLAKE2B 299de4016a15a6fd7c7a83aed062c74f0e60bd70832deb694e0e1fab412a4901df8883ab6d90de95787f914db8cd038f40099747ef1b42018c74a8d9e6b38aa1 SHA512 32d8b3e23a82d2102e4f160dbd62030f5032f27b5ebcbf9d07f5a4d72977245fff3e30c664181e5e1e2d02a5155897acab9a7fbf5d7efb20463f849dd0d852ac
 MISC metadata.xml 313 BLAKE2B 9e6ce7bf4cf82ff78b3a930ec36589308e448ae076c231a742ce3bdc3c43648bb63946636c5564995f7463d2d69b039d0d533d4af1d55790f3fafaeaf68597d8 SHA512 f56b3020ded5e21f6ca53bd6d81396f16c3917c702bcda8553a46bdc996bd751ef30757f241efe61343a5af58886b3cfdad51aa7b1e008378bbc4891dd7fa308
diff --git a/dev-db/hsqldb/files/hsqldb-2.7.3-hsqldb.conf.patch b/dev-db/hsqldb/files/hsqldb-2.7.3-hsqldb.conf.patch
new file mode 100644
index 000000000000..2f34a0b3b55d
--- /dev/null
+++ b/dev-db/hsqldb/files/hsqldb-2.7.3-hsqldb.conf.patch
@@ -0,0 +1,30 @@
+Patch created with sed expression borrowed from 1.8.1.3-r4.ebuild
+
+	# sample-hsqldb.cfg seems to have moved/renamed to sample/hsqldb.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' \
+		-i sample/hsqldb.conf || die
+
+--- a/sample/hsqldb.conf
++++ b/sample/hsqldb.conf
+@@ -34,7 +34,7 @@ SQLTOOL_JAR_PATH=/opt/hsqldb-2.0.0/hsqldb/lib/sqltool.jar
+ # /opt/hsqldb-2.0.0/hsqldb/lib/hsqldb*.jar.
+ 
+ # Where the file "server.properties" or "webserver.properties" resides.
+-SERVER_HOME=/opt/hsqldb-2.0.0/hsqldb/data
++SERVER_HOME=/var/lib/hsqldb
+ 
+ # What UNIX user the server will run as.
+ # (The shutdown client is always run as root or the invoker of the init script).
+@@ -91,7 +91,7 @@ URLIDS='localhostdb1'
+ # root who runs the init script.
+ # (See the SqlTool chapter of the HyperSQL Utilities Guide if you don't
+ # understand this).
+-#AUTH_FILE=/home/blaine/sqltool.rc
++AUTH_FILE=${SERVER_HOME}/sqltool.rc
+ 
+ # Typical users will leave this unset and it will default to
+ # org.hsqldb.server.Server.  If you need to run the HSQLDB WebServer class
+
diff --git a/dev-db/hsqldb/files/hsqldb-2.7.3-hsqldb.init.patch b/dev-db/hsqldb/files/hsqldb-2.7.3-hsqldb.init.patch
new file mode 100644
index 000000000000..bb4984691936
--- /dev/null
+++ b/dev-db/hsqldb/files/hsqldb-2.7.3-hsqldb.init.patch
@@ -0,0 +1,20 @@
+--- a/sample/hsqldb.init
++++ b/sample/hsqldb.init
+@@ -57,7 +57,7 @@ SERVICE=hsqldb
+ # chkconfig: 345 87 13
+ # description: HyperSQL Database, A High Performance Java Database Server
+ # pidfile: /run/hsqldb.pid
+-# config: /etc/sysconfig/hsqldb
++# config: /etc/conf.d/hsqldb
+ 
+ # This block only used by insserv systems (incl. SuSE Linux).
+ ### BEGIN INIT INFO
+@@ -198,7 +198,7 @@ case "`uname`" in
+ esac
+ 
+ for candidate in /etc/hsqldb/${SERVICE}.conf  \
+-        /etc/sysconfig/${SERVICE} /etc/${SERVICE}.conf  \
++        /etc/conf.d/${SERVICE} /etc/${SERVICE}.conf  \
+         /etc/${SERVICE}.cfg  /Library/Hsqldb/conf/${SERVICE}.cfg  \
+         /Library/Hsqldb/${SERVICE}.cfg /usr/local/etc/${SERVICE}.cfg; do
+     [ -f $candidate ] && {
diff --git a/dev-db/hsqldb/hsqldb-2.7.3.ebuild b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
new file mode 100644
index 000000000000..e0bb6b6b5a4a
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-2.7.3.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 ~arm ~arm64 ~ppc64 ~x86 ~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
+}