gentoo auto-resync : 19:02:2025 - 00:15:15

14 files changed, 197 insertions, 203 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ef5d32ba247c..f24a96507ca2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/kdstatemachineeditor/Manifest b/dev-util/kdstatemachineeditor/Manifest
index 37518448dfce..b097a9a07207 100644
--- a/dev-util/kdstatemachineeditor/Manifest
+++ b/dev-util/kdstatemachineeditor/Manifest
@@ -1,4 +1,3 @@
-DIST kdstatemachineeditor-1.2.8.tar.gz 243271 BLAKE2B 0b44598115d6bf7272ef8a534a857c02141a34070836a010021b8925002f2b87bd590c3c76413904ac52de297bcb322db0dea6d76f5e04947bd98257e2ece229 SHA512 728b8576d2d0b32b285b0fccbd698b426c557ab08470fc4ec044ec5acce5dc7a394c183d24ae3e9cde02d872b3eaef6b60424a3acd22052508b2456b0dad10a3
-EBUILD kdstatemachineeditor-1.2.8.ebuild 1108 BLAKE2B d91ff71e30028d1244e651053f84ae0300e1ecbb22d1ac79e1790376f672fc47f0d79fb62f8dd38f3939a23c493e67fdff17ba5ea26059cdadf1f382e2b3fe21 SHA512 b1a13a18f0e6b8a0869c13b976213e604485e6459295afaeb87b0992c958b06c5ff143619cd7fca04e49414db126aa04cfc0fea4661990d586ac7ebfea7d84f3
-EBUILD kdstatemachineeditor-9999.ebuild 1108 BLAKE2B d91ff71e30028d1244e651053f84ae0300e1ecbb22d1ac79e1790376f672fc47f0d79fb62f8dd38f3939a23c493e67fdff17ba5ea26059cdadf1f382e2b3fe21 SHA512 b1a13a18f0e6b8a0869c13b976213e604485e6459295afaeb87b0992c958b06c5ff143619cd7fca04e49414db126aa04cfc0fea4661990d586ac7ebfea7d84f3
-MISC metadata.xml 258 BLAKE2B 77a9425a73bdbaff0a84a156acd3e401964808dc4cb400025a9c87ec0dac2160de99651b4c7abed84f616d3baff202135874df540993bfef028a8411ed982a5d SHA512 a400a2ec44b9e2617e7928fa2325b69a18296a0717161dcc3f8f68fe598006d207faf68a77617c12b9bcfaa6700970facf5fc32a301133df9eb40358f204ab69
+DIST KDStateMachineEditor-v2.0.0.tar.gz 1008123 BLAKE2B 5aa60276b91bfec01528300d6d80872a586baf1ef5f76b0b2afb058bed84d4a2400a302b9bbd647cb82e69ca9daad5f1fc14d1b758bdce88010d51a147444e39 SHA512 dedd7166f434689cd5acf4ee3172169d3f77182269d3187f0a7a12966467dd5c7733e3ff64cd1fd03b0f3866c2aafa37cc3f2d7b8a3f4a5d8a7592da039de7af
+EBUILD kdstatemachineeditor-2.0.0.ebuild 2224 BLAKE2B 71b4abc49dfb72d88da65067d24d909dd4a26e3e158d6e4b62e869574ab9aa9934bbbc65e58e43b51e3125847403cc637fb1ff297d8bf8a71f871938f7da6193 SHA512 3c1f48d93acd5b7110f988316ac06d4e7112df9b3c0aa3c7477fbc8aa6014237009dbf303d5e2523e1fe44c706e32dfd2c53d4c916496a31c59724859da05ebf
+MISC metadata.xml 357 BLAKE2B eae4e615b75f008fa166c60f6ed32edfd7afbbee5f13cf67d364a415e3f0009bf7f476b216e25a1a9360c7d63cfa0559567f4ecc3aa1b3be585aaf2b45c0ac28 SHA512 50ca2d2e24bde21960ee67829e52cf7420826af5014fb97d8f665173cab16a97396e5d50e692ff699551e7334d6a04fb89a7e02fea1b63c83838110fcf1bd165
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.8.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.8.ebuild
deleted file mode 100644
index 89a9ce6a8c63..000000000000
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake qmake-utils
-
-DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
-HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/KDAB/KDStateMachineEditor.git"
-else
-	SRC_URI="https://github.com/KDAB/KDStateMachineEditor/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qttest:5
-		dev-qt/qtxmlpatterns:5
-	)
-"
-BDEPEND="
-	media-gfx/graphviz
-	doc? (
-		app-text/doxygen
-		dev-qt/qthelp:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=OFF
-		-DWITH_INTERNAL_GRAPHVIZ=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-2.0.0.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-2.0.0.ebuild
new file mode 100644
index 000000000000..087476985050
--- /dev/null
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-2.0.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="KDStateMachineEditor"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
+HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/KDAB/KDStateMachineEditor.git"
+else
+	SRC_URI="https://github.com/KDAB/KDStateMachineEditor/releases/download/v${PV}/${MY_PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc gui test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,network,opengl,widgets]
+	dev-qt/qtdeclarative:6[widgets]
+	dev-qt/qtremoteobjects:6
+	dev-qt/qtscxml:6
+	media-gfx/graphviz
+	gui? ( dev-qt/qt5compat:6[qml] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		dev-qt/qttools:6[assistant]
+	)
+	gui? ( dev-util/patchelf )
+"
+
+src_prepare() {
+	# set TEST_DATA_DIR for application env instead of test env.
+	if use gui; then
+		sed -e 's:${CMAKE_CURRENT_SOURCE_DIR}/data:'"${EPREFIX}"'/usr/share/'"${PN}"'/data:' \
+			-i CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDSME_DOCS=$(usex doc)
+		-DKDSME_EXAMPLES=OFF
+		-DKDSME_INTERNAL_GRAPHVIZ=OFF
+		-DKDSME_QT6=ON
+	)
+
+	use doc && mycmakeargs+=(
+		-DQCH_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}/" # prevent ${PF}-qt6
+		-DQHELPGEN_EXECUTABLE="${EPREFIX}/usr/$(get_libdir)/qt6/libexec/qhelpgenerator"
+	)
+
+	if use gui || use test; then
+		mycmakeargs+=( -DBUILD_TESTING=ON )
+	else
+		mycmakeargs+=( -DBUILD_TESTING=OFF )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# skip tests that use scxml files in modified TEST_DATA_DIR
+	use gui && CMAKE_SKIP_TESTS=(
+		test_layouter
+		test_scxmlimport
+	)
+	local -x QT_QPA_PLATFORM=offscreen
+	KDE_DEBUG=1 cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use gui; then
+		patchelf --remove-rpath "${BUILD_DIR}"/bin/${PN} || die
+		dobin "${BUILD_DIR}"/bin/${PN}
+		mkdir -p "${ED}"/usr/share/${PN} || die
+		cp -R data "${ED}"/usr/share/${PN}/ || die
+	fi
+
+	use doc && docompress -x "${ED}"/usr/share/doc/${PF}/${PN}{-api.qch,.tags}
+}
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
deleted file mode 100644
index 89a9ce6a8c63..000000000000
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake qmake-utils
-
-DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
-HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/KDAB/KDStateMachineEditor.git"
-else
-	SRC_URI="https://github.com/KDAB/KDStateMachineEditor/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qttest:5
-		dev-qt/qtxmlpatterns:5
-	)
-"
-BDEPEND="
-	media-gfx/graphviz
-	doc? (
-		app-text/doxygen
-		dev-qt/qthelp:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=OFF
-		-DWITH_INTERNAL_GRAPHVIZ=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/kdstatemachineeditor/metadata.xml b/dev-util/kdstatemachineeditor/metadata.xml
index 143d5804c389..1431bca71854 100644
--- a/dev-util/kdstatemachineeditor/metadata.xml
+++ b/dev-util/kdstatemachineeditor/metadata.xml
@@ -5,4 +5,7 @@
 	<upstream>
 		<remote-id type="github">KDAB/KDStateMachineEditor</remote-id>
 	</upstream>
+	<use>
+		<flag name="gui">A proof-of-concept application called kdstatemachineditor</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/pwntools/Manifest b/dev-util/pwntools/Manifest
index e0853503fd5c..768aa19ad609 100644
--- a/dev-util/pwntools/Manifest
+++ b/dev-util/pwntools/Manifest
@@ -1,10 +1,12 @@
 AUX pwn.conf 24 BLAKE2B cac0a12eea8abd3d2ee21632e7f2281e7e35c2d7839cfbcba83ae5d0e8f427e9cc2462a6d17d187252b99d9dbbb14393b9d5a63996c42043f553e9b66bfe9e07 SHA512 9d849115348ddb34ddc3232a03442b64268e7970a89ee2eeb040aeb6dec5bd20f53dc39c73e10c143065acb4b84775cf638854ec8ba6d65b8e2f38e09ce59be8
 AUX pwntools-4.11.0_update_deps.patch 225 BLAKE2B c39cfd5a0f49972c56c32567a8b8d63397ea17e076d3ffca0aa4b1f6de2859e2843382e2b2fd83616a3b72e5f4defe86aa4c01e9e87ece8c51aef5ef6c4fe5f7 SHA512 b17b016b9eda2ac7e535ffd62fe6451206e30bce3de1b71a3c14d4d565c2a1bd2833bad24335851887cab82af70499bb8d6188f3758b18c382e32e9a4b7aa8df
-DIST pwntools-4.13.0.gh.tar.gz 4388643 BLAKE2B 59a50621135e5e0fd247de37f9367d07155ab370fab5e5985a2e5900451d1d52b5b8362da2c1f59aaea36cfec9414345d2697256a4197fb0d31e90b4e58af45b SHA512 23511d60f619f7d6fb0cbe8389069e94c9b4ff33a3454c98e02db7b9ab591395511b56121f5bab7a8edd75ad06ca80154d379cda73acf61758e6d1215e463ed6
 DIST pwntools-4.13.1.gh.tar.gz 4388789 BLAKE2B e7f83e877f4f5b870bc7d2036d22746d997877c9de6bb76bf21010c6c5052d617670424d6a347455547085d385a165b7d00ca5c16b9789817690e5b128ba66d9 SHA512 9906b1f3abb747316ec2f6ce8ed23030a580ec07206ca1662f44eb9153be5d65bdfc4b9594778f6521be40e48acd48e2b6a83d4818161e2cc2eaae5ebeae7160
+DIST pwntools-4.14.0.gh.tar.gz 4423992 BLAKE2B 3b8eaad79947aac1da127f472f2ad32add81ef7c6493e50616206dba5ff0bd1383a06c89834ca2b8eb2fb18529a76fcd44fa1e72322cd728c21f46a58ea42111 SHA512 beab86689aa8c7b4b19c299ae0a3825153ddc2364adbc2208998de27fe6ceb6127578fdb7f4c767b1f54598e61cd3340a41e6785b1dacfe1b383ce33cc13e7a2
 DIST pwntools-4.14.0_beta1.gh.tar.gz 4423427 BLAKE2B e5240782f90098582342068296e0ce2fa3f8ba1f9600d273a8d83afca3ac95ba7fcef67e07c80044d4553a67a771d22f463caefef15bdca0f6f53db5cae87cc7 SHA512 b35ad15071633966637e5c9f45d4c0c0b897c1df946c2877a9c163ad041eb7da0203003615ae7d4aa2c8d3c558dd1b538e97d75e052ea864f0e6d8af20f33b1e
-EBUILD pwntools-4.13.0.ebuild 2028 BLAKE2B 2b7e8b51a6408e18b6fa23dff3aa89cb9353f3c7bb16175e99a008fa07f7121df21ff251f383397a89c66e8e11803545517ab376202a191b138fa5985c2d0a0d SHA512 54be140885b27aba42265927e7d6bd85cb2226f6041be1146a6e2edaf014298434598ba5e81ce0d9aeaac47717c72b5cbd87444eb8ebefc6e97601afef4c223e
+DIST pwntools-4.15.0_beta0.gh.tar.gz 4437712 BLAKE2B 2d519c4f6e70a91e5abc60d8741f8331846cb14392e8775dfc9e8068aa28100856b3501255e57d44d4fb6dad49d9b629ca484e17677b00b4b394f0c713ba187b SHA512 a60b8bbde885609e63245507be6f23020821bc3f2f50eb34a388af5f794967c2d6b5f438c413131d2c50c6e645cd3ee7e81dd8e3851ecadd5f7645485255ec4c
 EBUILD pwntools-4.13.1.ebuild 2028 BLAKE2B c4b5bbe94273fbe9ef31b29ec8eb495549b794a3f008731d73965dd135a3382060158c1021c7393412835e2083585aa441252a4b5919e9985d65469ec631be2d SHA512 dc3e2d53d6733b5ecd8936d58fa56d06635e0a70dea2d92d39f79f49c913fd740338009fc54121492a6bbaafac7ea882cf3ba6987776ba23fdf8c7bbe4ebf9e7
+EBUILD pwntools-4.14.0.ebuild 2030 BLAKE2B a356020123940d9c2c23d43aa58ba86133a1710487d4d878f44e5d55239dba1c61d0172e8af7430ba97e8c7e40c456eaf199a966ee82cb7fbd4bd2b1cb3f8fb9 SHA512 f14d3f36ebe7605b61e24c4edffa2d0307a40a597550beb325543f9a5108c2e7be64cc9ae43170858fe53c058c155693e3766437f35aa452dd608570986c6f30
 EBUILD pwntools-4.14.0_beta1.ebuild 2030 BLAKE2B 685006cbe559e97895fb4b17ebc2bdc55bf890325ea3627ace30221624f47815b106195c511047770d7618ef0dad3ef90cf8bf54ea6270a5fcdbef3b881fd627 SHA512 342e7e0e53e04d9a066417108a2874b3a4e92e9b89313c4a281aa44c463616cb4cb8a5bd512d9f6484984bde1a8a150ca5ba9535cdac9938a0a8fd0eabc74f53
+EBUILD pwntools-4.15.0_beta0.ebuild 2030 BLAKE2B a356020123940d9c2c23d43aa58ba86133a1710487d4d878f44e5d55239dba1c61d0172e8af7430ba97e8c7e40c456eaf199a966ee82cb7fbd4bd2b1cb3f8fb9 SHA512 f14d3f36ebe7605b61e24c4edffa2d0307a40a597550beb325543f9a5108c2e7be64cc9ae43170858fe53c058c155693e3766437f35aa452dd608570986c6f30
 EBUILD pwntools-9999.ebuild 2030 BLAKE2B 685006cbe559e97895fb4b17ebc2bdc55bf890325ea3627ace30221624f47815b106195c511047770d7618ef0dad3ef90cf8bf54ea6270a5fcdbef3b881fd627 SHA512 342e7e0e53e04d9a066417108a2874b3a4e92e9b89313c4a281aa44c463616cb4cb8a5bd512d9f6484984bde1a8a150ca5ba9535cdac9938a0a8fd0eabc74f53
 MISC metadata.xml 541 BLAKE2B 31c34e39b19efa02a71fa2916d584f78893a864bd06559cffd475b9ff9837989164ab1e7fb8fa5ec345b63bacad314c4218772efed0b5201a964b225ba8e84d4 SHA512 e213766d68840db16fe46c9f3ba7094ebc63955f763963b44606636dfab95f0ed48a368901ad3b464e991205bcacd1de7cfe470dee63268eedf3a74fa901773e
diff --git a/dev-util/pwntools/pwntools-4.13.0.ebuild b/dev-util/pwntools/pwntools-4.14.0.ebuild
index 75d41e17910f..fc3a6da5c4dd 100644
--- a/dev-util/pwntools/pwntools-4.13.0.ebuild
+++ b/dev-util/pwntools/pwntools-4.14.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_USE_PEP517=setuptools
 inherit bash-completion-r1 distutils-r1
 
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
 	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="amd64 ~arm64 ~riscv x86"
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	fi
 	S="${WORKDIR}/${PN}-${PV/_beta/beta}"
 fi
@@ -35,7 +35,7 @@ RDEPEND="
 	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.24[${PYTHON_USEDEP}]
+	>=dev-python/pyelftools-0.29[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pyserial-2.7[${PYTHON_USEDEP}]
 	dev-python/pysocks[${PYTHON_USEDEP}]
diff --git a/dev-util/pwntools/pwntools-4.15.0_beta0.ebuild b/dev-util/pwntools/pwntools-4.15.0_beta0.ebuild
new file mode 100644
index 000000000000..fc3a6da5c4dd
--- /dev/null
+++ b/dev-util/pwntools/pwntools-4.15.0_beta0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_USE_PEP517=setuptools
+inherit bash-completion-r1 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"
+	if [[ ${PV} != *_beta* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+	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.29[${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
+
+	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/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index fb47f6d1def5..647a1543878f 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -1,16 +1,10 @@
-DIST tree-sitter-0.22.6.tar.gz 3036954 BLAKE2B f109a738214882e63a721e8db384fa42a624af78d42ceb9ab7a45135b36cf3bbbd2554f470ca5038404365f5b9dbf9979c4d26309e123a9d9533feb1f0a3f724 SHA512 bf0b87bb9ce16b049824e53933986ac451a7b7f432df39ee9d4546627d740ae689af9e838a53cc50e29d66d6d85d51dab7490d66a429a14bcc9d0b8e2935a63a
-DIST tree-sitter-0.23.0.tar.gz 2977346 BLAKE2B e10846d5bd0a6aa1ecac362e2ab2ccf0f0bdb17c5fde796d8d65f8bc84a6e054d86c18a42e66e8effef865f95013c38ff6bd6ab5498a680ae172d7d57020604e SHA512 ab821be564ac7223cc4f9659c08922a78016af9dd3bd69166706fb6a889ac175ba2712a337a1303aceb8f44beaf58640a183e77dddc2c57e35da23079d0cd7b9
-DIST tree-sitter-0.23.2.tar.gz 2980520 BLAKE2B 54b4ad96948fc3ec6142da998306f9385ce9107a7c330915bbb733c5886a0baa869a675602be99aa4a491c58a1121d30f654856ce0f2dee0eff4c4fcce370f24 SHA512 393fa62fe6bce51ff5498f977bbb357fd896aaf98d80f08d4faed6dcf8fd5d41012a7489816c662c1873595108c30d0c18d7721a535c69d9904b2220fef8f858
 DIST tree-sitter-0.24.3.tar.gz 3018668 BLAKE2B fa703b6250e11274d0c5ebccb741cc41f521cc5e882383d8f891369540ce6b3b4b048eddb4d0c88186e57516e2d01977e76b42352f26759b3f6093a339cc6a11 SHA512 2d934c03b0ee71419654d03bf6e4ca759b4ef3217b8837fcaef64ee5b4bc8ea8298ff685ae4aaa477b615d11d538ff960b92529b11f13e936b85bad52e369cd3
 DIST tree-sitter-0.25.1.tar.gz 855493 BLAKE2B 6b9e4bf454c50e9b7341aa94d5131d333f45a0a047090ca04da71bfc54357568d0c098c6f7df65ee9d20ede7050537342fc394e281f4070f2d021a7e4134cedf SHA512 9861b18c7209e3c37d180a399bcae181cea46c4e58eff743ff6044ed0f2923ee838fa88993f1266272e07163748d5df1bef7d7dc6d8800e004e8af1227e489af
-DIST tree-sitter-cli-0.22.6-crates.tar.xz 22184056 BLAKE2B f18cfafa9a767fb1b3408dd473d97b2d7a87c9c37a50fb108e164074641e656cc2ca322914f98d627209485cf7b14f92280a50a64cf5136f8375e5870d2b097f SHA512 a3e6eb6585d61c86e32de21c0422c2cd1f95c6116823f5a8ee291f6682658fb7afe5e1369eda4682d4e842d91531b56e6fadb99e4d575230f4c1d65a6b0778ca
-DIST tree-sitter-cli-0.23.0-crates.tar.xz 18131480 BLAKE2B 796a05ed87ce0f248491600bee4af9d14ba6a244ce04d4cda3192226c5063be921e2a4c5e454c91f712f629481c6cca160544a457cf7635c6024d0d10291e3a0 SHA512 98472d6603d973c34f1cafc042219495228693a0fbbe9af920120d8cf27fd78e5263052fb784c79b38e8b27f9b881d18205ebb439de15945c3f10410590ed76a
-DIST tree-sitter-cli-0.23.2-crates.tar.xz 18556276 BLAKE2B 4d63a95f129b563e91970209418283b822ee9957d16be80dbd1b8b8301c6ccf6add1313854837b6883d6c19a99a833b5e8cc07896a0835340758413108bdf227 SHA512 ac3d03c2735581472bbb0e866f03ee6987f43d0cb65449777a8ee0c0c95d82d032f9e0506c878ab7ea1208a6126327c4136fcb0656ea0b2b67b789f9d07ba57b
+DIST tree-sitter-0.25.2.tar.gz 855826 BLAKE2B 5c2cdaeba229c58d40f5d9b2c4af920d4e1d9fd60ce1d49e632cd660d441d3c32632864b1e226e4c99b4e8f054bfc0082a80c2eb1cdca0684f899b913378a17d SHA512 8acdb410c8b5c2552e9dd5524d80ab1d529e418f408d7c495619e6781f3b70ea2d61b6f69b5b3d1ebd753b739c0f9dd744302808d9a3051b5c7dcf68dba30002
 DIST tree-sitter-cli-0.24.3-crates.tar.xz 18883756 BLAKE2B 5a35f3c32ff53b123f2d6fceeddc93bc621ac024d26b26292a7bca7370c8a6f26292c318bebf6716924ac90123d3809c4e66afb7bcb53b531fb641cb6a686bbc SHA512 5f0670cf5c102ac4982c1c6e5a77aea39fc02a3db24eb8151d335bcac0c51cac7193fd882f17f7740465830dfe708cc88cb4a7a58047a49df15e26b2fa96b2f6
 DIST tree-sitter-v0.25.1-crates.tar.xz 24760872 BLAKE2B 5861f09c9649b83275adf5e4742d76eb9028b8b946b195f9433e64e71ed4b1b7dfb8534f08819c37f92f1b51df1723ae14a73e8d14bcc8c65b975c80f9ecc822 SHA512 d6d8d4ab1814584176a092a1f72b8562a5d17dbadf4190d03a0e6aa8b060986038f2ea3e9fbbafc17fcf06b9c52b5f79a99e64311133ff8bc7f3fb660ea35bcd
-EBUILD tree-sitter-cli-0.22.6-r1.ebuild 909 BLAKE2B 5a7d01cf494ae8551e36ba9b1509f5c0bd0b0b86cfaa2377750099988c2e7250924996880fea53a8e1101363646d3a543625b83b01941efc637ced4f5f074f75 SHA512 d45b4ed49fa313db416873451dab644baf65844e9985d9c91e8fa59438003283a48166b23dd73719d52a43c046ee498025daba3ee9b0c4e9349651bdf3cf2011
-EBUILD tree-sitter-cli-0.23.0-r1.ebuild 931 BLAKE2B a7080a4213dade542c12062079d58341c4291ba127b7410d5ac80fd3bff66fbd9ee105439ac31770bb9f500baf6396a6c3f1267a112ca5e09d4bd20159accdbe SHA512 43d12c3300d4608d14cf60edd78d29dcf778f6f7d5d52b39b856273a9dba716938da735d15f9c41e0683cd0abcef96078f134386cdc3010c6648a7d8fe165f18
-EBUILD tree-sitter-cli-0.23.2-r1.ebuild 938 BLAKE2B 085b47f3ae6de1cd2e7d78ce04106e2a551148d7dcd014dcfdbfc7a281e55240c2283b5e586beda19222fe395d1ab47dde182767a78622dd0ca106cbbbaf78d0 SHA512 6d6fa315b57e33f0a500b13367433290c16a15225077bb925232e4d7c38e1ae9825ed5ba78e54898e70c6f79ecbba21038d3b031fb6fcc85481ec2b2a27382d7
-EBUILD tree-sitter-cli-0.24.3-r1.ebuild 933 BLAKE2B bcd7fe4e0ee5fd9a4dd42fbef26fb216a727a225f93a044caaceea1ab30f14774e21732c96df73b122cc19e70c50e13d4e38c457bf8750394383acb1d88255b1 SHA512 0a20924add9b8ffe67c751fc65854d017a8d86c124692031d785d9dc84a70035121436857c351aa56c2e9e00f193e92e91cc18f015d429ffa7d90a1c2d55d14b
+DIST tree-sitter-v0.25.2-crates.tar.xz 24760872 BLAKE2B 5861f09c9649b83275adf5e4742d76eb9028b8b946b195f9433e64e71ed4b1b7dfb8534f08819c37f92f1b51df1723ae14a73e8d14bcc8c65b975c80f9ecc822 SHA512 d6d8d4ab1814584176a092a1f72b8562a5d17dbadf4190d03a0e6aa8b060986038f2ea3e9fbbafc17fcf06b9c52b5f79a99e64311133ff8bc7f3fb660ea35bcd
+EBUILD tree-sitter-cli-0.24.3-r1.ebuild 932 BLAKE2B 62d98f0e462129c67341382fc280ca7ac407442e898b6cfde1ef9e2acf1cb6cb710876500c14578fa098328a13d29132e25081fe9e637538a80d3e7a7be8c18a SHA512 a902cff29ebada3fabbdca7b90f6c9f8382a52581141737afc1936200d93071f096c180f98b8d597ac1fc0e34810e0f84106431c0649f32dd2886b7a578e3846
 EBUILD tree-sitter-cli-0.25.1.ebuild 996 BLAKE2B e691a4007ac90b634c18f81b709d20d6dd5a312fac3f4b8650d8f71435f8417225670f8b16a4e8da7d24b152eef29ca6e26caee00b90b75dbe962ba89161b152 SHA512 42fe684d89eeb96277ad2e195bf588b5ca38a7601478888b1d26a04ae3f4f921696cafeff55ff2ef824714517c3836133f7270ab6256577335b9498c01ec7584
+EBUILD tree-sitter-cli-0.25.2.ebuild 996 BLAKE2B e691a4007ac90b634c18f81b709d20d6dd5a312fac3f4b8650d8f71435f8417225670f8b16a4e8da7d24b152eef29ca6e26caee00b90b75dbe962ba89161b152 SHA512 42fe684d89eeb96277ad2e195bf588b5ca38a7601478888b1d26a04ae3f4f921696cafeff55ff2ef824714517c3836133f7270ab6256577335b9498c01ec7584
 MISC metadata.xml 464 BLAKE2B e008906a78a1f8a1b1f16e1b7527c4e42add184ed00e5cf0708fd7636f2be9902a862a9d2dbb6f5374d782fc5b05e8f355db0b84796c5aedceda845af5333618 SHA512 cb56cf0df6db2f661395cce2e6ebb5d9f9731b937438c12cd2f5d21a9227d2aee69a9e9ca9754b29ff7e42acbdbc4436f3dc4b3f40abdc3df6df33eb8e913683
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.6-r1.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.6-r1.ebuild
deleted file mode 100644
index bd4053e831df..000000000000
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=tree-sitter
-MY_P=${MY_PN}-${PV}
-
-inherit cargo
-
-DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
-	https://dev.gentoo.org/~arthurzam/distfiles/dev-util/${PN}/${P}-crates.tar.xz"
-S="${WORKDIR}"/${MY_P}/cli
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0
-	Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Test seems to require files (grammar definitions) that we don't have.
-RESTRICT="test"
-
-BDEPEND="~dev-libs/tree-sitter-${PV}:="
-RDEPEND="${BDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/${MY_PN}"
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0-r1.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0-r1.ebuild
deleted file mode 100644
index b2788d6bac28..000000000000
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=""
-
-MY_PN=tree-sitter
-MY_P=${MY_PN}-${PV}
-
-inherit cargo
-
-DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/dev-util/${PN}/${P}-crates.tar.xz"
-S="${WORKDIR}"/${MY_P}/cli
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0
-	Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Test seems to require files (grammar definitions) that we don't have.
-RESTRICT="test"
-
-BDEPEND="~dev-libs/tree-sitter-${PV}:="
-RDEPEND="${BDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/${MY_PN}"
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.24.3-r1.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.24.3-r1.ebuild
index 1e38a01988c5..9a8cea16de9c 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.24.3-r1.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.24.3-r1.ebuild
@@ -24,7 +24,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.2-r1.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.25.2.ebuild
index 1fe76acc30bb..3d143f671496 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.2-r1.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.25.2.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES=""
+RUST_MIN_VER="1.76"
+inherit cargo
 
 MY_PN=tree-sitter
 MY_P=${MY_PN}-${PV}
 
-inherit cargo
-
 DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/dev-util/${PN}/${P}-crates.tar.xz"
+SRC_URI+=" https://github.com/gentoo-crate-dist/${MY_PN}/releases/download/v${PV}/${MY_PN}-v${PV}-crates.tar.xz"
 S="${WORKDIR}"/${MY_P}/cli
 
 LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0
-	Unicode-DFS-2016
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC LGPL-3+
+	MIT MPL-2.0 Unicode-3.0 ZLIB
 "
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"