gentoo auto-resync : 07:08:2024 - 12:37:20

5 files changed, 2 insertions, 581 deletions

diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index d3100f13df3f..fcbba860cc53 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,14 +1,10 @@
 AUX StringComparator.java 1986 BLAKE2B e86079c260e0732c8828626de3c3d1611376377c228c8efb28739dff5f82cbe26ed2a06f9bf6c2214e44a291c1af51e6cb2044fc639aaafb54e356fe6b978dc8 SHA512 a0103b0b8445bfbbe325c73ab65dcf4c22c8fd4dab89cd9d60809b4323263e62da2c20a0c1f2900ee97eb9ca2549730e1d37b7f1bffdfce3d116ca802fe8beaa
 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
+EBUILD hsqldb-2.7.3.ebuild 5371 BLAKE2B 7dc94cca85dea54c73b72cc47334238f99cb1fb71d780f3444ae13db905603399990511ade4467702b0f92e4f11819932165c33fca2b71ad4b8b08980c52b9bb SHA512 9108b291fc6b81d0c43efbdfe15be133ac3840a417a7d8445077d1ca17bf7bc59c48ffac6d879698d6d4aeb6ab24a4342bd66bb2cdc7ea4c87b18a282173bdbc
 MISC metadata.xml 313 BLAKE2B 9e6ce7bf4cf82ff78b3a930ec36589308e448ae076c231a742ce3bdc3c43648bb63946636c5564995f7463d2d69b039d0d533d4af1d55790f3fafaeaf68597d8 SHA512 f56b3020ded5e21f6ca53bd6d81396f16c3917c702bcda8553a46bdc996bd751ef30757f241efe61343a5af58886b3cfdad51aa7b1e008378bbc4891dd7fa308
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
-}
diff --git a/dev-db/hsqldb/hsqldb-2.7.3.ebuild b/dev-db/hsqldb/hsqldb-2.7.3.ebuild
index e0bb6b6b5a4a..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