gentoo auto-resync : 29:10:2022 - 22:01:57

28 files changed, 384 insertions, 110 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c8da0c5455af..5233fbba6744 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index e291ba567ba6..f204dac3db58 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -6,12 +6,9 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
-DIST ccache-4.7.1.tar.xz 545788 BLAKE2B 0d96b7d7739329cb86f749cac756998af648f512c2be0a88b35cda8dcc1160a2eb37a02e6bfde34810451b66bb99b56bc91ad64d67c8305c7af620a2075464b7 SHA512 9a17f550e9a70067c55405a0832769cf367e96b21256631f9b0e638574f2c4c90106be0fcef04e868cf4b069668fe09f13cf71539e9f85752f7869da6a9abd0a
-DIST ccache-4.7.1.tar.xz.asc 833 BLAKE2B 3735876dd9a4e9a7105480b55154baaff269f1a4564c82d5d95a36c4a085e95386f21a971e6349a0b9043dc0208ddd464f120bdd8127c20dd33909c7e70c449d SHA512 2ad6be6805254d5d4f24d89801f6338431118d948ee90f38f4eeecb282e99c8f90294e6cd4f8f582d01e2ac138d7ac233e71fa985dd73dc43869606f841faba9
-DIST ccache-4.7.tar.xz 545560 BLAKE2B 20d08092e775354f84699ed48a88f8212517e7202ff2bc1bc381164341d4058b598d2a4981e35059ac10fc46ada183c35056732f1a61c9d14185cd41839a7485 SHA512 af7010de1f44bf5be9ba62a3af54af6b19e01b6dddf986a52c37106676bc3a5bd2298cccd2337cccbacfd1c148de177612c2bf24d254c6ade9dec253a0a62efd
-DIST ccache-4.7.tar.xz.asc 833 BLAKE2B 4c868467e53fb21021e5f553b6660b94f7fc93ba66d1798c09f09a281124f8351cbe29fcb621637e29c1f6f24468f0a9a6423a33a1691c220f929a595e961a56 SHA512 e88e8cf2ee8ce9015a93eefe3a7c8dab58da3e50536b5af8ee5013f6cb2af9928f82b4a6d9c4af2880e14698819f63c434324e45aa667e63e9fd309aaef448a6
+DIST ccache-4.7.2.tar.xz 546016 BLAKE2B ce68e759bbeb99e5d5fb7341c85e58dbcf05aa21caa7aea67cba244041a44cfb22bceb7dcea47597ea44f39e88d7d006fd0a5fc7ceefb264309a74affedf8d8e SHA512 854834d38ae64c1a253746be7f30b6f6f50215277a3eb01f25dcab23d3fe1131bc5fde76da10506b72c8eca5b00bc63555f5c2363b8613833f491d05635173ed
+DIST ccache-4.7.2.tar.xz.asc 833 BLAKE2B 63dc3d283148622b2ed3a8688c865602e6f803f6cf00c1281e0004ac16b4c7606df2d977329328b784bf36134ac529f3d7dbabfd3c295b9eb688a7962e2d81fb SHA512 5ffd9f51b7ff580603c9926cba6df0f13ccd1cf217a49d0cc97963a15d690cc51da9a42e37f6f2fd53bbf8b3458badb138c19f1383ef3899a54514d135362070
 EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba
 EBUILD ccache-4.6.3.ebuild 2583 BLAKE2B becd6116917e1e64e1b6d7168cf99af6503196a0d414735f926b72b66757fc649e0f68df851d39eb7733deeb0b339dadea320b2a33fa3976fb1c180a5aa14c5a SHA512 b917373e3f5bf306aad19dba9df0200bf0a20b2a15a16ca91d87fdef05adcc16eb7f87999884bd83751ba3bc9f98c883cb0f0627f28fa740d0403eb7fc915c7c
-EBUILD ccache-4.7.1.ebuild 2545 BLAKE2B 5d914716fa1f62164e9408564682e2b89b19557f682e1cb1ba8d470b9bc68f97248630c034ff8adf988e3aa407b40853d51e25a375a27f00a04cbf32596ee30a SHA512 5b1a858ae8c027cd4381d94eb82c285dddc116d3081424428887856cd0c9ce6940b5d40c77f9ac7446f06ef209e64f6124ddcdf8e8800100286c9253255d47e4
-EBUILD ccache-4.7.ebuild 2545 BLAKE2B 5d914716fa1f62164e9408564682e2b89b19557f682e1cb1ba8d470b9bc68f97248630c034ff8adf988e3aa407b40853d51e25a375a27f00a04cbf32596ee30a SHA512 5b1a858ae8c027cd4381d94eb82c285dddc116d3081424428887856cd0c9ce6940b5d40c77f9ac7446f06ef209e64f6124ddcdf8e8800100286c9253255d47e4
+EBUILD ccache-4.7.2.ebuild 2545 BLAKE2B 5d914716fa1f62164e9408564682e2b89b19557f682e1cb1ba8d470b9bc68f97248630c034ff8adf988e3aa407b40853d51e25a375a27f00a04cbf32596ee30a SHA512 5b1a858ae8c027cd4381d94eb82c285dddc116d3081424428887856cd0c9ce6940b5d40c77f9ac7446f06ef209e64f6124ddcdf8e8800100286c9253255d47e4
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.7.1.ebuild b/dev-util/ccache/ccache-4.7.2.ebuild
index 57b53e31e44a..57b53e31e44a 100644
--- a/dev-util/ccache/ccache-4.7.1.ebuild
+++ b/dev-util/ccache/ccache-4.7.2.ebuild
diff --git a/dev-util/ccache/ccache-4.7.ebuild b/dev-util/ccache/ccache-4.7.ebuild
deleted file mode 100644
index 57b53e31e44a..000000000000
--- a/dev-util/ccache/ccache-4.7.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DHIREDIS_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/coccigrep/Manifest b/dev-util/coccigrep/Manifest
new file mode 100644
index 000000000000..8652b0ee731b
--- /dev/null
+++ b/dev-util/coccigrep/Manifest
@@ -0,0 +1,4 @@
+AUX 50coccigrep-gentoo.el 99 BLAKE2B 596f01a6ac85deca70bdcf4f50c2475c7a38e44926d719e0da5eb23a8c713f89ebad0182cdca66b3011029bcda14d0cde76d4a186a126e05b74a0ccaa8e9efd1 SHA512 13cf90c99017cfb865c1d41e9813bb20993b4a91419e4bcca6b5536e8c35bfb871616c5174dd08eb8f1726f05296205428d14eaf9e9fabcf08bff01b287581f4
+DIST coccigrep-1.20.tar.gz 33027 BLAKE2B b4d38662beaa5ad6972e21e33523c9c7253f9f124067c45b21fc0234b6aa6338481a9a3a08242c3c4227ac102b75ff7070bd7d7dcec31193d84367d1d739072d SHA512 35d6a43b515c261ba025b876a72566581f892624eb9f47cde4121f16b2922ead8cd94e2c0ea6e00e4c64a3fe0cdcc4aeadc4c49900a8de8cfc0b589208ecae9c
+EBUILD coccigrep-1.20.ebuild 1340 BLAKE2B 88058781c7994470bea93e0ee848d834c18c1f3be82a37cdbd01ca42defd98a451500f78dcbf4a5489ffa997505cd7dd2c4d8f6ac14c3c80cdb1ed6b78803a01 SHA512 e923b5ff693575cab0173fd41c94064cceecc3183602cfffd5014c88f23e0b16ba13f8936985c409032e8275e161ecc4c01567c8fb2bd8c11672b7375b9f3daa
+MISC metadata.xml 312 BLAKE2B 22969d34c7ebb142abb6844c45c08f9b52c133fd608fd2905af02eb19702a0b36c2010bd6c070a158cc73d45c86f003a4f6650d8a8afe3cd170ba5028e319eea SHA512 2a6fa7da698256ae9e56de7475fc91e1477297ba601c4e417b41b37b01d9c445745d517a28abdfc9a48590854458286a1d62fabca463056213b16d8c75382c8f
diff --git a/dev-util/coccigrep/coccigrep-1.20.ebuild b/dev-util/coccigrep/coccigrep-1.20.ebuild
new file mode 100644
index 000000000000..5a30a6669a76
--- /dev/null
+++ b/dev-util/coccigrep/coccigrep-1.20.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 elisp-common optfeature
+
+DESCRIPTION="A semantic grep for the C language"
+HOMEPAGE="https://home.regit.org/software/coccigrep/"
+SRC_URI="https://github.com/regit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs"
+
+RDEPEND="
+	dev-util/coccinelle[python,${PYTHON_SINGLE_USEDEP}]
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+python_compile_all() {
+	use doc && emake -C doc html
+
+	if use emacs ; then
+		elisp-compile editors/*.el || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+
+	doman ${PN}.1
+
+	if use emacs ; then
+		elisp-install ${PN} editors/*.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	insinto /usr/share/vim/vimfiles/plugin
+	doins editors/cocci-grep.vim
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	optfeature "Syntax highlighting (colorized output formats)" dev-python/pygments
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccigrep/files/50coccigrep-gentoo.el b/dev-util/coccigrep/files/50coccigrep-gentoo.el
new file mode 100644
index 000000000000..7fbc6b93e541
--- /dev/null
+++ b/dev-util/coccigrep/files/50coccigrep-gentoo.el
@@ -0,0 +1,4 @@
+;;; coccigrep site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(require 'cocci-grep)
diff --git a/dev-util/coccigrep/metadata.xml b/dev-util/coccigrep/metadata.xml
new file mode 100644
index 000000000000..69ff36f5dcae
--- /dev/null
+++ b/dev-util/coccigrep/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">regit/coccigrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
new file mode 100644
index 000000000000..6518e621cb22
--- /dev/null
+++ b/dev-util/coccinelle/Manifest
@@ -0,0 +1,4 @@
+AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
+DIST coccinelle-1.1.1.tar.bz2 2118055 BLAKE2B 7efb0c86432c88daa1bce2710acdf2f62b6210c69245b4896ea8c5e39a0b28c538d94deae6ed1544e0ced66b2baa6edf8670f5e02dad40c2d1f5562326ce23e3 SHA512 fcb83203c91dae18122cf95f7db931d2e1576559b74a7a1c664c795437904acdffa005a8b9e732c1d99c8f0ab1c5f529d143eafe79c6397d28c4879848afca45
+EBUILD coccinelle-1.1.1-r1.ebuild 2866 BLAKE2B 0d5dd7513c3a580e5aa5a3cc96c540b3cd7712be1d136ea9a3596a6f933dcccd7e8b5049f511c821239a4d38bfc8b9aa825fa139d1394046346d91b3cd30443c SHA512 2f0a4a308c42846e853a63e24d7bec015d86313e5f348894019d688f2581439fad1735e654c291200967f5e2dabdafbc46c4b2726e0e3c73cf48a133d1a36acc
+MISC metadata.xml 318 BLAKE2B 0d950c53a548409db938f27ae7e6941875f2d3260237c72fb3771659ed35e876e456e48823f2340122e68da18bf80bc4f16b58182937117977567579d49d48ad SHA512 c32dd8ca3473e147b69f305fe58412f10ba00dd939eba5fb871d366c6440cffbd623ce4922cd5879b2fefed19a3cf3ffb29bd588021e707623a32f85640905c4
diff --git a/dev-util/coccinelle/coccinelle-1.1.1-r1.ebuild b/dev-util/coccinelle/coccinelle-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..bd296f7e09d3
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.1.1-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools bash-completion-r1 elisp-common python-single-r1
+
+DESCRIPTION="Program matching and transformation engine"
+HOMEPAGE="https://coccinelle.gitlabpages.inria.fr/website/ https://gitlab.inria.fr/coccinelle/coccinelle"
+SRC_URI="https://gitlab.inria.fr/coccinelle/coccinelle/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs +ocamlopt pcre python test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Test failures need investigation
+RESTRICT="strip !test? ( test ) test"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/sexplib:=[ocamlopt(+)?]
+	dev-ml/menhir:=[ocamlopt?]
+	dev-ml/camlp4:=[ocamlopt?]
+	dev-ml/parmap:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	emacs? ( >=app-editors/emacs-23.1:* )
+	pcre? (
+		dev-libs/libpcre
+		dev-ml/pcre-ocaml:=[ocamlopt?]
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsextra
+		virtual/latex-base
+	)
+"
+
+DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
+
+SITEFILE=50coccinelle-gentoo.el
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use python ; then
+		# Fix python install location
+		sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
+			-i Makefile || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ocaml
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-python="${EPYTHON}"
+
+		$(use_enable python)
+		$(use_enable pcre)
+		$(use_enable pcre pcre-syntax)
+		$(use_enable ocamlopt opt)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	export TARGET_SPATCH=$(usev !ocamlopt 'byte-only')
+
+	emake VERBOSE=yes -j1 $(usex ocamlopt 'all.opt' 'all-dev')
+
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts emake VERBOSE=yes docs
+	fi
+
+	if use emacs ; then
+		elisp-compile editors/emacs/cocci.el || die
+	fi
+}
+
+src_test() {
+	# TODO: See Fedora's method?
+	# https://src.fedoraproject.org/rpms/coccinelle/blob/rawhide/f/coccinelle.spec#_231
+	emake VERBOSE=yes check $(usev python pycocci-check)
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes install
+
+	if use python ; then
+		python_optimize
+	else
+		rm -rf "${ED}/usr/$(get_libdir)/${PN}/python" || die
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} editors/emacs/*
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	use doc && dodoc docs/manual/*.pdf
+
+	newdoc editors/vim/README README-vim
+	rm editors/vim/README || die
+	insinto /usr/share/vim/vimfiles
+	doins -r editors/vim/*
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccinelle/files/50coccinelle-gentoo.el b/dev-util/coccinelle/files/50coccinelle-gentoo.el
new file mode 100644
index 000000000000..6721b3c5e5a1
--- /dev/null
+++ b/dev-util/coccinelle/files/50coccinelle-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; site-lisp configuration for coccinelle
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'cocci-mode "cocci" "Major mode for editing cocci code." t)
diff --git a/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml
new file mode 100644
index 000000000000..313e852a9cce
--- /dev/null
+++ b/dev-util/coccinelle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">coccinelle/coccinelle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 5a2ef2f66342..6a2499490a34 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,4 +1,4 @@
 AUX d-feet-0.3.16-fix-meson-0.61.patch 911 BLAKE2B 21198e257461b1df602b1d7cdeddc3158d39967d8d3bd412ea36ac6cb1fd904d6419e5c40664958639e2be8b2cf08bef53fdd8fd458f6e4548d7b08f519874f1 SHA512 bcb3ddf35293c2f000bd857a20de403cb1903b787de078c1276bbdf8dc8b4285f8419a8ad6e031296e1428e098325d8471fcf8c19480818502d280dc9a591d16
 DIST d-feet-0.3.16.tar.xz 237888 BLAKE2B b4773b781c53feb11889b49746e714a42a15a85daeb16dcd5235609fb6105c0b1a3ebeeb4a08830de9067f1c193702b31fcbfc67190eb2f901907b96acfcadbc SHA512 ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d
-EBUILD d-feet-0.3.16.ebuild 1059 BLAKE2B 08897d24f22cf5a8bf89b93e8611e4f1d42a429283d54107e6418da9bc060e1375b309129344530129b3eb52dc8114b1cc6e862decdd47a97e6bac223971244a SHA512 53abf1d522e387c50a72412f6de2796dea37f315785f239d31eca133624376f58490e2db1fa2f8810fa78a2165bed57549912d1316967e577067a0540e9f7ad5
+EBUILD d-feet-0.3.16.ebuild 1059 BLAKE2B c3adaccf8234820aaa4ab1f0ddde2f4d987fb8fec56bd52bb12f020f211e78ebd0f513df645ece62dd0690a6886e2126273adebc76d776c8868c258bbc977c47 SHA512 544004d5ca970494feb9b968f17b3bf5552ac4e1dddb8bc433aaca0eece3e6d2c0532252b0e19b1098c99b9565c62b20a8273893e135288e813016f0b555ba3d
 MISC metadata.xml 252 BLAKE2B 1dee28ae6c6e69a9c06e2c6f7f309e1193633c7571f0fc645546b89aa018837d3222514caf1db9ac7d43a014377d6ba04620347c78aeba5b6aa020dc51a49690 SHA512 e8d972cad532f8afa0e4d67eb837160d7d436db8c8296a69e97d40e010a12ae11651147cd8f6b5e39c445992ee16008f52ea2eb6f8c032e340040d298abf979f
diff --git a/dev-util/d-feet/d-feet-0.3.16.ebuild b/dev-util/d-feet/d-feet-0.3.16.ebuild
index ac5cf9b1964b..6e54e38cce55 100644
--- a/dev-util/d-feet/d-feet-0.3.16.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.16.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome2 meson python-single-r1 virtualx
 
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index b0d48039db0e..d82ff5318264 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,4 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
 DIST dogtail-0.9.11.tar.gz 132832 BLAKE2B 9004216a3d96714e9bd524e6ffaad7892a3630c97b61293d9784bc04df353f3c09e6226f92329103768a38c55b7eecc5f23a1aec0e6cd4baf8012892bb7d5cb7 SHA512 b5880386d9952b3aceac95d8b7a4f5e8293b29a629019e7cc3aa57e13b35a9cfbd0fd2a9db5fed80b2ebf7225a1a05c7388a67da91b310434833b4c6efd02278
-EBUILD dogtail-0.9.11.ebuild 1342 BLAKE2B d903b56865af0c80d7ffb4f3b97fc900ee0e6f5a5f9dd32b82492eacda8a32fd39da7f8e925093c3bb0b1c97d3cecdc95d982090cc056572e22f86e41ba6f599 SHA512 e0cd2596824916ee04badae76e52c82bf48a18347db8b7d36ba10ac49eb31d3ed8f6718a5e10f170d53e6edcd79f9cf18c1879acdcd2cfa19817b91946b6c1a7
+EBUILD dogtail-0.9.11.ebuild 1342 BLAKE2B cc4f1ac0671d66cf8acda8851f18a6f351ca48cc8e7a824ed560c7d0beaffde7246f287a3686f347d077f8425e9c3c621f0210d1a4d0b22ab66e3177062c5e43 SHA512 d70d58ed1839b2598964151c69200bd18881fc49729b373e92867c3ea2f8c9ae0f0e8ebf72841672e18fa33f1ae833e45b8e46c4e69afe43633ca303d00c1970
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/dev-util/dogtail/dogtail-0.9.11.ebuild b/dev-util/dogtail/dogtail-0.9.11.ebuild
index 29c039e37cd4..9d960b00f282 100644
--- a/dev-util/dogtail/dogtail-0.9.11.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 gnome2-utils xdg
 
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 66afc7eb1265..9e1b9bdf4137 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,3 +1,3 @@
 DIST gi-docgen-2022.1.tar.gz 2515101 BLAKE2B 4eacc1c63fa9456f4a7465b1917c3c46a654546fc9c8a256bb0e83b415d0af8e8b6cdd29cca610dff00568c82f7a0bcba4f18ff7c32820689647f7604dde1be3 SHA512 823f6b5b598b0f52e748622f9993524b840f71d6f2dc157ea3b931564a0ec59c43cd79386936d525118c9a62de380bdff70fd01405d088ea873ab35ddbafb210
-EBUILD gi-docgen-2022.1.ebuild 946 BLAKE2B 3a0d15568d93ec897d33024bd315795079655db3af5d8812f7fa379708a9d4ec4a299042ea877c0ba97ef1373ed2da6c4bd03d01d2e913f3e79c63a3264b40d1 SHA512 362647882e05f31db6f15e6ec9b661b59dfbc5ffa2eeb5f48fae8f5670cf80e97f3cbec946441b401d789ed703c611660bc03ae75c49a27ed27f66d60131a8d6
+EBUILD gi-docgen-2022.1.ebuild 946 BLAKE2B 74af13d1f4dc78db668ad4d99d01811fb1f1a1bc781ef0883ea6c13eb4558d1718d1c84c25fdfef0e41604e3d6f3f6d1aeb66c424476f5dbef260d95593ed999 SHA512 0fdfe58e935e3d8e9cc84ed4d51a07e8f6131cd8126d1456a7a94c336154ecedcbfd49eb3793cf449c1a5e7c70437785af9ae1756ab0bc7dc9cf681a679fa293
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gi-docgen/gi-docgen-2022.1.ebuild b/dev-util/gi-docgen/gi-docgen-2022.1.ebuild
index c214904040f3..83b320d3e34e 100644
--- a/dev-util/gi-docgen/gi-docgen-2022.1.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2022.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A documentation generator for GObject-based libraries"
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index bf28d6087ce8..00585b7ff7a6 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,3 +1,3 @@
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
-EBUILD gtk-builder-convert-2.24.33.ebuild 965 BLAKE2B 6c2fc3bf42099fb0e16abfc40646147f19e031269ed89f667fbb75202d6fa58289b305c03dc836dabde96921ec49f5cc479ad853c8b99e3c39744110396099d4 SHA512 0d781ed47e4ee4d0840952354bccea8fdc28573e14e0d5d447c8650800c84df8a9e0a24fc2b2502e30d35b551cc96e6f931cf2af50095f8fb1844d918f6c06f1
+EBUILD gtk-builder-convert-2.24.33.ebuild 965 BLAKE2B 46e82ef7e4e186dd00330bcca73ba21d71e275bc0df03d46b6924b1e275add3676a210f73584e8ff48e4d82a869a23298d7ed7c6f8058ad2105d1c3afe082e5c SHA512 fc3ac9226e35a70112702095a4430630ce44937ec7484e431e8d379db8d8b869c39bae4cc29dfcfd7652a025944175482a482d5996c6cfc91753ce053d430236
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
index 294e4a580033..5f81e6df2e62 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit gnome.org python-single-r1
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index c1f692c26ea6..42908fdb6838 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab
-EBUILD gtk-doc-1.33.2.ebuild 2616 BLAKE2B f2be67af42f8f5eeb6dec39bc23d66859f3d5d98cfe23a50e07f14c890bb9c5039cf37fc9c2303cc2602c84a5fcaca4704982b796714169977d0dd9922614785 SHA512 9b94b648d9ab19ac65383cc38c65c10fdb6c20c24bebece4dfe2d4557395b0d516728856af731d03fb745510495a0e8ca817e9dcf65c687ebde7b2de828928b6
+EBUILD gtk-doc-1.33.2.ebuild 2616 BLAKE2B 6e977456cab4f18994ab1e94e591c4948e5a176651c49144c527cde8d76f4a59ab19ccbe9fcebe67c1d26b640c30fdc0b3db2b0f58d3fbfc9abbe9cc00dc2c0d SHA512 73a114bae02238505647136a30fd2e41dd13d426ade530ee37a53f8330c1792bd19970e47a10d780a7bc8f5bb6ea97e38b8975d0e8279a6afaac2465779378bd
 MISC metadata.xml 491 BLAKE2B 8e3c12a969ab340838ef5349b1eee409a820c997d4b178ba81397335ebecf4067e10bd3fb7a7647cb76649b28a26a07c9a614107e877290f1666b47ecc206e27 SHA512 6f4ac803fc8d8c1504b67474fe48545c0dae97abd4aebc43607365c1f337018996a295649630d8ca540a08c2b7b37e3f15f3b4cceb2025fcec88ecf905faa09d
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
index a8d355659e85..e307da125aeb 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1
 
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index ed2890290812..d9c99dcf86d8 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,3 +1,3 @@
 DIST itstool-2.0.7.tar.bz2 104648 BLAKE2B e2d27d7b0a772596a0fa02b157bbef65b132b839c908c114596d21a54c245a0c941419a3555a8b9b7255800f9ef65d557a5b0f6847103b0a3934c908d43128ab SHA512 710c188e518a7eccbf9d31df59692fd6acc79430589a93ef4333f33f74440c311c340614ca74cc43191830567a98024d0981325ccd83a8fd9b75410d9dd91992
-EBUILD itstool-2.0.7.ebuild 1009 BLAKE2B dfd4c34a51dd05adba8bcbf65f013e3b6722ae1d73aec47c523725fbe0a6af6c57c02c03bd93651fffb64957c653ac588da098d2152bd3af85d9cc503ed4ce39 SHA512 dedbcd44b05a88dbd9e7f03247581b8584fc359bd72effbfc4ef285fe0fb57fa91dd79f53996e5d017c32b1be813f848f47c39fee435722054592652278066ae
+EBUILD itstool-2.0.7.ebuild 1009 BLAKE2B 2c5bb623e43847b4d0b3bd816a5bccd7ec8391e572b566e0c0124a81186a02a4f754c9d7a8a66690dc370f2c48e58d2003027a505f28d7386f3ccd59f2c94dcf SHA512 aee92ca2ed555696b89ec078a3e15e7d58cc6741996633102cc615f0c252daba3977d88995bc4d5a383dbdee3dfbb411aafb65fb742e6f0d23218d6b9927241a
 MISC metadata.xml 612 BLAKE2B 0d4784d03f20c26f28f64015ee59a119b1059fd75f27352b0e99f07b5c3914ea3541674d4970620b1bbd6278951e524e687807d1275da1999d3a2fa311fb8206 SHA512 dcf3e043d41747edbd72e8081b75617b88d76e6c46fea1e112e5c2a8e7049f74f1b5ece6de4681863994eeb18bade3b793c3944269ddc5d3b6c6ead1a72dc8f9
diff --git a/dev-util/itstool/itstool-2.0.7.ebuild b/dev-util/itstool/itstool-2.0.7.ebuild
index 246c57c2cdde..5cf8840898b1 100644
--- a/dev-util/itstool/itstool-2.0.7.ebuild
+++ b/dev-util/itstool/itstool-2.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-single-r1
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 17cfc8459e8d..51aff0d61058 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,7 +1,9 @@
 AUX strace-5.11-static.patch 5306 BLAKE2B 24150fcdf0ff75c4698542914bcd0fd39df9794f39ce0d16dac6dc3b689365e124d8d77a75a8fe81caff9432679563d84ffd31add74edb4c8f83aec28ff2f078 SHA512 bbeecbfd73109d21732acdaa28d5b4c82b23b7165f09e78e62cad68f9ac63dfb4c7a1c2eb8bdc642dda9f07d62e286ab46a2be236b5f03e1e6f9920f3093ede8
 DIST strace-5.17.tar.xz 2281220 BLAKE2B 27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec SHA512 1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44
 DIST strace-5.19.tar.xz 2353276 BLAKE2B 44b9a87f36e66481d8ac2107efbc389fa64c47b2ae7b1cc728241baa1c7d2d5d4d9410622763eb1247b415cad9afdd9f61552d2545388cadf5a33b568ed09af2 SHA512 1ea1c6e12d05bf145bc3c74f8d06b08dfc3eae3a5a21bfe8ab080053dc4c2da8a95be5956652ea62bb083462015a55f9bc1d1023919dcf2929a05211b7dde963
+DIST strace-6.0.tar.xz 2367144 BLAKE2B ab9cb1f81b01068de5af5125ec2901b57a2f2b24fc01f4f68a284d74eb9fc0f4d583510a353554327845e7c157ea71ca4042ce3c27b3d2b0469d65a13aabfab1 SHA512 2f5aa18949b9f64769eee4e7720e41bf4a61e3b552acad693ff7baed2e662407a7b5e8bfba94ac49bb71639d21cd54084de902fb4337904f48480b25b8e72b54
 EBUILD strace-5.17.ebuild 2448 BLAKE2B 99b2514d006878e750d31ea9711581fb5d1980f3091c7ded5d3ac129054f3793bc22ec00657d95ea4f7ac00bf2f6df76f79ba8bbbfc1ce0dd3fb741fe5d9e104 SHA512 496610adfb263912392935a7fea69f79ac98f0339a91719221b615a4ba1e330b6fe9159663f7e9bdc8e3bb58031a62a5c472bf934630cddc851bed65c5e57633
 EBUILD strace-5.19.ebuild 2447 BLAKE2B 88535b5906a24d4b2ccf26777e4a9fddc382187721598b44a6092e6ca7087601e2895575ba0046bd78c1caeeeface1dc52883b7fb30e266129b40bb5ea19b8df SHA512 c29e74848ff20d686ff02acbec5e08a9ad55d5f1970bc30779fde8e609ba88688fee69d6a63e6607c1da32b53676995f29adea9e81498e3feeaeaa0bb7fe6b16
+EBUILD strace-6.0.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 EBUILD strace-9999.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced
diff --git a/dev-util/strace/strace-6.0.ebuild b/dev-util/strace/strace-6.0.ebuild
new file mode 100644
index 000000000000..49ada010927a
--- /dev/null
+++ b/dev-util/strace/strace-6.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		edo ./bootstrap
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	eautoreconf
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+
+	dodoc CREDITS
+}
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index cb668731ab76..d1d22b9a90e0 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
 DIST xfce4-dev-tools-4.17.0.tar.bz2 341014 BLAKE2B cb9588a200176cae5031b50e51baea1d2c4051b0a68e6886766986f1883f00e3cb13d662ebe1aa0e72892b83eb9dda114f545d1a8883fd7bdef8fd030e60ab4e SHA512 73423bb5cc55ab8816d734ac24c3f005bdb7db370d9a2e5e820cda1e6385730cab1f2fc8af715caa961e571ddb234c2b46b9cd26636142b9ab5d18c3a26efc00
+DIST xfce4-dev-tools-4.17.1.tar.bz2 348817 BLAKE2B 0b5bf16ce9e38666ab8284b6ff7fd4b7da53bb82f548db666d051ebbfddf053709c8e95887435d405d13fb6d2fc2b32c87a4e2286df5ebb9ab7a1549df4e7046 SHA512 0e57547823be6cb7f2153728061db6efb003b7651f3ab204473aa45d5408078b9368a677b2e599a1a93266d93c1d626eea92ba05e4be9427caa0b5bcbd345833
 EBUILD xfce4-dev-tools-4.16.0.ebuild 598 BLAKE2B 13b4bfa02960605265c996d8d2e1976c4e5dd645026ce5fe4c7812f12b5f63891d481b22b0e06cbbbc9290fb1178a85afd3e124d31a033c92827e63e4b3e1d56 SHA512 9a17075362771d9af7d4aafba81d9e5a2f61c8be4c595c46feedb96fe8b5f7bf185d310352bcd24fd6024b66e2f76f921c3d58c20e30041bfaf89089d2e91d0f
 EBUILD xfce4-dev-tools-4.17.0.ebuild 611 BLAKE2B 59e40a3ef02f0c554b512991bee165d8054e656eb1bf6cb34d435ce14e7c820f20f6b4622b35db440315f567309de494643aaf586ebc526e8b88d3bdeb2f9acb SHA512 059c1008c79ae6ff69820da19d3daf4042b6fd29aee7c1056e47e57a2ef9574046232be6d39ce2b2a5ad76197329e90db4c618673fa5af3ac5a871b277057963
+EBUILD xfce4-dev-tools-4.17.1.ebuild 629 BLAKE2B 67dc7710e79735b17caf0f59b60731da8079b3b5e28ab25562d2bc662dc9f6e0183cbe2c330361997ebd256146f5a6fbf7d9220b7251dedf6ed85c68f8292c52 SHA512 deee8675a7e3e9694f9fe303a6de33b925e84fc2e5194f7b4cdef464d03f71ee68afa71764296fefe0cdde68d212c5922cbfcb87b09888e5bcc2cd8a684c8aa1
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.1.ebuild
new file mode 100644
index 000000000000..fa89cb983824
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-dev-tools/start
+	https://gitlab.xfce.org/xfce/xfce4-dev-tools/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+DEPEND="
+	>=dev-libs/glib-2.50
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"