gentoo auto-resync : 27:05:2023 - 15:12:15

5 files changed, 79 insertions, 6 deletions

diff --git a/dev-util/pwntools/Manifest b/dev-util/pwntools/Manifest
index ed4587484ccf..faa1fd643e29 100644
--- a/dev-util/pwntools/Manifest
+++ b/dev-util/pwntools/Manifest
@@ -1,8 +1,11 @@
 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
-DIST pwntools-4.10.0_beta0.gh.tar.gz 4228046 BLAKE2B 3b03b3a9af12b23405af3d59fffa6c0baf430d9c8fc9c4180d43fb015b5707e317189a4d38091de02a688da34756aa9dd1ba8ae264857556db142880141f7d61 SHA512 9806509deff098e1d0f4f3cec335191f536d3e59d620acb7966aafccc64ebc84a28ee77c91b2aac93c8ba13a36fc77968dfe56852b1fc593a1ca2d2e568d82c6
+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_beta0.gh.tar.gz 4234690 BLAKE2B 8e87cd9eddf1fe7e4ee716a8e5ad82150b0f9c8c3bd44e4c071b551643be032111b97d7024844cd0107ef259287e29920d3fa672a7f458331baba7a97ec7acac SHA512 f3377b2c2b2cd25f3c36930245117fbbdb30fb8ff7f0c0c8633745cbb9b5192822087d8621da5ad325bf349efe616c538435fb490a35b12f57d04b79788d07f3
 DIST pwntools-4.9.0.gh.tar.gz 4218616 BLAKE2B d811a96943fbe80a4082bdff412aee5df02250846189e6300e99a6630bc02906053e728ca9904b27ddc546ad2c3612818a046b4d6418d8ebf682df600b99bc99 SHA512 8ed404dc556383712ad4de799fbff09f51735065cac07ca909f1430b22e6e9574d870aaaa4a7ce0e22d5f6edb18b956847a7aaf4dd6cf0b44fbfcf58e32497fb
-EBUILD pwntools-4.10.0_beta0-r2.ebuild 1755 BLAKE2B 3b5e268044c21064f885a12f095c8cdf6cd89e413c14bcb194a148d2c903d4d2c1ae83c487d9963a8c3e72077eb9a401121277620138716e4fd6257fdf5326b3 SHA512 490cb802832d53d950ace5aefcc319d1167026a026c559434f8b61a3c59da233a83a69c7ea936b96700ced7f19306dde11cd208daa636a6eedb9df159d245af7
+EBUILD pwntools-4.10.0.ebuild 1755 BLAKE2B 3b5e268044c21064f885a12f095c8cdf6cd89e413c14bcb194a148d2c903d4d2c1ae83c487d9963a8c3e72077eb9a401121277620138716e4fd6257fdf5326b3 SHA512 490cb802832d53d950ace5aefcc319d1167026a026c559434f8b61a3c59da233a83a69c7ea936b96700ced7f19306dde11cd208daa636a6eedb9df159d245af7
+EBUILD pwntools-4.11.0_beta0.ebuild 1701 BLAKE2B 16a7625d9e351ef3bd793bb5ab3e63dd36a89cb9de70f1afc6437f5df378cb66e26c1a6010424cb956cb8441ef5a742304dc98e4837f8aecfe5d1640b830a593 SHA512 6ea07302a60e4efbc61ddb19157ae78c63705211c32ee2a9dbffb559f795b865dd88eab44d6c6b871b8209fbdaa64beb0c9fa1a7e458549da0b0e49c1db67b81
 EBUILD pwntools-4.9.0-r2.ebuild 1739 BLAKE2B f5f8cf92df6b7908ed833e4fe3d689f4324672cab30deea566108c6227e3b856ee2b992b0f39e76910caf163c118489581ed193f0a03e4c20ac7d6feda0303df SHA512 059b434f84d82699ac6651b6425944b40061039e3f1971344b1f4e853571807ee4d40d26e3ccae1b5f506ae6133dc7d34d3caf94913a4e76611fa62e61476708
-EBUILD pwntools-9999.ebuild 1741 BLAKE2B d2a362efc41203d765c59dddffcf61b1024f7f8170c0d12a4e9a1ba68ce208e1c3eaac9f333267d54b494d22a3a3815b0c89920075128c9360268bce9cdc562a SHA512 2b645bc2f325911fbddd8b865b5f7446ad38ae464b6a06f0803c62a2a0d1aa1ef233e688dacaa8efb06720a107edbfc7c70a37016c66dff2558a6cdbfa0aa4aa
+EBUILD pwntools-9999.ebuild 1701 BLAKE2B 16a7625d9e351ef3bd793bb5ab3e63dd36a89cb9de70f1afc6437f5df378cb66e26c1a6010424cb956cb8441ef5a742304dc98e4837f8aecfe5d1640b830a593 SHA512 6ea07302a60e4efbc61ddb19157ae78c63705211c32ee2a9dbffb559f795b865dd88eab44d6c6b871b8209fbdaa64beb0c9fa1a7e458549da0b0e49c1db67b81
 MISC metadata.xml 541 BLAKE2B 31c34e39b19efa02a71fa2916d584f78893a864bd06559cffd475b9ff9837989164ab1e7fb8fa5ec345b63bacad314c4218772efed0b5201a964b225ba8e84d4 SHA512 e213766d68840db16fe46c9f3ba7094ebc63955f763963b44606636dfab95f0ed48a368901ad3b464e991205bcacd1de7cfe470dee63268eedf3a74fa901773e
diff --git a/dev-util/pwntools/files/pwntools-4.11.0_update_deps.patch b/dev-util/pwntools/files/pwntools-4.11.0_update_deps.patch
new file mode 100644
index 000000000000..653c41f665b8
--- /dev/null
+++ b/dev-util/pwntools/files/pwntools-4.11.0_update_deps.patch
@@ -0,0 +1,10 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -41,7 +41,6 @@ dependencies = [
+     "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_beta0-r2.ebuild b/dev-util/pwntools/pwntools-4.10.0.ebuild
index 8fbdaf6ae04e..8fbdaf6ae04e 100644
--- a/dev-util/pwntools/pwntools-4.10.0_beta0-r2.ebuild
+++ b/dev-util/pwntools/pwntools-4.10.0.ebuild
diff --git a/dev-util/pwntools/pwntools-4.11.0_beta0.ebuild b/dev-util/pwntools/pwntools-4.11.0_beta0.ebuild
new file mode 100644
index 000000000000..627a76a38d69
--- /dev/null
+++ b/dev-util/pwntools/pwntools-4.11.0_beta0.ebuild
@@ -0,0 +1,61 @@
+# 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 716ef0f390c1..627a76a38d69 100644
--- a/dev-util/pwntools/pwntools-9999.ebuild
+++ b/dev-util/pwntools/pwntools-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	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 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${PV/_beta/beta}"
 fi
 
@@ -45,8 +45,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0_do_not_mess_with_docs.patch"
-	"${FILESDIR}/${PN}-4.1.0_update_deps.patch"
+	"${FILESDIR}/${PN}-4.11.0_update_deps.patch"
 )
 
 python_configure_all() {