8 files changed, 5 insertions, 249 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 4b51c9393cf2..023cb8d71626 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/pgLatLon/Manifest b/dev-db/pgLatLon/Manifest
index 686306b4dcaf..17ef255a12a7 100644
--- a/dev-db/pgLatLon/Manifest
+++ b/dev-db/pgLatLon/Manifest
@@ -1,3 +1,3 @@
 DIST pgLatLon-v0.15.tar.gz 46667 BLAKE2B 7a5ff9b1c451d3fed69614198c06725d11d6ccb2265a8542a6602c1c77fb7a0a2044fffbe7cc0eafa10236813f113b3ff1a73aa159014bafaa7d49cbf4b21973 SHA512 9a6ced9d32e9868baba5bdb8677fd5800cea14af75ab2f2d99f6fda33e2cd85ac00c356dac4584386338c830b9ad0f4b8d7441f59f2b671505463e1895a655ef
-EBUILD pgLatLon-0.15.ebuild 451 BLAKE2B 930ea39f5351e2323236425405d644386c76d72f40f11d1dc74516834c2089ff1a358f9f0cd646e0206645c8b72c123a9f9ae2fa3b9a7c7fbbf2009369954c09 SHA512 9ddbb2d57b40d48a181323603899f916085777b51b737ce88560489728349f4fa5387687e3938052f6df357ae405f5dcda56ff1f3035ab26aad932eaaed27bb4
+EBUILD pgLatLon-0.15.ebuild 458 BLAKE2B 26d78373a27bf236d3ff317ebee57fc16544fb8b44200f5aa526d7f2bd21725eb846e10b1cddf944207e03bb5e09febc2b9830cd664031dbdb17881d26279fff SHA512 61f11f6798805bbbb99c2db4803bed813426cee9437dc95eefd03a220b2f43218ebebbf435230cb607fd1b410be146a0ae43a1dcb911b2af653b9bf615852ce3
 MISC metadata.xml 248 BLAKE2B a52f1b42e34917354d5d99824d47adca0f36afbe44b9f3398cc819976181e5b067ffc621d3d02f337cc080dbb8676864fd6ae0e5b48736a124687eeea01e11ba SHA512 7524a042ca62db175429683f3aee96e272e324d3e26f9d8c28d1737c5784b72962338d49dfeb28e172d171d55e46b9b889ac471eb3a26a0b58a0b3b20fb1d0b9
diff --git a/dev-db/pgLatLon/pgLatLon-0.15.ebuild b/dev-db/pgLatLon/pgLatLon-0.15.ebuild
index 0f1e3d7100d9..f6b441ed140c 100644
--- a/dev-db/pgLatLon/pgLatLon-0.15.ebuild
+++ b/dev-db/pgLatLon/pgLatLon-0.15.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MYP}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 
 DEPEND="dev-db/postgresql:="
 RDEPEND="${DEPEND}"
diff --git a/dev-db/phppgadmin/Manifest b/dev-db/phppgadmin/Manifest
index 1d95fd1cd736..1a2119b95bca 100644
--- a/dev-db/phppgadmin/Manifest
+++ b/dev-db/phppgadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 162 BLAKE2B d08f1f1064e8f268fe92ee622d0b5a756e20d80a6376abf1bfc7e8bb88c90d7b3c1b7c3c3291d3189791cca9766feb05b9831ddcba2e84f69e295f7048d440e7 SHA512 3aa9e4b58ffd97cc9bc990e0ca8444e8be012fb56859b28705e7ed3d5ffae74bcfab19c55e415785c9f09fabcc20ea5a493ee2f03fb380a351c02fe958231bd8
 DIST phppgadmin-7.14.7.tar.gz 1154132 BLAKE2B 96321c9f2c67f8a740425b8a049a8b31320d43eedaaa2f8ceaf135d0b5b725ea168aa14715fc2df19fe9eb75d551bdb76c3821d1dbde6550dc865595ecc0ca99 SHA512 b5c6dd52e1458184a0bdb693650157c69f36d72a43df0645fde87ec7e0b3b75216dd4e1dcb3f34f95e8a0acb4bf3ec6bd9a9086a72a3ad526b80431acb476054
-EBUILD phppgadmin-7.14.7.ebuild 938 BLAKE2B 00f865b317ac251a98785b0a5742f8a6f5295e2d890b16b0a2b0739f79bc8cb98230d17efa92a381ae82c52f941eb03eaaf862f41d40d119c41189dcfab722cb SHA512 52eaef9f8a2dc32f6532f018d2e8e84c9b5a5eeba3f6acb7f0977d869b2338b29ed71372414f14c5e3e457b96ccf3a19bb427a1df6d7ad6ef742def0971bf639
+EBUILD phppgadmin-7.14.7.ebuild 945 BLAKE2B a900a2cba9dadaf7a954d5dbd20579c05eda11fa56f2b0a9344202b4576adc0bb0e8f771f6fe5c6d702ac35a3bd4a6a597dda4a6fe66edd7f033be964415c0bf SHA512 600b249ffa52a3c60e00013ba4702272d9d606a7c3daa18fe2c51330538511912671eb3be3a6f5d74e1208131b85dfbc53d3cf25695e001681c4be82ca522092
 MISC metadata.xml 336 BLAKE2B 77497569d487b6229d058b35c2c5f78ea1e5749e68f37515ffc4b4704c754b3ba10ad4be6044f49937bd46361ba3788aab22ac8e93690aecef3aa37b4c16968a SHA512 d96603ccdd1a6e66adc36bb3cbef1f46895c45b3e7e147fa1b2ccedd2f648b676f255cb1696ec1555c1455850de8e819580fe3eb41e9849165602ab49d51307e
diff --git a/dev-db/phppgadmin/phppgadmin-7.14.7.ebuild b/dev-db/phppgadmin/phppgadmin-7.14.7.ebuild
index e1741b8a26fc..c8dc1c53484d 100644
--- a/dev-db/phppgadmin/phppgadmin-7.14.7.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-7.14.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ReimuHakurei/phpPgAdmin/archive/refs/tags/v${PV}-mod
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="dev-lang/php[postgres,session,unicode]"
 
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 1b1f69a43b3e..99c93addbfac 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,8 +1,5 @@
 AUX sqlitestudio-3.4.17-fix-python.patch 393 BLAKE2B ade724444f57b54ef2bce44f4edb754dca311a62a79987f1ab751e9229623a91e8abfbf64a79ea1c411a3cacb6ef3ec2aacc4bc2b93b1b350b25c47bf3af66f6 SHA512 591ccc9f719aaa442a497dac033f180b503dcbfb48eee736a94197683919754ecf42e90bce941e79f5f9652113b9c9903b646644a7977956e08f283b6b989385
-AUX sqlitestudio-3.4.3-fix-PyThreadState.patch 2084 BLAKE2B b9fdd9b233a8e053013484a6c0d9949a5a71374d62bd3fc3cd2d0c180a8bc1a709cf0ba12f5d6a62d5ac0d2f3bb522972599a808a2a45d9e165303cecd73c954 SHA512 d0aedf2ff6dd0e567d410f8e809179a5504f04c39284e0ab9b1a089a6062da6e50a8e9c5640712491742ce34b58b60bfdbe0e5d89cc9256af7e5adf6937ac548
 AUX sqlitestudio-3.4.3-fix-python.patch 382 BLAKE2B 81da31e4f4d712e005639d12c3d1d41a2f339edc054e985903de16986967348fe0a2cca13a6dbced8762fc1f8bd497f8d061ac58a8810abc8f7cfab8b4a3150a SHA512 d391b549f842d7dbb1b8027c6814ad79f44d8bdc30adf407401fd2f139069a56ddbd8ceee0b2093bdd69922dd0f01ecd77d1f9f1b4550ba3bbbf67e59c4a87db
 DIST sqlitestudio-3.4.17.tar.gz 16696859 BLAKE2B 6b1d4660c7b4ed4880df3c7e2e68d7b52edb46d7e19a751d49825c08a477adc02646729418e3a8b1fd6e5bc8192cc35197a23aa7e9142e4c2ebd184c049ee1eb SHA512 2fab60c9a695022998ad7848b0ece614170070fd9603fb559a942692fb644204aa4437cf33b18f66bbcfe36f82bdfddb7e1d5c934e2946a3e56f537171798f4a
-DIST sqlitestudio-3.4.4.tar.gz 16187828 BLAKE2B 34a19880c0ce82a0457c8b34fe713d1792101563dd37849f02538a3f62310e0720939a3930c2c1d2fe43a8379c66012e75cf9e45e961a382c3ea5fbd857e42d3 SHA512 ddbb926afcca0afe8e4199be64254d0a9a47bef66f260c51cc7e5c5d38c8a00bfbe2012e8ec933bf69e85481c0c214136146cd3bff0975f6178f9fe7884e8190
 EBUILD sqlitestudio-3.4.17.ebuild 4735 BLAKE2B 68266bec6218f1cf579a5b00ad185fa69ea159641d4cc0c6fc46d1628ba8f67f5ff4848d5c76d4bf7ffd4a164deb4b15dba54bdbd66e68d586d780f8b0fa2b2e SHA512 50821e372a605fc65e7d1ac617bbf7ef720bda95a121cc2ae73ecd2db88b3fed58d1915521c9ea470c31cead180c16858fc05d426475bb50c0bd4fd65a86c5b8
-EBUILD sqlitestudio-3.4.4-r1.ebuild 4786 BLAKE2B 4926024bd08aa718ec7f5475ab0b83a9826b6ab00827b5db343824000cfa40519959074a87ddca077e6945f47f49788d0d1ff7aa5f168fe677264a0870b56d9e SHA512 7aa70e135314b70d041ce14e73eac40d3b6d357502c6a263cb767aed7628de9b05345f5c1af32a3ad697afde41b3d7ea57c1fa93ff64cdc44d1fe293ba29ba8d
 MISC metadata.xml 318 BLAKE2B dbda5d06a4e9349a582d2d09cf846580b383388ec7db0986675d1b4fe63e0ded9dbc7f50c332d855b600d9df99935b67e77a2fab9c0a37fc3b6af2d03b4e3212 SHA512 d1bf82ea37f8d16e7dd51d8da26eb5f93383a05df40ca1b91309be7fbad0b786db9365b8bc8f72b63556ccbf96969d2e38c785112754b035e3242b75ff2bacb7
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-PyThreadState.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-PyThreadState.patch
deleted file mode 100644
index 5f69298bb6d3..000000000000
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-PyThreadState.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 364981e072039de1322a72c936e3747c462e57d4 Mon Sep 17 00:00:00 2001
-From: Matthew White <mehw.is.me@inventati.org>
-Date: Fri, 5 May 2023 11:46:27 +0000
-Subject: [PATCH] Plugins: fix compiling with Python 3.11
-
-Python 3.11 removed PyThreadState()->frame, but since Python 3.9
-PyThreadState_GetFrame() can be used to get the frame.
-
-To get the frame's f_locals and f_globals use PyFrame_GetLocals()
-and PyFrame_GetGlobals() when compiling with Python 3.11.
-
-Merged here is also 'Fixed compilation for Python < 3.11':
-https://github.com/pawelsalawa/sqlitestudio/commit/30ad718415ffe78a5ac0ff9cf12cff2bd01e9810
-
-References:
-https://docs.python.org/3/c-api/frame.html
----
- Plugins/ScriptingPython/scriptingpython.cpp | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/Plugins/ScriptingPython/scriptingpython.cpp b/Plugins/ScriptingPython/scriptingpython.cpp
-index 1dedb5c106..663c55b7d7 100644
---- a/Plugins/ScriptingPython/scriptingpython.cpp
-+++ b/Plugins/ScriptingPython/scriptingpython.cpp
-@@ -582,15 +582,25 @@ SqlQueryPtr ScriptingPython::dbCommonEval(PyObject* sqlArg, const char* fnName)
- QVariant ScriptingPython::getVariable(const QString& name)
- {
-     PyThreadState* state = PyThreadState_Get();
--    if (!state->frame)
-+#if PY_VERSION_HEX < 0x03090000
-+    PyFrameObject* frame = state->frame;
-+#else
-+    PyFrameObject* frame = PyThreadState_GetFrame(state);
-+#endif
-+    if (!frame)
-         return QVariant();
- 
-     const char* varName = name.toUtf8().constData();
-     PyObject* obj = nullptr;
- 
--    PyFrame_FastToLocals(state->frame);
--    PyObject* locals = state->frame->f_locals;
--    PyObject* globals = state->frame->f_globals;
-+    PyFrame_FastToLocals(frame);
-+#if PY_VERSION_HEX < 0x030b0000
-+    PyObject* locals = frame->f_locals;
-+    PyObject* globals = frame->f_globals;
-+#else
-+    PyObject* locals = PyFrame_GetLocals(frame);
-+    PyObject* globals = PyFrame_GetGlobals(frame);
-+#endif
-     if (PyMapping_Check(locals))
-         obj = PyMapping_GetItemString(locals, varName);
-     else if (PyDict_Check(globals))
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.4.4-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.4.4-r1.ebuild
deleted file mode 100644
index 5b746ecdf792..000000000000
--- a/dev-db/sqlitestudio/sqlitestudio-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="af_ZA ar_SA ca_ES cs_CZ da_DK de_DE el_GR en_US es_ES fa_IR fi_FI fr_FR he_IL hu_HU it_IT ja_JP kaa ko_KR nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_SP sv_SE tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-# ScriptingPython says exactly 3.9
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit desktop plocale python-single-r1 qmake-utils xdg
-
-DESCRIPTION="Powerful cross-platform SQLite database manager"
-HOMEPAGE="https://sqlitestudio.pl"
-SRC_URI="https://github.com/pawelsalawa/sqlitestudio/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli cups python tcl test"
-
-REQUIRED_USE="
-	test? ( cli )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	cli? (
-		sys-libs/readline:=
-		sys-libs/ncurses:=
-	)
-	python? ( ${PYTHON_DEPS} )
-	cups? ( dev-qt/qtprintsupport:5 )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	test? ( dev-qt/qttest:5 )
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.3-fix-python.patch
-	"${FILESDIR}"/${PN}-3.4.3-fix-PyThreadState.patch
-)
-
-core_build_dir="${S}/output/build"
-plugins_build_dir="${core_build_dir}/Plugins"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	disable_modules() {
-		[[ $# -lt 2 ]] && die "not enough arguments"
-
-		local pro="$1"; shift
-		local modules="${@}"
-
-		sed -r -i \
-			-e 's/('${modules// /|}')[[:space:]]*(\\?)/\2/' \
-			${pro} || die
-	}
-
-	use cli || disable_modules SQLiteStudio3/SQLiteStudio3.pro cli
-
-	local mod_lst=( DbSqlite2 )
-	use cups || mod_lst+=( Printing )
-	use tcl || mod_lst+=( ScriptingTcl )
-	use python || mod_lst+=( ScriptingPython )
-	disable_modules Plugins/Plugins.pro ${mod_lst[@]}
-
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-	local ts_dir_lst=$(find * -type f -name "*.qm" -printf '%h\n' | sort -u)
-	local ts_pro_lst=$(find * -type f -name "*.pro" -exec grep -l 'TRANSLATIONS' {} \;)
-	local ts_qrc_lst=$(find * -type f -name "*.qrc" -exec grep -l '\.qm' {} \;)
-
-	# delete all "*.qm"
-	for ts_dir in ${ts_dir_lst[@]}; do
-		rm "${ts_dir}"/*.qm || die
-	done
-
-	lrelease_locale() {
-		for ts_dir in ${ts_dir_lst[@]}; do
-			local ts=$(find "${ts_dir}" -type f -name "*${1}.ts" || continue)
-			"${mylrelease}" "${ts}" || die "preparing ${1} locale failed"
-		done
-	}
-
-	rm_locale() {
-		for ts_pro in ${ts_pro_lst[@]}; do
-			sed -i -r -e 's/[^[:space:]]*'${1}'\.ts//' \
-				${ts_pro} || die
-		done
-
-		for ts_qrc in ${ts_qrc_lst[@]}; do
-			sed -i -e '/'${1}'\.qm/d' \
-				${ts_qrc} || die
-		done
-	}
-
-	local ts_dir_main="SQLiteStudio3/sqlitestudio/translations"
-	plocale_find_changes ${ts_dir_main} "sqlitestudio_" '.ts'
-	plocale_for_each_locale lrelease_locale
-	plocale_for_each_disabled_locale rm_locale
-
-	# prevent "multilib-strict check failed" with USE test by
-	# replacing target paths with dynamic lib dir
-	#
-	sed -i -e 's/\(target\.path = .*\/\)lib/\1'$(get_libdir)'/' \
-		SQLiteStudio3/Tests/TestUtils/TestUtils.pro || die
-}
-
-src_configure() {
-	# NOTE: QMAKE_CFLAGS_ISYSTEM option prevents
-	# build error with tcl use enabled (stdlib.h is missing)
-	# "QMAKE_CFLAGS_ISYSTEM=\"\""
-	# CONFIG+ borrowed from compile.sh of tarball
-	local myqmakeargs=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"LIBDIR=${EPREFIX}/usr/$(get_libdir)"
-		"CONFIG+=portable"
-		$(usex test 'DEFINES+=tests' '')
-	)
-
-	# Combination of kvirc ebuild and qtcompress
-	if use python; then
-		myqmakeargs+=(
-			INCLUDEPATH+=" $(python_get_includedir)"
-			LIBS+=" $(python_get_LIBS)"
-		)
-	fi
-
-	## Core
-	mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die
-	eqmake5 "${myqmakeargs[@]}" "${S}/SQLiteStudio3"
-
-	## Plugins
-	mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die
-	eqmake5 "${myqmakeargs[@]}" "${S}/Plugins"
-}
-
-src_compile() {
-	# -j1 for bug #902991; it clobbers object files in parallel
-	emake -j1 -C "${core_build_dir}"
-	emake -j1 -C "${plugins_build_dir}"
-}
-
-src_install() {
-	emake -j1 -C "${core_build_dir}" INSTALL_ROOT="${D}" install
-	emake -j1 -C "${plugins_build_dir}" INSTALL_ROOT="${D}" install
-
-	if use test; then
-		# remove test artifacts that must not be installed
-		rm -r "${ED}"/lib64 || die
-		rm -r "${ED}"/usr/share/qt5/tests || die
-	fi
-
-	doicon -s scalable "SQLiteStudio3/guiSQLiteStudio/img/${PN}.svg"
-
-	local make_desktop_entry_args=(
-		"${PN} -- %F"
-		'SQLiteStudio3'
-		"${PN}"
-		'Development;Database;Utility'
-	)
-	make_desktop_entry "${make_desktop_entry_args[@]}" \
-		"$( printf '%s\n' "MimeType=application/x-sqlite3;" )"
-}