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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C222A1581F3 for ; Thu, 28 Nov 2024 14:39:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF6E8E087F; Thu, 28 Nov 2024 14:38:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16AEEE087F for ; Thu, 28 Nov 2024 14:38:59 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C622335DCD for ; Thu, 28 Nov 2024 14:38:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6232AAED for ; Thu, 28 Nov 2024 14:38:56 +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: <1732804725.fd05590c331d6f2bc602c34ebeccad2e4f6d1bba.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/hsqldb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/hsqldb/Manifest dev-db/hsqldb/hsqldb-2.7.3.ebuild X-VCS-Directories: dev-db/hsqldb/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: fd05590c331d6f2bc602c34ebeccad2e4f6d1bba X-VCS-Branch: master Date: Thu, 28 Nov 2024 14:38:56 +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: 6744c596-6dd4-49a9-aa38-5cebc8ca9e9c X-Archives-Hash: 4ad085724a71f40106c27e9c7006a583 commit: fd05590c331d6f2bc602c34ebeccad2e4f6d1bba Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Nov 27 08:54:09 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Nov 28 14:38:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd05590c dev-db/hsqldb: drop 2.7.3 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39233/commits/405321c53b74d02ec81d156ae669c1b9d0a7aef9 Signed-off-by: Miroslav Šulc gentoo.org> dev-db/hsqldb/Manifest | 1 - dev-db/hsqldb/hsqldb-2.7.3.ebuild | 181 -------------------------------------- 2 files changed, 182 deletions(-) diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest index 5389b8a1ecbc..f8717e3b2c57 100644 --- a/dev-db/hsqldb/Manifest +++ b/dev-db/hsqldb/Manifest @@ -1,2 +1 @@ -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.3.ebuild b/dev-db/hsqldb/hsqldb-2.7.3.ebuild deleted file mode 100644 index 7af11c355afb..000000000000 --- a/dev-db/hsqldb/hsqldb-2.7.3.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# 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 " - 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 -}