gentoo auto-resync : 02:12:2024 - 02:07:07

12 files changed, 215 insertions, 23 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index aa8c1c7f37c7..baf0731aedf6 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index c89bb2e7c99e..1dab700823cc 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -10,7 +10,10 @@ DIST etcd-3.5.12-deps.tar.xz 3935756 BLAKE2B c043cc55f59549734f38b1a734106bd25a1
 DIST etcd-3.5.12.tar.gz 4083299 BLAKE2B 85615cf9095a440ef73aa59f5582293de543f7e473c8049712ff13646276c9441039c96c4e42aaedfddcfb3baede8d37f0ef68bb5ddabdb3f4833c8591ee1c8c SHA512 6fc8bd64ad63cff71c7645253273418fb3fa262c2da1742dc345576caa733af7cd75acad2f57610c5883e6bf16cffd36bc5a0c89cbbb0793c00c2a4db1c6d14b
 DIST etcd-3.5.15-deps.tar.xz 5885840 BLAKE2B 378d8136da0ca3486433ee2d55f2d65e569de3807bd41ea9dbb69e2a220a75ad3b2b1efd971738de84a21ac7a2fa1cb97055553982ba571d4f115a88feddf9a1 SHA512 65810da4852df376b29b6023594af8da01fbdd63b3c25c4b95e2e643f327b15274750ed8db2f71da2d8a3223d00c603db5ed84ba13dce72303758e043ac62f19
 DIST etcd-3.5.15.tar.gz 4113649 BLAKE2B b65ae93875cefffc09ff0c61eda485abd3a32691b0b8bb2d957c109c2e43cb36d26a51c4d81b7dadb9e96452dfdbfb626dfc5a151678154339d7e08324c15efb SHA512 1b22376fcda4c182ea0388b97f3b5a6a2fd62f753c2f4c13d06c3b53e9b7fb8efb2b20177f1724a5775f5ecc13bfcaabe6b308d4ee205dea86f7311fbe3a2900
+DIST etcd-3.5.17-deps.tar.xz 5651912 BLAKE2B bd5293b0e125082736b785534eb7fb4a7f32e4427419f1b298a5dcb9d07ced41b1435e9cd8db2a1c05f81318416436d2ad3f4a8f2815801e6973039a8a5ed716 SHA512 70b50559e2c3be40fadc2462087db8e773858c948cc5e7d9441845a70c6f6ded022b12a4f24b2959748825fbec0772e73694f907b3aec1b3e713ca9beefc1944
+DIST etcd-3.5.17.tar.gz 4124391 BLAKE2B 9602c31369cfd5604ac7283307b712ffb5468e6264731a78d6a598752d533b18906d22d44aafe70027da217b85220376972b5305fad562f0a80704f30637381c SHA512 6d1cae12f7352c7075eeec2273e70870ac89d7e92c313e5cf2c2316b0c93813047f7412756712169faf48657efefec98062ba03853fcd11c8b08d4d587752291
 EBUILD etcd-3.4.31.ebuild 2044 BLAKE2B 6e527a0a48a368426300a7b24f73651e56074260684ead38996a418e2cc51490a0ee5621cafc767bf426c385d44bf9be9cff3b296d75849c9d0c8d2fd2f9db2c SHA512 ad5b18908d458864acbaf9e4ac570b5dda321bec9f989549d25aaec3682e0819b086f015f12fd10ae69e4895466152610d74c0cd062cb37e9b99051e7ce1d429
 EBUILD etcd-3.5.12.ebuild 2095 BLAKE2B c476ec700d5a1b1642dd364924302e63fe01d4cb52a7bb5f21e9e92f6e1545660c75d5a8f6f5e427b77d2594d6ee8ec4559c05104f7757ce515ff7b0bb441de0 SHA512 4575ff154dfcd068dcd39aa82c460f50fcbee8a8f51857d2b20b6ee46c18f9cefa0327eff770e28d91b00b11539e71fdd9ba8eeefd1278fc1b68c51bdd15e16d
 EBUILD etcd-3.5.15.ebuild 2188 BLAKE2B 1830c6d33dafe08816432fb509e28ece04c4ccff7ac41e4b246b89efeb4af9512fa792b404aecdb9baa346d83f85a4b2721d689f08232728d0ae536bf8e1f480 SHA512 fd8863e639c6b21e58c2d5a08b26d4bd8a5deb8609d1b1027ce417379654bd982e242db55f23f32b07f9bbd2eceed5d375ab2888af0b699926bf70f927ddc82a
+EBUILD etcd-3.5.17.ebuild 2188 BLAKE2B da310b239a1982e2c25d05ec0a31ca1b351fa94893a417d21cdf74a838c1f37476d612cf0245779cc28ced2a09f16972e0ea2481b19cc94ed8ab505276458205 SHA512 52658452075d8e40a4a8d1d02059df6046a30f9ae8ad6800ba91320262a99af8cb2a9f5911ab50bec9c450eb4a0da18f047b142adb08a8f505ed3b33bccfef6e
 MISC metadata.xml 421 BLAKE2B 5498a48643720f59f55d3b37d21fa80a4d8c984e7dc0e9beaccdb4f08d53819025e5849e481a7ce14fc519de15fdbed622f3c3912335cf81a678c522ba367b32 SHA512 ed8b5d3b552fdc284301ed63b941c2ce87cc808718dc15191597932d6543606907a175c929416f51193c63e12d79fef7993d0f91d9d0f70aacf75447c3744b73
diff --git a/dev-db/etcd/etcd-3.5.17.ebuild b/dev-db/etcd/etcd-3.5.17.ebuild
new file mode 100644
index 000000000000..2843adb5c129
--- /dev/null
+++ b/dev-db/etcd/etcd-3.5.17.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+GIT_COMMIT=507c0de87
+
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="https://github.com/etcd-io/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv"
+IUSE="doc +server"
+
+COMMON_DEPEND="server? (
+	acct-group/etcd
+	acct-user/etcd
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# Unit tests attempt to download go modules.
+RESTRICT="test"
+
+src_prepare() {
+	export FORCE_HOST_GO=1 GO_BUILD_FLAGS="-v -x"
+	default
+	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|" \
+		-i "${S}"/build.sh || die
+	sed -e 's:\(for p in \)shellcheck :\1 :' \
+		-e 's:^      goword \\$:\\:' \
+		-e 's:^      gofmt \\$:\\:' \
+		-e 's:^      govet \\$:\\:' \
+		-e 's:^      revive \\$:\\:' \
+		-e 's:^      mod_tidy \\$:\\:' \
+		-e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
+		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
+		-e 's|PASSES=${PASSES:-"fmt bom dep build unit"}|PASSES=${PASSES:-"fmt dep unit"}|' \
+		-i ./test.sh || die
+}
+
+src_compile() {
+	./build.sh || die
+}
+
+src_test() {
+	./test || die
+}
+
+src_install() {
+	dobin bin/etcdctl
+	use doc && dodoc -r Documentation
+	if use server; then
+		insinto /etc/${PN}
+		sed -e 's|^data-dir:|\0 /var/lib/etcd|' -i etcd.conf.yml.sample || die
+		newins etcd.conf.yml.sample etcd.conf.yml
+		dobin bin/etcd
+		dodoc README.md
+		systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+		newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+		newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+		keepdir /var/lib/${PN} /var/log/${PN}
+		fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
+		fperms 0700 /var/lib/${PN}
+		fperms 0755 /var/log/${PN}
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		tmpfiles_process ${PN}.conf
+	fi
+}
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 3b3375e8eb00..fca626a845b0 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -2,5 +2,7 @@ AUX mydumper-0.13.1-atomic.patch 965 BLAKE2B 789b72fc49a8362466b7081ea6f112d373e
 AUX mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch 984 BLAKE2B 6b47af57b37adf29e273c9ce4384e75efe9ad4ed89ff54bf93ac491d7149f240b4b67263886c30acc6f69c60fe05cdf14572da781614d7a2697ddd5defeb1d4d SHA512 959c56f38912844e7e10aced0e9bde14ea5db68962de83b0649647ebd348c94a0999e17845cd2b2f565f5e14c942930b9c7b7020247378d211d9894cb977a8ac
 AUX mydumper-0.15-fix-call-to-open.patch 1341 BLAKE2B 8d7080f694fe99eb70c79519877873ce4e237015647b8997590df3dd95c3307e3b818ead2f8735405b3040049844b85d83d277b169a8662709a6199b6eb3f681 SHA512 e9baeeb10d61f129df457106be56ab379b9cf948aee2bf9f5f68cabf14a8876d749459ad6c42280e67ed5caf3ad6735bae39901a6c16cf93f65677b9d8e464c1
 DIST mydumper-0.15.2-8.tar.gz 186389 BLAKE2B 84e08fa6460a156771f598a8a0c98c79089490f9f2fe3b90fa49efd519e2270468fe86287bab03612006489a3a1d5ab2442e76cc0f4825c8df95acec30a1c4ba SHA512 f6ca5c5756944bd2704e8a25432db1fbe14ed2a1e88b549c0799c3e0c251e524523ed39797b0b2c15c9d65c0e6e5ce3d93a60a17c77090732a8f909ab24a0126
+DIST mydumper-0.16.7-5.tar.gz 192080 BLAKE2B dac0d0700ad7a68b3bffdb13f6cb674e75b868715822ef791eb00d64ce4a41335b5f54fc4a166ee527356a4f4c5311c01aabb1c8e0c91d964b4bca5b30a546c0 SHA512 ab7f06557814318352b1a511ff06f9e094dac43d3d5638977074aa8a79c3a9b83114aa15fcafcd0a39945a8c497c725b0a8221759d55aedb424eb048f10653d8
 EBUILD mydumper-0.15.2.8-r1.ebuild 1265 BLAKE2B 221ab1b3ca989ea53a26bc0216c60538b3be6b1293e6a30e888b1a3f9525a91a58517a763e91e3ccddb573c8ca4c8b0bc0fe9347c55c314423cad5456c7bf8aa SHA512 0902075b31384658fe192618cf8f5bc149dd16b03150d50183bdf7ac43b71dc0ce031235f4aef90951c79c74b1e38fa94bee95aa97e9a4ddcb69b744f729b5b7
+EBUILD mydumper-0.16.7.5.ebuild 771 BLAKE2B eae39daf3cf031f83509a99b99a218bee7bb07964a6d8ae841027b240810fb4734b84ffbd28820e83c87a5a52c6ea29b86f5fb732b7fc9ebe5a22189ead5b69f SHA512 b26145add4df7afc92a2f815256869c47554e988f06eed8451b6bf09516a4583e69c03a47231c5ee5e183249e078c6803523e98184ca2f119e60af8e43422f6a
 MISC metadata.xml 480 BLAKE2B b046228a8aea053cdd034cb3ce0e28e3fd666fe9a600b7bb82a36083fff6686559a6746518ff8c41002476ac8214ff45376c5b08fa9e71c1e2ed1ed890b68091 SHA512 8d71ae229741c263328195baec3917d9c496d9afeff591e3c66ef8744776d8cbc53f17ff526255e61139338b03f5027e19142108dd9c37c0871a6510f72a8661
diff --git a/dev-db/mydumper/mydumper-0.16.7.5.ebuild b/dev-db/mydumper/mydumper-0.16.7.5.ebuild
new file mode 100644
index 000000000000..245b0197d96c
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.16.7.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/mydumper/mydumper"
+SRC_URI="https://github.com/mydumper/mydumper/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-arch/zstd
+	dev-db/mysql-connector-c:=
+	dev-libs/glib:2
+	dev-libs/libpcre
+	dev-libs/openssl:=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.13.1-atomic.patch" #654314
+	"${FILESDIR}/${PN}-0.15-Do-not-overwrite-the-user-CFLAGS.patch"
+)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index b8aab39866ea..02e59d697050 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -14,7 +14,7 @@ DIST pgpool-II-4.4.7.tar.gz 5024007 BLAKE2B 701d6b266156c565e562b926aa8c20ebfdc3
 EBUILD pgpool2-4.3.10.ebuild 2458 BLAKE2B 22f65c3a22c9b79dba97d5eb6ba24ef010a3e99db42e3f43f61e99b5ac2b1568ec1b207534b757f3300ca318ffddbcffe0f7c134d69383829771f635c53fc99d SHA512 1a7c3c4d8a53819c1ec00fd606b8d475a1e83a4f5aa60dcbef68f8ecbb53e7099d6093a2167d871aab1c591fc7923b447310a29024ff67fb653059477056653e
 EBUILD pgpool2-4.3.8.ebuild 2456 BLAKE2B 7ac3722e1336c3b8447732fa2495b919fc91f56012aafc96bd19ca2ab2beea30b942f03341df33831c68c02b97673b0fa974a2930fca5bc8b787224ca7534d0a SHA512 6edb966973bc72d7284b6f15474758b16755da8b65befa094f79b51150d8be1dcf22d9e951abc1efdb1bd0cc9b58f9d11d751485479defe719deca463704e1fc
 EBUILD pgpool2-4.4.4.ebuild 2454 BLAKE2B a59c283e26abaaf4444c57cc9055465ecc5c4233dbabf8a072f47432e5d14f2d21f17068c09968584f01f70d29bfe95d490bd04dab487778c04cb473230b25da SHA512 4355cb8dde83e810a46cbb8859bfbb841bea03382e14cf7760eda76ec969d24ccedd35db6cea0d90107997369ca3f58cbdef78e66d12eda79beaef65685331a4
-EBUILD pgpool2-4.4.5.ebuild 2454 BLAKE2B a59c283e26abaaf4444c57cc9055465ecc5c4233dbabf8a072f47432e5d14f2d21f17068c09968584f01f70d29bfe95d490bd04dab487778c04cb473230b25da SHA512 4355cb8dde83e810a46cbb8859bfbb841bea03382e14cf7760eda76ec969d24ccedd35db6cea0d90107997369ca3f58cbdef78e66d12eda79beaef65685331a4
+EBUILD pgpool2-4.4.5.ebuild 2453 BLAKE2B 03108c5efa21fe38230d793f4188eb178a85c21f46aebfe3cd2a2ef1c9f48dd3d73904987669ea0c87f50e07a48ca28d64092794f446c62eac3a7381d8b2983a SHA512 36e69ccad76e5549a999d2648d48ca0f78b126c07da3c76b52b26cd6a9666f49cbc8c82a2121c07d830100f5d7494db0a44900209e078d1c09bdaae661edea88
 EBUILD pgpool2-4.4.7.ebuild 2454 BLAKE2B 72c3f7bf2142e85be2d0c4d58f1e23537bcac20079436d95ab3da45f9150150e2a83a21d98b42999d1593dde041a6eb5d618203e293e7ac4c09446f7c1e87c82 SHA512 d2f5256914cc5aefdae9958a019b8e353ed1d603f3a0103c22c5c0834a00b01f75daa51c87255175675687a8f31e7ac4c62963b983aadcad167beb7d281abec5
 EBUILD pgpool2-9999.ebuild 2552 BLAKE2B 01e1997a789efb97126111830ab8022a25d47d6eb45a25545fe5a218644de73e7a8a54aca7f18881bfc25e60a0b2361dd0ced1a8682b065bf1619b3d5df14542 SHA512 b989b9385dcff0bf1fcdb876d6eac368a3e57ef6d2e6d376c4e4001c04373ab6e2464ff912d325eb5a8ef512655245cfcf5c1ec2c1f6b3e1016459c5c0982a80
 MISC metadata.xml 391 BLAKE2B c5855fde95e138709d778b50b897ea0dd75267547e89faf60988d1dfe78740c313291a226c30fdd618ef2893ad3dc11000b33026e04369fe294ca9ed1e18efb1 SHA512 374bd70841f1f13e2f8265f972e2debc7fb79a3f463efb897a75fd8ddc3163edf82c888d3d8d5bfede6c509fc27f67e74592599b8da8640035a5d4241cad98c1
diff --git a/dev-db/pgpool2/pgpool2-4.4.5.ebuild b/dev-db/pgpool2/pgpool2-4.4.5.ebuild
index f296ca0fb0a6..4885aa0ffece 100644
--- a/dev-db/pgpool2/pgpool2-4.4.5.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="doc memcached pam ssl static-libs"
 
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 9ae2fa2eed3f..3f381f40518b 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -5,7 +5,7 @@ DIST pspg-5.8.5.tar.gz 2445232 BLAKE2B 90d6ca969bd365fea1801fb9125e4d3c5e92b916c
 DIST pspg-5.8.7.tar.gz 2445765 BLAKE2B 3cbc0b75cb6b2063026e8a614e0f0821062bf2ecbdebe7b7290f82f8589541b0ff0edd19890b7de66c879b0519fe9f93deb9645c740635c8c002a8d8cd4f9cc3 SHA512 fefdd178663b4ed44484e5092667c435cfcb8c059c0687f8e51121948f414ab862cc23808432d2f5b4b516a2c8f1d22ceecb2eba872a8acdd5c6a9d45f456cd6
 EBUILD pspg-5.5.4.ebuild 439 BLAKE2B db8b1de5b6be0673a72436bdae85c087ad23de36ce212e9601e3a698f85a8a73e5ac0b5333e42d0d663ab21ee79662cce97d68371df15271b02e7444672cee6f SHA512 27f6dde8fc504e29d059dac4a35189f46f95f45ecf4fbc234f6c51b7803ea96dcb8445ff5e3ea66783d2376912b47f84bbe357de27131c8cddebceead271b702
 EBUILD pspg-5.5.8.ebuild 552 BLAKE2B f2205e51ed599efcc708d5f6baaeefd30fbd3692f0faf7bf51b62da0c7d34256135e8cb9b28a7ecaf21645a48e5e58eab71015e2eba1521b5eaa265bf056974b SHA512 c9d19d2162d95e203fe7bdca23c32bb73c4381af36de8dc9c598997779b5467cb69dbf93c3f3ef0c46e0ff188041d7c1e3c78203306cbabbb30fb84bff34e6c8
-EBUILD pspg-5.8.1.ebuild 557 BLAKE2B 1eaed8396be4fc1293e0ad933ca3b33dac2c390c977f1b2fa2d1e58978fe948531871874d839726fab8a285436fc8e97dee0f2e3d98f2bb22721649d0ffcc753 SHA512 655edc70f86ce3257d04c473f4c7d11a91c0ba75cf71f6b208218ec193794a4735f0de58a03be60480fbb079a1c5985ddd9ecdd583c43fb814e922115e8fd616
+EBUILD pspg-5.8.1.ebuild 556 BLAKE2B 371db323a1784422a6c6081971ee6dd7bda25b6940b89df28acd52d067fc88a924455ce22130ea4f7ceb8b0010449b285e8c56989af801d9552f2fc1a9ec803c SHA512 14982d93694882cf376bbd30c9e2d4223d95cc712501963c86b30c07dc0cc18dfe5426f6e887304f9edb3d49269e24845254fe569f2e4962f624ebec72492d94
 EBUILD pspg-5.8.5.ebuild 662 BLAKE2B 17db5033506ba2f9b65803e276596045b2706914c9050ba861405096fe0e8509e0ffd860ae8bf813f52f5190ff6ab2fd13d8146a9947f6b3311545349928ab13 SHA512 e2fb2e9a1e560ea7e111776e7b2e360295308d49fd9bd487712961c6afa7e8a0f5cd7480b1e5c5481ac8712b257095b1373e4c5f62ee0dda7e32bd1a5fbfdd78
 EBUILD pspg-5.8.7.ebuild 663 BLAKE2B 95918bbe9b2820f8e8ab78696e50b275818336844158eec704dd82007658d577e63abde846fac98b976e9e40ea1721aa4ec0321907f5666da9ef9d767a0742e0 SHA512 f6090a6691573467a843fc9e4919563cff4343df45d2f06d5cd50fc68a566ec8d5b20678b2b13fee223d08f75a185f16e7e46e2c88071b99a9103b40feea3a8a
 MISC metadata.xml 746 BLAKE2B fbf6df3b4bddc3c61508c50c9ecdd1f0fa0191b1123f60da461160a4b667a9b810dbe15effcef7776f97b0fa9de9a0ed6050d25e06e8d922f4bec519456c24c2 SHA512 e03312cd437fed48a22fae4a28ab64c6633f6079204809fd3fd26eee255c5a979c05520348a9bd9396fefa611f31225798d771616ba27ed96b8e3c637eadf0d6
diff --git a/dev-db/pspg/pspg-5.8.1.ebuild b/dev-db/pspg/pspg-5.8.1.ebuild
index 36f09ddb9371..cc5f0e9d4291 100644
--- a/dev-db/pspg/pspg-5.8.1.ebuild
+++ b/dev-db/pspg/pspg-5.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="postgres"
 RESTRICT="test"
 
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 74aafa33ab7e..858061858c69 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,4 +1,6 @@
 DIST sqlitebrowser-3.13.0.tar.gz 4901507 BLAKE2B 4430944fb6f02a3e33aa6d3e5720faa8e43351314a0c21803fe8bed6d2241ca92830de7be33deb18294f0cad808c96d6c913bd9ddcd64d41a34db32349d44d88 SHA512 6261043cee7bc5c525b162e0b5d1ac38d380228ffd752e086fecb49c7f50b463a993a6128547d99addb0480ba71e4f6dd3a0c1e412a692ae86b0b183b7379610
+DIST sqlitebrowser-3.13.1.tar.gz 4923092 BLAKE2B 894790cc30b802b4aab19a8e7834aef1bf68b027bcd66b63901269d6d44b706ce5ddca1ae4ca4743d14f9a8d2a5cc6005711b6ee25cef068c55e0b01c56f8b5c SHA512 7482094823293a216e4df20105d1351a23fcc706fd9e64bca58cd1c6a46dcf639a945f919613f1a9550d0a15e60a4c2827ee5eee4f89a7b11046d8eefbf375ee
 EBUILD sqlitebrowser-3.13.0.ebuild 1902 BLAKE2B daab9e0b566e3fee7e1188ab8266a7ad961874a39f8265c3b82fc0ba193ad3748a2f7239a10e65a3b1613a4ec92d0224cad58762216f7861e257b821500ea387 SHA512 fca418cc6dd2544d97c3c9b3bd1fbb54106f26b6e2a30505bfec37410273cd86ca7ec23e93ed5a552fa1bb3c1b12988567dcbb382881ce270cb2a51d18885196
-EBUILD sqlitebrowser-9999.ebuild 1904 BLAKE2B 43238842a291a9b87269a2bfffa41255b69cd60d645b39be3a9d42ea11a70c9ae850c791dea05903ca91a66ecb69a95164dc7ee2237471f62ca31cf63a02a733 SHA512 5d3295bb31b2f60e622c84d3f35832a8837b22be937460d5a696fce868f801499689e6564e025e443d033fbe9cdd8d0fec415fe5e789da510ae75039f11de4d2
+EBUILD sqlitebrowser-3.13.1.ebuild 1654 BLAKE2B 0ab4021710c5c25e1ed1fc66beb34ce7c579e9f60a8692552e68c7380f64a8f0d2abab9b0dcccea4dac1e2a950fa29c951d9ef569bd24ad5bb2ecf4341302dd0 SHA512 a9e22e522b6285a8b6af40a62ea89bf52efe1a562c8219d478e277cbda6e3fb4559b7316de557d8263301037e141af1d8015e977a6b1e5ee14f632f92f66b950
+EBUILD sqlitebrowser-9999.ebuild 1654 BLAKE2B 0ab4021710c5c25e1ed1fc66beb34ce7c579e9f60a8692552e68c7380f64a8f0d2abab9b0dcccea4dac1e2a950fa29c951d9ef569bd24ad5bb2ecf4341302dd0 SHA512 a9e22e522b6285a8b6af40a62ea89bf52efe1a562c8219d478e277cbda6e3fb4559b7316de557d8263301037e141af1d8015e977a6b1e5ee14f632f92f66b950
 MISC metadata.xml 1796 BLAKE2B 988ec79d4d043ecbf8802aa3d761868479fc0a398a00035c387aa4b362e2c6c59afbbd04d648d2084aa0d9d35972336cd312c4b596e663e5142ce72671e70a55 SHA512 6b0e05517590c7c56cabc1bfecfafed155be78ccff4d159fd810b3c8e6555559c45fba3ea3bdf0aef73d1c1a1d8fcabc7005c2e7dbb3b6377d14505c819355d7
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
new file mode 100644
index 000000000000..2570150a6735
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="A light GUI editor for SQLite databases"
+HOMEPAGE="https://sqlitebrowser.org/"
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sqlitebrowser/sqlitebrowser.git"
+else
+	SRC_URI="https://github.com/sqlitebrowser/sqlitebrowser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+ MPL-2.0"
+SLOT="0"
+IUSE="sqlcipher test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-editors/qhexedit2
+	dev-db/sqlite:3
+	dev-libs/qcustomplot
+	>=dev-qt/qtcore-5.15.9:5
+	>=dev-qt/qtgui-5.15.9:5
+	>=dev-qt/qtnetwork-5.15.9:5[ssl]
+	>=dev-qt/qtprintsupport-5.15.9:5
+	>=dev-qt/qtwidgets-5.15.9:5
+	>=dev-qt/qtxml-5.15.9:5
+	>=x11-libs/qscintilla-2.8.10:=[qt5(+)]
+	sqlcipher? ( dev-db/sqlcipher )
+"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-5.15.9:5
+	test? ( >=dev-qt/qttest-5.15.9:5 )
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	images/
+	BUILDING.md
+	CHANGELOG.md
+	README.md
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use test; then
+		sed -i CMakeLists.txt \
+			-e "/find_package/ s/ Test//" \
+			-e "/set/ s/ Qt5::Test//" \
+			|| die "Cannot remove Qt Test from CMake dependencies"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTING=$(usex test)
+		-DFORCE_INTERNAL_QSCINTILLA=OFF
+		-DFORCE_INTERNAL_QCUSTOMPLOT=OFF
+		-DFORCE_INTERNAL_QHEXEDIT=OFF
+		-Dsqlcipher=$(usex sqlcipher)
+	)
+
+	# https://bugs.gentoo.org/855254
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	[[ "${PV}" = 9999 ]] && dodoc SECURITY.md
+}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
index 2918a95b0493..2570150a6735 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake flag-o-matic xdg
 DESCRIPTION="A light GUI editor for SQLite databases"
 HOMEPAGE="https://sqlitebrowser.org/"
 
-if [[ "${PV}" = *9999* ]]; then
+if [[ "${PV}" = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/sqlitebrowser/sqlitebrowser.git"
 else
@@ -24,28 +24,13 @@ RESTRICT="!test? ( test )"
 DEPEND="
 	app-editors/qhexedit2
 	dev-db/sqlite:3
-	dev-libs/double-conversion:=
-	dev-libs/icu:=
-	dev-libs/libpcre2:=
-	dev-libs/openssl:=
 	dev-libs/qcustomplot
-	>=dev-qt/qtconcurrent-5.15.9:5
 	>=dev-qt/qtcore-5.15.9:5
 	>=dev-qt/qtgui-5.15.9:5
 	>=dev-qt/qtnetwork-5.15.9:5[ssl]
 	>=dev-qt/qtprintsupport-5.15.9:5
 	>=dev-qt/qtwidgets-5.15.9:5
 	>=dev-qt/qtxml-5.15.9:5
-	media-gfx/graphite2
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	media-libs/libglvnd
-	media-libs/libpng:=
-	sys-libs/zlib:=
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb:=
-	x11-libs/libXdmcp
 	>=x11-libs/qscintilla-2.8.10:=[qt5(+)]
 	sqlcipher? ( dev-db/sqlcipher )
 "
@@ -62,7 +47,6 @@ DOCS=(
 	BUILDING.md
 	CHANGELOG.md
 	README.md
-	SECURITY.md
 )
 
 src_prepare() {
@@ -91,3 +75,9 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+
+	[[ "${PV}" = 9999 ]] && dodoc SECURITY.md
+}