gentoo auto-resync : 27:10:2023 - 08:42:41

23 files changed, 89 insertions, 365 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 42e293d4e344..262fce46b6ac 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 9d3aabb30569..2a2125147b46 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -33,6 +33,6 @@ EBUILD cmake-3.26.4-r3.ebuild 8804 BLAKE2B fdb48b62ba66d6aa0f162bded4ef491f9476a
 EBUILD cmake-3.26.5-r2.ebuild 8805 BLAKE2B 1da0302fa4bd402e226a898ba1f43daf22ca6ad6d9f29850c57729448b9c83f6f39866e2f07f043849306bcf4568a85203c3b35be915428b712238d639aff5cf SHA512 ddb5480a9deba4eeaba8ee57d5a712887525544b720908ce5a5c3dfb5eb49c347b86f6f08d4cb85d2dc9cfad161761092c59900dee875ad07666ef0bb821da4a
 EBUILD cmake-3.27.6-r1.ebuild 9132 BLAKE2B f1142e9c7425d65ef6ace05df14a1651d8c0ae968a24e2bc8265fe70f972495408e70352aea6bc7e1e5c329fa4730f11f37112c993974a9ceec14c4777e620cb SHA512 7035fa3e835c4a34e8fc92dd443d7817202efbf24f52a09f788bd6888ae65246d16d023260313f9cff37a253d4504b58d1c3db7a4a2fd20bbac2d88e5c4ecdd2
 EBUILD cmake-3.27.6.ebuild 9019 BLAKE2B e6b5634aa8c3f54dafc0df82d3f2ac3fc6220ca8034b8fbea516a8cf37a4ed3d2b7f99fa8c0fec06704e3fc237b6ade8f6f7af9db52c21b50eb549440b3c70dc SHA512 4930f6197e984e1d92de5daf777f62c7ec85d32672388af582f18ae3be0242eddaa170cef0a36db993415d23e4d2740df47a9f87e75ae705769eedf65e80617f
-EBUILD cmake-3.27.7.ebuild 9126 BLAKE2B f39ee2543fad5d3d5839918752b288986d965cd1e0f0db62f627d906bf478c35e591afd8d7ec7eb8993e2e3b7cd46dcce270c84158d2c62617e206f7fbfeb615 SHA512 053d188ef9e13e310895c871eeedcbc87bf6517c7ed94c901da275989f0063c4139cfb17ddbb068267a34a709dc89fd726afa59ae1c700d286fe4bbde7cb4aab
+EBUILD cmake-3.27.7.ebuild 9125 BLAKE2B 8693efb52d37845cac66267ae26c67a6b3a84238caebeee600f3cec01e3bbf7ecf3f674ef8bb5e489478e59a96cbb0ebccb99f4babb25536263a6bbe401cd4da SHA512 54cb98297df9d527f1b8a5083d33e9f98690baa6ad997e805b3bc882219685326aa989702c3d5900c2e39ade63323845884385a34781a589a23f833f789ea468
 EBUILD cmake-9999.ebuild 8947 BLAKE2B 083307c4486f18f6716658217634bef9854d2d955fe05bb43ec1168d728e09849337f146648002483a1efc7cb8353894794552528e9888a4f71874b6f5a915b1 SHA512 748622de8b1771ec7f5cc422b4de227cffcfdead272ea29f7999651cf9d445a84254e44968f23afb33d3ea514c890ff1b32a934810877912fe4e821fe6cffbc8
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-util/cmake/cmake-3.27.7.ebuild b/dev-util/cmake/cmake-3.27.7.ebuild
index 3b3f104ca535..a0fdebab243d 100644
--- a/dev-util/cmake/cmake-3.27.7.ebuild
+++ b/dev-util/cmake/cmake-3.27.7.ebuild
@@ -48,7 +48,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
 	fi
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 84d92549c496..b5f0f2bf0f25 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,6 +1,8 @@
 AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
 AUX geany-plugins-1.38-webkit2gtk-4.1.patch 811 BLAKE2B 1c682cd813350cc61d53fe72609aac7ef212bb4710f0925bc55f5da6f9241c3709d7183d25478024ac8883633ff3605b5b4e5e5c90005a09eb653c701059909a SHA512 4b02c9a13e57ded452d52ff10c0f81ddc56bc193e0301c0805ef154792125fe9f9b6a5c35e81d9535407a67b12a268f5e1eb122b24580c6cf5ad92b0de2b1479
+AUX geany-plugins-2.0-webkit2gtk-4.1.patch 1341 BLAKE2B 33613eee4f4f547d5eeecb13872e1fef85e934d25c74c93fa52915aaa14f02baac9e941215f617d5a29230a4eb68169d6b655444044f1b89d85371ba06000b6a SHA512 8cf132a9eb7d0054645a50aec9be847e743a888aa3fc5f349272c64aa158c3f1ab811e2d814aa8aa0e1f4b34d074c9095f18acf343005deee5356291a4347ec3
 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
+DIST geany-plugins-2.0.tar.bz2 3181264 BLAKE2B 6175f91a3a7effa081393e9397336e0f5f59846fdadd0e31584f237c14863016cc4ab1b17745e1e2804ad88161dc7e43aef97a2332a5c18a7f1baf10d2ea42ba SHA512 48d575459e5c9f905b8809796ea89a05f6e082a1bb1d29c9f44dd5de607a64ad65a27d18348312702d25cfbb80ea0348b9e806f8c0fe649ea558b5b4ccd84818
 EBUILD geany-plugins-1.38-r410.ebuild 3208 BLAKE2B 752378c5eeb13bf3f4ed0d62d6d63c931a42c2da707c4fa86f85b6a65652ad0ecf9217d113c7b91f4656839034a41beddfb991134c2a14bd5d160cef0cecb70f SHA512 b07aaa0c2669e5d40ac599a9efee6cdbb94e7c66c3e627b155647bd35e632b927992078790bd2a20288f97b3c97affc201684c44bffd280e82de9eb150b9158a
-EBUILD geany-plugins-1.38-r5.ebuild 3175 BLAKE2B fe5ff1db7c4186578dc23a45153df0baa490f6448727ebd11fc841ccdea3009253a698997332633bf739cd7289fa1bef00c190d842b752336a655eab986cb7c5 SHA512 c0e1e867c78d8be62ab26fb9d6287f8d393ce98b01038f7212c8c468e98cb4524b607bf2c386cbc6a285af7d8309362029dcddb61bf88c4d667ef550e46a5abd
-MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
+EBUILD geany-plugins-2.0.ebuild 2872 BLAKE2B c9b23e7a8a3080637f844768769a9c83172906ff5f208e4a6cedcfd0179e1edf3d981a697a7753f0dc45e8b403a814a869cb7dec6b425d87f74848238613e0fe SHA512 dd7dbc8a6110600793d6a9bd86ce16bf9a1071a99fb96e7787707361a42035ed2a3cd5c71b4b7536e6fb4aa370bc458ca9949740b6395e05ba6fb6d690682abc
+MISC metadata.xml 1143 BLAKE2B dc494d485e5c1aa77a9a6a7a69a5bded4fdb9a9dbc237765b26deaad5e23ced2681a6e32eeaeddb8dde438044e85801ad35692920f8a3b9a91d7b80d47bdd512 SHA512 0986c7bc90242bdc5f21e28328efcbbd075c556d162b663bb0eb01068860e2faabe25b151b7b1c5837d246b17ff1ee8d0bdee2068284f1c66a678b6e00e3e298
diff --git a/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch b/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch
new file mode 100644
index 000000000000..91015aa1a619
--- /dev/null
+++ b/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch
@@ -0,0 +1,33 @@
+diff --git a/build/markdown.m4 b/build/markdown.m4
+index 6c1f53a6..39bea2a6 100644
+--- a/build/markdown.m4
++++ b/build/markdown.m4
+@@ -49,13 +49,13 @@ AC_DEFUN([GP_CHECK_MARKDOWN],
+     GTK_VERSION=2.16
+     WEBKIT_VERSION=1.1.13
+ 
+-    GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0],
++    GP_CHECK_GTK3([webkit_package=webkit2gtk-4.1],
+                   [webkit_package=webkit-1.0])
+     GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN],
+                          [$GP_GTK_PACKAGE >= ${GTK_VERSION}
+                           $webkit_package >= ${WEBKIT_VERSION}
+                           gthread-2.0])
+-    AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.0])
++    AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.1])
+ 
+     GP_COMMIT_PLUGIN_STATUS([Markdown])
+ 
+diff --git a/build/webhelper.m4 b/build/webhelper.m4
+index eacef95c..2325a65f 100644
+--- a/build/webhelper.m4
++++ b/build/webhelper.m4
+@@ -25,7 +25,7 @@ AC_DEFUN([GP_CHECK_WEBHELPER],
+                           glib-2.0 >= ${GLIB_VERSION}
+                           gio-2.0 >= ${GIO_VERSION}
+                           gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION}
+-                          webkit2gtk-4.0 >= ${WEBKIT_VERSION}
++                          webkit2gtk-4.1 >= ${WEBKIT_VERSION}
+                           gthread-2.0])
+ 
+ 
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r5.ebuild b/dev-util/geany-plugins/geany-plugins-2.0.ebuild
index 7f84f12c63f3..d1ffb9d1c929 100644
--- a/dev-util/geany-plugins/geany-plugins-1.38-r5.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-2.0.ebuild
@@ -4,24 +4,23 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
 
-inherit flag-o-matic lua-single
+inherit autotools lua-single
 
 DESCRIPTION="A collection of different plugins for Geany"
 HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
-IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
+IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope webhelper workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 DEPEND="
 	dev-libs/glib:2
-	>=dev-util/geany-1.37[-gtk2(-)]
+	>=dev-util/geany-2.0
 	x11-libs/gtk+:3
 	ctags? ( dev-util/ctags )
 	debugger? ( x11-libs/vte:2.91 )
@@ -32,11 +31,11 @@ DEPEND="
 	lua? ( ${LUA_DEPS} )
 	markdown? (
 		app-text/discount:=
-		net-libs/webkit-gtk:4
+		net-libs/webkit-gtk:4.1
 		)
 	pretty-printer? ( dev-libs/libxml2:2 )
 	scope? ( x11-libs/vte:2.91 )
-	soup? ( net-libs/libsoup:2.4 )
+	webhelper? ( net-libs/webkit-gtk:4.1 )
 	workbench? ( dev-libs/libgit2:= )
 "
 RDEPEND="${DEPEND}
@@ -46,17 +45,18 @@ BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
-PATCHES=( "${FILESDIR}/${P}-libgit2-1.4.patch" )
+PATCHES=( "${FILESDIR}/${P}-webkit2gtk-4.1.patch" )
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
 
-src_configure() {
-	# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-	# deprecated (in 5.1) luaL_openlib API (#878529)
-	use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+src_prepare() {
+	default
+	eautoreconf
+}
 
+src_configure() {
 	local myeconfargs=(
 		--disable-cppcheck
 		--disable-extra-c-warnings
@@ -95,23 +95,18 @@ src_configure() {
 		$(use_enable ctags geanyctags)
 		$(use_enable lua geanylua)
 		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
 		$(use_enable git gitchangebar)
 		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
 		$(use_enable pretty-printer)
 		$(use_enable scope)
 		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
+		$(use_enable webhelper)
 		$(use_enable workbench)
 		# GeanyGenDoc requires ctpl which isn’t yet in portage
 		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
+		# Require libsoup-2.4 which conflicts with webkit2gtk-4.1
+		--disable-geniuspaste
+		--disable-updatechecker
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index 5ed0076a04d4..9e62141c276a 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -18,7 +18,7 @@
 		<flag name="markdown">Enable the markdown plugin</flag>
 		<flag name="pretty-printer">Enable pretty-printer plugin</flag>
 		<flag name="scope">Enable the scope plugin which is a graphical GDB front-end</flag>
-		<flag name="soup">Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag>
+		<flag name="webhelper">Enable webhelper plugin</flag>
 		<flag name="workbench">Enable workbench plugin</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 869642ccc6fe..8fb428232d65 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,4 +1,5 @@
 DIST geany-1.38.tar.bz2 4860717 BLAKE2B 3dda3a7454f96be18de95f8dfeb7a6ee2627ffe370879fa3ee7aee851e21fa46076de6b9741b6e83af94b66afa245a0f69237db4582858bc40f819d8a3c78e6e SHA512 5aff0643d0d9e667d0fb526e9c8426cb80c89decf92110683086c2a7a18e0d3d55ab514fdd68aa0c4431c98ae0c4685607b49c620525184c89e21b26fca06699
+DIST geany-2.0.tar.bz2 6836300 BLAKE2B 9a810827c3c8e5156329ec2e693d7181183d341ea74b5cbca940904912004e09b1ac0307710d2a6bec76c3c4b3e08c0a5231ffe5e65ba1234b33900192703d1a SHA512 443b64fc09501a95241340a6ee582810a3fddb033ef06c1a42d530625921a871a5183b575d73a858fa98b040651c4308a273272cb735753e969fd1270170b87d
 EBUILD geany-1.38.ebuild 1612 BLAKE2B 7c9ae5b22ea599b78517cf3a0a2636fb10b4f60dc65a8049e7b5d22a976842f0e131e7a1f0943bab85bc45bac45423ae66cd6cc3d675f026e509503e62283404 SHA512 96257b8f9f202f471351712eed450658ab20eaa11a6b8db53de0461ab56dfd6c698c26d2ec3bcd7c2da75c0ce36125eec384c69432b0d59e6ff3ce7fca84193d
-EBUILD geany-9999.ebuild 1610 BLAKE2B 6abc84159775826a0e5b6ee85986fbae208b2c0a83ad3c5f711a92681b716713873f7564abb2dd4fcc929ab337e15a0a5bb9d75bd323986b38261d26aa765a6a SHA512 2d9eb564a87d1a7d797cc8f0ad580c9c4e0db548d0d30599313896628dc694e671aa6bab1189d98e4e260443890f3f7ec3dd4cfecf0238920495e01c09d8595f
-MISC metadata.xml 1841 BLAKE2B ef03faa1d2dc0043e8500dd35b25674cbf1ea09a85fe297f7405616c600c3d00fa006ef9006c182ddcf62e0d3fdf76a07805ccc066a2ae28b592ba90e7ebbc83 SHA512 c26bec6b5266b6fb991116f19e350272b5e539056643f2ca4a418265116008a46be2501f7ba83a2129251cc2da354b0d738e0e28d2b1f12f329670094b92b74b
+EBUILD geany-2.0.ebuild 1621 BLAKE2B c553fa6b1ba97fb2630f3bce1d4895d2fc8587cdeeba1b41c318118a87085d126c667fae3041858bf5e2c21f65a1bd3f52dbf178774db648ed71e9aa271206e7 SHA512 264e77667f47afad44a0ed207e2201f38056c6c7835051eb172b9a33f50ab2e25eb03ebcbfdc95c5d94985da8c06725e3e5a3c34a0897add6054d3faf0503730
+MISC metadata.xml 2079 BLAKE2B 231aa8e22749349026a3b3008a8fd75014ed5f26a139d5cd93a70735527ccbc056355a9020afb304a5d95c75913a4cf04dc5d9b26e5bef8062f49da450379b74 SHA512 e454183d6cd55228276bbb28ddf672a826152bc2fa1293f31c386a4f4343aa4c36b27caef3295a8c4b9d45aed13334e2e0566e58b01b4bff14f52aff30913b9e
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-2.0.ebuild
index 067b8c015b22..33efc6136757 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit strip-linguas xdg
 
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru si sk sl sr sv tr uk vi zh_CN ZH_TW"
 NOSHORTLANGS="en_GB zh_CN zh_TW"
 
 DESCRIPTION="GTK+ based fast and lightweight IDE"
@@ -16,7 +16,7 @@ if [[ "${PV}" = 9999* ]] ; then
 else
 	[[ "${PV}" == *_pre* ]] && inherit autotools
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
@@ -26,7 +26,7 @@ IUSE="+vte"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.0:3
+	>=x11-libs/gtk+-3.24:3
 	vte? ( x11-libs/vte:2.91 )
 "
 DEPEND="
diff --git a/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml
index 93ae2d3e4645..419db80e1fce 100644
--- a/dev-util/geany/metadata.xml
+++ b/dev-util/geany/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>aklhfex@gmail.com</email>
+		<name>Chris Mayo</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Geany is a small and lightweight integrated development environment.
 		It was developed to provide a small and fast IDE, which has only a
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index ced6c577a04b..bdbc6989ded7 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -5,6 +5,6 @@ DIST pkgconf-2.0.3.tar.xz 310796 BLAKE2B a0a526d59dce4eaafb5a43784676d7717ea8718
 EBUILD pkgconf-1.8.1.ebuild 1557 BLAKE2B 713707b02b74f5abbee292446c94ee2dff2040b01bae387f541a610aa9332f8bd4b094932f1f4e806c8db3da0ad2e7a8f8f1328fcacf7801de6f6c5d5cb2d331 SHA512 fe9f9aedf8f38686d5d83a9f17355955d1da48e0e3eed4176a37b36f8417b5b0d2c8d84ee2d3e98f9484b3a5a2f82e2d6a87f1aeb4dece86a7ad938fa3e944cc
 EBUILD pkgconf-2.0.1.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce
 EBUILD pkgconf-2.0.2.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce
-EBUILD pkgconf-2.0.3.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce
+EBUILD pkgconf-2.0.3.ebuild 1519 BLAKE2B 0aaf33fef4394eaae96798a1642da77788105a5f10af56e3294e34149f4895e5bc5c1da6b0fd61998b018d5cbaf7e1aa7c0818e6829bfec7750533c6fb5c2284 SHA512 f74643e5fef09d071d6a8882b88c067eecdd8fe16d4c5f197abd989f90bc4fea468092b921a85bae4cd31b129eff59cf69d89087f6c4f99aa54a6cb4e387343b
 EBUILD pkgconf-9999.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce
 MISC metadata.xml 375 BLAKE2B 068421081109c9b0ae560b84f92dd8d68b0c8e1675fc7675a324e4629ce3047b5d9ac43d255734fa12b4584c0e62d5c60aa1ddc5989f1e156d60a708cf99267d SHA512 44affcb6779b704b6062e283d19a4b5b9b8eee41f4a2aaea864ab93c74d86166abbbb71b042988cdb1cd58636443b3878001402fa3d9c876ab01dc612015a6e7
diff --git a/dev-util/pkgconf/pkgconf-2.0.3.ebuild b/dev-util/pkgconf/pkgconf-2.0.3.ebuild
index 742423bfd5ac..1a3b9b6870e5 100644
--- a/dev-util/pkgconf/pkgconf-2.0.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-2.0.3.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 	[[ ${PV} == 9999 ]] && eautoreconf
 
 	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/pkgconf
+		/usr/bin/pkgconf$(get_exeext)
 		/usr/bin/pkg-config$(get_exeext)
 	)
 }
diff --git a/dev-util/pwndbg/Manifest b/dev-util/pwndbg/Manifest
index 1b1ed454a3a8..e7cd85324455 100644
--- a/dev-util/pwndbg/Manifest
+++ b/dev-util/pwndbg/Manifest
@@ -1,7 +1,5 @@
 DIST gdb-pt-dump-ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz 385989 BLAKE2B b7582289f83fd0c76b8ef2a04540db979b0f599b6b711e17541e2804b93bcffe6fd611d43101c96644a7324398eea5df02326267b4e201564929de956849b719 SHA512 57701b5fdd4c69be79a451f08fa6d7cbd43a0963cfd7689443676b68ece96154ccb61121d4a770d6e519d3142f99c589df1143b0ff8308547c06fb0e87e187db
-DIST pwndbg-20230319.tar.gz 8363103 BLAKE2B 9ad84450116b4e8e3e82107fea6d33505c61e81cde52a209865d4fea1620dd8db2e7f395e2764f9ed38e10311ea9bb77e08fb4c087bd3307ad06d3ea3489ec42 SHA512 aa84908f1dee97e04b72d4f789d78c861507a3a842ecfe00a0ab8a073d63652b8319094a28d910c916131dec3d8fd1eced00c9dc4b97220e1dd76da89baaf695
 DIST pwndbg-20230717.tar.gz 8392017 BLAKE2B e373a7408366090f58385dac8dfcdd13702c475117a35158a1a149d149c9a2cbf5f2702be33aeab537451cfd990b5253e9bc0283fa5ae197c9cceb680e65a724 SHA512 d261ed992327d62b0b3e7cc002d3185435748e27cc2ce0085d438848ef1bdb0b3921ae5c1ce19c25e49d52b10f8340eb67c4e05fc197d2adeb888b47e2c158ba
-EBUILD pwndbg-20230319.ebuild 2498 BLAKE2B af61511a773f76c068461a8b57d7e07bf85cbfd29d7def183791ecef1feccc8d893564d1a5265f70da921aa09e1fbf51bacd79d6006a2b1861e7f4ee40bc8f40 SHA512 010b4f794d7bb7066e07a0ac187d24424a8d75ea1ab46573834fad4aa8cc92c71411a4a70046e4d06f5fd97921e4965ef9d0a7665a4562486cf0a2135f4ab00b
 EBUILD pwndbg-20230717.ebuild 2500 BLAKE2B 08ff29915156bf644909ac18194ac0fe16497415fda7259704d4f8fe9124b54c0caa2c2e9d9a8ec6801650cc314405048737e8d86670107435525ead7ab960e5 SHA512 3e4580c98f444023bdd76c7db11f4573fe9456e7ad31680dc803dfb11e13e6633015c6e08282bffcb1d82cc957cf4a63bafd75a42d3b33b63373447a799c9a4e
 EBUILD pwndbg-99999999.ebuild 2502 BLAKE2B 552320bf94f7d8167dec7157285acb391e8630ac9d8a3e327b04833430ef382fc3f004a5173b3f2f87bb272b65fe8b10a91e914236e4b96a52f2e35811a0a77f SHA512 936ff3ce1dd2f0325072a6793fc718f28fa0022e1d5dfac7380711d2ba7f518cf4a8e22733ae264e5791a70bdfe79c91bdae44d1ea3f0efb8ae11000f12c832a
 MISC metadata.xml 692 BLAKE2B bb74dda183fe35e5873e7cbaa5886dec5beaf082968b16352bcda55f2e14dbdb78ee48d2e0195baa735b0f615b0469f8fd48429c47f4a81d2fc0391cafaade76 SHA512 8a6a9ec3aa03e597d8302a5b1001fbfd569e6efb08157445bedb58ec82b4d7812aad7a852ae3eb0d0f245cbf89c85a357e532855c19e6dbc9d438c16e0bd549d
diff --git a/dev-util/pwndbg/pwndbg-20230319.ebuild b/dev-util/pwndbg/pwndbg-20230319.ebuild
deleted file mode 100644
index c94c890cb91a..000000000000
--- a/dev-util/pwndbg/pwndbg-20230319.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-single-r1 wrapper
-
-DESCRIPTION="A GDB plug-in that makes debugging with GDB suck less"
-HOMEPAGE="https://github.com/pwndbg/pwndbg"
-
-if [[ ${PV} == "99999999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pwndbg/pwndbg"
-else
-	MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
-	GDB_PT_DUMP_COMMIT="ebdc24573a4bf075cf3ab6016add9db6baacf977"
-	SRC_URI="
-		https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz
-	"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-libs/capstone-4.0.2[python,${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		>=dev-python/pycparser-2.21[${PYTHON_USEDEP}]
-		>=dev-python/pyelftools-0.29[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
-		>=dev-python/tabulate-0.8.10[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.3.0[${PYTHON_USEDEP}]
-		>=dev-util/pwntools-4.9.0[${PYTHON_USEDEP}]
-		>=dev-util/ROPgadget-7.2[${PYTHON_USEDEP}]
-		>=dev-util/unicorn-2.0.1[python,${PYTHON_USEDEP}]
-	')"
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]]; then
-		rm -r gdb-pt-dump/.git || die
-	else
-		sed -e "s/__version__ = '\(.*\)'/__version__ = '${PV}'/" \
-			-i pwndbg/lib/version.py || die
-
-		rm -r gdb-pt-dump || die
-		mv "${WORKDIR}/gdb-pt-dump-${GDB_PT_DUMP_COMMIT}" gdb-pt-dump || die
-	fi
-
-	python_fix_shebang "${S}"
-	default
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r pwndbg/ gdbinit.py # ida_script.py
-	doins -r gdb-pt-dump/
-
-	python_optimize "${ED}"/usr/share/${PN}
-
-	make_wrapper "pwndbg" \
-		"gdb -x \"${EPREFIX}/usr/share/${PN}/gdbinit.py\"" || die
-
-	dodoc {README,DEVELOPING,FEATURES}.md
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		einfo "\nUsage:"
-		einfo "    ~$ pwndbg <program>"
-		ewarn "\nWARNING!!!"
-		ewarn "Some pwndbg commands only works with libc debug symbols.\n"
-		ewarn "See also:"
-		ewarn " * https://github.com/pentoo/pentoo-overlay/issues/521#issuecomment-548975884"
-		ewarn " * https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html"
-		ewarn " * https://wiki.gentoo.org/wiki/Debugging"
-	fi
-}
diff --git a/dev-util/pwntools/Manifest b/dev-util/pwntools/Manifest
index 1e747f17dca1..440bb7af48b3 100644
--- a/dev-util/pwntools/Manifest
+++ b/dev-util/pwntools/Manifest
@@ -1,14 +1,8 @@
 AUX pwn.conf 24 BLAKE2B cac0a12eea8abd3d2ee21632e7f2281e7e35c2d7839cfbcba83ae5d0e8f427e9cc2462a6d17d187252b99d9dbbb14393b9d5a63996c42043f553e9b66bfe9e07 SHA512 9d849115348ddb34ddc3232a03442b64268e7970a89ee2eeb040aeb6dec5bd20f53dc39c73e10c143065acb4b84775cf638854ec8ba6d65b8e2f38e09ce59be8
-AUX pwntools-4.0.0_do_not_mess_with_docs.patch 1047 BLAKE2B 5a70f8743e0ff11db1f18a949be897d095ae988ca168298b820c1f1e3c3b5aa6db8141074fee0d496d56203df6fa1f63c91e74623793e37d1381adc6ba69e046 SHA512 58fb14c98ff001522cec3a06d8fb3f4baac090fedea169c68c5914bacd002ec8d98fdbc1f8bf1e6ca6947cc3da950de6994521c2d4d718e499c748f86cdc62ad
-AUX pwntools-4.1.0_update_deps.patch 413 BLAKE2B ead75c25972bc604baf20da71f6b9f229ca3d34b24a6af63f6ead03424cbb242a65e31a575d08f78a6b00df44831a3a9f4e16f6151049f7639711e761ec0cb28 SHA512 537b456640837728abad2d7d2ba0c0509b876b1de3e45b36470b5e16af7b84ccd1e6a4d68f2429533f81d5a2c9649d494fea712d3e224ebf2e27d0cd63d8d850
 AUX pwntools-4.11.0_update_deps.patch 225 BLAKE2B c39cfd5a0f49972c56c32567a8b8d63397ea17e076d3ffca0aa4b1f6de2859e2843382e2b2fd83616a3b72e5f4defe86aa4c01e9e87ece8c51aef5ef6c4fe5f7 SHA512 b17b016b9eda2ac7e535ffd62fe6451206e30bce3de1b71a3c14d4d565c2a1bd2833bad24335851887cab82af70499bb8d6188f3758b18c382e32e9a4b7aa8df
-DIST pwntools-4.10.0.gh.tar.gz 4228469 BLAKE2B a452d1efb23430a27630b402ad49967088bf8f9bcfa1e9fda1a87c58384c750531724ad24efa89caaa205097617529f9e0b8489251b7d5f098540efd8e4459c3 SHA512 6d96b71da08661ca225cc21bb06d66333c8ccdb79852bbd679ff7d69b091fe3cc6811f7317e1011e7c6867c5b70aaeb5f02de2fb03882914005fbbde583570d0
 DIST pwntools-4.11.0.gh.tar.gz 4237576 BLAKE2B 11b1b6a923c44ee1b5027b4a71f9f3b6b9bcd36a2a38915ee46ffc855b0749528a204581dcb5071d50031701924b3cc08edf95b363d1d1b6e76d029a91011293 SHA512 a5be69a19cea933680f1946e389fad4edbbdb0d6106cd1f78778f901a6ddaaef734389678c5b4f16718a788d53bff6025817d83c06ab3dc1a200a5ff3c696aaa
-DIST pwntools-4.11.0_beta0.gh.tar.gz 4234690 BLAKE2B 8e87cd9eddf1fe7e4ee716a8e5ad82150b0f9c8c3bd44e4c071b551643be032111b97d7024844cd0107ef259287e29920d3fa672a7f458331baba7a97ec7acac SHA512 f3377b2c2b2cd25f3c36930245117fbbdb30fb8ff7f0c0c8633745cbb9b5192822087d8621da5ad325bf349efe616c538435fb490a35b12f57d04b79788d07f3
 DIST pwntools-4.12.0_beta0.gh.tar.gz 4244487 BLAKE2B a5312c5c454ddfbdbfd27ddf200194155db1dbc6bd545bc2de0ba0d18bee731dc9d7109e205e4426776a12a9cf715a45a365afd1b624edd0d3e1abb81e3a1936 SHA512 d14ea4283b78387362673c5416e2c7aa55c6ac5e2cd7191f57b28afdf55b1cf8c4044c265022591f30f56bcf7bde8d745e2dc70ada6763abf07c43899516f537
-EBUILD pwntools-4.10.0.ebuild 1753 BLAKE2B 1fa2a733f3698520ab515e6268e5eeb34753e9fdbc4d558dbdce192e7e4fc9aeb88a3a321bb3d6ce2c9156eb95f4bc6569201e8114097e1f32be9eae078e8b01 SHA512 01ca275d6ce55772658e48834268eccd6bc45ef6a0942b5283ae8004f54ccc00258b6d761008fa20334f9caaa60da709ac1cbb63294f9f59481a7e7b66931795
 EBUILD pwntools-4.11.0.ebuild 1699 BLAKE2B 011024772043ee432ccadfc1c8bd316d58886720d8f33db4001d66c9eb2626edc059f13bb41675f1b9097f13daf1f5893de2882533ee7b013296198a2a65a131 SHA512 86b2de9e55b9df45bd2ffca78cee8b1e5dbe571a9378aa56aa22c6cb359abc9dda994744ee482092b8a56365f112f073a1f9c72232f11dadf20ae6ba710babc6
-EBUILD pwntools-4.11.0_beta0.ebuild 1701 BLAKE2B 16a7625d9e351ef3bd793bb5ab3e63dd36a89cb9de70f1afc6437f5df378cb66e26c1a6010424cb956cb8441ef5a742304dc98e4837f8aecfe5d1640b830a593 SHA512 6ea07302a60e4efbc61ddb19157ae78c63705211c32ee2a9dbffb559f795b865dd88eab44d6c6b871b8209fbdaa64beb0c9fa1a7e458549da0b0e49c1db67b81
 EBUILD pwntools-4.12.0_beta0-r2.ebuild 1944 BLAKE2B e766f1da1064fb6763fead250e0ce6d81733ba0e6b0ebeb264ec04661bf4c62660e1f75ea5f459bbd6a43031cf2f8633a41f93eaf92e6b40e534b60c96a46180 SHA512 3df5afb68f9c351b36c5be271c9bcdcdb48144fa3fdd7859fac5972c695dd0c77fbeb5d4acca17d2680b47ff95a9590640168152145316440f3d37c33ab82124
-EBUILD pwntools-9999.ebuild 1702 BLAKE2B 46728b95d49b1c0edd4d5cbd0d3cd435fe13952c9e53e29d1879776e014e25a57f639926924cb9091ec5ec5948551ce81cdcdf2bd14d13a049cf896c62571d50 SHA512 318d184947270e29990202c0582e9252b33d2da33b5ee877550d2f5e22dd32243b9bda23556f4e777d9b8e7a9871a9c6ee9ef941a40dda5c2c172f4661ab922f
+EBUILD pwntools-9999.ebuild 1992 BLAKE2B 84ce6bf5ec58c6502ee1219aba23177a66983f2c1a44ee1e30b40848d72ac02bb9f67cfdc842ca05db96bea0c856e117f346b96cbce631e84df824a03e69bcc8 SHA512 38793e0b41151f44b3cb035922e764adc83287250f5dc2b21b6b8e256a452562a22497ff157886631e5d1acfba4f7ff44247d820ad48e57afd32e72f94799165
 MISC metadata.xml 541 BLAKE2B 31c34e39b19efa02a71fa2916d584f78893a864bd06559cffd475b9ff9837989164ab1e7fb8fa5ec345b63bacad314c4218772efed0b5201a964b225ba8e84d4 SHA512 e213766d68840db16fe46c9f3ba7094ebc63955f763963b44606636dfab95f0ed48a368901ad3b464e991205bcacd1de7cfe470dee63268eedf3a74fa901773e
diff --git a/dev-util/pwntools/files/pwntools-4.0.0_do_not_mess_with_docs.patch b/dev-util/pwntools/files/pwntools-4.0.0_do_not_mess_with_docs.patch
deleted file mode 100644
index 9256a2772245..000000000000
--- a/dev-util/pwntools/files/pwntools-4.0.0_do_not_mess_with_docs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/setup.py.orig	2020-01-10 12:01:28.688051015 +0800
-+++ b/setup.py	2020-01-10 12:02:10.370053813 +0800
-@@ -70,14 +70,6 @@
-     print("$ apt-get install python-dev", file=sys.stderr)
-     sys.exit(-1)
- 
--# Convert README.md to reStructuredText for PyPI
--long_description = ''
--try:
--    long_description = subprocess.check_output(['pandoc', 'README.md', '--to=rst'], universal_newlines=True)
--except Exception as e:
--    print("Failed to convert README.md through pandoc, proceeding anyway", file=sys.stderr)
--    traceback.print_exc()
--
- setup(
-     name                 = 'pwntools',
-     python_requires      = '>=2.7',
-@@ -99,7 +91,6 @@
-     entry_points = {'console_scripts': console_scripts},
-     scripts              = glob.glob("bin/*"),
-     description          = "Pwntools CTF framework and exploit development library.",
--    long_description     = long_description,
-     author               = "Gallopsled et al.",
-     author_email         = "pwntools-users@googlegroups.com",
-     url                  = 'https://pwntools.com',
diff --git a/dev-util/pwntools/files/pwntools-4.1.0_update_deps.patch b/dev-util/pwntools/files/pwntools-4.1.0_update_deps.patch
deleted file mode 100644
index fd103c13e497..000000000000
--- a/dev-util/pwntools/files/pwntools-4.1.0_update_deps.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py.orig	2020-05-09 10:43:06.946464282 +0800
-+++ b/setup.py	2020-05-09 10:44:20.572463455 +0800
-@@ -52,7 +52,6 @@
-                         'ropgadget>=5.3',
-                         'pyserial>=2.7',
-                         'requests>=2.0',
--                        'pip>=6.0.8',
-                         'pygments>=2.0',
-                         'pysocks',
-                         'python-dateutil',
diff --git a/dev-util/pwntools/pwntools-4.10.0.ebuild b/dev-util/pwntools/pwntools-4.10.0.ebuild
deleted file mode 100644
index bbd1e3a48c01..000000000000
--- a/dev-util/pwntools/pwntools-4.10.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="CTF framework and exploit development library"
-HOMEPAGE="https://github.com/Gallopsled/pwntools"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git"
-else
-	SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~riscv x86"
-	S="${WORKDIR}/${PN}-${PV/_beta/beta}"
-fi
-
-LICENSE="MIT GPL-2+ BSD-2"
-SLOT="0"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/capstone-3.0.5[python,${PYTHON_USEDEP}]
-	>=dev-util/ROPgadget-5.3[${PYTHON_USEDEP}]
-	>=dev-util/unicorn-1.0.2[python,${PYTHON_USEDEP}]
-	dev-python/colored-traceback[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyelftools-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.7[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	dev-python/rpyc[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0_do_not_mess_with_docs.patch"
-	"${FILESDIR}/${PN}-4.1.0_update_deps.patch"
-)
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		--only-use-pwn-command
-	)
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	rm -r "${ED}/usr/pwntools-doc" || die
-}
diff --git a/dev-util/pwntools/pwntools-4.11.0_beta0.ebuild b/dev-util/pwntools/pwntools-4.11.0_beta0.ebuild
deleted file mode 100644
index 627a76a38d69..000000000000
--- a/dev-util/pwntools/pwntools-4.11.0_beta0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="CTF framework and exploit development library"
-HOMEPAGE="https://github.com/Gallopsled/pwntools"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git"
-else
-	SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	S="${WORKDIR}/${PN}-${PV/_beta/beta}"
-fi
-
-LICENSE="MIT GPL-2+ BSD-2"
-SLOT="0"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/capstone-3.0.5[python,${PYTHON_USEDEP}]
-	>=dev-util/ROPgadget-5.3[${PYTHON_USEDEP}]
-	>=dev-util/unicorn-1.0.2[python,${PYTHON_USEDEP}]
-	dev-python/colored-traceback[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyelftools-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.7[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	dev-python/rpyc[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.11.0_update_deps.patch"
-)
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		--only-use-pwn-command
-	)
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	rm -r "${ED}/usr/pwntools-doc" || die
-}
diff --git a/dev-util/pwntools/pwntools-9999.ebuild b/dev-util/pwntools/pwntools-9999.ebuild
index ae6e8ade5145..c560e51d59ec 100644
--- a/dev-util/pwntools/pwntools-9999.ebuild
+++ b/dev-util/pwntools/pwntools-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="CTF framework and exploit development library"
 HOMEPAGE="https://github.com/Gallopsled/pwntools"
@@ -57,5 +57,15 @@ python_configure_all() {
 src_install() {
 	distutils-r1_src_install
 
+	newbashcomp extra/bash_completion.d/pwn pwn
+	newbashcomp extra/bash_completion.d/shellcraft shellcraft
+
+	insinto /usr/share/zsh/site-functions
+	doins extra/zsh_completion/_pwn
+
+	# Disable automatic update check (bug 915496).
+	insinto /etc
+	doins "${FILESDIR}/pwn.conf"
+
 	rm -r "${ED}/usr/pwntools-doc" || die
 }
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 8879651530a7..aa1ca274ef99 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,7 +1,5 @@
-DIST uftrace-0.11.tar.gz 1120956 BLAKE2B e3bda84a7323cc50780950e502856e28a380249a0f518ad3f7950c4147f0ab635e84b978395eb9025e6b47ecf7eefddcde59356a22f1c8a1d60ddf9820dc3d41 SHA512 519ca13665ba97cea4c349d81b4b5cacd8d3d9b2188ef5edb447f6b783cb7a92356bc0f9e63b67427a896d8df671f58091113e1de3fffd8d8000417a9fdb6e46
-DIST uftrace-0.12.tar.gz 1138670 BLAKE2B 0110f22e12231a8795b12722220b8e9ad6efb79eac99969f3f4c67b7925e1466753bcf7dbcf10fb98c3b3dfa77f6f01ebfd55705fb0b9a3672a725ff24a1483d SHA512 02331f9e76b5652b0464fb3e9e29320ca1d4691a9de7bc7e7e489c3eac040ecd389c201ff2875b1b6a6695c687d7eab640239728f8b66c97efea21414b215842
 DIST uftrace-0.13.1.tar.gz 1159973 BLAKE2B eafb5141f5c86a77d6c68fbb44d5575df62cb679ce037144eea4a76a6a729e9965f15437b5a3cbd3566d560d48946a7788970aa9e40ba86eb1cf39571ac30bfe SHA512 03033cc314fe902046eb8c7cdc8a15c6f67f7b4df189329ccb654041ec2e02baa03e6d3d8cbdf3238946096a3893f60ed105fe4807194a74f90a107400accd7f
-EBUILD uftrace-0.11.ebuild 1411 BLAKE2B 9921acbe6113231bf8b41c1e253a4407bee13aabf67fe0c6f9e6b3f6e2bd7a2578b245b4cc30973c6580e15a49f3e0700d0867b41e85983b43b33abc71661207 SHA512 9da4cd7cf0ae4c73bc29e7ef3748f3e9c6a4f3bf2167d7859848c967d0c89b053f057f9d2ab0a9cff59a0ddebb419c5bd505ae413cbbc3231238c9ff521e013f
-EBUILD uftrace-0.12.ebuild 1412 BLAKE2B f8ecf16fe767a4344a197d5879bd9dd4588e2b3061ab6442225805e21f10f68f429a149569401f6370e4adf1f05184a1bcfb24b2f3bdace30403491e7fc9f946 SHA512 14aac7b0e707eca8ca668e5aed6d604a7060f6cce479142871a8dd40b24d154a2853cfe83d57ae4d25ea5fcd7132bad58ae6ac540120a899c0812d3ef27ffa85
+DIST uftrace-0.14.tar.gz 1192139 BLAKE2B 81c83581351fc8b8302c312ad0a4d84a9f19c0db9253b31de6f2bb7e507aa8540eaab494ae1b52de3fd10baa4f2b658403676f1f53eeecb14f03c765b6fc98d0 SHA512 35fd121d0d0ac738a841deb470dd48b0a1a8a3d711b36463eddbbd8fc70122c76c5b5158ad2e92bd6a0b68f4bbe51c6957f4473f8b5be7ec82a9b962d31ffc5b
 EBUILD uftrace-0.13.1.ebuild 1411 BLAKE2B fc498a6663a8e08f972abf087ca79360129969e338f11ed10cb5ee98504207d0827884e1b5a73a06041dd8c27d57eec918894ef8cc5541a4687c8ea26ca729f6 SHA512 38d47e2a37f0e9f0910e8e5e5f4c69c177f77390cbc6aff255be89aa56ed0bfdbc249b56a4decd40cff8f59bbfcacc02e41c314c76b7ce0bbe7ac08acd77c687
+EBUILD uftrace-0.14.ebuild 1412 BLAKE2B 63489e73200e116c59e376290eec78c819bb840893e34d865452f75098bad2fff61f7fadd29619eef9c5ff44582df50f5ee32f3cdcc458eca67e35f6fba9fcb1 SHA512 975304c79e8ae91cb972218839be775eb68789f2af1334530937d502dc25df09718156b618ac4b2ca60cf73bdd5a4bf25b5e03e95c8ba9d1e467582223631f8b
 MISC metadata.xml 439 BLAKE2B 5164074d22c56fcba8f0677446484c392c347058c444e3f2760cc1e6d17e07406741f80a525ba99b575dca2d9347fe3b13b82fe5aa79bc734add9806695a5fe2 SHA512 d6e0f7ab729d6088748d5efe5c88910355f5ab7e70308b3b24f8cd27956b0ee21f8ff8bce18f9969694bd4677c229fe80317735de63e9a80b4dca638738dbe5d
diff --git a/dev-util/uftrace/uftrace-0.11.ebuild b/dev-util/uftrace/uftrace-0.11.ebuild
deleted file mode 100644
index 84dfa3dfa4f6..000000000000
--- a/dev-util/uftrace/uftrace-0.11.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 lua-single python-single-r1 toolchain-funcs
-
-DESCRIPTION="Function (graph) tracer for user-space"
-HOMEPAGE="https://github.com/namhyung/uftrace"
-SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="capstone lua python unwind"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	virtual/libelf:=
-	capstone? ( dev-libs/capstone:0= )
-	lua? ( ${LUA_DEPS} )
-	python? ( ${PYTHON_DEPS} )
-	unwind? ( sys-libs/libunwind:= )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)/uftrace"
-		$(use_with capstone)
-		$(use_with unwind libunwind)
-		$(use_with python libpython)
-	)
-	if use lua && use lua_single_target_luajit; then
-		myconf+=(
-			--with-libluajit
-		)
-	else
-		myconf+=(
-			--without-libluajit
-		)
-	fi
-	CC="$(tc-getCC)" LD="$(tc-getLD)" econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-
-	dodoc doc/*.{md,gif,png}
-	newbashcomp misc/bash-completion.sh uftrace
-}
diff --git a/dev-util/uftrace/uftrace-0.12.ebuild b/dev-util/uftrace/uftrace-0.14.ebuild
index 70c9daa27ad6..4c30b0c9557a 100644
--- a/dev-util/uftrace/uftrace-0.12.ebuild
+++ b/dev-util/uftrace/uftrace-0.14.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit bash-completion-r1 lua-single python-single-r1 toolchain-funcs