11 files changed, 103 insertions, 11 deletions
diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest
index bb91a33def45..167fd29cca22 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -2,3 +2,5 @@ DIST gitlab-cli-1.44.1-deps.tar.xz 18136428 BLAKE2B 9fafde045efac7a00029170ee3b9
 DIST gitlab-cli-1.44.1.tar.bz2 16841236 BLAKE2B 3a9ab7b0ca02c6a4a0652a268364785a6514c7bda688137947f11add4688e30ea547fe211b92a2543b765b8a82dc9ac85a7e189697bdc51c39cf62e82eaef42f SHA512 8b4bc19f78054104ae4551efacade8c2a1e86cf538dba2b31a9e7127cd6a792b8bf00d788a93aa26ba3f9a03684db0dbf67968e66d6048168cec6a512d90b18c
 DIST gitlab-cli-1.46.0-deps.tar.xz 21625028 BLAKE2B c4c5c38f505e0812e2ab5490d5064815fb6b8b2d65fe21016db886959b6dee2c5ed3e2abf51a00a40b70927a9d4562e4330075809e0c2d413652f5cc33ba4be2 SHA512 9a04a6ba82c8c00124b53adfefaf4b22dbd59d085823ed44e26d7a0436c359b2e966987258206030881373302627a40b800675efbf05ed4c3558f20830aabe94
 DIST gitlab-cli-1.46.0.tar.bz2 16845037 BLAKE2B b1bbfffb0968b5245fae91a7ba0c29f7c278de06006a79f8d5b9c64acb577b5cead2a3587eb770a35d5b0fd75fc9917c078918cb51541e677b739d38ec9510e3 SHA512 c6a1a854019f21cb172dba1ce01c8a4e94d6af7ada52c1bf182bb3444fcb8f7d593eb009a2c89c078f09f7abde57443a95d2a81aa11619ebecb75bfb5ace6ada
+DIST gitlab-cli-1.48.0-deps.tar.xz 21543860 BLAKE2B 7193a39b845a2afc999100f5936a9a5e8565597b51c37c9717fd38ff4799fba53ba74eb4acf9d02cd6d7247270e794976e8c0e57949881a3183f692cd32dfb96 SHA512 15c294669b61288bf9f23c312b5d29e3fb53c6dd9b2bbc4877bbcb42ad8b06cac1cb5f8b4252749bebb774f5d374b63e9e7ee89e5fefd452a81e6082c0d7091f
+DIST gitlab-cli-1.48.0.tar.bz2 16863481 BLAKE2B d7ffaca8b63772dc3394d7205044f2c43c8bb58b08f3e892bd4ab169c10151dd67337847b850b7e625b4d32bf674162851664cfb81af76bb9636432439758f12 SHA512 e59d31b6fb3ebbbe989c1198b9e33bc639a46d68fffa24b5df3c1b4fe8391a5c7a9fb84a7d9dcf1989d63375ef92d964e6474203be31a2fc82509959b28075a2
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild
new file mode 100644
index 000000000000..7ac646600117
--- /dev/null
+++ b/dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=2db471edb1eb73439eecc04e0a6ab5acc1f32c80
+
+DESCRIPTION="the official gitlab command line interface"
+HOMEPAGE="https://gitlab.com/gitlab-org/cli"
+SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND=">=dev-lang/go-1.23.0"
+
+# tests communicate with gitlab.com and require a personal access token
+RESTRICT="test"
+
+src_compile() {
+	emake \
+		GLAB_VERSION=v${PV} \
+		build manpage
+}
+
+src_install() {
+	dobin bin/glab
+	dodoc README.md
+	doman share/man/man1/*
+}
diff --git a/dev-util/pifpaf/Manifest b/dev-util/pifpaf/Manifest
index 54398ceac29e..0e7e583e4203 100644
--- a/dev-util/pifpaf/Manifest
+++ b/dev-util/pifpaf/Manifest
@@ -1,2 +1,2 @@
-DIST pifpaf-3.1.5.tar.gz 189903 BLAKE2B 5742e995feeb91af41db20cc605e8a5f5f21f63281d4f66ba8b108310a88d716ab4be0a43e0371f10e7f3f42b693953b3344c648458999348b914e03abe462c8 SHA512 4e0f70740f8260cb3cf801ea97f1fa30e6b87cfc4112b5482389d0635e76bbc7f1561945397e4e6586116c49d11b1e8f721dd61dca82668833bf224f9ba3e94f
 DIST pifpaf-3.2.1.tar.gz 183005 BLAKE2B 4ce210af724bbe615a3ccf0b70cd1eb8f1f3b8e0bba1d80e157bdb96a6f705487283977b86aafd71483c750a0029bb2cd4c65c6b7694d47b539dff86be663572 SHA512 680d034e00b6491e1e7c56524b83be8d1853e41a6c3be0c8f9af5339d9a248f7d3ae21e801c10ccaf2f530ce36f8e33fdbe49196f7add69c9a85c8e89fdc02ac
+DIST pifpaf-3.2.3.tar.gz 185673 BLAKE2B f8e3f953e8f232120f320ee3f6914672c5f16fb9c4345a9391055c3e27169283a462eed745e0c2a337b03f64ba6822484cc9ff3d82c218b2bc5f321bb9432e6a SHA512 cb7f22ed1839e0615ce01414baf6113070a6cec8a6649beb3ea0e588c6d235f4b35c0a8daacafa098b9ba08975f61bb38e0784263aa9cb1037bf60df8b838d5f
diff --git a/dev-util/pifpaf/files/pifpaf-3.2.3-psql17.patch b/dev-util/pifpaf/files/pifpaf-3.2.3-psql17.patch
new file mode 100644
index 000000000000..9055d0388584
--- /dev/null
+++ b/dev-util/pifpaf/files/pifpaf-3.2.3-psql17.patch
@@ -0,0 +1,17 @@
+Space after "-A" causes the following error in PostgreSQL 17:
+> initdb: error: invalid authentication method " trust" for "local"
+> connections
+
+Commit: https://github.com/jd/pifpaf/commit/0f4abc1306563ccca72bddf89f430fcbd8a7a6e9
+
+--- a/pifpaf/drivers/postgresql.py
++++ b/pifpaf/drivers/postgresql.py
+@@ -53,7 +53,7 @@ class PostgreSQLDriver(drivers.Driver):
+         self.putenv("PGDATABASE", "postgres", True)
+         _, pgbindir = self._exec(["pg_config", "--bindir"], stdout=True)
+         pgctl = os.path.join(pgbindir.strip().decode(), "pg_ctl")
+-        self._exec([pgctl, "-o", "'-A trust'", "initdb"])
++        self._exec([pgctl, "-o", "'-Atrust'", "initdb"])
+         if not self.sync:
+             cfgfile = os.path.join(self.tempdir, 'postgresql.conf')
+             with open(cfgfile, 'a') as cfg:
diff --git a/dev-util/pifpaf/metadata.xml b/dev-util/pifpaf/metadata.xml
index 27269b93c232..c8f58bebb277 100644
--- a/dev-util/pifpaf/metadata.xml
+++ b/dev-util/pifpaf/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="person">
+  <email>cyber+gentoo@sysrq.in</email>
+  <name>Anna</name>
+ </maintainer>
  <longdescription lang="en">
-Pifpaf is a suite of fixtures and a command-line tool that allows to start and stop daemons for a quick throw-away usage. This is typically useful when needing these daemons to run integration testing. It originaly evolved from its precussor overtest.
+        Pifpaf is a suite of fixtures and a command-line tool that allows to
+        start and stop daemons for a quick throw-away usage. This is typically
+        useful when needing these daemons to run integration testing. It
+        originaly evolved from its precussor overtest.
 	</longdescription>
  
  <origin>gentoo-guru-overlay</origin>
diff --git a/dev-util/pifpaf/pifpaf-3.1.5-r1.ebuild b/dev-util/pifpaf/pifpaf-3.2.3.ebuild
index 25b70883c9e3..d3f2c5e2ad37 100644
--- a/dev-util/pifpaf/pifpaf-3.1.5-r1.ebuild
+++ b/dev-util/pifpaf/pifpaf-3.2.3.ebuild
@@ -17,23 +17,21 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-# dev-python/pbr: for pbr.version
-# dev-python/setuptools: for pkg_resources and distutils
 RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/daiquiri[${PYTHON_USEDEP}]
 	dev-python/fixtures[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/xattr[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		app-admin/consul
 		app-admin/vault
+		dev-db/etcd[server]
 		dev-db/postgresql[server]
 		dev-db/redis
 		dev-python/httpbin[${PYTHON_USEDEP}]
@@ -46,14 +44,21 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.3-psql17.patch
+)
+
 EPYTEST_DESELECT=(
 	# Need updates to new CLIs and APIs
-	pifpaf/tests/test_drivers.py::TestDrivers::test_etcd
 	pifpaf/tests/test_drivers.py::TestDrivers::test_influxdb
 	pifpaf/tests/test_drivers.py::TestDrivers::test_mongodb
+	pifpaf/tests/test_drivers.py::TestDrivers::test_redis_sentinel
+
+	# RabbitMQ wants to be run only as root
 	pifpaf/tests/test_drivers.py::TestDrivers::test_rabbitmq
 	pifpaf/tests/test_drivers.py::TestDrivers::test_rabbitmq_cluster
-	pifpaf/tests/test_drivers.py::TestDrivers::test_redis_sentinel
 )
 
 distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-util/qbs/qbs-2.4.2.ebuild b/dev-util/qbs/qbs-2.4.2.ebuild
index 5097254df513..d40591faf78e 100644
--- a/dev-util/qbs/qbs-2.4.2.ebuild
+++ b/dev-util/qbs/qbs-2.4.2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-src-${PV}
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/rye/Manifest b/dev-util/rye/Manifest
index 38350330cad7..c42366964251 100644
--- a/dev-util/rye/Manifest
+++ b/dev-util/rye/Manifest
@@ -186,7 +186,7 @@ DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d23
 DIST rustls-0.23.12.crate 438443 BLAKE2B 638ed38c62f807d1a28cd880a8664e09e0ef25ef038f93c6b8f5512e1864d60f2bc8a83e00907f9ee36e543bbbd9e5b6f5a0ff7fb57770619864298d32c31bd7 SHA512 49b7fb3dc02e9ded96718d064a121629dffeded6affbe8dd8a41283be62c99244b23208205a1821d83b557200b017d26589d4f42a0048b2cbd70156dcbbb8b94
 DIST rustls-pki-types-1.7.0.crate 29555 BLAKE2B 9da5d853671e2e33f46434509e7c83edf487a6a940e1bc8937c3ed7900cac590674bf2c5a5edac6055a2bdf763b132d4624a8c51caf0250d5055ce5e8f4bc5eb SHA512 5502795aebd7058084d0e30d6c09befc4182493113207f539a8d42006d4189158e9028245aa627d6943a88514b6292fbd56b5ea1abef8c83a429bf6d641f6f11
 DIST rustls-webpki-0.102.6.crate 201331 BLAKE2B 9802401ac0134a4c6b2ae7d72ad73126dfb271458a9ced5128c4fe7919ec64b5d68be13b5abf9ca9f666052c462bac112c321cca3b54c1b615224fcabb1bca3a SHA512 83ed70c4ca8e0714b363bf76c04281fafac08788bb5f283b87c21eb6d5b3bbb9ebd21a62dd9e1eea89d41f1557f953486e1160c5e7eb02b693bec3745a9603c5
-DIST rye-0.41.0.tar.gz 1473968 BLAKE2B 0e86f96367d2f2b9a0291f1e3412b7f7eaa5dc7ac0e0f752ffa8b2846f44dc5512a109d6a385e24b5b2a032395ab27ce33d10f330b8887fdf32d07689a6e54e5 SHA512 5aca2fa25a843d2577b70c16456bbe6e8caccd3a170951b0d76cf1b5155e6084113ac360304c27e7ed4931abe9279e1e9b09c69d52b2ef2a40cc598b73f90de9
+DIST rye-0.42.0.tar.gz 1474955 BLAKE2B 56cd08c169a46d81f9bf79648e0c3130d5cda84999ef2b01a13d60536fe4d8fa14c33e1c81cb887432104d36df09aae9d68ff716ccfae85b53cc70d3c6c83bb3 SHA512 d9b725ac8338e86d5b2d0930cd7b477a9b69029f1eb736d01b9d391f5090ccdf7214d552cffcbffb72bef458bddfa46553d2c00454a61754a957b78aad809423
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905b05d58ced99eac357c27c3b363ef9dc40afd3d19c39a6fd5b19fab7f7149b1fcd85f3e2f63edf7cb1e8990ee SHA512 9066143f6f503fbd6e85434e9dcbe0f0ed4e71e363c599d90968f6f9517dc749798f3e4cae6ed45e4ec429495a103ff4fc9ec564397c947ea63a6c32773c90f0
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
diff --git a/dev-util/rye/rye-0.41.0.ebuild b/dev-util/rye/rye-0.42.0.ebuild
index 4e08ab17d058..4e08ab17d058 100644
--- a/dev-util/rye/rye-0.41.0.ebuild
+++ b/dev-util/rye/rye-0.42.0.ebuild
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 2a768bc732cd..8082bdd5715b 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,3 +1,4 @@
 DIST stripe-mock-0.188.0.tar.gz 1667602 BLAKE2B 0a26afc1865c2123f4aca4dc8231b74eef43972e8c1f43cb2196529c72feaa0143239c7c74ef34dc9a1cb543eec6ee328a96e45ca4515f488d89452dfbecefc7 SHA512 aaf2ed6619383d7eecdf43e93306b8523f4699ba6e0971724e69c1c0921d0c691ab5211a9e5efb642a7e7dd51324aef2996b663b622a1c346da9d80241a476ee
 DIST stripe-mock-0.190.0.tar.gz 1749633 BLAKE2B 3d4e186a9c8fe9d0b6dc457c1b8e998b6fa7d7aa039392de7010478f4b20dd98b9b78ea3112d004ef239e65523f1717bda23f45a9935171efd6629fbf8f7b879 SHA512 90fc3bd64e3743b5c347d12c9b73cf0052f6b4db1c29ad4bb019f64ce97bd592c1b5090d25a40d9d29cf7990f96a4429aa39cb9a938adbfa2bdda29c0395fe99
 DIST stripe-mock-0.191.0.tar.gz 1769336 BLAKE2B 97511d99e01cda789c9534e2f407e499f4b1e60d86840d113b1dc5cdd5d67c6493dad76ed025b3237efb119415f2d4f03037bb6d651d089c9092e340d56bd8a2 SHA512 5347b5f5936f6431a0ad90908689a2bbabfa138cf693a52fc4b67f9679fe75f1b9b4ee898b1c70de9e19cb94070bb62bfec4766c7c44960514dc950e9e6f8707
+DIST stripe-mock-0.192.0.tar.gz 1783633 BLAKE2B a5edad1e8924c6a0b72538eb5c4eb91e6b976464352ae3097163e56ab507031d139ad8d205a0ca689c88d1b8f39c2c60daf284592e4c7b4d192b531b2097347a SHA512 d5a289d379fcaa84e3416ed1d27202a6c9a268a7799dba6d8790398f89fd7fa70bd1bf416c21c117ba5312b8ba095d78ddc88ee67bed76c05790b25d84d0ed07
diff --git a/dev-util/stripe-mock/stripe-mock-0.192.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.192.0.ebuild
new file mode 100644
index 000000000000..352d14e2ce00
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.192.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock/"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+src_compile() {
+	emake build
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin stripe-mock
+	einstalldocs
+}