gentoo auto-resync : 23:08:2022 - 08:44:14

24 files changed, 610 insertions, 12 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a1f1893d2326..f1fb267297ac 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest
index b18fe6535d45..cb70a3d2089b 100644
--- a/dev-util/ROPgadget/Manifest
+++ b/dev-util/ROPgadget/Manifest
@@ -1,8 +1,10 @@
 DIST ROPgadget-6.6.tar.gz 9349424 BLAKE2B b1f1e5fbc76329f64122e65161ab188e9f7260c4e43d5e92e0e43cd4ebbf27ae281c32bd49790a363ff1d10360a1cda1846310054c249ab40279063a735654e6 SHA512 bf636a264975c95676e5bb6223d0cf04885699eeaf691c6c93a1ac8c1bc44f95323207660a57a58f44163f8c07156567daa73755b35a13cff5d27aee01ec4fb6
 DIST ROPgadget-6.7.tar.gz 9348558 BLAKE2B 004f28993e3567b8bf78853c83b60fa17ff7dc8eb82867eabec33aee247283938ed522883bcf62a11f27a70fa10c4afbdd2636d613770bc8fa0ee7dd3667e859 SHA512 81bebafc1ba9cb18e017487395dacdaae044d6f1383604a0183b41d2210651c9a6870755f741cd7a3e2dc38ee5c004b0aeac52cc1082fa352c06c0598ac7e87b
 DIST ROPgadget-6.8.tar.gz 9348922 BLAKE2B f7278ea0934e61f6afcd95f3c3047a34cf07bfaa52b67514ad2c63aa06104ee1c3c13bf77275ae89a406e2db5f238b95353d2cef7b696b3b53769434775183f3 SHA512 9e14d5a180a2d2d974bf69fb6456d9a68f197d4d4dda1de16374a2c81b0b2780b220d6a73d155be65d5eee03273fdc94f76235fe645511646bc3b29c07e6e828
+DIST ROPgadget-6.9.gh.tar.gz 9903435 BLAKE2B de20400cc4b247a080ead3060c8790447e0d543e757975a17b5638ba9d5e44ff437a1f4a43731308427e92f9062c72b3e5bcdab68816f4e3ce19a849efc7d384 SHA512 c844a856e4185261fbd2b550c95439a7cfedf41c15fd988497b43c559264d266ebd3c684af705b539ed64f56526080313e1802f3cc6486a17d69439e0aa2a394
 EBUILD ROPgadget-6.6.ebuild 770 BLAKE2B 6a784652b7b1683dbdccf5e953771390368a8a5255b4977fdb925de256c10f810f811439b6553b52aeebee9880b0dcf0dead3930bd97127ca3afdebe5b6b51d2 SHA512 97b42dba38a91ddef663a10846890ee7d347bd16c969aa538e76ef0b8ba50e52b119f2888735aba745e458938db95d9611d5861b0a0eb1517f04efcc43efd3cd
 EBUILD ROPgadget-6.7.ebuild 776 BLAKE2B 938a1577945445b06b728224c43a0764d449088fd62529d1d5a88db3bd593e958c8e385c7ad29599274728575ca0dbd808602fe63c322dd75daa1106e5aa32f0 SHA512 08a3861da0bc60a415fda3c6a8e519b7daa7a7ed353b976a4abfd4ea7d8e97fb276155bf1522e4d6b51d7949df66b97cf00244c6e0157e8ff468f9ebbfd3a497
 EBUILD ROPgadget-6.8.ebuild 783 BLAKE2B bb87427b746ef673273fc317a736d7fc1a09e4016af7b8accec30d1c3c6f3ab54e5e0d5e6fd0e2d3ad408ccb6c811889f447090f0f454747b3b02487d580d97e SHA512 d25e3e6a7249dbda90c99b40d33f43e4544a08e46eadf6fec697fcd7d3dfd9cf313e3da5e6add0aebec74b4c4c7e680dba8ead461f044e77da09bbfe4df35bd9
-EBUILD ROPgadget-9999.ebuild 776 BLAKE2B 938a1577945445b06b728224c43a0764d449088fd62529d1d5a88db3bd593e958c8e385c7ad29599274728575ca0dbd808602fe63c322dd75daa1106e5aa32f0 SHA512 08a3861da0bc60a415fda3c6a8e519b7daa7a7ed353b976a4abfd4ea7d8e97fb276155bf1522e4d6b51d7949df66b97cf00244c6e0157e8ff468f9ebbfd3a497
-MISC metadata.xml 761 BLAKE2B 4945ceb179f08902671a650504bc6671a51223aaed0f676349bbe6aaf0cf3622a7df096810181099a8488f35a687cd682005f11839219eb7b5a63074a634cb78 SHA512 afd23e85344db0600b9ac51767af44ba57e653e47b47746109c52dfe7c69e85d07a999a2bb5e51dc7fa3e8f1738f04dbafe8f46c214fa7e8679a44f2e078d77e
+EBUILD ROPgadget-6.9.ebuild 786 BLAKE2B 37ece1f9e9d0e0dd9c54ef33e76247618769baa1b9fdb69e4bbdab177a342833ec43560c4850cdf49eb1d22b8b0e5a8b1d67e938e04549e7b89d022cf20d49ab SHA512 66b95cf6c4fdf24fb0115a83e2ae4d007316681699e425f639bb1f8cb9b98163da3cf5204d3c6933c49f6d3ff16a75ad492cc89360d74f03eb299680782649bb
+EBUILD ROPgadget-9999.ebuild 786 BLAKE2B 37ece1f9e9d0e0dd9c54ef33e76247618769baa1b9fdb69e4bbdab177a342833ec43560c4850cdf49eb1d22b8b0e5a8b1d67e938e04549e7b89d022cf20d49ab SHA512 66b95cf6c4fdf24fb0115a83e2ae4d007316681699e425f639bb1f8cb9b98163da3cf5204d3c6933c49f6d3ff16a75ad492cc89360d74f03eb299680782649bb
+MISC metadata.xml 894 BLAKE2B 5b46ce7117f8bf1adc0fcae940bcb693b2efe1d46469627e28cf2b6375d9c0952968c69dbda53e4d6190c13e47010127caffa63f3f9a68fd28ede9970d841445 SHA512 2c198345cebbd725e2ba634d8b72efb7e62209fc38c12c05e3cb2ce949e9ed870e0b937096a16e2e75bbbd298a1ec5376e49d79b6992ed775061742ca60a088c
diff --git a/dev-util/ROPgadget/ROPgadget-6.9.ebuild b/dev-util/ROPgadget/ROPgadget-6.9.ebuild
new file mode 100644
index 000000000000..50c40c36f4b9
--- /dev/null
+++ b/dev-util/ROPgadget/ROPgadget-6.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Search for gadgets in binaries to facilitate your ROP exploitation"
+HOMEPAGE="https://shell-storm.org/project/ROPgadget/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
+else
+	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/capstone-5[python,${PYTHON_USEDEP}]
+"
+
+src_test() {
+	pushd test-suite-binaries || die
+	./test.sh || die
+	popd || die
+}
diff --git a/dev-util/ROPgadget/ROPgadget-9999.ebuild b/dev-util/ROPgadget/ROPgadget-9999.ebuild
index 776ffc4f5af6..50c40c36f4b9 100644
--- a/dev-util/ROPgadget/ROPgadget-9999.ebuild
+++ b/dev-util/ROPgadget/ROPgadget-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -16,8 +16,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
 else
-	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-util/ROPgadget/metadata.xml b/dev-util/ROPgadget/metadata.xml
index abb0bc50b189..8a844e4ae0a5 100644
--- a/dev-util/ROPgadget/metadata.xml
+++ b/dev-util/ROPgadget/metadata.xml
@@ -9,6 +9,10 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This tool lets you search your gadgets on your binaries to facilitate
 		your ROP exploitation. ROPgadget supports ELF, PE and Mach-O format on
diff --git a/dev-util/gpp/Manifest b/dev-util/gpp/Manifest
index 69d7d8f364b6..d54180ddc775 100644
--- a/dev-util/gpp/Manifest
+++ b/dev-util/gpp/Manifest
@@ -1,3 +1,3 @@
 DIST gpp-2.27.tar.gz 66226 BLAKE2B 18490dae11fa295c6a038c6de86919a9b37a10c6008490bd554f11e52916e92e80238bb858c799fa1345419a56b37f9f817cd9c8d0fe221bd8c51b3d12245fb1 SHA512 ad7eaf89796208668143c160bfe764d5b38fb734dfa29869d2b222ce4c1982e8f5eef679960645de51c7d4fda6a18cac4ded55334a62cd16698a42b89aebf71e
-EBUILD gpp-2.27.ebuild 423 BLAKE2B 5c00cdd0832be876ff57b7b6c300e1964a6d504d1b73121d63ab2c7f79ba3af3b69a9ac338b80226ec2a2336cfbb64b7bdd59e6af106f682a3e0b5d8231e3a6d SHA512 a678b6af78550e76fb1d59855c6f3bacb33065625a70e9912c4688221572661dde9e3beb257b17c437c535dde4a8bfdfeb3ba9fb40ba3590f5016b57d9f5eaec
+EBUILD gpp-2.27.ebuild 435 BLAKE2B df0fdb450085ddb71f85741c0f9b03f77aecef4615b498fcc785f033ee0e52c98c76b239f94f15f2dc9681c9bd71e861c85c4e0b8437c56504ae49d8d64ffc46 SHA512 fbcfe6732fe5afbd987abc13cb413c1858b32b8bfea241bbae17742933d7aba4fda54e44b46dd863f17de4da2f936b2a88882069f1c4a1d12782ea9ecb834be0
 MISC metadata.xml 823 BLAKE2B fe21889c430825056b947677778a7509837b1ba56156c88d18128497eea04adb2c78c396bd3538a4da698b658917590ee88907c4fe969c3d52ca214ca301f253 SHA512 65f205222a6a282b18c617d9ded5ecbff3b4cb08d068794f6141c5db675fbd6b806f0dd1b7f43af0ab31017a363639c4fd053f1c54851da2c0ec5b52b5daddcf
diff --git a/dev-util/gpp/gpp-2.27.ebuild b/dev-util/gpp/gpp-2.27.ebuild
index 1c1ee3e1352f..5024d6dd96de 100644
--- a/dev-util/gpp/gpp-2.27.ebuild
+++ b/dev-util/gpp/gpp-2.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/logological/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 src_prepare() {
 	default
diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index 3ce9a7bc77a3..60481570d48c 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,3 +1,3 @@
 DIST librnp-0.16.0.tar.gz 2755417 BLAKE2B bdd06b1bd20ae816b54be19fa844767e9978eb387487db85db2dcd699da1d1b426455565a6c0508bf3782e07317d3bf6ae3613ebe6f8721f80849cb985e7850f SHA512 3d1ba077f85b08ca308d0ebc6499b3a2f32db38f0fd3abbfa7c38277d4552d2bcb7b2e7d07b7fa3222130af347b73d853136974ec289d6de3e97c1e18e407b36
 EBUILD librnp-0.16.0.ebuild 896 BLAKE2B e78d4c67996cd88c881f9c74bc5edf3b01d6e7d9e657e8823cad9df083fe34a9ff0d99a21349ee3beca70444f68ea516c473214714e9845fc0500cb9a0f4a9c2 SHA512 d222176a990b06e4bb4cecb307de5de2aed0b8003b87a63d5a1c1ae0663eb40d25f025f862f50ec1d6b16251e66b60f37b2ac43884b948503fd53140d62ef249
-MISC metadata.xml 261 BLAKE2B 48b50d9686d1d80d63fef0053bb2e63bad6efc0ad43c21e1e81ca2d788e665fc2e817b62547ffbdf43111a8e7529f0d0d19e968c7156cca212631b3b884f5afe SHA512 146426f2fec9df2ed0008392e46e9fd3828a19da621fe073ebc1ef022a2eeb0342fd56eb6e0116c384aed991bbb33c591513d3db7f6321f5697fbf1ac5a43334
+MISC metadata.xml 339 BLAKE2B 435d74e705e406e63a6349676c46f3a9ce2fb6b3952bd36d31372cadf163ab1f61ba7bfb4de16e4586695783cf9bd3cbd29b67bfe236c6e1fb52e1e2edab14cc SHA512 5431a0d99435dd7001c179159cb728e2b0af71c0c3df23856e1cbc794af2b0808b046de6ead30a8679cace52f67667f5ab634f9ffb04efedf4f24a247eb4f211
diff --git a/dev-util/librnp/metadata.xml b/dev-util/librnp/metadata.xml
index d7a0807d3469..086e8d1f3ea1 100644
--- a/dev-util/librnp/metadata.xml
+++ b/dev-util/librnp/metadata.xml
@@ -5,4 +5,7 @@
     <email>mozilla@gentoo.org</email>
     <name>Gentoo Mozilla Team</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">rnpgp/rnp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/peda/Manifest b/dev-util/peda/Manifest
new file mode 100644
index 000000000000..6b56a0403394
--- /dev/null
+++ b/dev-util/peda/Manifest
@@ -0,0 +1,4 @@
+DIST peda-1.2.tar.gz 65331 BLAKE2B 6942b99d714eb1114167b80ba202d86f6dee52cd47c8047b4cb78d4a91f45e1594521440a3318a968e35c5dc56a616393c0837d6f9db5ba41505641a385fb573 SHA512 e69844b8c3a51af96096d97ebfa4a67ac8ff16e4a9e0edb64bbb5e946b1ebeaa56260663718b90145f4191cc25762f3e351a8de92bf9b56f9f1d11389c563c43
+EBUILD peda-1.2.ebuild 995 BLAKE2B 45a55fa2275a14e4320ce0bf534607ee028a0ac60aa47c7b856426754e823ac7580905aac913702e34da2d848199603cc6909c342c5abced29b03d7bef019415 SHA512 0fd96dc6599b8a1f3b7b812ba596008ba9fd6679d386ba4f8a83f040796bc8b746c5f0a9a14f1a9ab58bf69b7e3b0d34ce618bf7cd256a5434db1c85185e3a7d
+EBUILD peda-9999.ebuild 995 BLAKE2B 45a55fa2275a14e4320ce0bf534607ee028a0ac60aa47c7b856426754e823ac7580905aac913702e34da2d848199603cc6909c342c5abced29b03d7bef019415 SHA512 0fd96dc6599b8a1f3b7b812ba596008ba9fd6679d386ba4f8a83f040796bc8b746c5f0a9a14f1a9ab58bf69b7e3b0d34ce618bf7cd256a5434db1c85185e3a7d
+MISC metadata.xml 487 BLAKE2B 0e628d9250a7ffad11b26dc82ac257d8128f1656939525478ed90916381a2781a4f6f1c479a3251151bca74f647da0580c9e725ca2b2d4cd89eb96210dcb8a2d SHA512 0420e4ec7a90845c4021ee3ddfbaee208836c7c1fd633d0c5e8767ac346c56fa7de9a6840c7ac698611786bc7245c42e0f5a4b495266462eca1fceca33521e9c
diff --git a/dev-util/peda/metadata.xml b/dev-util/peda/metadata.xml
new file mode 100644
index 000000000000..a4d70b1a53ea
--- /dev/null
+++ b/dev-util/peda/metadata.xml
@@ -0,0 +1,15 @@
+<?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">longld/peda</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/peda/peda-1.2.ebuild b/dev-util/peda/peda-1.2.ebuild
new file mode 100644
index 000000000000..e3fd8e0aa2bb
--- /dev/null
+++ b/dev-util/peda/peda-1.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 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="Python Exploit Development Assistance for GDB"
+HOMEPAGE="https://github.com/longld/peda"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/longld/peda"
+else
+	SRC_URI="https://github.com/longld/peda/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="CC-BY-NC-SA-3.0"
+SLOT="0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
+	')
+"
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r lib/ *.py
+
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper "gdb-peda" \
+		"gdb -x \"${EPREFIX}/usr/share/${PN}/peda.py\"" || die
+
+	dodoc README{,.md}
+}
+
+pkg_postinst() {
+	einfo "\nUsage:"
+	einfo "    ~$ gdb-peda <program>\n"
+}
diff --git a/dev-util/peda/peda-9999.ebuild b/dev-util/peda/peda-9999.ebuild
new file mode 100644
index 000000000000..e3fd8e0aa2bb
--- /dev/null
+++ b/dev-util/peda/peda-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 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="Python Exploit Development Assistance for GDB"
+HOMEPAGE="https://github.com/longld/peda"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/longld/peda"
+else
+	SRC_URI="https://github.com/longld/peda/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="CC-BY-NC-SA-3.0"
+SLOT="0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
+	')
+"
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r lib/ *.py
+
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper "gdb-peda" \
+		"gdb -x \"${EPREFIX}/usr/share/${PN}/peda.py\"" || die
+
+	dodoc README{,.md}
+}
+
+pkg_postinst() {
+	einfo "\nUsage:"
+	einfo "    ~$ gdb-peda <program>\n"
+}
diff --git a/dev-util/ropper/Manifest b/dev-util/ropper/Manifest
index 16b73c309be4..060a798c48e7 100644
--- a/dev-util/ropper/Manifest
+++ b/dev-util/ropper/Manifest
@@ -1,4 +1,6 @@
 DIST ropper-1.13.7.tar.gz 1491228 BLAKE2B 24e3f4d2454cad2b4ba8f365a4da4060f0aadc4e78423388024adbf2b58d33276e68ed92f7b778b9a7d9eda057c6a1675a67c43c93df4d378605c08720d97197 SHA512 1d93c4d58454bbd5cfb6a4a7a69f571294613e10e77cae6a65eaf7b9a5c977a3b82c888bd414d1b3e6a1082ba7cd9f2121253bf849dff2a40cdb34acb1371acf
+DIST ropper-1.13.8.gh.tar.gz 1491769 BLAKE2B 8601bcd2287763aa208b227c437362b9799ec1775104b659213e69a77f118bce567e95a0b83a4f0556439a82ee853ebc9aabaa4098b2a700572d1b661213eb25 SHA512 eae2279e1c6bc91af76e8e5d37b7d57c5d2e518d027e293dbd52c6c27dcd8826e73673c55fe581cdefda272b657c8eff2b5eb4fdc4996fec1548709b8371b5d4
 EBUILD ropper-1.13.7.ebuild 1102 BLAKE2B e52ef8a6bc3a1aa70d72d0b5d1b172312cc943ac029ab53281afe52d72bc2c9666fccdaf06a4475b5811e2114cde8b8d8c800168e137e7757240c26b891f3132 SHA512 e8302bfe62bb3c97bc1260537b4c2561d2d18e21832e81cab4693a1870e614cb74a4bc9a81e3af2eb6010ddfd66690c95a9fd052b278e47c4825cbbb8a8daf04
-EBUILD ropper-9999.ebuild 1102 BLAKE2B e52ef8a6bc3a1aa70d72d0b5d1b172312cc943ac029ab53281afe52d72bc2c9666fccdaf06a4475b5811e2114cde8b8d8c800168e137e7757240c26b891f3132 SHA512 e8302bfe62bb3c97bc1260537b4c2561d2d18e21832e81cab4693a1870e614cb74a4bc9a81e3af2eb6010ddfd66690c95a9fd052b278e47c4825cbbb8a8daf04
+EBUILD ropper-1.13.8.ebuild 1105 BLAKE2B 805e2e2c6336104c9215a28a75b0df7564bf3feef8c504056d2fc5a7917be8584083e21accfd53cea07188359aed1ea29beef15475f6cbad3703b5bf9908a10a SHA512 a7618d437ed1022f4b9fd457aa57e26e58f1a4441f6fd916f5589ff071e9e63fa02f8f57365a7992f4f02f1f4395337ccbdc4984232cd973f18b60ef9f2dfdfb
+EBUILD ropper-9999.ebuild 1105 BLAKE2B 805e2e2c6336104c9215a28a75b0df7564bf3feef8c504056d2fc5a7917be8584083e21accfd53cea07188359aed1ea29beef15475f6cbad3703b5bf9908a10a SHA512 a7618d437ed1022f4b9fd457aa57e26e58f1a4441f6fd916f5589ff071e9e63fa02f8f57365a7992f4f02f1f4395337ccbdc4984232cd973f18b60ef9f2dfdfb
 MISC metadata.xml 786 BLAKE2B 1080932503cd360d0ecac2d9f135bb4e52c5590944adf0f491eac763fef40e4d95361fc81a9144469d86d1c75f6448623662f179030ec7b01634e0edb8202a8e SHA512 4dbd1c561976731b60ad27d9c71128151b2063e4a9c28291e4e53aedfe829110f1bdbc89b0a3ffabc95236dbe30830489f034280c3c0e9bf90a572960654cba3
diff --git a/dev-util/ropper/ropper-1.13.8.ebuild b/dev-util/ropper/ropper-1.13.8.ebuild
new file mode 100644
index 000000000000..715beb97d20b
--- /dev/null
+++ b/dev-util/ropper/ropper-1.13.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Use to display information about binary files in different file formats"
+HOMEPAGE="https://scoding.de/ropper https://github.com/sashs/Ropper"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sashs/Ropper"
+else
+	SRC_URI="https://github.com/sashs/Ropper/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}"/Ropper-${PV}
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="z3"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/capstone[python,${PYTHON_USEDEP}]
+		dev-libs/keystone[python,${PYTHON_USEDEP}]
+		dev-python/filebytes[${PYTHON_USEDEP}]
+	')
+	z3? ( sci-mathematics/z3[python,${PYTHON_SINGLE_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Remove test which dies on trying to import itself (stub loader, not a real test)
+	rm test.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/ropper/ropper-9999.ebuild b/dev-util/ropper/ropper-9999.ebuild
index 6bd50c5a169b..715beb97d20b 100644
--- a/dev-util/ropper/ropper-9999.ebuild
+++ b/dev-util/ropper/ropper-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/sashs/Ropper"
 else
-	SRC_URI="https://github.com/sashs/Ropper/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/sashs/Ropper/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	S="${WORKDIR}"/Ropper-${PV}
 
 	KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/scap-driver/Manifest b/dev-util/scap-driver/Manifest
new file mode 100644
index 000000000000..89d16eecb186
--- /dev/null
+++ b/dev-util/scap-driver/Manifest
@@ -0,0 +1,3 @@
+DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
+EBUILD scap-driver-0.29.3.ebuild 1757 BLAKE2B 1490fd0fb697c08e0ec71485fbc9e0f9de996cf2caf50b5a53505ccdabb5c4a5d9833d1edfc75b274bfbe028ac0198b4c73a16c5cef0a909074ec9a59b4f3b90 SHA512 07a85a6d23085036f42c2b549ae3b33e0cc87f7b0d82ffac0744f6c0cb7d6f8ec20d3736de16ce9e14752b577dd724ebf4c92fd17ace2a56a7c424b9354fbf75
+MISC metadata.xml 494 BLAKE2B d0bc754d3af2488b9dc7672fc63e962f4c885d88a819e4332bd1c25f84c967e2e1cd8489122490a864cbfd930225b3dc28c8bfad4426750c030dce6ef5a08b4e SHA512 b77b7c103cfb606333814af210a0fae1f7956ddd9d3c3a044b0bebf42553f5ffe99d04549fb9c5e40fce33e9d23761830b4944b2cd83bd8ca2193f9b7da60fc0
diff --git a/dev-util/scap-driver/metadata.xml b/dev-util/scap-driver/metadata.xml
new file mode 100644
index 000000000000..66a8465c5f91
--- /dev/null
+++ b/dev-util/scap-driver/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>holger@applied-asynchrony.com</email>
+		<name>Holger Hoffstätte</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">falcosecurity/libs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/scap-driver/scap-driver-0.29.3.ebuild b/dev-util/scap-driver/scap-driver-0.29.3.ebuild
new file mode 100644
index 000000000000..518e80e54462
--- /dev/null
+++ b/dev-util/scap-driver/scap-driver-0.29.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-mod
+
+DESCRIPTION="Kernel module for dev-util/sysdig"
+HOMEPAGE="https://sysdig.com/"
+
+# The driver is part of falcosecurity/libs, but for versioning reasons we cannot (yet)
+# use semver-released packages; instead we pull in a commit that is used and known
+# to work with sysdig, see sysdig/cmake/modules/falcosecurity-libs.cmake for details.
+# For now the commit here and the one referenced in sysdig should be in sync.
+LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a"
+SRC_URI="https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz"
+S="${WORKDIR}/libs-${LIBS_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="!<dev-util/sysdig-${PV}[modules]"
+
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod, so just pretend to use bundled deps
+		# in order to make it through the cmake setup.
+		-DUSE_BUNDLED_DEPS=ON
+		-DCREATE_TEST_TARGETS=OFF
+		-DDRIVER_VERSION=${LIBS_COMMIT}
+	)
+
+	cmake_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="scap(extra:${BUILD_DIR}/driver/src:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	# work with clang-built kernels (#816024)
+	if linux_chkconfig_present CC_IS_CLANG; then
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+
+	BUILD_TARGETS="all"
+}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 04c6c8f784a8..5a2f7c5da4af 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,5 +1,8 @@
 AUX sysdig-0.27.1-grpc-absl-sync.patch 813 BLAKE2B 663be7d7011fc1a973972015d6a0dd4f5e1fd42ee09247cf200195660cb347df3fee35759ec596e0851124bffb7a95469788677f03dea36359a0b8124091b318 SHA512 edfad225dd2cbe45ab22da2785c58f738a20b113cc8b1099326ffe4ed5929e55d0c4aa6cf23c8c01c6cd8c48d316be3fcb1a359a91bcaab6a7d383eebdf3aed6
 AUX sysdig-0.27.1-luajit-2.1.patch 3824 BLAKE2B cac4079894303c4ee1d7829ec2fd77675db76883973cf0cae99d61d8ce459eb9735dc9d504064280e8c77b39ecefa2c48a191f8880b743c3ea1be92e8695c4a8 SHA512 1acca04049255538003ba95effc0ce631036ed872e54b19601a2f690428531e80c6e5d9ea86b8639d17df32608d9fab8e4085d858b4157ce37a1e929aa5537fe
+DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
 DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08
+DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8
 EBUILD sysdig-0.27.1-r100.ebuild 1750 BLAKE2B b41840987df0d6a09c4539e914c26efa56fd6d8df029cc0d0d97513ca281007cce4be60619231195e5e7055cad8f558926adbd50fb16e9b6acaa65208c17f0f9 SHA512 07e0c1e07c93b9e7be2bfd6b4b67d2dba255767b73a70ce787669a9b4cd200efd1deeb9e7f1589e11a5364c2b882430a3f73f70dd4e2a18206f45ac3993c4c1d
-MISC metadata.xml 428 BLAKE2B 06b3d161458d7de7549a6a737ad526232d58ce75ceb52a0f7c55f5647a1c49a8b8dfe79f8a1e2bd155ef0a2924839094a4578fd73243870250f42704ae14cd04 SHA512 bbd2326f2d2fda2d7a9716e6e63676217bd730de7c2a6457bee068893f67766b6b5ab392485c5f9ce2896fc34c5eab3bfd5b91dd6dffdafeac30c58b1983a533
+EBUILD sysdig-0.29.3.ebuild 2037 BLAKE2B 80952b562f59739320d4d936daf83331903c896692caae41d058acd18879ca22c7f5efb44d48eeb8567ecf1922bc879184bc9109832246661337b8d4ea75033b SHA512 d7876cb3eed6aaa2d43d01dd36e280cd77385cb80ed524f7cca91dcac83336c5586a2bd005bc632c1c1d5d7096ba33573632438b78cf09836b35bc7d5562fe7c
+MISC metadata.xml 671 BLAKE2B 553dbbe2ea2a56f5a88bb0276b3f97c5d4d8d798291eaef42d5aadd842cf5cbbb770515729c9779890f9227f7cc96fc8e35457009f066cfb43993b02c7406d7a SHA512 4d0b92b271bd4ceb86db363a29cd465124ab71ec6941848cafec4ebba0232a52bf62a4128d8cbaf5a7a6c9350aef29e4a797b6a659d5d5896c077b0b5df9f73d
diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
index 8e4769903018..c16f8ef41665 100644
--- a/dev-util/sysdig/metadata.xml
+++ b/dev-util/sysdig/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>holger@applied-asynchrony.com</email>
+		<name>Holger Hoffstätte</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="modules">Build kernel modules needed for tracing local
 			events. Disable this only if you intend to use sysdig purely
diff --git a/dev-util/sysdig/sysdig-0.29.3.ebuild b/dev-util/sysdig/sysdig-0.29.3.ebuild
new file mode 100644
index 000000000000..2c0745f73303
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.29.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit bash-completion-r1 cmake lua-single
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://sysdig.com/"
+
+# For now we need to bump this version of falcosecurity/libs manually;
+# check the used git revision in <src>/cmake/modules/falcosecurity-libs.cmake
+LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a"
+
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+modules"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	app-misc/jq
+	dev-cpp/tbb:=
+	dev-cpp/yaml-cpp:=
+	dev-libs/libb64:=
+	dev-libs/openssl:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/grpc:=
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-libs/zlib:="
+
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-cpp/valijson
+	virtual/os-headers"
+
+# for now pin the driver to the same ebuild version
+PDEPEND="modules? ( =dev-util/scap-driver-${PV}* )"
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# don't build driver
+		-DBUILD_DRIVER=OFF
+
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# point to the falcosecurity-libs tree
+		-DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_COMMIT}
+
+		# explicitly set version
+		-DSYSDIG_VERSION=${PV}
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+
+		# add valijson include path to prevent downloading
+		-DVALIJSON_INCLUDE="${ESYSROOT}"/usr/include
+
+		# enable chisels
+		-DWITH_CHISEL=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove driver headers
+	rm -r "${ED}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 852477dd2a4b..5e14bc68bf63 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -90,6 +90,7 @@ DIST watchman-2022.04.11.00.tar.gz 3783345 BLAKE2B 0b4b4cadfb45e5a894428ab27fde3
 DIST watchman-2022.07.04.00.tar.gz 3785684 BLAKE2B b27f71cd5d505d9383858434eaa90dd9a70478507a2750f10c3fdc88e39978cc6f94402d498dc26e2b5043018913bf71a28c04870dbefe8ee79fbe3e963a86e8 SHA512 43bbccd5e69905105da54fb661f506d2b3ef43719660deb07cb4b3b47b1569af71edcdc798ffdae79ec26c7cf24988394321d0f183f20af51daf6d54f4a3d8e5
 DIST watchman-2022.08.08.00.tar.gz 3788351 BLAKE2B cdf5ea901bbe7ff46d32fadb7eb46d2346f3330fd20c2e14dd4faa54c3feabfaf4c0a76b83a4493bcd052b7fa9d08e7ed05ad3d1bc883edefef9812258afeba6 SHA512 537b52d50823ce27f0c42927f2c04a57bb273f53d9f4c91a6744a319ff8efef9f5ed202ec2f2a1dfd59b1c16f5e8044ba21148bd40ca45660813cc67c839d6a2
 DIST watchman-2022.08.15.00.tar.gz 3783166 BLAKE2B a2090fb9e62890ea77e264c6d2727d93e8799b96ad4eaf7e02c58a8526fbd57b3b6ff2fdeddfb67a41771e2c0e29ca2f7fab2246ef8455df9902685c40c96138 SHA512 497f7127fe6efc5419f9f169b580701bdf88c4774b2c2d35b5c3849b29f679bf72569885cbb4411ebfd92e8d34eb589bf327d2362d8b5a1c141f9c063833f3e7
+DIST watchman-2022.08.22.00.tar.gz 3785807 BLAKE2B 7be65183a03bbef4b880349bc04b27c71699ae3a7c140bddea4f3f40299d9bbf19d63980bba988eab4219205b7250c9de2045d29aa9a5c65820e03a1b4cc647d SHA512 33efa917f7561f8f6fddd77590ad87064cfcca10c3936ccc3fd078a3f425ae49ec4a7e0859251c3020f26a0e9086301fd23fc1fafe73746316bf336123463f9d
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
@@ -104,4 +105,5 @@ EBUILD watchman-2022.04.11.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb69
 EBUILD watchman-2022.07.04.00.ebuild 4687 BLAKE2B b9b8376653dab8674d042f6f5a0f4f99deeb1459e8dba60e975711d239e61f40a7871ea04dc1ba84e694a242a48957f3766b119a38aaafbd46ba52899fd638c3 SHA512 ac344b1bc10a34808b4a9453280cd682a77bc8e687e7cc8b8e50d9bb413d17a668863a3ebff904d459a0481dc67f4bc485d2a635c3251c25af3a03bb1d672883
 EBUILD watchman-2022.08.08.00.ebuild 4857 BLAKE2B 595589dd252817a04b4fd6cc73d794605f59455616ed25a7b478fcbfc763b9be196f28b6339aa0793f24de7a2e4786c73158b2a6a14b9815adb14fb2299ee9ea SHA512 a74284b7a14e154f38cb656bfa655b3053679f4c71ee13b3f2350a7a8f8e1eb28f92fdcecb9f036c7a94fbeb7235fd7ca066f6aaff1ba5d8134ffd8c834f6474
 EBUILD watchman-2022.08.15.00.ebuild 4857 BLAKE2B 595589dd252817a04b4fd6cc73d794605f59455616ed25a7b478fcbfc763b9be196f28b6339aa0793f24de7a2e4786c73158b2a6a14b9815adb14fb2299ee9ea SHA512 a74284b7a14e154f38cb656bfa655b3053679f4c71ee13b3f2350a7a8f8e1eb28f92fdcecb9f036c7a94fbeb7235fd7ca066f6aaff1ba5d8134ffd8c834f6474
+EBUILD watchman-2022.08.22.00.ebuild 4864 BLAKE2B db42639b804d0d08eaa483788e9a85ffa0dcc6a1be2bcf642bb0affe155a8f017525d6b3ec8b829eef6f8df2c4d67c8c464f6e0d31da3a043ae01164424d5893 SHA512 97b2bfc19ed453f19354bfe05b4170bfbb9195aeafb9f9bb036d71ab27e52bfcbec658af8799c329c1b9d65b8fd90d4246507948c166f27ad5c77472cdddb69d
 MISC metadata.xml 691 BLAKE2B 68506bb31b8d7524b07a12bd2a237ed985215701eb2a28bacfd63ba5f3d61713b0369523a369c5880392e2f4790da4f908538627f3c3d58fe7c78faf9ebc9a15 SHA512 71c073c60fd880455dee0af9193a4279975ba34558144cfe03baa50d2a7c2c5074631a53fb89504d852e9782478f0add9dcea361f36cefe8a42f8f94ae27831a
diff --git a/dev-util/watchman/watchman-2022.08.22.00.ebuild b/dev-util/watchman/watchman-2022.08.22.00.ebuild
new file mode 100644
index 000000000000..ab5b42363940
--- /dev/null
+++ b/dev-util/watchman/watchman-2022.08.22.00.ebuild
@@ -0,0 +1,217 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+# TODO: Split into different variables then combine for each component?
+# Not all is in rust/ dir.
+# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client
+CRATES="
+ahash-0.3.8
+ansi_term-0.12.1
+anyhow-1.0.55
+atty-0.2.14
+autocfg-1.1.0
+bitflags-1.3.2
+byteorder-1.4.3
+bytes-1.1.0
+cfg-if-1.0.0
+clap-2.34.0
+const-random-0.1.13
+const-random-macro-0.1.13
+crossbeam-0.8.1
+crossbeam-channel-0.5.2
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.7
+crossbeam-queue-0.3.4
+crossbeam-utils-0.8.7
+crunchy-0.2.2
+either-1.6.1
+futures-0.1.31
+futures-0.3.21
+futures-channel-0.3.21
+futures-core-0.3.21
+futures-executor-0.3.21
+futures-io-0.3.21
+futures-macro-0.3.21
+futures-sink-0.3.21
+futures-task-0.3.21
+futures-util-0.3.21
+getrandom-0.2.5
+heck-0.3.3
+hermit-abi-0.1.19
+jwalk-0.6.0
+lazy_static-1.4.0
+libc-0.2.119
+lock_api-0.4.6
+log-0.4.14
+maplit-1.0.2
+memchr-2.4.1
+memoffset-0.6.5
+mio-0.8.0
+miow-0.3.7
+ntapi-0.3.7
+num_cpus-1.13.1
+once_cell-1.9.0
+parking_lot-0.12.0
+parking_lot_core-0.9.1
+pin-project-lite-0.2.8
+pin-utils-0.1.0
+proc-macro2-1.0.36
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.19
+quote-1.0.15
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.10
+scopeguard-1.1.0
+serde-1.0.136
+serde_derive-1.0.136
+signal-hook-registry-1.4.0
+slab-0.4.5
+smallvec-1.8.0
+socket2-0.4.4
+strsim-0.8.0
+structopt-0.3.26
+structopt-derive-0.4.18
+syn-1.0.86
+textwrap-0.11.0
+thiserror-1.0.30
+thiserror-impl-1.0.30
+tiny-keccak-2.0.2
+tokio-1.17.0
+tokio-macros-1.7.0
+tokio-util-0.6.9
+unicode-segmentation-1.9.0
+unicode-width-0.1.9
+unicode-xid-0.2.2
+vec_map-0.8.2
+version_check-0.9.4
+wasi-0.10.2+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows_aarch64_msvc-0.32.0
+windows_i686_gnu-0.32.0
+windows_i686_msvc-0.32.0
+windows-sys-0.32.0
+windows_x86_64_gnu-0.32.0
+windows_x86_64_msvc-0.32.0
+"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cargo cmake distutils-r1 tmpfiles
+
+DESCRIPTION="A file watching service"
+HOMEPAGE="https://facebook.github.io/watchman/"
+SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent
+RDEPEND="
+	dev-libs/libevent:=
+	dev-libs/libpcre2
+	~dev-cpp/edencommon-${PV}:=
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/glog:=
+	>=dev-libs/libfmt-8.1.1-r1:=
+	dev-libs/openssl:=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+	python? ( ${PYTHON_DEPS} )"
+# TODO: Make gtest test-only (needs a fair bit of patching)
+DEPEND="${RDEPEND}
+	dev-cpp/gtest"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch
+	"${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
+	"${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch
+)
+
+# Rust utility
+QA_FLAGS_IGNORED="usr/bin/watchmanctl"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17
+	export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}"
+	export RUST_CARGO_HOME="${ECARGO_HOME}"
+	export CARGO_HOME="${ECARGO_HOME}"
+	# Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69
+	# so no need to force -j1 via cargo jobs
+
+	local mycmakeargs=(
+		# Rust wrangling
+		-DUSE_CARGO_VENDOR=ON
+		-DGENERATE_CARGO_VENDOR_CONFIG=OFF
+		-DRUST_CARGO_HOME="${RUST_CARGO_HOME}"
+
+		# General bits
+		-DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman
+		-DWATCHMAN_VERSION_OVERRIDE=${PV}
+
+		# Fails to build against fbthrift for now in libatomic troubles
+		-DENABLE_EDEN_SUPPORT=OFF
+
+		# We handle this ourselves
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	cmake_src_test
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_test
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process watchman.conf
+}