12 files changed, 229 insertions, 71 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 152b49930a0d..68ab943c1394 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index a46cd2f6a501..442d93f2a1a3 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,4 @@
-DIST conan-1.53.0.gh.tar.gz 1540050 BLAKE2B f3ce976566be427d5bec68ce7dd79a6236c4c5860f39fe5aed4077690061d9c671063575cab407b0aeecae1c47a12bae0126341014fba66f187d4c969fb8f3f3 SHA512 ec2e445c5e097459aabea62e2d77906614cbba8b3edcecc14b7ecc7205de3bac8027362580eb4c68f3a7d708a302ecef0f6d09d2b80db9aa6e4884ccec836fb2
-DIST conan-1.54.0.gh.tar.gz 1547224 BLAKE2B 7638304e99470487fc6733e223352c2f372d47cc3c5ca4349f5ce731374831ba490f3c6aa73c2e2a02bca60d8e8797e26b43c85d07c40f0b60b6b3c22d9dc1e8 SHA512 bfe5a0c023c939ce552a6b3d8578c794aa2c58790d3b2816355358a95d8931b46353172e690df482c94a3ed37f7abeb5b94f91ddf3bb7756be3a58338e501c05
-EBUILD conan-1.53.0.ebuild 1744 BLAKE2B 79f4b38bc9b39672f3195fb5d79c3f0aa55d60e44fc98f5b77de75c20f75f5ed9dfa07efe3ff155731262072a5df61acff27837e047d660155fec94cef4347c6 SHA512 c57d706f1d1c74311b8081e967dc0f94a98df44b10298785f02c7cf2a01df7818b99fc2b8736797f9617f30fcd260bf5ff1f6c79f2f0be0615d6120cf571e70f
-EBUILD conan-1.54.0.ebuild 1778 BLAKE2B fd101dbb371299edfd39a9c175c4b6af50dcccb07718a930635322ebd5a430d889efc52737677fb8a24639f826f2ca27a734f5fc7d9eba054cea291c4e46d5b0 SHA512 f3d97b81eabed32441168ff047e7cead0c9ec9b506f73ffee62d775bb6ec22a60ec034542d12bd50d7039020cf97aedcecb573fd0f4ceff2c5c4d2500aa0c1b5
+AUX conan-1.59.0_nodesemver.patch 1511 BLAKE2B d2e6ac235c20b0a1d573ac82981616645baf7f9316ca31dee2719c3e60fd6a875d049064e89c6a9fa7c0612b830d0bf8281a87b7edccfb1b9ab1f6930c80de8b SHA512 e5ac706884722b0e22b39bd2421327dfb2da4e608a8eebb94d8a2a033ffd8101109858338447abb13247ba6c4b5b50764011be56679a4fbdd28b3842313f6796
+DIST conan-1.59.0.gh.tar.gz 1572455 BLAKE2B ab29fc6d86aca26271d8736185dbd7761984101e8489b57390a5073b680f4bffef957c4367030112acf8b2bf6e8ef867efd38eeece4081fe63d1f1f3ecf5b8c1 SHA512 101d00529a22623626ad0098539411c2411a1fd44d198b9d125c4c7d38527db6efb0a9eb5a9e77fd8d70436f9c4f60131458e3ca2c20c3385fcd32c20a4dd2db
+EBUILD conan-1.59.0.ebuild 1830 BLAKE2B 1ed2d192145c00d3cdfe5ffa29013f005a10ae6122943e834d492fbffa20bde77ce76298080bae18d491c43d7f737069bbff283ddb9f45d6a1a4124147f79314 SHA512 0775a177a47c1635ab9fe7d67a8e3b8905d312d411e1334d71d02ac61ed76a47d0ef228532fe715ddffb568998a1d449078cc8925cd37dd44f9b660efc15d56b
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-1.53.0.ebuild b/dev-util/conan/conan-1.53.0.ebuild
deleted file mode 100644
index f081b466f1f1..000000000000
--- a/dev-util/conan/conan-1.53.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed C/C++ package manager"
-HOMEPAGE="https://conan.io/"
-SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# overly strict requirements?
-# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
-# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
-RDEPEND="
-	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.8[${PYTHON_USEDEP}]
-	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
-	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.6[${PYTHON_USEDEP}]
-"
-
-# Try to fix it if you're brave enough
-# Conan requires noumerous external toolchain dependencies with restricted
-# versions and cannot be managable outside of a pure CI environment.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	# Fix strict dependencies
-	sed -i \
-		-e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
-		-e 's:==:>=:g' \
-		conans/requirements{,_server}.txt || die
-}
diff --git a/dev-util/conan/conan-1.54.0.ebuild b/dev-util/conan/conan-1.59.0.ebuild
index 4d835f1995cb..434460af9a91 100644
--- a/dev-util/conan/conan-1.54.0.ebuild
+++ b/dev-util/conan/conan-1.59.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
 	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.8[${PYTHON_USEDEP}]
+	>=dev-python/node-semver-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
 	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
@@ -44,6 +44,10 @@ RDEPEND="
 # versions and cannot be managable outside of a pure CI environment.
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${P}_nodesemver.patch"
+)
+
 src_prepare() {
 	default
 	# Fix strict dependencies
diff --git a/dev-util/conan/files/conan-1.59.0_nodesemver.patch b/dev-util/conan/files/conan-1.59.0_nodesemver.patch
new file mode 100644
index 000000000000..4c914af6a63c
--- /dev/null
+++ b/dev-util/conan/files/conan-1.59.0_nodesemver.patch
@@ -0,0 +1,39 @@
+diff --git a/conans/client/conf/required_version.py b/conans/client/conf/required_version.py
+index f06342d66..f1f62d3c7 100644
+--- a/conans/client/conf/required_version.py
++++ b/conans/client/conf/required_version.py
+@@ -1,7 +1,7 @@
+ import six
+ 
+ from conans.client.cache.cache import ClientCache
+-from semver import satisfies
++from nodesemver import satisfies
+ from conans import __version__ as client_version
+ from conans.errors import ConanException
+ 
+diff --git a/conans/client/graph/range_resolver.py b/conans/client/graph/range_resolver.py
+index 616585967..856fb25da 100644
+--- a/conans/client/graph/range_resolver.py
++++ b/conans/client/graph/range_resolver.py
+@@ -56,7 +56,7 @@ def satisfying(list_versions, versionexpr, result):
+     if some version cannot be converted to loose SemVer, it is discarded with a msg
+     This provides some workaround for failing comparisons like "2.1" not matching "<=2.1"
+     """
+-    from semver import SemVer, Range, max_satisfying
++    from nodesemver import SemVer, Range, max_satisfying
+     version_range, loose, include_prerelease = _parse_versionexpr(versionexpr, result)
+ 
+     # Check version range expression
+diff --git a/conans/client/tools/version.py b/conans/client/tools/version.py
+index c6518302c..4c2206124 100644
+--- a/conans/client/tools/version.py
++++ b/conans/client/tools/version.py
+@@ -2,7 +2,7 @@
+ 
+ from functools import total_ordering
+ 
+-from semver import SemVer
++from nodesemver import SemVer
+ 
+ from conans.errors import ConanException
+ 
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 8e618cc81692..174120d2e8e0 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,3 +1,5 @@
 DIST cutter-2.1.2.tar.gz 10520198 BLAKE2B f19ebdb09be8df270f72cfd17c8e3bf0172fd4506942e33c0f57d771f483ef365504b05eaf030eff7d1b4f4520484f6731d3e60eafaf4d8d2481718d48ad8d77 SHA512 f01cc08085587be00c5b64f0797180d74a02e2cce60c8ec040d831ca4b74fe371e34b284a293a0d88447ebdca4d72718aaf179ab3bb4db3bd6659deaae732272
+DIST cutter-2.2.0.tar.gz 10750189 BLAKE2B 00626b1fe01044e6a718b81bc2452204ed35003a50e73ec083838610d50b7b690fb5783fd2fdc7f31c35390a664862c488c48f156ebbffdc16ffb39e8e943ebc SHA512 5435f700603f144903e9d93c21f7561b31f1734a2558fe5d11d62d50a635c800e8fb62d866b3b4186d665f57ce9271665dcae8423f0009c3e0bb63bcfa168c1c
 EBUILD cutter-2.1.2-r2.ebuild 1289 BLAKE2B b39d681d76ac8df74eff7b2beb4d1dbf7d200cdf523becd4ee0d2c85c58f0525f92fe99ad3cf6a1f5e289e080afdde1e81afac676a0bd3c400fcde3b6ff9a3ee SHA512 479367c950441da7719a9e86cd952ad79e4c63ef0640e53f7ee850c444f6ef7d555b23c4911142e61e0a09715d2aaa3ea6016bb176d2d20c6d38f6b6e2566fd4
+EBUILD cutter-2.2.0.ebuild 1291 BLAKE2B e301f8c85dadd941aa7ea820247f7ba8852f614abe7762280553a8ac2541d559f7e82103caf31c19c833e0df1f63b7087a800dea3bb48aa3a5504bf6dc4d1498 SHA512 8ccdb39fc092d2890146c523acb861aace29943bb96ba20ff0c679c79d9ac7d5922e47c494c2dfa2472cfdf7527dae23ba661f10a4f0d192c3b13ddf04a162c5
 MISC metadata.xml 329 BLAKE2B ccc11908a8ba66fdc15f6fe8ea45e62e797050488dc82de159525338cb4ffc4d52609bd815dd0a2ad3ad23a915e5bf631dc3db640a0e7c314fb5fa66cfe5b2b7 SHA512 208b070fdb02df4825d364ee5d86c3be7658fb6c84420d53b5e4f72427de0a2b8c201e46a6bae9d923eb5e9b0f195fb639336452c89dd4affc5527908cd152fb
diff --git a/dev-util/cutter/cutter-2.2.0.ebuild b/dev-util/cutter/cutter-2.2.0.ebuild
new file mode 100644
index 000000000000..a50f8070c0da
--- /dev/null
+++ b/dev-util/cutter/cutter-2.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake toolchain-funcs xdg-utils python-single-r1
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
+HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
+SRC_URI="https://github.com/rizinorg/${PN}/releases/download/v${PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CC-BY-SA-3.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=dev-util/rizin-0.5.0:=
+	graphviz? ( media-gfx/graphviz )"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
+		-DCMAKE_C_COMPILER="$(tc-getCC)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
+		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
+		-DCUTTER_ENABLE_PYTHON=ON
+		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+		-DCUTTER_USE_BUNDLED_RIZIN=OFF
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 6e706096f9a9..033ed1ac80b9 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -3,13 +3,13 @@ AUX gitlab-runner.confd 688 BLAKE2B 1e99cdca8949a1a085e126c9aa2f23cf15d081087d02
 AUX gitlab-runner.initd 1174 BLAKE2B 53b897abb3bc358839843faf56b52d99412c2a08e2e69e1b8258bab907a0da10dedeafd95e6c4e505fd7e8e4d2344dc07b1e693a130fe0d6a3730bf619ee2e75 SHA512 eae2668c5a98a9e111573a2ea193266252e46e073fafd2c101d3a93e65cb9705f78ceab173ca4d3e1c806443345e7f66b7b97c8b644188cf9f86dc4c087d401f
 AUX gitlab-runner.service 419 BLAKE2B f1a9217eb97d03036eac67569ec6ce6ed91dc2182b20357cf8d17ee0eee01b8d094854b1c76942e0515c2a5923f4d3a1ed044c60b89d8a29c354955f9f666160 SHA512 10cbe1cc0a0b7bb9decde5780bc20caf73892759532df5fc42a7c3b55e141b26957a2986656ac1eb79ce15fd95ee01a184893c22d0dd1ce9117932d0e55ae1b4
 AUX gitlab-runner.tmpfile 54 BLAKE2B 4b2849b9c72998409efce207a336dce42d6e9104e72e0071266e03509841bbb5f39ad8e560beb696eee780bfe82efdec5b877120b5606c524d5cd002095e52c4 SHA512 2b5cccd83c8113a8c58011ced9ff5720a5aeaedb8f819c2a71c8fff3b1683ad87b54fa3da67b7e5f91ab35659d2adf5cf792d93ff293eee39924fbb5b9db2d4b
-DIST gitlab-runner-15.6.2-deps.tar.xz 160098068 BLAKE2B b312f78c79a2ed47a6d5244307fee02fb9842b69873cb3babc14fd43b4f93a4e75cdbc9a3c13caa3e30f382ff5886b1c5a4957e0a07500c1a64e42e4b4ac3b33 SHA512 29f454cd15c24b74432e5759fbdd2d9ff7c42b0c516684c742752320701ffbfb87fb9381323d1bb0dca34f76150f48b9ac22362d2b0d287458898b381ff8d18f
-DIST gitlab-runner-15.6.2.tar.bz2 1237158 BLAKE2B 2466e2688626e70cbb46386d9f963c95b1ac3fa6d5dbeeca02917524530588ad69e73cfe54adb1c70de1aa4eaa0599d8f9558fdc72432c87de2d6382ad56f060 SHA512 b9fce864b52ecc49441c4714beb9b6584cd30c1d55d3fea3e188b3154bd33931601111c4c869f354a75f97aeb803c68f8f1a3faa6c0b4d62ba85853f28ccdd25
 DIST gitlab-runner-15.7.4-deps.tar.xz 160601896 BLAKE2B a208b751544fec8033276b541bb445c2b28100c16c9438113d83d719cae8d2b8a8c61a9a86c98e1b0c221c5be7365ad68ee9b29432df5ea03d1122e62763d022 SHA512 4a0f56348ef13ffe80395fe2887fbc5aca54f1ae620793c96388f69ae6b8c8e09c9e49d6b7524f14f7d93c560bce76678a4c8f74f6f00e0f146d54af7788344f
 DIST gitlab-runner-15.7.4.tar.bz2 1250425 BLAKE2B 933aa20c9c4ae0008caf0a63e3cc0b8fb22e34830d2536a54980b484913f8e6dc545539697fb36185d0cb1360660a9162fd5231ef4ef351177062b9b2cd56dc5 SHA512 9db90d39e1c52676165f39e9002da777c2e8c4c38c7f9538579628d858e9e541ee1b2e66156c0b6387d503088ea75084dee82a761733366dbd3db895da80a9e5
-DIST gitlab-runner-15.8.2-deps.tar.xz 160677404 BLAKE2B 7b1d07dbcbf7ce9255969036f6c29cd2b01d59ff5763f2bb6993def34fc714038c6ace11f2cfbec728396acf93c158d0b350b62340d5795f98e84999c3bf2fed SHA512 9dc6b6e19dc5f203142049e75359ccd31d750803bdee95434436bcc6d9ac2148a92da00598454d5642aafa883e145174bdd3989a525a76db0b1646d0e96c919f
-DIST gitlab-runner-15.8.2.tar.bz2 1258847 BLAKE2B be5e704bf12c7c64cab38c8b5a42b03f7023f1e6d390807fbb5b89a650ad07ec1cae2d4f1e7af946e87d33fc6eb14c944912443880ce51b62a944ac8c87e1598 SHA512 3faf5ccd6948511a7f5b31996e860806fe4b15a2b6ee2bf5eb53bc56f52cf4393d20b2a2a93a8741c29a517e8e6b5cb6af3f26d9438aac518a454b300a846557
-EBUILD gitlab-runner-15.6.2.ebuild 1799 BLAKE2B 2a0664109a24c3aa52478a33d28b55b5cfecf6da7764b2f7f7e7aa4e833847952bb6a74f84a167376ba6ceff5f8cd1c27cb348f1118b9091f01cda0f39d8df9b SHA512 be918316631744c39f8b5cf3ce06222c37e86b0455d2f369d136061e5b1f532e8f3b96c6fdebcf4ce898283df94793b8d5cada8b686713f430d2f94464b15a02
+DIST gitlab-runner-15.8.3-deps.tar.xz 160672020 BLAKE2B bb0cb16ad7c19afb048c0c1e5d48fc157f25d9a79abc564265152b16e3b436693cc0a0faa02dade584e0b95d9806b491582f8741b2b091798aa6b77a3bf9fadc SHA512 f379f5a514314d6f86fc6ac2dc00b1407e1637709c09555e3828adb7544141224c012cf104e1d47ac67f04c19371536ff338c446c7f69c985e1f67278dbee3c7
+DIST gitlab-runner-15.8.3.tar.bz2 1258834 BLAKE2B 84473b3d704f271e286c7cba696132f2d26ec4d5f4944f99b8ad4dd4accd4f9680b36ca5d13432eaff3ce020b57420b40edccb2620b8e246c2020a2c75fca692 SHA512 4b5d659e257d78d84471fe6799367bc50929e1f0356a8a919d248b490aa73b1fb777086a49f777b5d09b10b649e7829439a1ebd517a83ea7c7ccea8c988676d3
+DIST gitlab-runner-15.9.1-deps.tar.xz 159144912 BLAKE2B f10167c731371dbf4d61a05d9154a3127e286846fd60e2eb7291a587d707389fdb989526942263e7a7fac2af02fc343e316528ee2f64aaf97a048e83e58521f9 SHA512 ae74bbfa62ac4a7506ec6099fab11bcf66f7b270ccc0a17dde0b226cccdbaf51949bea44f437e97c20e4b60c605060b42e77a36a11fb5eb080d55dcf30ee58d5
+DIST gitlab-runner-15.9.1.tar.bz2 1267756 BLAKE2B 1732db4d7d8a3f530654f2897ec665bef87cefbfafc8776ba4b15d327768924d9fef5918a5d31899825e17bba20d04bfd30f6c8cbe834b266cadd0f414cfe840 SHA512 ab82cce1956105046aba8560317e00f3f333669ca7ee305879821bf433485599d2eb206afd8edc04c3b9c3d07eb38dfe335c77ff9a4f431bee5dea0a1d10b9c2
 EBUILD gitlab-runner-15.7.4.ebuild 1679 BLAKE2B 588834d3e7f427eaac4d54c3d9c1bad2ac9465f7f2622ae391df14c99204298d73081b9e35a5e6ecbbdd3e8b296d3ec43af066127e8ed2eed003acd3be044c83 SHA512 fa80fab4a5de208c5c973a6e8addd57b3422466aec5878a1975db4a3ae3f02dddffa8574daa48c5fef2967b5f56233d63fda76076e965c0390d396a028818f36
-EBUILD gitlab-runner-15.8.2.ebuild 1679 BLAKE2B a9d59bd776c940e9cd3d755d7c9e40fc49107ce8abf3d347ac695e06edca02a2f7a5cd1677d32aead2b8a2eee41d57d952dc2db052dee27c90bedf3d1ba176be SHA512 b9eb81862594f0bb78f5a8451266700796e0cee61f2aa5f339cd3c67d79edcad324809e7055f496239763a73b41c00ad54f1ec8d506f4366edefa8bd75e85c76
+EBUILD gitlab-runner-15.8.3.ebuild 1679 BLAKE2B c464e1b243266d889de6c0581f699b020256e85a366eb0cc7aceb75d70bb354a204c84c6e7180b387ddb90a04e60fe5a4a069d48d14fe566f3f7b5d033cb087d SHA512 5944b39f7455b9dd7d0c4f03264bb17be2e362bbb3060e2694f263840066c8f5993b8adb4a51648e276fc86c64ffc3758faf301952234eafcfd392022305a1de
+EBUILD gitlab-runner-15.9.1.ebuild 1679 BLAKE2B b225f3d51ff0f48c228244647ccc1ec58b6184732b624a25929ad55607840407994828c9a372f4407d1053e8817dbe7df9e7803d522c28b113985efa3b2116ba SHA512 7e17c1d37046d20b49bf2c40d8bd70a8183e7e0f9099dc9e4f8d9ff53aeeb32fed7e84bdf834db91fcd5030689a77643973db966e125d9b7468d43bc84d4289b
 MISC metadata.xml 338 BLAKE2B dfdcaaee18d3e5492674d3b4055002201342fa4d5b713f88240753002de2bde6244469fe42fe514cb82544d15deacd235cd031dcf71d661a24b26f422c67c392 SHA512 b12a8270df4f07c6b4359150a3b7341d3913a93598153824ec758384758e69667a89de20066735ccc24aea7af07b5c1bdd444fca3193be5402bce5154f90ec79
diff --git a/dev-util/gitlab-runner/gitlab-runner-15.8.2.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.8.3.ebuild
index 99558db152a5..cfcd4b537a95 100644
--- a/dev-util/gitlab-runner/gitlab-runner-15.8.2.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-15.8.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit go-module systemd tmpfiles
 
 # make sure this gets updated for every bump
-GIT_COMMIT=4d1ca121
+GIT_COMMIT=080abeab
 
 DESCRIPTION="The official GitLab Runner, written in Go"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
diff --git a/dev-util/gitlab-runner/gitlab-runner-15.6.2.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.9.1.ebuild
index 42f99ade7103..9fc00e12c5ee 100644
--- a/dev-util/gitlab-runner/gitlab-runner-15.6.2.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-15.9.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit go-module systemd tmpfiles
 
 # make sure this gets updated for every bump
-GIT_COMMIT=c081f284
+GIT_COMMIT=d540b510
 
 DESCRIPTION="The official GitLab Runner, written in Go"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
@@ -24,11 +24,6 @@ BDEPEND="dev-go/gox"
 
 DOCS=( docs CHANGELOG.md README.md config.toml.example )
 
-PATCHES=(
-	# https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3498
-	"${FILESDIR}"/build-for-arm64.patch
-	)
-
 S="${WORKDIR}/${PN}-v${PV}"
 
 src_compile() {
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 362e5bbe59d9..379447637827 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -8,6 +8,7 @@ DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
 DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
+DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
@@ -16,4 +17,5 @@ EBUILD lldb-16.0.0_rc3.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81
 EBUILD lldb-17.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-17.0.0_pre20230211.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-17.0.0_pre20230218.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
+EBUILD lldb-17.0.0_pre20230225.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
new file mode 100644
index 000000000000..985e9ba9d42f
--- /dev/null
+++ b/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}