gentoo auto-resync : 20:05:2023 - 10:17:50

18 files changed, 232 insertions, 208 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f7a8b6fe68ac..3b15db992561 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 209ed3f85dc5..c7ee2eee8ddf 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,16 +3,20 @@ AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530c
 AUX ccache-4.1-avoid-run-user.patch 823 BLAKE2B de70e7b3f687f099e8b6eafb069d725350bb32c1ca39e42223113a5cbd79d6be7edb0560d6f199b0d43d20f4c99a5a5d888d96b8ec74d678e9793011e2463613 SHA512 2f3351af3ee755ff44802239cddd16e5990edd067d44228707ba2cb96f44faf26ce220b2e9e9994a45baac11a54bf778ba48c27fdd526e59a889638a84cfd5c7
 AUX ccache-4.6.2-avoid-run-user.patch 1042 BLAKE2B 192a0c0fa957b8c1e9c12984a898953f84b2ff14b38206e92cf33e6f80d5c25cf4800add72a3e1d38ff0d6a6c22d071bc7e46ca324662e478f2ec75df632f1f2 SHA512 2d2269021e5eab22d144e81318e620ef0191a34e2de15ff78e2019ac13fddc277802df1387b4aa673649662244c0c2c8c76003af7247f00287dafa6c460aa18f
 AUX ccache-4.8-avoid-run-user.patch 1270 BLAKE2B 2ecdef4b319a2d3c2fd4740667ae22b6134d977b252d9d022acfab723cc9c2cd7f11ea4f2674d5461fba5e3cf5574de39a3df840451670b68689569b819f2cb3 SHA512 898b0d7041af9765ac2a5f26099256e96c881d39452eb0cc90d859f9f64dab2d31d673d6b538958337a6f7848eb2ebf309064e96c37567e271a42e46c948b0ea
+AUX ccache-4.8.1-test-typo.patch 748 BLAKE2B 62cfb943fd957cba389183b8aa507833625d2d7c5b096b2c5475ad0179aa371ca1e0c1d71703fbd5f199e3ab162c77043700f8c7c72b4b39da14827c7606b127 SHA512 ef666ee37d70f0b9970ea78d72514e8c69e61e69d87f7945a722e93e2f036bf22ef5c25dbf4f909b8ad20e6deda6aaac90d8bc21ac9decb85c260a2ee3f6aa28
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 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.4.tar.xz 547820 BLAKE2B 03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f SHA512 48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
 DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908 SHA512 567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
+DIST ccache-4.8.1.tar.xz 559628 BLAKE2B 01c676447aff5493f319df8360b5478b171a229dc47068bfda814bd30afeb28492a3b112532dbe93cf89d47796f4d682e37b22a1d1c31aaf46023e4f7682d80c SHA512 672971560a8aed7754c4280b8983fb185bc7f7f456651e952db3e32fb855ba430c7dcec1f45466e4d10aa59e80e30696f540d93b5f260a846a49dbf4901de514
+DIST ccache-4.8.1.tar.xz.asc 833 BLAKE2B 948ef7d7965717f42f27ee0858c36b2d6272629f190ddf96f7882463304cc103bd70aebda739686fd6176024356c8998d58642ef1d3b0e7943ef7898496ab689 SHA512 c89af05eec3eee8001098c77b27d67b084af06f406af32aafe71f11a2592df86bfe7ac58283749bb7ab3401046312da129c7262230a1a3f892b81946227dd0ad
 DIST ccache-4.8.tar.xz 556804 BLAKE2B 5cca7d49088c5391abf93a2a493ba8e120575ae834abae86f3669e8c883a93ec29d48ab934aa086a87feb6a08d0c0053b3ce7174cec2f342c2d695a93fa3ef9a SHA512 561424d448a049971742b846429c2fa5f1df43c05f201610dab0a3fab7e4806589c14ca20875cb5733763603c0813fe9350a244b63dda03e9def95d547738d0b
 DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 4a646db5b7a220a21ad93a02ea4bad23a666ad116af70211ea4a9a546ba7aeaf0c1c88c79d264f614a2ca5387dc91bf655a1632f53889dd74f49e085e2f6bd01 SHA512 22b6aeb54248576a1199e173db7b58b985bdc4e6a298e9fbd32992ab6dbadcd4496ffcadc24241215bd43166b68faf77aa3e492e44ffeac53e1e5e4c46015836
 EBUILD ccache-4.6.3.ebuild 2575 BLAKE2B c8b4113239bf1ea5d2b394f68e0f2dc623a602bf082c72cb4e5c38640b83e9909e69324a894a9a79bd88610a36451cee2ea35ddfce7060794b52fb8923b8fa95 SHA512 37fb4a65048e332d928279eccb5bcebeb20ab61379898aa548eb5ced5a858b680cd844f2f679d4ea528af54f21ca663614112dc45b937b8da38b1718fa919f2e
 EBUILD ccache-4.7.4.ebuild 2489 BLAKE2B c96ba952f7f90c54812fcc1ead1bc4adf7b036937b2d80a05c0bebc54cdf3cdaac456e8918b6f4905cb38c19aa98d9c912624d22bfd76c0ae35d32e8c7cea6dd SHA512 90802b6ff902bb7cced6947824d38ea90bf8da66b48dec9cc7f1584193f4fb3f4d50217685306e1504118a55a46c6680f27b6a59368c835058171ef33f772e4b
 EBUILD ccache-4.8-r1.ebuild 3607 BLAKE2B 591692c06da7e031ce7811e057ea8d638252bd9f6577074230dfb31d7da1977a2d9da8ae3f5eb8665bc48d9ca13cb54fd7952185817482bb4139828fc9167690 SHA512 f2d6a6745589b6a7fbc6998a6c9e296da3f01e05a61ead453315166d7cda335cf0028b1db7fee3814e5b62c0e1312ebde1eb587fba395270793b5c1a5473724c
 EBUILD ccache-4.8-r2.ebuild 3653 BLAKE2B e13133a7ddfa243ba9b36125709fb452923ad6119b9c3af2b872826f7f23fd077d850190ec3065337418d1a47e960c4231695897ef3ed3fe0aec57d87871582b SHA512 5d466f0935c26f9ed92ff9d8c2dc5c1710ccbdc753439f1c9f9b1fb0577c06a7477d6670fecae1454ee4b0fdb4ffb6eeccb34f2c21917c926d07c337151f4e81
+EBUILD ccache-4.8.1.ebuild 3783 BLAKE2B 7ce3ca24b5df4b0eff759c1965108749f2356dce5a7232347587a5a4b00312fd22769f54d8dde67333feb57f07998d64574c8d3b8585df986d900c11bb322d56 SHA512 cca6d2c8e75745411bb13cc7d02490df626668bbfe9828402036d4b36ef214b4a1c793e04a21466835df3d96bb68879d191a29f67076bb65cec35cbe3ab9ec6b
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.8.1.ebuild b/dev-util/ccache/ccache-4.8.1.ebuild
new file mode 100644
index 000000000000..37009fdc79b4
--- /dev/null
+++ b/dev-util/ccache/ccache-4.8.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+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 )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )"
+	MY_DOCS_USEFLAG="doc"
+fi
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+# Unkeyworded for now because of failing tests: https://github.com/ccache/ccache/issues/1288
+#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="${MY_DOCS_USEFLAG} 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.8-avoid-run-user.patch
+	"${FILESDIR}"/${P}-test-typo.patch
+)
+
+src_unpack() {
+	# Avoid aborting on the doc tarball
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+	fi
+
+	default
+}
+
+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"
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
+	fi
+}
+
+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/ccache/files/ccache-4.8.1-test-typo.patch b/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
new file mode 100644
index 000000000000..f557d24e6e93
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
@@ -0,0 +1,20 @@
+https://github.com/ccache/ccache/pull/1287
+
+From efad3d7c1d18a260b694904fe695e6abd7dfd4df Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 20 May 2023 05:30:54 +0100
+Subject: [PATCH] test: Fix typo (missing line continuation)
+
+Fixes: ef634bdb292e1e24b8d1b5490e7857144a77c0fd
+--- a/test/suites/base.bash
++++ b/test/suites/base.bash
+@@ -552,7 +552,7 @@ fi
+     # -------------------------------------------------------------------------
+     TEST "Directory is not hashed if using -gz"
+ 
+-    if $COMPILER -c test1.c -gz 2>/dev/null
++    if $COMPILER -c test1.c -gz 2>/dev/null \
+        && $COMPILER -E test1.c -gz >preprocessed.i 2>/dev/null \
+        && [ -s preprocessed.i ] \
+        && ! grep -Fq $PWD preprocessed.i; then
+
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 1c72edbcd47f..63d70e769adf 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -6,5 +6,6 @@ DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec946
 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
 EBUILD colm-0.14.7-r1.ebuild 1548 BLAKE2B cbfd522b33a1444ed0107ce67ed93bdb52d3c08e4759f30a0f29cf0ddb64aaf11e439fc216c0127322e5af2c4d1860019fdb6c38f069c9ffc682815be8deb600 SHA512 5ac04d835b9637569755fe65e4a918820c4d55b08c6eb6a6379aa5eaa1c26cedf8e533cc60090e19b8adc2358a54fec3673d77057b5f65b30be7cdbe99a03cb0
 EBUILD colm-0.14.7-r2.ebuild 1626 BLAKE2B 134b719654a28a368da647ec2b46f8b135e466464d1262054eb1ca258ef373dee5d6272dd078416d6183fa09788f1ee6c847d3402ab28d40c9f0e99362c1dbf8 SHA512 fcc30237fb0d7c175509a83ba931613c2e7ac1166ef4f66cdd37140fb060971fdd60bfe6e077ebf03d33e157712afc26f28d3f40106dfde4472454ccc26810b7
+EBUILD colm-0.14.7-r3.ebuild 1757 BLAKE2B 6ad8d70c6e56c21911bd979af3604bbbf1890b7fcbd5ef0c49d2199ac6e9a2a9656187d554da0390858cdf11afaa830089f42674bfac44864d8782f3ffdc0669 SHA512 58584b6129435ff342100cb9e72e81e2a8b57c9141ad3f98d6ec2ff7e7df6b143e9c602fe4211f1b2c513c1c2269795a328dd13cd3c2f5cf37c864addbca1d4b
 EBUILD colm-0.14.7.ebuild 1382 BLAKE2B a040745057dc087cca435929c57c7cb09ba76156fddce29a3e8e50bda6e100c550bab847a66a24947bb089566992596d83b69c9f0260287894355a11e9f37284 SHA512 026aa8dcbf7c827840179d3d336bf6ed006732a2b69688df307183ccc6d622eacdf4581510b8499c7cce9904b1028dc6e664af6b71f027dca9dba2f592d1e627
 MISC metadata.xml 253 BLAKE2B a2ab0ef0490c566ca6997a4cf9cb3b5e92449a989cfb7c71a653e6f06c8eeb1945cb81155e315051f91369dcb5ed689eb9f31b4cee0afc479ae4c61d95335833 SHA512 ed9c676e9a7622619fc74ff3cdc943e7ea4203f230043200fe3aa1836b776952ffd2c34160c93ed5156b500ffc538ac0582a201322b5577f29df625224a69ed7
diff --git a/dev-util/colm/colm-0.14.7-r3.ebuild b/dev-util/colm/colm-0.14.7-r3.ebuild
new file mode 100644
index 000000000000..19e1284d28ca
--- /dev/null
+++ b/dev-util/colm/colm-0.14.7-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="https://www.colm.net/open-source/colm/"
+SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		|| ( app-text/asciidoc dev-ruby/asciidoctor )
+		dev-python/pygments
+	)
+"
+# libfsm moved from ragel -> colm, bug #766108
+RDEPEND="!<dev-util/ragel-7.0.3"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
+	"${FILESDIR}"/${PN}-0.14.7-disable-static-lib.patch
+	"${FILESDIR}"/${PN}-0.14.7-solaris.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #733426
+	sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], [asciidoc asciidoctor]/' configure.ac || die
+
+	# Respect CC/CXX (bug #766069), we also omit CFLAGS here because
+	# it seems to crash with some combinations and the software is fragile
+	# (bug #883993).
+	sed -i -e "s|gcc|$(tc-getCC)|" src/main.cc || die
+	sed -i -e "s|gcc|$(tc-getCC)|" test/colm.d/gentests.sh || die
+	sed -i -e "s|g++|$(tc-getCXX)|" test/colm.d/gentests.sh || die
+
+	# fix linkage on Darwin from colm itself during build
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/libcolm\.so/libcolm.dylib/' src/main.cc || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable doc manual)
+}
+
+src_test() {
+	# Build tests
+	default
+
+	# Run them
+	cd test || die
+	./runtests || die
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/ebuildtester/Manifest b/dev-util/ebuildtester/Manifest
index 79e9f3ea9303..b5f4cc6b757b 100644
--- a/dev-util/ebuildtester/Manifest
+++ b/dev-util/ebuildtester/Manifest
@@ -1,11 +1,3 @@
-AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded9e3adc795a06e8a753dd27784b9171589119cc8c4e26dd0b03def5c0fb6668f9ef960f7f93da34e33c996373b923f SHA512 21c413a8aa7ddaae5e11c4f279f9c6ffd700e8fc3f64c1df6cd07087d5cd0e6097e193a01bc266ec669dbb3d516e1e6361c3e1461e8ee07ecd7cd4fae05482f5
-DIST ebuildtester-0.1.35.tar.gz 19842 BLAKE2B 3d562718680914a47bb078f38f4351e5b4575ef6d11fa39247d7f06b81868cca0a30ec29ba0e7b14330ef45a117330ad2351f5eea2b75f23cbaba9e37d0441d4 SHA512 c268c621c3b22aefb6945da7169a4049c7bd3f9cc198d43eb733bc144bf1ac46e251235af669d2af5231f5517ef997ffcd28f4bcbb1c945237f6dd2dca502c46
-DIST ebuildtester-0.1.37.tar.gz 20919 BLAKE2B a97ea0de557601aae3faee8c959453179d402450f722872a7de6f544abdc2facaa71558d8b2088fbadf37b829a2991ca717ff5e1790c1e7c48ccfcd619e1737e SHA512 dfa157bb5745854cfd2a7580e5c8650712b796e01831137b90dbea7097f926e7b1eb6718bef8ab70a8e703a65049274cfe52eda9c3635df6b5697ff3403f5ee0
-DIST ebuildtester-41.tar.gz 22320 BLAKE2B dcaa1e35e4ee9dd43e6d9c1d6332d56c711117e98eb59e9bc0e852b6676a5e05bca69d7949f8a2edbd2cef7f6b100cefc866bd8394281ce9aa25b9287c235c8c SHA512 abee45178782f6ec648ebf7f3c2885065866a8f518e396bb1b0fd0b2815141b175c172114fb319ccdfa83f3043ecd44e83871a1a9d9dbea72f6091b3732717c5
 DIST ebuildtester-42.tar.gz 22852 BLAKE2B 0e672c70ed854b3ee459010590da22811ed06e0397d45e51b8ad1a86047aa3fbd61321a7a9bdf1b583c3a66246030bb30dbef4dc8acc1e10bc3b141095e08ff4 SHA512 c2fe0dbca673c51d686cc19954928efb3ab1e82c4d8b8548d272f8fc60a5fffd1898fe33dc26feebc5bc73a71207f5f1615e18036b264e76a09b9dc6d94168fa
-EBUILD ebuildtester-0.1.35.ebuild 780 BLAKE2B 8fee075ebc0ec9d5ee04417ed143cf529a722d27a5f50dbfffadcea79ac9088b0d7b21774083c17d44f97fd79365fea3127b91ea2f89db88463f60a2e94c7ced SHA512 98c4322b74daacf2abda9c7dc7cc903e0a1b61a1e54884e1393ea08e9960f7239638784b1de33c8d4b9ba792e5c2f5b2b6fed77462bce1d0d56c8442686f30af
-EBUILD ebuildtester-0.1.37.ebuild 768 BLAKE2B 14af09e5f8c43b835d626e50c6397ba1d1db21bb8ccf1bc34a2025c3e118cc73fb568ad3de338f7b9de530aacb43332c54957254f8bed7c58f87ae7b7a540ad7 SHA512 183c348b1cc29baeda1d8f308cb9577ba4ca7bbe8c9c657e1ca3e1d4c30592080e6d7c122a93de50d3425fae4eca37a27cfb88b0593a60d755b0a8f60b7ea623
-EBUILD ebuildtester-41.ebuild 854 BLAKE2B 77a5e52904a47bd3290326277e85866004e43bc5734f53588fa20da8eb7c47f1a3e48395446eef81b6eb58e1833d2580a4f0f407090590f8b6832e38d902f10b SHA512 8092db66093654f06789816be9bf9f527a6e576374b7a30537cd1658d503bfa9022faf34dc39c22f0dbd8309adb18a15898634a90f17529991848aa2ace4bd71
 EBUILD ebuildtester-42-r1.ebuild 757 BLAKE2B b53e8232d08eae3f3b780162bb080ecce913c8792bbc5e9cce9160152dd1555b13401bb3b9e9b10bb419437ae9e4f5c3b96f9e15c5d85ec1ee729275865cf9a7 SHA512 6a3771d805880924be1d28677d6ec0e5a0666270f58b3b454d17db0f966e60fc6ef785cabe64bac7dfe263b0ab3d4b67a07025753ac1752dec375551e1af831c
-EBUILD ebuildtester-42.ebuild 854 BLAKE2B 77a5e52904a47bd3290326277e85866004e43bc5734f53588fa20da8eb7c47f1a3e48395446eef81b6eb58e1833d2580a4f0f407090590f8b6832e38d902f10b SHA512 8092db66093654f06789816be9bf9f527a6e576374b7a30537cd1658d503bfa9022faf34dc39c22f0dbd8309adb18a15898634a90f17529991848aa2ace4bd71
 MISC metadata.xml 362 BLAKE2B e177f43c79bd6b0ad08513f5355721ad318d686bc3f3ff595c952605662899cf1fb2fcd8fdf356c1950ddff64ab5d51cf3257034e831f431eb260f55e11a3f06 SHA512 09d7e95819a4d9214f43a2b0d7956b0de93b07baa919ec9eeb66ca439c7553c806250f211addc7a34092794d42ea6a9ac62ecb33baa5a91afe03f824d73ea483
diff --git a/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild b/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild
deleted file mode 100644
index 46d59b26d96b..000000000000
--- a/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
-HOMEPAGE="https://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-containers/docker
-	sys-fs/fuse
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild b/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild
deleted file mode 100644
index 2e8f74e55d09..000000000000
--- a/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
-HOMEPAGE="https://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-containers/docker
-	sys-fs/fuse
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-util/ebuildtester/ebuildtester-41.ebuild b/dev-util/ebuildtester/ebuildtester-41.ebuild
deleted file mode 100644
index 3ed8193c7564..000000000000
--- a/dev-util/ebuildtester/ebuildtester-41.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
-HOMEPAGE="https://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-# SRC_URI="https://github.com/nicolasbock/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-containers/docker
-	sys-fs/fuse
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-util/ebuildtester/ebuildtester-42.ebuild b/dev-util/ebuildtester/ebuildtester-42.ebuild
deleted file mode 100644
index 3ed8193c7564..000000000000
--- a/dev-util/ebuildtester/ebuildtester-42.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
-HOMEPAGE="https://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-# SRC_URI="https://github.com/nicolasbock/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-containers/docker
-	sys-fs/fuse
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-util/ebuildtester/files/ebuildtester.bash-completion b/dev-util/ebuildtester/files/ebuildtester.bash-completion
deleted file mode 100644
index ca0266720622..000000000000
--- a/dev-util/ebuildtester/files/ebuildtester.bash-completion
+++ /dev/null
@@ -1,20 +0,0 @@
-_ebuildtester() {
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    opts="--help --portage-dir --overlay-dir --update --atom --threads"
-
-    if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    case "${prev}" in
-        --portage-dir|--overlay-dir)
-            COMPREPLY=( $(compgen -o dirnames -A directory ${cur}) )
-            ;;
-    esac
-
-}
-complete -F _ebuildtester ebuildtester
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index ac02befef323..8db0f6f0cc4d 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,6 +2,6 @@ AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031
 DIST pkgcheck-0.10.23.tar.gz 568903 BLAKE2B 8b00dc93d0c3f597f7397d2e7b3686d11b12da715d6e8071f1b02a8085061cbb2d7cb24bde6a73ef6e5d1459637cb78e536ce80a162f188a42739a434c62c397 SHA512 3bcdb91bf73cde60fd9fc2f5e470c5ccdfd7b3564e83192201b0fa1dc38265e1e0c7f7052039accbb62c55d816a6e89317d7d388c0cc3da3b4836475cb82bd03
 DIST pkgcheck-0.10.24.tar.gz 572336 BLAKE2B 851d6e8d8a5402c539cb690e6e915d3875658f0f4c9e60e8f506d6a663d0732993f2af7a46b3dcf7c2fba11a3d7b521753aa537a893796b8cda216c9e9d370af SHA512 bb0eb962d9d6cafc5b4ca1280307aae8e154d813151841373334971b7613099ebeeb2b9eb3ca9755da43d76a6448b6a8f6570201810b182cf868a172992b40a5
 EBUILD pkgcheck-0.10.23.ebuild 2161 BLAKE2B 205f7a20d466ec9d3300d373e9aefea4420489b251b077543375fcf40636820fe2d258f8c10421434f167f4654e1da69d4b21c36b493236c241ff10929c2462e SHA512 3ac329f184a5708c80e3d1096c964054126f5d1f367598d881c526861160f0dab970ef9c2ee49db43fbbfd1f0af13a9c1edcca5d72a5ca7ff566ced3e82825ea
-EBUILD pkgcheck-0.10.24.ebuild 2169 BLAKE2B e94f98e25963292d6581d4e167816da3b62ecc26c93bb7810365b3c1d6978ed803a4c8176065035202c2184e8b54abfdf0b443e18d0e7d619a3762086a0a96f8 SHA512 57aeb9a89927976fd235f0ff5f6fc625dba260ef81a937f85a9e72380e30f091287ad32d4781b9971222640f17855b99f4fb17018e59f74ea1dac2f877997023
+EBUILD pkgcheck-0.10.24.ebuild 2161 BLAKE2B 205f7a20d466ec9d3300d373e9aefea4420489b251b077543375fcf40636820fe2d258f8c10421434f167f4654e1da69d4b21c36b493236c241ff10929c2462e SHA512 3ac329f184a5708c80e3d1096c964054126f5d1f367598d881c526861160f0dab970ef9c2ee49db43fbbfd1f0af13a9c1edcca5d72a5ca7ff566ced3e82825ea
 EBUILD pkgcheck-9999.ebuild 2169 BLAKE2B e94f98e25963292d6581d4e167816da3b62ecc26c93bb7810365b3c1d6978ed803a4c8176065035202c2184e8b54abfdf0b443e18d0e7d619a3762086a0a96f8 SHA512 57aeb9a89927976fd235f0ff5f6fc625dba260ef81a937f85a9e72380e30f091287ad32d4781b9971222640f17855b99f4fb17018e59f74ea1dac2f877997023
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.24.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.24.ebuild
index 95b29b01a08f..60b9b8d6e828 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.24.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.24.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	inherit pypi
 fi
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index b34b4c7c6f7e..b1c0d64ca5d7 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -10,5 +10,5 @@ DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 1f7306d288eb5ecfb2b2f0b2dc68960ecd
 DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2 SHA512 114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba
 EBUILD valgrind-3.20.0-r2.ebuild 4300 BLAKE2B a7c9b1f23d8e84375846633c1f91e48cf12ac40b9238b2f0d0edd3500c28706837ec1733f7c81e81c2469ae444e8153ea64670c1612e696205629171d3578019 SHA512 7ad54251e9ae5ac05dbb7bc5d59113d7c74cd3a98e1085e6c907672fde857ce2f5acd4ce02aa616db3e4aada01ad3e0923d5695b7e14623e3537dc316b27f823
 EBUILD valgrind-3.21.0-r1.ebuild 4091 BLAKE2B 0f0f215935aff6fc3a6e2ee77670f15348ad0de8733d929a47ea7a58ae06a0ffede43df2e9f333af5b91782623bf629de9073da04b83e1a627f82edc383948f7 SHA512 fbdeda95b2ac0b4bf4d3371249198877802a8e91d742f0e86b285c71a5a9c5d64d2b7c7572378cb479a57ce256c4507db22d99d488e64427d3b16ee097db9e5e
-EBUILD valgrind-9999.ebuild 4091 BLAKE2B 0f0f215935aff6fc3a6e2ee77670f15348ad0de8733d929a47ea7a58ae06a0ffede43df2e9f333af5b91782623bf629de9073da04b83e1a627f82edc383948f7 SHA512 fbdeda95b2ac0b4bf4d3371249198877802a8e91d742f0e86b285c71a5a9c5d64d2b7c7572378cb479a57ce256c4507db22d99d488e64427d3b16ee097db9e5e
+EBUILD valgrind-9999.ebuild 4154 BLAKE2B a97cfa84b586051f943d3793ae227aa077e197da9c645bacabdb79daf061af5fee000e63d5c7766cc79c10458db240e26160384c07ca6883fee80d84a89c8ed0 SHA512 6ef312def3f5cebe6c60950fd7bd56699c1c9ad29c9deed138f90b2774dde7fc329c83c6fed66607d60fa1fe01a4534aca54864e7b0eaeb1cd0585904cd9498e
 MISC metadata.xml 1037 BLAKE2B b39708a006ad3ff24b100c702382ec8c45f6e300f3497ccd06199a6195abfa936c8f71ebd3223e0f7299e6644e378ef1d8d2c95a23059b66757d8a91bcbfce15 SHA512 4398f60fdacedbd92881dea016e60c5def5abe8989b56fc450b71b5c65b0d9c26a44b8ee89d0dcb71ab376d987c8e22d12031e9fb2a17b126e3223adb12e0f2f
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 7b6c9f5f76e8..a32a0da1588d 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -57,7 +57,9 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-gdbscripts-dir="${EPREFIX}"/usr/share/gdb/auto-load
+	)
 
 	# Respect ar, bug #468114
 	tc-export AR
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index bae5577a1dfb..b5b9cbaa2984 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,4 +1,3 @@
 DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
 EBUILD ydiff-1.2-r1.ebuild 599 BLAKE2B 8e7f6558fdd0db8fb96d2f2caff5d41b142dfd107110cb046e546d8a02d55e5e87c8e371b45f47ba7b0e4f46d2a72b556ea0317bfc12f97b6292b6b7843c4b16 SHA512 07f49ded5e0f84ad69e92ada1e7a86a1585c090dc78fdeb7b47c07abd74b77e80e5fb05b1e83136ec656214039e853fea8932a8383b09cd6860d3ee6c26e17e5
-EBUILD ydiff-1.2.ebuild 642 BLAKE2B 461635fc87413caff56750c87bfb828d036249013690ed8d584cc5c4555055196d5c7044c856894792f573e524bd35b64190f5543063f0d37d3e720ba56ab34c SHA512 eea9f0471582ed3020195d4079ce9c090f61a6a5b13ffb62f094453a058b131a924a152deba4b941995a21cbdaf7a75f15ae1205f1751583a4d26707ea87354f
 MISC metadata.xml 394 BLAKE2B 7333c46ff0d147ca8dc7eafd8e5f3eae67c7217467d45431585898948671df5e836995e89414fb95a9645f69c4f1d2020168a87b952115ce3b6225d89b46aa01 SHA512 781694fc99405f67446875b9fb40a306cd5223f1f27d1fff5f0bd2fe35aee1d6a518486999d06732e89fdc5759afdf0235615170718fea80ba0d69fc95f97fe7
diff --git a/dev-util/ydiff/ydiff-1.2.ebuild b/dev-util/ydiff/ydiff-1.2.ebuild
deleted file mode 100644
index 1c27c642fb66..000000000000
--- a/dev-util/ydiff/ydiff-1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer (ex. cdiff)"
-HOMEPAGE="https://github.com/ymattw/ydiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-apps/less"
-
-DOCS=( CHANGES.rst README.rst )
-
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} tests/test_ydiff.py || die "Unit tests failed."
-
-	./tests/regression.sh || die "Regression tests failed."
-}