commit: ae8586c113df8c04fa146742d4dfde97fba05037 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Jul 29 09:56:47 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Mon Jul 29 11:12:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae8586c1
dev-db/hsqldb: drop 1.8.1.3-r5 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/37780 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-db/hsqldb/Manifest | 1 - dev-db/hsqldb/files/hsqldb-1.8.1.3-java7.patch | 380 --------------------- dev-db/hsqldb/files/resolve-config-softlinks.patch | 22 -- dev-db/hsqldb/hsqldb-1.8.1.3-r5.ebuild | 173 ---------- 4 files changed, 576 deletions(-) diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest index 4f76610cc00a..7d624437e929 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_1_8_1_3.zip 3170550 BLAKE2B 0664bfa259af5091e3e76ca804e9c9890457ecc982ab07ee37640dc713053fb63d6dd295e9db4adb5e5436fac6275745526d3e830dd84e5daa3a32162627dc76 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442 diff --git a/dev-db/hsqldb/files/hsqldb-1.8.1.3-java7.patch b/dev-db/hsqldb/files/hsqldb-1.8.1.3-java7.patch deleted file mode 100644 index 7f9245597182..000000000000 --- a/dev-db/hsqldb/files/hsqldb-1.8.1.3-java7.patch +++ /dev/null @@ -1,380 +0,0 @@ -diff --git a/build/build.xml b/build/build.xml -index 68c446f..e82f00f 100644 ---- a/build/build.xml -+++ b/build/build.xml -@@ -98,16 +98,24 @@ examples: - <echo message="ant.java.hasjsse=${ant.java.hasjsse}" /> - </target> - -- <target name="javaversion6"> -+ <target name="javaversion7" unless="ant.java.iscjavaset"> -+ <available classname="java.util.Objects" property="ant.java.iscjava17"/> -+ <available classname="java.util.Objects" property="ant.java.iscjavaset"/> -+ </target> -+ -+ <target name="javaversion6" depends="javaversion7" unless="ant.java.iscjavaset"> - <available classname="java.net.IDN" property="ant.java.iscjava16"/> -+ <available classname="java.net.IDN" property="ant.java.iscjavaset"/> - </target> - -- <target name="javaversion4" depends="javaversion6" unless="ant.java.iscjava16"> -+ <target name="javaversion4" depends="javaversion6" unless="ant.java.iscjavaset"> - <available classname="java.nio.Buffer" property="ant.java.iscjava14"/> -+ <available classname="java.nio.Buffer" property="ant.java.iscjavaset"/> - </target> - -- <target name="javaversion2" depends="javaversion4" unless="ant.java.iscjava14"> -+ <target name="javaversion2" depends="javaversion4" unless="ant.java.iscjavaset"> - <available classname="java.lang.ref.Reference" property="ant.java.iscjava12"/> -+ <available classname="java.lang.ref.Reference" property="ant.java.iscjavaset"/> - </target> - - <target name="-prepare" depends="init,javaversion2"> -@@ -166,6 +174,7 @@ examples: - <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > - <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> - <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> -+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/> - <arg file="${src}/org/hsqldb/persist/LockFile.java"/> - <arg file="${src}/org/hsqldb/persist/Logger.java"/> -@@ -183,6 +192,7 @@ examples: - <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > - <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> - <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> -+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/> -@@ -210,6 +220,7 @@ examples: - <arg value="+JAVA2FULL"/> - <arg value="-JAVA4"/> - <arg value="-JAVA6"/> -+ <arg value="-JAVA7"/> - </java> - </target> - -@@ -218,6 +229,7 @@ examples: - <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > - <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> - <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> -+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/> -@@ -244,6 +256,7 @@ examples: - <arg value="+JAVA2FULL"/> - <arg value="+JAVA4"/> - <arg value="-JAVA6"/> -+ <arg value="-JAVA7"/> - </java> - </target> - -@@ -253,6 +266,43 @@ examples: - <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > - <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> - <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> -+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcCallableStatement.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcClob.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcConnection.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSet.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java"/> -+ <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/> -+ <arg file="${src}/org/hsqldb/persist/LockFile.java"/> -+ <arg file="${src}/org/hsqldb/persist/Logger.java"/> -+ <arg file="${src}/org/hsqldb/persist/ScaledRAFile.java"/> -+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/> -+ <arg file="${src}/org/hsqldb/util/DatabaseManager.java"/> -+ <arg file="${src}/org/hsqldb/util/ConnectionDialogCommon.java"/> -+ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/> -+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/> -+ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/> -+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/> -+ <arg file="${src}/org/hsqldb/HsqlDateTime.java"/> -+ <arg value="+JAVA2"/> -+ <arg value="+JAVA2FULL"/> -+ <arg value="+JAVA4"/> -+ <arg value="+JAVA6"/> -+ <arg value="-JAVA7"/> -+ </java> -+ </target> -+ -+ <target name="switchtojdk17" depends="switchtojdk16" -+ description="self explanatory" if="ant.java.iscjava17"> -+ <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > -+ <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> -+ <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> -+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/> - <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/> -@@ -279,10 +329,11 @@ examples: - <arg value="+JAVA2FULL"/> - <arg value="+JAVA4"/> - <arg value="+JAVA6"/> -+ <arg value="+JAVA7"/> - </java> - </target> - -- <target name="store" depends="switchtojdk16" -+ <target name="store" depends="switchtojdk17" - description="compiles the /store folder"> - <javac srcdir="${src}" - destdir="classes" -diff --git a/src/org/hsqldb/jdbc/jdbcCallableStatement.java b/src/org/hsqldb/jdbc/jdbcCallableStatement.java -index 3779094..d2131ed 100644 ---- a/src/org/hsqldb/jdbc/jdbcCallableStatement.java -+++ b/src/org/hsqldb/jdbc/jdbcCallableStatement.java -@@ -3106,7 +3106,6 @@ implements CallableStatement { - - //#endif JAVA4 - //#ifdef JAVA6 --/* - public void setPoolable(boolean poolable) throws SQLException - { - throw new UnsupportedOperationException("Not supported yet."); -@@ -3376,7 +3375,20 @@ implements CallableStatement { - { - throw new UnsupportedOperationException("Not supported yet."); - } --*/ - - //#endif JAVA6 -+ -+//#ifdef JAVA7 -+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ public <T> T getObject(int ColumnIndex, Class<T> type) throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ -+//#endif JAVA7 - } -diff --git a/src/org/hsqldb/jdbc/jdbcConnection.java b/src/org/hsqldb/jdbc/jdbcConnection.java -index 5d59464..0c7e08a 100644 ---- a/src/org/hsqldb/jdbc/jdbcConnection.java -+++ b/src/org/hsqldb/jdbc/jdbcConnection.java -@@ -43,13 +43,17 @@ import java.sql.Connection; - import java.sql.DatabaseMetaData; - - //#ifdef JAVA6 --/* - import java.sql.NClob; - import java.sql.SQLClientInfoException; - import java.sql.SQLXML; --*/ - - //#endif JAVA6 -+ -+//#ifdef JAVA7 -+import java.util.concurrent.Executor; -+ -+//#endif JAVA7 -+ - import java.sql.PreparedStatement; - import java.sql.SQLException; - import java.sql.SQLWarning; -@@ -2794,4 +2798,31 @@ public class jdbcConnection implements Connection { - */ - - //#endif JAVA6 -+ -+//#ifdef JAVA7 -+ public int getNetworkTimeout() throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ public void setNetworkTimeout(Executor executor, int millis) throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ public void abort(Executor executor) throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ public String getSchema() throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ public void setSchema(String schema) throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+//#endif JAVA7 - } -diff --git a/src/org/hsqldb/jdbc/jdbcDataSource.java b/src/org/hsqldb/jdbc/jdbcDataSource.java -index 9f79a37..d0ab49b 100644 ---- a/src/org/hsqldb/jdbc/jdbcDataSource.java -+++ b/src/org/hsqldb/jdbc/jdbcDataSource.java -@@ -47,6 +47,11 @@ import javax.sql.DataSource; - //#endif JAVA4 - import org.hsqldb.jdbcDriver; - -+//#ifdef JAVA7 -+import java.sql.SQLFeatureNotSupportedException; -+import java.util.logging.Logger; -+//#endif JAVA7 -+ - // boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final - - /** -@@ -312,7 +317,6 @@ public class jdbcDataSource implements Serializable { - } - - //#ifdef JAVA6 --/* - public <T> T unwrap(Class<T> iface) throws SQLException - { - throw new UnsupportedOperationException("Not supported yet."); -@@ -322,7 +326,14 @@ public class jdbcDataSource implements Serializable { - { - throw new UnsupportedOperationException("Not supported yet."); - } --*/ - - //#endif JAVA6 -+ -+//#ifdef JAVA7 -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException -+ { -+ throw new SQLFeatureNotSupportedException("Not supported yet."); -+ } -+ -+//#endif JAVA7 - } -diff --git a/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java b/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java -index ffa238d..0480228 100644 ---- a/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java -+++ b/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java -@@ -5650,7 +5650,6 @@ public class jdbcDatabaseMetaData implements DatabaseMetaData { - } - - //#ifdef JAVA6 --/* - public RowIdLifetime getRowIdLifetime() throws SQLException - { - throw new UnsupportedOperationException("Not supported yet."); -@@ -5694,7 +5693,23 @@ public class jdbcDatabaseMetaData implements DatabaseMetaData { - { - throw new UnsupportedOperationException("Not supported yet."); - } --*/ - - //#endif JAVA6 -+ -+ -+//#ifdef JAVA7 -+ public boolean generatedKeyAlwaysReturned() throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ public ResultSet getPseudoColumns(String catalog, String schemaPattern, -+ String tableNamePattern, String columnNamePattern) throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ -+//#endif JAVA7 -+ - } -diff --git a/src/org/hsqldb/jdbc/jdbcResultSet.java b/src/org/hsqldb/jdbc/jdbcResultSet.java -index 2a6567e..81aecf3 100644 ---- a/src/org/hsqldb/jdbc/jdbcResultSet.java -+++ b/src/org/hsqldb/jdbc/jdbcResultSet.java -@@ -5332,4 +5332,19 @@ public class jdbcResultSet implements ResultSet { - */ - - //#endif JAVA6 -+ -+//#ifdef JAVA7 -+ -+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ public <T> T getObject(int columnNum, Class<T> type) throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+//#endif JAVA7 -+ - } -diff --git a/src/org/hsqldb/jdbc/jdbcStatement.java b/src/org/hsqldb/jdbc/jdbcStatement.java -index f84f2e2..38bf8d0 100644 ---- a/src/org/hsqldb/jdbc/jdbcStatement.java -+++ b/src/org/hsqldb/jdbc/jdbcStatement.java -@@ -1588,7 +1588,6 @@ public class jdbcStatement implements Statement { - } - } - //#ifdef JAVA6 --/* - public void setPoolable(boolean poolable) throws SQLException - { - throw new UnsupportedOperationException("Not supported yet."); -@@ -1608,6 +1607,17 @@ public class jdbcStatement implements Statement { - { - throw new UnsupportedOperationException("Not supported yet."); - } --*/ - //#endif JAVA6 -+ -+//#ifdef JAVA7 -+ public boolean isCloseOnCompletion() throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ public void closeOnCompletion() throws SQLException -+ { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+//#endif JAVA7 - } -diff --git a/src/org/hsqldb/jdbcDriver.java b/src/org/hsqldb/jdbcDriver.java -index a377b36..361c074 100644 ---- a/src/org/hsqldb/jdbcDriver.java -+++ b/src/org/hsqldb/jdbcDriver.java -@@ -42,6 +42,11 @@ import org.hsqldb.jdbc.jdbcConnection; - import org.hsqldb.persist.HsqlDatabaseProperties; - import org.hsqldb.persist.HsqlProperties; - -+//#ifdef JAVA7 -+import java.sql.SQLFeatureNotSupportedException; -+import java.util.logging.Logger; -+//#endif JAVA7 -+ - // fredt@users 20011220 - patch 1.7.0 by fredt - // new version numbering scheme - // fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping -@@ -321,4 +326,12 @@ public class jdbcDriver implements Driver { - DriverManager.registerDriver(new jdbcDriver()); - } catch (Exception e) {} - } -+ -+//#ifdef JAVA7 -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException -+ { -+ throw new SQLFeatureNotSupportedException("Not supported yet."); -+ } -+ -+//#endif JAVA7 - } diff --git a/dev-db/hsqldb/files/resolve-config-softlinks.patch b/dev-db/hsqldb/files/resolve-config-softlinks.patch deleted file mode 100644 index 5a716e6dc3a2..000000000000 --- a/dev-db/hsqldb/files/resolve-config-softlinks.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urpN hsqldb.orig/bin/hsqldb hsqldb/bin/hsqldb ---- hsqldb.orig/bin/hsqldb 2006-07-08 15:55:55.000000000 +0200 -+++ hsqldb/bin/hsqldb 2006-07-08 16:03:28.000000000 +0200 -@@ -282,6 +282,18 @@ else - echo "Auth file '$_AUTH_TEST_PATH' not readable" 1>&2 - exit 2 - } -+ -+ # resolve links - $_AUTH_TEST_PATH may be a softlink -+ while [ -h "$_AUTH_TEST_PATH" ]; do -+ ls=`ls -ld "$_AUTH_TEST_PATH"` -+ link=`expr "$ls" : '.*-> \(.*\)$'` -+ if expr "$link" : '.*/.*' > /dev/null; then -+ _AUTH_TEST_PATH="$link" -+ else -+ _AUTH_TEST_PATH=`dirname "$_AUTH_TEST_PATH"`/"$link" -+ fi -+ done -+ - ls -ld "$_AUTH_TEST_PATH" | grep '^-..------' > /dev/null 2>&1 || { - echo "Fix permissions on '$_AUTH_TEST_PATH' like 'chmod 600 $_AUTH_TEST_PATH'" 1>&2 - exit 2 diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r5.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r5.ebuild deleted file mode 100644 index be250b19dc31..000000000000 --- a/dev-db/hsqldb/hsqldb-1.8.1.3-r5.ebuild +++ /dev/null @@ -1,173 +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" - -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="https://hsqldb.org"; -SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.zip"; -S="${WORKDIR}/${PN}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -CDEPEND=" - acct-group/hsqldb - acct-user/hsqldb - dev-java/jakarta-servlet-api:4" -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" -) - -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="jakarta-servlet-api-4" - -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{db{,util},tool,jdbc}.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 -}
