From b49088575eb777ced2551f484da86317332d6087 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jul 2021 02:11:45 +0100 Subject: gentoo resync : 24.07.2021 --- dev-db/hsqldb/Manifest | 3 +- dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild | 173 --------------------------------- dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild | 2 +- 3 files changed, 2 insertions(+), 176 deletions(-) delete mode 100644 dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild (limited to 'dev-db/hsqldb') diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest index 76a04025537c..68217b9e6ead 100644 --- a/dev-db/hsqldb/Manifest +++ b/dev-db/hsqldb/Manifest @@ -6,6 +6,5 @@ AUX resolve-config-softlinks.patch 846 BLAKE2B 257d552458e7d4b59d45fa6827e081dfc AUX server.properties 686 BLAKE2B 6b4482dfe6187adada772cffb1a46e39bacd9fa8ca5501dd58414f9815dc6b118d3f9de909953f88f1055ae1984ef3f9aee479c339920bf182f31f4265cdb6f1 SHA512 c36a1d2e387762f96872d94bdb3a6a2af9edb949be9d33321f9ea4e3fb996baecff6fc3875b6bef8f73a54a6a1cedd71dcdf97c881819cb130b1a2b43ec7e842 AUX sqltool.rc 560 BLAKE2B 5f5e4bd1e9fe9759c2e2d5b6b5274343caa5028b29cfa4597c3a3348a1b07e4540d608d3dea5b189cf471b85721f15018490a7e4f8c56cc48ce648a07f0b7a45 SHA512 80ce53ad07c2091113787cb41232e5900426b042dcc3f62157569588538ad26d471e5d17aac62052902789065efb01647bfbc3488ff3d0f3c9e3df513895f57c DIST hsqldb_1_8_1_3.zip 3170550 BLAKE2B 0664bfa259af5091e3e76ca804e9c9890457ecc982ab07ee37640dc713053fb63d6dd295e9db4adb5e5436fac6275745526d3e830dd84e5daa3a32162627dc76 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442 -EBUILD hsqldb-1.8.1.3-r2.ebuild 5503 BLAKE2B f60641d2e1803e463cd2847c6a71aba983b96d47e55c864f7370829df797ad41aa6b22eaf28ae6c722b42703a0eef1383d005d97578047b5a5803981d0ca5606 SHA512 8006dfcc2160aaf0d7f3d01ee872ec61d3842d3208c0d265d27aa245fde3460ab3e98970d14893e8e21f3b23962311b28d3a8e539f7752eb52a3636d93174f85 -EBUILD hsqldb-1.8.1.3-r3.ebuild 5447 BLAKE2B edb7b8daf637d17e2e56ec9b1993b639b5768b1e17262db39c214a97e9eee441a5d8feb7887dd2c1dc13ee30485f7320ab60653452f52f16eae7544010c6a0da SHA512 064e6f2342044eb07d4e88daa14c5acd752d211e89555fd28e0caa5f14dfbf99eaf92791c59cf1ef3f25dd9913aed8bfcdc95a65241d073b49ba2b7d6f5cdd46 +EBUILD hsqldb-1.8.1.3-r3.ebuild 5445 BLAKE2B ce7628d681e8345394d5a6331a3c669b5fb5dbfd2e31bdfb487c62e1622a4aadc6277563c11a6b955cdca8a4797b9475a56c7ca7a5df04a643a772b02e7022d8 SHA512 47843945a3aad0416f61620645d72a9ecc3a89332f4b3c023439f5c1cc080c28cd448f09b15be98e597d9066eb9ae9a7068f849ec912636a9f719007eab3afd5 MISC metadata.xml 312 BLAKE2B 175d7bb3c54ffcc616117749062b16130ca8cf394ffd780991bd8bd5a21509527e2844cd4f1aaeba70b498274131d786b9a16d48d5ee8dca176e949e334093a6 SHA512 2b9fff35bd58701cd4992ddc02f6bc7a2027d90616a5b886ef352ad6c6781949a68478bb17bbc22382189ec73ddd1798f67c27941323cb0b727dfead38c7f975 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 72bc62a9b033..000000000000 --- 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 " - 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 -} 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 af2617dc5ac2..fa8ac6606938 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 -- cgit v1.2.3