Adding metadata

10 files changed, 4 insertions, 580 deletions

diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index 293f142610bd..730f2e049aed 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,4 +1,4 @@
 DIST citus-11.3.1.tar.gz 6623462 BLAKE2B ef07fb1e6cf0dd3f49600c3befcb300d47244393dd3bbe01450a8cb7bdb40adf1b7c6d7cf473ac80c466fc5dd4d6e0f5a62d1a587804d74011dda65731431028 SHA512 481d74cdf0e8de86b918fc73ed72f988f42679a827a39e7d89e2d0ebb0447d629dbaf323099dc97e886ea3012539200831f580bfe0cf3a12ef1f3a7bfe3fab42
 DIST citus-12.0.1.tar.gz 6740395 BLAKE2B ca004f8026d94c1ed70c9c7450726287aff415c13b80b93d25a19fbae9a79cbbeaec51521fc7922d5574c75bddb9537d42d656121ca586f4512afe773be5bf76 SHA512 db9b882c63ef6ab848a85d547390d4fc61b97056485dcc8fa51c289a302b78d0de959e29c27a91c494fd3e20491f6a96e96436d8766d02b2770f0e375b94564e
-DIST citus-12.1.3.tar.gz 6905546 BLAKE2B 6ece3bb20dfdad3d9413a17dc4b9177ae3cb8829e692b37bd226c60cbb1fa1e827e9de6f833d31c65835ab040593e0cc5fe4b6b0c8b0314306313cd88533e622 SHA512 2bcd5fa83e4fa56b90a3a3873229d3c5a294a0483d031d04ebd9602132883dc54485ca0907b867cd545f9b131a5f8cdeecb2e7e500b46d87f01aa5d5a34ff16f
 DIST citus-12.1.4.tar.gz 6906485 BLAKE2B cb5ed7c53449c7497693cfff69f360e43ab10acc7ac8b7a7be9bcb4e7440dbdd0bd2a85bbbac25e62b43be3040301e11180e1c797b9f6c7a56fbdad2b0cd4bf3 SHA512 c4f7cd8f6f2f72b66de17ae529590518d5c62654d6e1393a4c7b2f1d8b2f9c70e7d4e1f07aef3434272f84edc92d299a0c9df00934b1f065a0997c6fc5274913
+DIST citus-12.1.5.tar.gz 6912425 BLAKE2B ec08387ed6883ecd27f432843ae1068fdc657b62e4bd74e2feb4f806ccf7f3954c600cb5dce27db90ef3fccfd9ddf43bd88bb73fd44c8f39c8517999264e3255 SHA512 267cf5e52a23eabd3ac86eedb9929fbeae09b16279db5656d328ddbf64879fe3691e82fb0d15efb216e3c254b37cb3b6a5ca9c5097fc5f075c8e7b9ec3337a93
diff --git a/dev-db/citus/citus-12.1.3.ebuild b/dev-db/citus/citus-12.1.5.ebuild
index 7b9ed91dac47..7b9ed91dac47 100644
--- a/dev-db/citus/citus-12.1.3.ebuild
+++ b/dev-db/citus/citus-12.1.5.ebuild
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
-}
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
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 1cf475048296..1a72e7ed120f 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,4 +1,4 @@
 DIST redis-6.2.12.tar.gz 2494460 BLAKE2B f7ac63c9c377743c158b435f954acf58db764f8ed70d5e76d13b814bf6316102eb9b0994477ac4629ff4fe94fef175735b95e7aa61f3ab69dd1caf63f39bf765 SHA512 cb955efacfd3ca9c526403f041d3500bfbd757137af46a1b76f2773ff835d9892f6a970cd9893f89f803aa2491f342b603c6208a08aad8f72f37feef4a03e8d1
 DIST redis-7.0.12.tar.gz 2992216 BLAKE2B 3aad6063d1d757568ebf249868b7728be49483c1e59f55cc84bc6407b1e9957abc68160f2ba2c4479679304cbe3878beba018cfbf89f818c015d3b1481ce9225 SHA512 27ed0ab054d262028d236694f323387e3ef0e007de782545878011a7535e188152ed0af898dea4d6c0a7fa385849bbce6a0d85661780cb0e69c7d89dea3825b8
-DIST redis-7.2.4.tar.gz 3386861 BLAKE2B 852d55f875378248fa15e189308afbe36bca73c2aa2e5423a765a3d6f6895908ac1455148e032f6d1a1087f57af5869bccf8a932684817109f3fcf09b204e639 SHA512 78590fb6680f229905c240ed8ce7a9a7153e5f8563577dbbb26aebf9bfbdcd7495d687f452bd95e0a86c76d772e1c497b506cf8d29bc97b62c9267f7d1e76f72
 DIST redis-7.2.5.tar.gz 3386454 BLAKE2B 5a0e5b0162f684ecd6db4a782a18a3c7bf272ec1ce38e2d2a4b5bc3966d968170f5b968e7f9946fd50d2b942c52298430eeccb386bbb443201eda6ac180c7f2b SHA512 e064a0f380e3a00ab8eb2f10ed7317fd6aa27d64cf00792fab80465036f92d17b166050e71b8a779fdf024528ac736cb54722316811f99951c4e386f4ab2245d
+DIST redis-7.4.0.tar.gz 3525325 BLAKE2B 232e5d8db368e1a6c13e044ea40b4f4cd2b1f8f8d02319e408c8b0cfdbc6e4630ca2d38af080c5ccd1a4564da06f8cc761b54b00362f515edb11dc13c4853f78 SHA512 f5cd7566664f41a038f1078cd746b0a143ae543e035c363ae1ba60639830cc244d1536c84a95ce897b277bd0c4aad91a569e209dbb7917b7a2319805901a49d1
diff --git a/dev-db/redis/redis-7.2.4.ebuild b/dev-db/redis/redis-7.4.0.ebuild
index ffe278380fca..ffe278380fca 100644
--- a/dev-db/redis/redis-7.2.4.ebuild
+++ b/dev-db/redis/redis-7.4.0.ebuild
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.4.4-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.4.4-r1.ebuild
index 35714cdf3648..08594d837c47 100644
--- a/dev-db/sqlitestudio/sqlitestudio-3.4.4-r1.ebuild
+++ b/dev-db/sqlitestudio/sqlitestudio-3.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8