gentoo auto-resync : 31:01:2023 - 03:00:52

15 files changed, 419 insertions, 30 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 86da4e614b7a..44983a156cd8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index b73d09676df2..7fb5628e1e87 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,4 +1,5 @@
 AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113
+AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b37e7bf72e6b03b54c244889706ba3c5156e2355d00cf395d14a6e8a7fe622e002acf9bab06dbc1427f6b637f0c59db86af08f05d51 SHA512 b591a73b0bbdd0105e6b87fb264ca4345e200ab58754d09a87dec79e60044eab165f2b34fe5ddc904cd877a460d5f41eef8b4d59eac255ea4f4e0fae37cf3511
 AUX bpftrace-0.15.0-llvm-15-pointers.patch 1023 BLAKE2B fc66196f11e9384878921309d09e3f205674a88041c93b0b353bf38ff345b4192b83cd1c80a15258b97710624b3341c9ed19b60beff38c163f677d644843ff54 SHA512 8282aa82eb867eed3378adc4ff2b73c6427d4f979cfb5268444bf122126c758229d680985e4ede7e8d011a14d4a122d6742650f57ee0e0759e3b1bfb9ba9458f
 AUX bpftrace-0.16.0-install-libs.patch 8507 BLAKE2B 84842c5c400e2921d40f32ccd27ec06174c517e35b3a413907231e128d636e7c4711d131682d3fbc75a861bf3cd0cf83de2ca1c4bfbf2606e69d32f898fbd3a4 SHA512 93341eca7566d1328cbd670685859803cc76869be2eb3d52d38e3956f30d28f63d73ba32ae7f111dfd01ccb95899be6e1834fe7e1f1ee3794a0b796b8f52574e
 AUX bpftrace-0.16.0-opaquepointer.patch 20038 BLAKE2B beeda98ded230a8bb22d2a32dd0e839f138ca9c9fec10402d039f4385016b4330ce94756641e4f24a5a1e294ce08d282cbf4f7e01ef0c817dda21d2324f7cf60 SHA512 4b61fe7d21a42493590e5e6bc7507852d6a1f0d685d78958d6aa2c1602211d99bbccced25a2c118ecdedd802ccfdd009b940ccb81573b28b010a476952bd1da7
diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch
new file mode 100644
index 000000000000..84241e052462
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.15.0-dont-compress-man.patch
@@ -0,0 +1,47 @@
+diff --git a/man/adoc/CMakeLists.txt b/man/adoc/CMakeLists.txt
+index 1a81dee0..c93ccbd2 100644
+--- a/man/adoc/CMakeLists.txt
++++ b/man/adoc/CMakeLists.txt
+@@ -1,7 +1,5 @@
+-find_program(GZIP gzip REQUIRED)
+ find_program(ASCIIDOCTOR asciidoctor)
+ file(GLOB FILES *.adoc)
+-set(GZFILES "")
+ if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND")
+   foreach(FIL ${FILES})
+     get_filename_component(NAME ${FIL} NAME_WE)
+@@ -12,14 +10,9 @@ if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND")
+       COMMAND ${ASCIIDOCTOR} ${FIL} -b manpage -o - > ${MANPAGE_FILE}
+       DEPENDS ${FIL})
+ 
+-    add_custom_command(OUTPUT ${GZ_MANPAGE_FILE}
+-      COMMAND ${GZIP} -c ${MANPAGE_FILE} > ${GZ_MANPAGE_FILE}
+-      DEPENDS ${MANPAGE_FILE})
+-
+-    list(APPEND GZFILES ${GZ_MANPAGE_FILE})
+   endforeach()
+-  add_custom_target(adoc_man DEPENDS ${GZFILES})
+-  install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
++  add_custom_target(adoc_man DEPENDS ${FILES})
++  install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
+ else()
+   message(WARNING "asciidoctor not found, building without bpftrace manpage")
+   add_custom_target(adoc_man)
+diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
+index 2a316cd9..2207cf80 100644
+--- a/man/man8/CMakeLists.txt
++++ b/man/man8/CMakeLists.txt
+@@ -1,12 +1,3 @@
+-find_program(GZIP gzip REQUIRED)
+ file(GLOB FILES *.8)
+-set(GZFILES "")
+-foreach(FIL ${FILES})
+-  get_filename_component(NAME ${FIL} NAME)
+-  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-    COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-    DEPENDS ${FIL})
+-  list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
+-endforeach()
+ add_custom_target(man_man DEPENDS ${GZFILES})
+-install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
++install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index cb4dbe721d45..d5774c3614d5 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0rc1.src.tar.xz 118364920 BLAKE2B 449fa321722e77d1a595d0f1f52a4e9492954d928355402f6e07e6c8a20e4ebfc03690ef8272b92eb5cdd58c97ca37fa6baf847d399e36a84e3ea7d94d1ea6ca SHA512 a24074ea8e21af49b0545f02bdec4727e8df841e59340dc189cc5a144a70fc6880e82381fba622ac62c7504f7bf394c916c773ee25904e8faf41eaedce6ae9e0
+DIST llvm-project-16.0.0rc1.src.tar.xz.sig 566 BLAKE2B 29a593f74b05ef6268f0b2ee5ebd810a244e7c6b27dd94f709b22bca8e6c8367f8321a6ec61f85476cd399f31519ac2a3c978014afae29490c1e70d26eb6c35f SHA512 dcca03d41ee3cc7d5b150184b03eb9f2e579603ce9cd5289360d1ca47169174afc26a85079cf096ec91e23f487f0b38bb6cd5fb7e5197530582155b16a5ce748
 DIST llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz 180436731 BLAKE2B 51c30c3f11dd55a225b8ebe4ded752ce9e8eb58751e7458c29901dbdd3673f94892d337d111d696e779e3f7ef0bca6c7d79709e2072a4bf3a001d8813125d571 SHA512 ebbe0f8becac39d63433dcc3de474c40f1215fc8faab94fa2ba869d28e66b27e4fe088377bd7ae64575a6d7b07017b88bf92e5488a3185a753e647d8da352bbf
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
@@ -11,5 +13,6 @@ EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b34
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-16.0.0_pre20230107.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-16.0.0_pre20230127.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
+EBUILD lldb-16.0.0_rc1.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-17.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-16.0.0_rc1.ebuild b/dev-util/lldb/lldb-16.0.0_rc1.ebuild
new file mode 100644
index 000000000000..985e9ba9d42f
--- /dev/null
+++ b/dev-util/lldb/lldb-16.0.0_rc1.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
+}
diff --git a/dev-util/pwndbg/Manifest b/dev-util/pwndbg/Manifest
index ce5297889ea0..5f7c157ff50e 100644
--- a/dev-util/pwndbg/Manifest
+++ b/dev-util/pwndbg/Manifest
@@ -1,8 +1,6 @@
 DIST gdb-pt-dump-ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz 385989 BLAKE2B b7582289f83fd0c76b8ef2a04540db979b0f599b6b711e17541e2804b93bcffe6fd611d43101c96644a7324398eea5df02326267b4e201564929de956849b719 SHA512 57701b5fdd4c69be79a451f08fa6d7cbd43a0963cfd7689443676b68ece96154ccb61121d4a770d6e519d3142f99c589df1143b0ff8308547c06fb0e87e187db
-DIST gdb-pt-dump-f25898adc61d60e5f30c6452b15700bbf1bd630c.tar.gz 385826 BLAKE2B 0cfca93c620f0292d5e0b99f57f6a4090af512d0c12e4cafd3db09960f70cba7efbd7b664235b4c6147d74d368e12fc8ab5d8884db0fc514a135cd6b2ea5db47 SHA512 ef8956a191ba0627ac9070b590e32da9fff452dcd1cef1bebcf2a45266a1f218229b694e617de25da412109a3c4115049519b7f9855ffd7b2e8d7d61bad3f4ed
-DIST pwndbg-20220830.tar.gz 8302318 BLAKE2B fd6821d0846646927a3a7f0f352067360984f90156702bb8d2001b40651e20b11c8a33b07fa522f568f39ce6337f2503d930f745ab424d5ce6948a270e331c1f SHA512 be59544eb959ba05e6a662dbc629eb33a014c39d5ad5fceb44e9c6a9ccfa3ac6c133c082adfda1602002aff9eab3326d5b97aff7b6ce1357116a2d1fe6aa28fb
 DIST pwndbg-20221219.tar.gz 8344938 BLAKE2B 1ecda02573ef03b569f8a46c390f5388e6db9cfbb0df84410f245e4f043e89be16b6581d0e07fe840d50cab875943dd5a30dab1c2fc40fb93c5982cecc33e490 SHA512 1578ea834d7aa1d574e559844dae1991eddc9575c4e445ae02d05f0024900c550253293cba7277ed651df613cb2a2e2028486c2b8bc52adc0dedb9d9796c58d8
-EBUILD pwndbg-20220830.ebuild 2437 BLAKE2B 3fe7d16aeeae24d78d437006980bc31f3a4fed5c49a2fb560002710d21e9d8ef113e62369b33320f7a363c25a891f1100d5ed965c69a296d5d6a7077e5535b9a SHA512 f75cc09ec1b3ab84ed1fc0cafca1f97d4a0b6e14958408110341a91d7c539aca68c3da9a7568c4ba0e5db72446ea6371ae6408d9db6cc26358ada9a59d341d64
 EBUILD pwndbg-20221219-r1.ebuild 2366 BLAKE2B 5ad3f881de127a195034ba355028fd81f442458c6fba4a64322309f6a07ec9fd98be2af0ac1b84e082d1916778af42247f2b3d173fdc498d638d406f23f61f38 SHA512 90e270d187ac34312a47c109052ba5179c62aa0a70e395ec59427739b9e91137538f9a11e1af43443203160e566ca7eb72c94ed296a23781cb2f375ccdc93cd1
-EBUILD pwndbg-99999999.ebuild 2368 BLAKE2B d60022004f9951e7aa16810e602ad66c158d4f89e79bfb66e46d7335ee4129355e47697ad5db0558b526a6690224f7e1d1c6e45bfe0ba9b67d8c3b9ff8e54252 SHA512 8c9a910929ece0d118fbdd282abcdc95b44aa56ca4f2394cb6c39e6726931d15cc0d443521433a3931109e12a19d408cef1d4611dab85cf52c8f837883ee0f2d
+EBUILD pwndbg-20221219-r2.ebuild 2387 BLAKE2B 4bfd37699192d71f3b05defbcd3f2e1076110eba20e8923a63472fb4e2ab0945df83f43988c5d2836e3f1a206fc0b3e6567e6850b5234731e15d7a1385bc6214 SHA512 0e2f2410ee29499cbb670a21e9e124914ace33ce47b335a7b1a66b913cebae5fdaf61772a5a5863ccfec3c08bd905d304dab5a91b7652cf35e8038f467fabe7a
+EBUILD pwndbg-99999999.ebuild 2493 BLAKE2B 603ba4fe11c0fcc31fb6dc2abd79dc752e6d031018ef889d691384666c18ac6ce599c483a0ce2af9cea774f81c64e8cdc1b47c970a80701212c1b8d0c431876c SHA512 52ff6a91eb267187a043d59ae72d8b0eca7614f6253c109e2a18617bfce776d123efbf9b533b22eee9e364a3cdf5468ea30fb6db6fa1c22e6abe8322834fa38e
 MISC metadata.xml 692 BLAKE2B bb74dda183fe35e5873e7cbaa5886dec5beaf082968b16352bcda55f2e14dbdb78ee48d2e0195baa735b0f615b0469f8fd48429c47f4a81d2fc0391cafaade76 SHA512 8a6a9ec3aa03e597d8302a5b1001fbfd569e6efb08157445bedb58ec82b4d7812aad7a852ae3eb0d0f245cbf89c85a357e532855c19e6dbc9d438c16e0bd549d
diff --git a/dev-util/pwndbg/pwndbg-20220830.ebuild b/dev-util/pwndbg/pwndbg-20221219-r2.ebuild
index 043d25b753e7..2c9a6ddb9ae8 100644
--- a/dev-util/pwndbg/pwndbg-20220830.ebuild
+++ b/dev-util/pwndbg/pwndbg-20221219-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-single-r1 wrapper
 
@@ -15,12 +15,12 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="https://github.com/pwndbg/pwndbg"
 else
 	MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
-	GDB_PT_DUMP_COMMIT="f25898adc61d60e5f30c6452b15700bbf1bd630c"
+	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 x86"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
@@ -32,17 +32,14 @@ RDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-libs/capstone[python,${PYTHON_USEDEP}]
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pycparser[${PYTHON_USEDEP}]
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-		dev-python/python-ptrace[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-util/ROPgadget[${PYTHON_USEDEP}]
-		dev-util/unicorn[python,${PYTHON_USEDEP}]
+		>=dev-libs/capstone-4.0.2[python,${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9.2[${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-util/pwntools-4.8.0[${PYTHON_USEDEP}]
+		>=dev-util/ROPgadget-7.1[${PYTHON_USEDEP}]
+		>=dev-util/unicorn-2.0.1[python,${PYTHON_USEDEP}]
 	')"
 
 src_prepare() {
@@ -50,7 +47,7 @@ src_prepare() {
 		rm -r gdb-pt-dump/.git || die
 	else
 		sed -e "s/__version__ = '\(.*\)'/__version__ = '${PV}'/" \
-			-i pwndbg/version.py || die
+			-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
diff --git a/dev-util/pwndbg/pwndbg-99999999.ebuild b/dev-util/pwndbg/pwndbg-99999999.ebuild
index bcd220f3d9af..bd3b1a48231a 100644
--- a/dev-util/pwndbg/pwndbg-99999999.ebuild
+++ b/dev-util/pwndbg/pwndbg-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,15 +32,16 @@ RDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-libs/capstone[python,${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pycparser[${PYTHON_USEDEP}]
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-		dev-python/python-ptrace[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-util/ROPgadget[${PYTHON_USEDEP}]
-		dev-util/unicorn[python,${PYTHON_USEDEP}]
+		>=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() {
diff --git a/dev-util/pwntools/Manifest b/dev-util/pwntools/Manifest
new file mode 100644
index 000000000000..0f8794a745b9
--- /dev/null
+++ b/dev-util/pwntools/Manifest
@@ -0,0 +1,8 @@
+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.tar.gz 4234355 BLAKE2B d214233b286422de0ba37bc6c4bb506c0f9aec37a3f740785636e7e5c556ba71fa150625cd50fb306a68a00f7896f32d8c84108ac57651417f984adf8fa7fa89 SHA512 7b0c0f7cea09ce85965be655aa6d776144b6d5940260a4bbb402c9f1b28aa7734faf215e1a44be4364dcded24bd9db0a4ef1923be2e74b5ee436a067256d2652
+DIST pwntools-4.9.0.tar.gz 4224412 BLAKE2B b4efd94c04b5c0b224fdcd97ebb6811f9cefe1ff9c433136bbcd4ea139c1c6e1c0900480f40d31de632c25982217aac8410afa801ff6ab4edfec60618f8903e1 SHA512 759be3889f71bde4e7276f67c2bee1b0b305216a7320c1ba056a3f440156e102eacd69e9397f7bf4b49a36a8e327cbfbe2abc4e430dc41b4c6bd83546c8047f5
+EBUILD pwntools-4.10.0_beta0.ebuild 1664 BLAKE2B 7cce27d47928a27f31a66b457efbfe16dff6d333da1ba8ad1a5e46caaa6717fe3f14b2f8eeba4de78a501c639048814032520d4181359da5e0517833360d3051 SHA512 b354d6ec4aa3cf75cc8bc89ffd122d9e7376e70c45e5d30b80b5d7ce4855d8367343646c6df50b9310976b8f01626b1e73725ba3cbdb3c74a994cfe5acc2cc25
+EBUILD pwntools-4.9.0.ebuild 1664 BLAKE2B 7cce27d47928a27f31a66b457efbfe16dff6d333da1ba8ad1a5e46caaa6717fe3f14b2f8eeba4de78a501c639048814032520d4181359da5e0517833360d3051 SHA512 b354d6ec4aa3cf75cc8bc89ffd122d9e7376e70c45e5d30b80b5d7ce4855d8367343646c6df50b9310976b8f01626b1e73725ba3cbdb3c74a994cfe5acc2cc25
+EBUILD pwntools-9999.ebuild 1664 BLAKE2B 7cce27d47928a27f31a66b457efbfe16dff6d333da1ba8ad1a5e46caaa6717fe3f14b2f8eeba4de78a501c639048814032520d4181359da5e0517833360d3051 SHA512 b354d6ec4aa3cf75cc8bc89ffd122d9e7376e70c45e5d30b80b5d7ce4855d8367343646c6df50b9310976b8f01626b1e73725ba3cbdb3c74a994cfe5acc2cc25
+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
new file mode 100644
index 000000000000..9256a2772245
--- /dev/null
+++ b/dev-util/pwntools/files/pwntools-4.0.0_do_not_mess_with_docs.patch
@@ -0,0 +1,25 @@
+--- 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
new file mode 100644
index 000000000000..fd103c13e497
--- /dev/null
+++ b/dev-util/pwntools/files/pwntools-4.1.0_update_deps.patch
@@ -0,0 +1,10 @@
+--- 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/metadata.xml b/dev-util/pwntools/metadata.xml
new file mode 100644
index 000000000000..bd1ce602dab7
--- /dev/null
+++ b/dev-util/pwntools/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Gallopsled/pwntools</remote-id>
+		<remote-id type="pypi">pwntools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/pwntools/pwntools-4.10.0_beta0.ebuild b/dev-util/pwntools/pwntools-4.10.0_beta0.ebuild
new file mode 100644
index 000000000000..765bf018a914
--- /dev/null
+++ b/dev-util/pwntools/pwntools-4.10.0_beta0.ebuild
@@ -0,0 +1,56 @@
+# 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}.tar.gz"
+	KEYWORDS="~amd64 ~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"
+)
+
+src_install() {
+	distutils-r1_src_install
+
+	rm -r "${ED}/usr/pwntools-doc" || die
+}
diff --git a/dev-util/pwntools/pwntools-4.9.0.ebuild b/dev-util/pwntools/pwntools-4.9.0.ebuild
new file mode 100644
index 000000000000..765bf018a914
--- /dev/null
+++ b/dev-util/pwntools/pwntools-4.9.0.ebuild
@@ -0,0 +1,56 @@
+# 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}.tar.gz"
+	KEYWORDS="~amd64 ~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"
+)
+
+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
new file mode 100644
index 000000000000..765bf018a914
--- /dev/null
+++ b/dev-util/pwntools/pwntools-9999.ebuild
@@ -0,0 +1,56 @@
+# 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}.tar.gz"
+	KEYWORDS="~amd64 ~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"
+)
+
+src_install() {
+	distutils-r1_src_install
+
+	rm -r "${ED}/usr/pwntools-doc" || die
+}