gentoo auto-resync : 09:07:2022 - 19:15:57

63 files changed, 794 insertions, 232 deletions

diff --git a/Manifest b/Manifest
index f1b468f13327..180ef0387ec1 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29573 BLAKE2B f4330e3fad73e2037318f31f7d47e2f47115416e8f38d987187d7a37c983e878b6b02d2da6b73ea84c3c834617a4703375eda6d151f47411254a3708bea3eff1 SHA512 d9238c0230918bfb80d05b8a581dbe398fc67d61a6d39e719e7f938173d725759c2b77f415a4b116b98be59722be0f2de21b0ae4df52c53260184c9c67486276
-TIMESTAMP 2022-07-09T15:39:43Z
+MANIFEST Manifest.files.gz 29578 BLAKE2B 4f528442fb485bd01a694ca9533e22bf279cd3f914f9a6111ad03f37eced3963981c1c67e14070741f4f47df2ecb35b5aa66d2744151ebe8d0aad65295d7f9c0 SHA512 b57c0f04387bc34cd610d850f961e7fe51a0bc12f52c0190f64c0c92fd9a4e55c1adf3bef9a07931f1c3d6a67c29005ab9aa469d708a088639667be01395b02e
+TIMESTAMP 2022-07-09T16:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLJoT9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLJr1JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBrKRAAp8TZuqgjFRX1ueDvnoXYBjvw0SmjF/2rwfTlUgJiufnpGLPycPC9/5zD
-/NzgQCmK5EKarRRu2VVxzqFZmLhOFDPIVWFcCE2eLBOlEIW3zvENikxefitdiW1S
-9jzoycZtzfcV36Gb4tEwmWY28OsPZ5NcrOBCJcrusdcO1K+REsSZwUsV+yzD8xeF
-h4TRWLIREclrzEgTLIl2u3DUPxEUv3iCTR4zThM4He1aajAv9baQbhsnKWw7VDdx
-W2OB3DzPCvYU+0JETY3CtbWpOvyBgSaqYtP+HBJZyF6Iw3mEPpZ8hzbH5cIqs1YB
-+3B1X6HZq/log42YyUdng28T9isN7v6iy+nJSBocQpZFoYKImLCHgp0QGpJa2Gg7
-Nkxv8olAFh7ynohz18TAGOWRB5t7/c6yDG0iKdCEYpmvx+BQP214Fo2+/OfjD/Ra
-O2GQvnswuxGPXgS4JqqwPj85Jlo/+Me0zHP5sC9a06+EucBxNV17FKwfIwm3LFyN
-K+Tc8M9yWYlu+YYz1bE01kGjyHEoAE1UZnWK7wqxHqsiaPIBFPHWUQViVNfVBo6+
-UKyhRnnL/T9Wnn6bIjOEMjfQuP/vZ7ANv+QYxcA8LPck41tO6hCBZbuW3O6UJR7Q
-WzoMm+waue/xwEmHev6aO13bW99Z+VR6OEd7PEeM6xNdgxs4rcI=
-=rdW+
+klAWnQ//f2dtx3d+ty5XzKQbmslBCkWK5PgXApeE2JrIIR320Ae4xYlFx4ObsxEs
+yIjKb9NxUICDS5eIKU0j1aybqQJOo1qgNBkE5DAIrA0ISZLRCu/rRWfwB1ns7uI2
+/jKG44DrA9NubWkO5K+dy5sQJIAjwfqjVHBlXuNCxYF2HMPhEu+tRHIndXnW6Uft
+Jx+4xClEminChdiz6AY75Pe2icRrMZQm2HTbKTSVhLVg9lfI+BgryCF2QlpKkzN0
+6Mv2OQLJrxVA0ZL3PLYtE2kz2Vqn7BWRDBVfybkerKAMwh8FsS/qyMue71SMghQb
+JMQ035J87xgqZq/A0+Zcc0GYwmCjRI+Fu9wpSptWDsNEE8xkfJMUCE1OQ1KgIWlB
+Vjq1eK9Uk4uCfsJ2nPuP1LFPUMf7hzOXHxeDtMCh1Gul7cin7ELTw9So6jdT8Tz6
+H1UZlDxEGfUl0nfmAhwFoVqYUHzU2UcDkazBqyn1JBEQaunUutpqyGEr8ha0iBr7
+6xGUn7uS8nsDlI4TirRLSFoByxQAwWcZmAReCpPnKiKr64LRi77vo8XACZ3ZLWDt
+a92R96XdRuq90H8rzStYmpvQMrOvMBiUUrRsQaE1bHONLQuxQUeRVjDKD1veCM8y
+1VWONVDWWv2nQCOHgzmHrdyCCIFnKVhWmwzHzjdZBoPiZGZm/e8=
+=oJaD
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 37fb729324d2..5d273dcc7d47 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0f269711f255..554dd568d933 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index f3ea2a06d67c..019ff5759166 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,7 +1,9 @@
 DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
 DIST xapian-omega-1.4.18.tar.xz 549892 BLAKE2B 440f7ac93acca5803c80d905a90db854f36a5fb1e486d5178c25db0490bc01812f2173feb8abb97a2e399449950524db7b557b303c671d1e9a50f062f332008a SHA512 35da36bdaa6997353554604db5ced3f3a05d0862ce5cf357fae639ca88a65ea83bf0be039629e6aedd67f8cb369a7eaeba7f279980c9e2f585083c737c61ea43
 DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
+DIST xapian-omega-1.4.20.tar.xz 563324 BLAKE2B 3836cc1f219f228edbd910dd92eb5bf7f91c6e0e5a1be2fad271dc9246ef0e5dd68d99d48f15c8ac9c449112d492e3becd501413a8c190d0b611d2506f8d82cb SHA512 026ca234d072da39a29d47b5b53033ec7677d51f93a6fedffb2a57ff5b788cc08d94d1dc43ff8c0062639470b8fe3150781008e4b50abd3ec5526b2b98a3a676
 EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
 EBUILD xapian-omega-1.4.18.ebuild 1163 BLAKE2B dae372708867c009c83bc637ad3e1bcab78ebd8337890eae447236367109096f1bdb96e70ac9ed80b0b09adb37358d763d2db08f5aff37576b810f23f7429a52 SHA512 dfa45c4f78539ea8f1e485f3c0381645f44c95cf9ff10df293d8b1244b0a3b64b865c98fb5323db6594389e1550ec3338b711de9eb67198f854a57d7bac0ed0f
 EBUILD xapian-omega-1.4.19.ebuild 1186 BLAKE2B c88384367fe78df1e95d61d37d5d234234b7b02fbf78cde7e18ab094c6107e8ebc91279edd54f3edf5239c8c39239006cb6cd3d61e7218db0e8b29c5a1819478 SHA512 e0b12ab4d578ddb627cc3cb874da6b81d43a27142aa33ba2460482b630f2317e456464c87c44cd1ec6ae52b31fa98ab80cf63fabaccf23f8664316d338de0b88
+EBUILD xapian-omega-1.4.20.ebuild 1189 BLAKE2B 903109b97d7bdf608a4919f51e4ebe983dd91ee1f147a340dd522206f4e10ce0b232888a8b2b166f08ce38e94297e480015e19cc5e2e939d98f5cc8ae5146673 SHA512 eea182953545f5d24fdb6d09f2c8084c6ebc3eb9fa1f57e55ccfade81efd15a2df5850eac475531cc7f99673ab683e3cfba9b418f19055faeb38933ea76f7156
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/app-text/xapian-omega/xapian-omega-1.4.20.ebuild b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
new file mode 100644
index 000000000000..91ff25791e25
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="~dev-libs/xapian-${PV}:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 095defa249c9..4ffc51564f98 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index d97171ae8299..51412b567cb3 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,7 @@
 DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
 DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
+DIST xapian-bindings-1.4.20.tar.xz 1143304 BLAKE2B 3ab6a9be536d10b0dd369c1c638acbdd7fdf855f6dc8726db9c3791a8369cd83196214771b923aa538e5dda320d2b417f5f0944181b5691cfe5d8e7ddc97dd96 SHA512 bdc876b8e1b946d27673122de6d298112c82fa41e19090a2bcbe0954905ddf66171d36e6753a1e8d46578b128edd729e2fd252311d60ff40a2aec9a4d57796ed
 EBUILD xapian-bindings-1.4.18-r1.ebuild 7061 BLAKE2B 8ab8e0fa2a6ab5bd3bf0298e2afd9dad783abb9660ac104a16046922838b23592c6b7099a47d113039d60be14ab549aace5da5ff602284e48242c4a027429a3d SHA512 57ff3aaa344665e81859569e5d9db86d5efe5c901ddc4c2f5f2970fea0ebe60f62252db1428b74c613da3acfa3f193f45ed66f655b29a562e82c37960fac32d7
 EBUILD xapian-bindings-1.4.19.ebuild 7129 BLAKE2B e9aedc0bc645d330a06dceebd31b589847cd2620cf8f6d7fe26842c55a569aa71537d284f83868e365b1c57da8778f389a6f216ebd31c1a7b1f7a44420bc2f7f SHA512 028b24619d045755f386c4ff1b80fed6a108a0375c7bfcfd5b8eaeeaac4ccea1dfd449207a582b4817f7f4382be7908117dc9192691449560a96df093643e806
+EBUILD xapian-bindings-1.4.20.ebuild 7125 BLAKE2B d11fbd87002b5e57c1d3c7ce035e0d517b4cf3750bf4a5cd23c6b97203be3754744c8780d1c90848892ce55da1f1904bb70a1bd22dfaba69531fa320bcac1365 SHA512 bcda12bd88f3a6f16e9e6032a9cd143d79e4402a66f3daea677521d5b3b0502ad59a49ae9778085055498e84c1e9c3bef51e1065ed9a8ae8d2c4c86a3798ff05
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild
new file mode 100644
index 000000000000..b7ecddfc2361
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php7-4 php8-0"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby26 ruby27 ruby30"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.20
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like lua, php, python and ruby are
+	return $(use mono || use java || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	# https://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use lua; then
+		lua_copy_sources
+	fi
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# Needed to get e.g. test failure details
+	MAKEOPTS+=" VERBOSE=1"
+
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-lua
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	lua_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-csharp
+			--without-java
+			--without-perl
+			--without-tcl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+			--with-lua
+		)
+
+		local -x LUA_INC="$(lua_get_include_dir)"
+		local -x LUA_LIB="$(lua_get_cmod_dir)"
+
+		econf "${myconf[@]}"
+
+	}
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir lua_configure
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+			--with-python3
+		)
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${ED}/var" || die "could not remove java cruft!"
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 27bf7002e444..2e9de99405f4 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -3,8 +3,10 @@ DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
 DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68034fe5d3ab94835709f969df643fd36da49a58a2d3b4177a42faf5af2e71df771277848169ae62f94fe0bb0378ba6aa SHA512 d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346
+DIST xapian-core-1.4.20.tar.xz 3003788 BLAKE2B c4bfa4af9112a206b14c8c2f4a76eb4c1267a752130287b6623233d3a09783b903a3275b2ec275f38f1d195119c730565a31ed303b8e2dedefc42cae10387600 SHA512 e2f62eebc946cc5d0641db85d2966e6ad9e84c6a23606e705f0461ab80b012933b46ed5b7e0691fe2070ca1c0755e99895c18bc055eaad0a9376def410aa7f35
 EBUILD xapian-1.2.25-r1.ebuild 2035 BLAKE2B 0bd199c71ce17e0c01eb702679a3e356d35fe8150c3aec92cbddc1127487638443aacc19d6cd0b1cd84725a044e61ceff288f331efeb2ea581e48d12e38a336a SHA512 2155f4652a2f6581aef65bf635aedcce76b7d3746cdcb270c97a34d3e5c6c386900d168fd2880b31fe50f1be2751df3e8b5f25ee74de3c1fea1e259deee190b8
 EBUILD xapian-1.4.17-r1.ebuild 1941 BLAKE2B 2cd45961ad77e56c60f906e7e49afc5287452a2b5f0e8abc51e5c0740ade9eb5ac5978e9ca9394af7b418e8a03eff83d482278bc64780957cbc8879198c49c7f SHA512 cc0aec3d3d555d28cba486f92d5bf8bf00fcd7b52c890ed6d3af11c8e9f8e0ec403dab41364a22f841953a554c40b58f0825808a04a48f1e34cdf9833f223141
 EBUILD xapian-1.4.18-r1.ebuild 1878 BLAKE2B 9f2ace2f966a2f129094b0f9efedf5e998eeb14bf0afad044988d951ef79eeebf56888a2ea108021449705c33eb1b466307fe0c73302b3397b2e5024386913be SHA512 74d0b7b8ed3dbf8c82de3f39e13d1e4720fe346efe5c0e6218805a9fcca59708b19f083056e089b1b33124bfc9f0fc9b0399a2b7aa2e10951f1f3fdefe1806bd
 EBUILD xapian-1.4.19.ebuild 1888 BLAKE2B e04ab49292c2d5c9182a0088ea355ce54b85207cddb02fad9beea9dbaf2acc864a36d8664fb4a8f7c6773e11bf6e89f769c941bd3651742477963985af530800 SHA512 ff5a7091c49622a037f1565cf829c6e3b74228222bfa2634c6beaacae18a41ef7f42465c4e63cfded04e24c25da0265389462c37f742f130e249a4002199be0b
+EBUILD xapian-1.4.20.ebuild 1892 BLAKE2B d0c9720409ff3d3d7d03e6c284834ce94497dec98669b7fe4b93e184199c1c738b5042339de63221661e73f85eb40560a2278883a8f05627e464ec2c9f557698 SHA512 559b923784ff7d5e5c5ee1b66c4b2d5d362d89e54a4aeba42036b26445ea73d4b5daefdf63913665e84fffc2ca82ed955bda593ada74805a886a75a883d741ee
 MISC metadata.xml 935 BLAKE2B beadb37293a033eafd108c3c81738866565c127813d860c6014fb75a97edb89117c29bc513a623c47be7270936e0e9e5f28f8a8f7ad3fad6630c896337cd627e SHA512 bd4020e6f4505cb25848c5cddefd2ce9d7a2e6f625ef622b220b510d65e083eda255f00154da26174b998a91082118cba8c25f1ee92df46d2442d1ace3b0b1d5
diff --git a/dev-libs/xapian/xapian-1.4.20.ebuild b/dev-libs/xapian/xapian-1.4.20.ebuild
new file mode 100644
index 000000000000..d50c34543512
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.20.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib-minimal
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
+
+DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myconf=""
+
+	if use cpu_flags_x86_sse2; then
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			myconf="${myconf} --enable-sse=sse"
+		else
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+	use remote || myconf="${myconf} --disable-backend-remote"
+
+	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
+
+	ECONF_SOURCE=${S} econf ${myconf}
+}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/xapian/postingsource.h
+	/usr/include/xapian/attributes.h
+	/usr/include/xapian/valuesetmatchdecider.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/types.h
+	/usr/include/xapian/positioniterator.h
+	/usr/include/xapian/registry.h
+)
+
+multilib_src_test() {
+	emake check VALGRIND=
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
+	fi
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a954768ef8be..62e9aa57f5af 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index b7307c378313..b28e0747a7c4 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,5 +1,6 @@
 DIST ansi2html-1.7.0.tar.gz 42189 BLAKE2B 91c7409b4f8b7503e719489b18e9d7267d80c5259b7481f127cb8d1e6429649249b0832746285efc3e8a4f90ca8f21b872b002634d47a4a54ddfdcc74df0f576 SHA512 bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977
 DIST ansi2html-1.8.0.tar.gz 44146 BLAKE2B 66672927a64ad38dce0b0819fabc3778f6aba82d176e992630a8db076988a21af8dd445306b8bb580f1539b35044b95de749d6bfb65c27f9b431e4cb6bd562c7 SHA512 cbdda41f206ced5b19761a1ff9747acc6cadca3a5a2f58c97c6073db7d517e59fea7601bba28a8e7e105f3c0c9c4d78ca4f242100cbded6c8a9ca2d598de0ab4
 EBUILD ansi2html-1.7.0.ebuild 1225 BLAKE2B 22da4cbc4407e2f8921fbc4ccf1f28c3e33e441dd129acad36000417b0f1088bb608a73c9a20123e833ba24acf21919b7f7605d682ff78e31359efdc1233bbbf SHA512 b428dc5cd02c81b8002f951becc68192320ad9c8adca1d77e8f0d9af5ec3899f9741b0d600ca3f793fde48a407a904c6b259cff4bf21d70823658b855001773e
+EBUILD ansi2html-1.8.0-r1.ebuild 745 BLAKE2B cbdc9158d87f858d8bd471afcce71351575f0a27fbce6b6ba95c1749f38da7ac356f3a929ba9850b7ab890966daceab92288a0dc8e3f726e583d9af50e1aac75 SHA512 8b1b1db98380efac7944a87af2e89438d64ed620f1447cb0bcb5162de3f68755522d387ca4a762c28dd57339b63f2ca8c25ccebd05c43ff4563aa18a28e98b3b
 EBUILD ansi2html-1.8.0.ebuild 956 BLAKE2B 6ef8144a9e0f8854e78553e67ebad97ac12ca9569ad6215bd1372704cff15c69c86b712f97eff7096815f16bd73db9b351b95cb63aa73bee4c70009aaf2b86b2 SHA512 c75224640c51ae057cf0d53480645cee9c9ecc84d686f2c1f208dda3a59ad19d29914214026225414f0a9acfeb088c5298bd9b0ac3f4e6fc9f778be923f53a20
 MISC metadata.xml 406 BLAKE2B af6335def83547635dc916a45f1d9296faa0e1806237eeb76deac4ea28e701549bdc7fc9cab7e35b84e8f5c32e31ac7bb22c924865872326b70485acef36d517 SHA512 ebbf8d50e3c798cd2889bec1f5bd3f827bbedb9bafe4610b88fa18b1805514f156351786461ae558769f1ce299174d50ee06c864e008d013b26a6c1afb10792e
diff --git a/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild b/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..f4df310fdf7f
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="https://pypi.org/project/ansi2html/
+	https://github.com/pycontribs/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	doman man/${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4d63bca1aa08..a3c412952b05 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index fc7d94169a67..f59f5a0b4261 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,6 +1,6 @@
-DIST mcomix-1.3.0_pre20201123.tar.gz 3888279 BLAKE2B 0bce5d8b3d6e20fc3c422d137963fa8cf506ce969bb5c8062b1db4dcd85d5c1912352fa1eb8c752719b0ac95715486ae47d56e0bf24119f9f55af56f6fbf657c SHA512 24b470e1dca266851bb241f109b39c785443ece36d12a01e579c8a59cb7585ad3978b3696829318f04d4b172cfcf57cf100d76c7c25765260bf26f698d85ba2a
 DIST mcomix-1.3.0_pre20211015.tar.gz 3888967 BLAKE2B 16275b5e63dbedb481dba34e787681a9bbc0615c53c71a0037f7d15fa5ee135b5c2508bbf4ef7fddeb45b65c291d5651d81b2e0a180de26054cdbe994ceab028 SHA512 93092a8ec992922bd2327c33a5ab86edbffcdc66e9da5b443d7e4131686b2c3b47017aa4f02b0ca991b6d08dd68e6578137bbf6028ca274efcd2679a12cfe05d
-EBUILD mcomix-1.3.0_pre20201123.ebuild 1744 BLAKE2B be86355dc4c55efe4d87bc22291391a4dcc851eae28bd7cba024c93c4a42341234b4e8891e937cc0b323701ad23c96ec0855ceb2c07cc71d2951724b0420c2c7 SHA512 112c81eefdbc94a8c6864ed0f09a91b1e753222693cb4caad3ac93d34a5c024a748884d3b45b3bfeff8fdbd5b2ca9ec177fa0f2cbd78e2816788c9b1b94c70dc
+DIST mcomix-2.0.2.tar.gz 515427 BLAKE2B 3f7b7a0788622173049169034a0a8ed3d3d5fb64fd32e10f4cb3f5b1a4815dee29a1a1b576798bddaeb41534ab66cb301825ddcd39b0b01252e1bbe37e0384b9 SHA512 fb908f19b98364e8a765c26fe6b2d7e0b147210b4406a421ae7f010ffdf1987520899ffe2343a26bcdb0bf6b6c9cc5f5ec866f72adb49fb16f0911dd42289a0d
 EBUILD mcomix-1.3.0_pre20211015.ebuild 1744 BLAKE2B de625b1d28b4ef329868f03fa1fad400ac81a1be9bf1a8a8ea8ca994a50446ad2804d98d0c7212855e3c7bd4f8f7d1e440ae9c9bae17e263b5028bd0d84a99aa SHA512 b457e2f35f4cb62f808a543afe970ae7c3037ec5ce023a9572916c4fe218900bcb41dd01b27aa871e49c630c52d70ddb24705fba5a1374a2dac21c32758e552d
-EBUILD mcomix-9999.ebuild 1582 BLAKE2B 93209ca60913f37a2d2484178795fb7ebe544b68a38850ad1c5d29b0cd5871cb24aafd2f4fedaaf695388afd650647b3a53bb2157539a86b05bca9aa916b30e6 SHA512 2325bf94421e427eabd661de45617055ace4ba893a03401258c3a92b98594e6e6ed65b18801daaa0324ae0edd833ac8ea791b68daaea0e6c79825834f5d160e2
-MISC metadata.xml 398 BLAKE2B 1595be3107e03d5ea0602c77d75d0d5b10c6c36307edaa979b64ce3418c674cd3905578ea098159493860ea4b3fb3c297da24b281869dedf92b7eec8f70d32c8 SHA512 4783cdb12689f0e346769eebd4da9a14e40225c30f6afed9b7058a6ac6eb3591b39990c70f2b57339582f27a71c2fa9f88390401f51cb5f7d43cc8c0d9a39205
+EBUILD mcomix-2.0.2.ebuild 1078 BLAKE2B 02fb804e596c3dbcc80fee96e2cb8d1e8087f0780a81264183a58c13e52ab109a97bd6222522d5facd56431c868d66d048bcd6dd82ac6034c8846dc7dcf88ba9 SHA512 bf39e1eb63cb0245bc0e8fa002fb4cb736b5389629aa77024c08189e9b894569d6f7b30dfca773b3cd5d3307ece3a11891e6a9dc7c578ac344f2905d8b4fdabe
+EBUILD mcomix-9999.ebuild 1063 BLAKE2B 4c372c8b3c6a7886771c486e82cbdde53bedd22d1a1522ba9281615895cba49766eca6198bfc3d12b673fc28ca98fdd6a83803e69bf74ab6a14eefcb6d38142e SHA512 23b6fa6c466e0866b63c8b75c0c32a2c2fd007ea7e530ccd08b4dead2ea72a715d7a2c1ce7dff67a7391237bfed9c7ecb4653e36733ba52eac71d99baf4554a7
+MISC metadata.xml 339 BLAKE2B 16c122a9f4454ff61d2b777e14de1bf321ba4d98aadd3284f88a13419bac2cdb227bd1001ef6960aaaa183b3e2f86f2d7b5a555aa9a17a6ad1f9e46db2657609 SHA512 a66ff965443f30fe9c647a760359ee71b4ed9cbe5ff684979fb547823bf1ae5ffbf8cd4128afdfef13d07c03e953ed5495b9e80526ec01a0e53b66b1b0f2e6dc
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
deleted file mode 100644
index b110995c4fc0..000000000000
--- a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit desktop python-r1 xdg
-
-# Hash used for this version
-GIT_PV="cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8"
-
-DESCRIPTION="GTK image viewer for comic book archives"
-HOMEPAGE="https://github.com/multiSnow/mcomix3"
-SRC_URI="https://github.com/multiSnow/mcomix3/archive/${GIT_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	media-libs/libjpeg-turbo:0"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/mcomix3-${GIT_PV}
-
-src_prepare() {
-	default
-
-	for file in mcomix/mcomix/messages/*/LC_MESSAGES/*po
-	do
-		msgfmt ${file} -o ${file/po/mo} || die
-		rm ${file} || die
-	done
-}
-
-src_install() {
-	python_foreach_impl python_domodule mcomix/mcomix
-	python_foreach_impl python_newscript mcomix/mcomixstarter.py mcomix
-
-	for size in 16 22 24 32 48
-	do
-		doicon -s ${size} \
-			mime/icons/${size}x${size}/*png \
-			mcomix/mcomix/images/${size}x${size}/mcomix.png
-	done
-	doicon mcomix/mcomix/images/mcomix.png
-	domenu mime/mcomix.desktop
-	doman man/mcomix.1
-
-	insinto /usr/share/metainfo
-	doins mime/mcomix.appdata.xml
-
-	dodoc README.rst TODO
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Additional packages are required to open the most common comic archives:"
-	elog
-	elog "    cbr: app-arch/unrar"
-	elog "    cbz: app-arch/unzip"
-	elog
-	elog "You can also add support for 7z or LHA archives by installing"
-	elog "app-arch/p7zip or app-arch/lha. Install app-text/mupdf for"
-	elog "pdf support."
-	echo
-}
diff --git a/media-gfx/mcomix/mcomix-2.0.2.ebuild b/media-gfx/mcomix/mcomix-2.0.2.ebuild
new file mode 100644
index 000000000000..575e32e3e1ee
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-2.0.2.ebuild
@@ -0,0 +1,44 @@
+# 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} )
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="GTK image viewer for comic book archives"
+HOMEPAGE="http://mcomix.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.36.0[${PYTHON_USEDEP}]
+	media-libs/libjpeg-turbo:0"
+BDEPEND="sys-devel/gettext"
+# Most tests are quite old and do not run
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# Uncompress man page
+	gunzip mcomix.1.gz || die
+	sed -e "s/mcomix.1.gz/mcomix.1/" -i setup.py || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "RAR (.cbr) archives" app-arch/unrar
+	optfeature "7Zip archives" app-arch/p7zip
+	optfeature "LHA/LZA archives" app-arch/lha
+	optfeature "PDF files" app-text/mupdf
+}
diff --git a/media-gfx/mcomix/mcomix-9999.ebuild b/media-gfx/mcomix/mcomix-9999.ebuild
index 137628e7dda6..f0dfb0115b36 100644
--- a/media-gfx/mcomix/mcomix-9999.ebuild
+++ b/media-gfx/mcomix/mcomix-9999.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-inherit desktop git-r3 python-r1 xdg
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 git-r3 optfeature xdg
 
 DESCRIPTION="GTK image viewer for comic book archives"
-HOMEPAGE="https://github.com/multiSnow/mcomix3"
-EGIT_REPO_URI="https://github.com/multiSnow/mcomix3"
+HOMEPAGE="http://mcomix.sourceforge.net"
+EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,53 +18,27 @@ IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
+	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.36.0[${PYTHON_USEDEP}]
 	media-libs/libjpeg-turbo:0"
 BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+# Most tests are quite old and do not run
+RESTRICT="test"
 
 src_prepare() {
 	default
 
-	for file in mcomix/mcomix/messages/*/LC_MESSAGES/*po
-	do
-		msgfmt ${file} -o ${file/po/mo} || die
-		rm ${file} || die
-	done
-}
-
-src_install() {
-	python_foreach_impl python_domodule mcomix/mcomix
-	python_foreach_impl python_newscript mcomix/mcomixstarter.py mcomix
-
-	for size in 16 22 24 32 48
-	do
-		doicon -s ${size} \
-			mime/icons/${size}x${size}/*png \
-			mcomix/mcomix/images/${size}x${size}/mcomix.png
-	done
-	doicon mcomix/mcomix/images/mcomix.png
-	domenu mime/mcomix.desktop
-	doman man/mcomix.1
-
-	insinto /usr/share/metainfo
-	doins mime/mcomix.appdata.xml
-
-	dodoc README.rst TODO
+	# Uncompress man page
+	gunzip mcomix.1.gz || die
+	sed -e "s/mcomix.1.gz/mcomix.1/" -i setup.py || die
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	echo
-	elog "Additional packages are required to open the most common comic archives:"
-	elog
-	elog "    cbr: app-arch/unrar"
-	elog "    cbz: app-arch/unzip"
-	elog
-	elog "You can also add support for 7z or LHA archives by installing"
-	elog "app-arch/p7zip or app-arch/lha. Install app-text/mupdf for"
-	elog "pdf support."
-	echo
+
+	optfeature "RAR (.cbr) archives" app-arch/unrar
+	optfeature "7Zip archives" app-arch/p7zip
+	optfeature "LHA/LZA archives" app-arch/lha
+	optfeature "PDF files" app-text/mupdf
 }
diff --git a/media-gfx/mcomix/metadata.xml b/media-gfx/mcomix/metadata.xml
index d517b361220b..f62d0f2ed5e2 100644
--- a/media-gfx/mcomix/metadata.xml
+++ b/media-gfx/mcomix/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">mcomix</remote-id>
-    <remote-id type="github">multiSnow/mcomix3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 669f46cfb896..bafb6c1db1ad 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 40c01c9d6cc7..f784de797a40 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Jul 2022 15:39:39 +0000
+Sat, 09 Jul 2022 16:39:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6b57fcc6a585..99c1ad3e743f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-09T15:39:42Z
+TIMESTAMP 2022-07-09T16:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLJoT5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLJr1FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC9UBAAn92uyBukGO4KvhgpheuBFQ1R91DqT/w8i3HMKv5UdKbdlEuFYmF0x3yR
-HYRHiQvusqJs26oMh9yzPpfbk8RVFx6kOYAi6pMHSYKNRavpO27SG2u9FdcALVk0
-jMEDdLM+hs+XfV0utvCv4OtHPnF8IkuFclswG3jH9J9iyJZFWn2loRDku+2/C0xk
-cjBZjMmZc4f7qh080oIK9ltiUh4AdWxVaB1JsukPohNaflAK1uT2+i16dlNgdsGz
-VQh1zuX2T2grpIfzzyBNEpI1A09U/hkl9fjvtfJf06wGDg7ZZ3TjUM79U+uXPujs
-NJQVqSUVEmgG3iKb7ECnKUYBf4Bv3/RjmJa4ravhhyklZOvd1CFmVJTVmuD6BIns
-rkpvpQudVIEf9vfQZboEFAlJMwemjoRf0alMCZRMDLr37fWYeDgfk1907x0rE8Kh
-vsWhz1j1OI40uxSmOkhzs8B0Odk6LuWoBMTE8ycZJSQZip1HuZzbeBR3XmbbGvIz
-eJie8+IxsQ7oUUuHP0fTmLwYBn2SE1kVsSWuImXADWUJZ6dRpVGC/oPBGJSn/aSh
-TAig2bMOguF+DZkWoJ3k90SRzI4pkNuD+iyn+cRaLp6wPy6OuBcm4jZZFhe5WiyC
-PE121VB01B6nXeURzctXjO+8LJDbi49fDmvcBmorhG9h1RG/onk=
-=RWWM
+klABxxAAk4THYGGkPHYYMgawE6XnKFJPaXomckJTau65eaWoiRFtA2dtT5ung3M8
+MyhpAqaVfB27Ysf49qWaaYqbDDrc8E7+hvDl2C7Q5eOSp2GzenaoaFWmOvv6+6y4
+GXX2SifaXPhl1UfiXjCXL4udgQZWMd//oAlcnq/Zz7ak2qGMCdPUz2AlZqMRfKUu
+mCVAB5zfryAzzbTS2lR/hwH73Z76mvIo0nzfxO4avVjNRcrNxHM6Xfy8Dtlk3Oha
+fUkKV0LlVEB1TTrBsq+V8NS8cVT+r3Ab7/UM25GOyekqPtWGdKmT5Ertubu0Yl/n
+URBc9JCF16RG8mEay7656UzDREtmpR9x+DCkvkWsDO5Jdp3TS1T4ACvtKPkeecBe
+NMkLA8vPg/bK9erwjfiadUIhgOEDFp8JxiT+qvqQxW0INFqkXkBWl5hq9tgDU9y7
+ddq4fnYWlQxIZV1DnLBE+4wKe9bBRRes7hn49xKwULU6qNA+Jg/LBEzjy+wymfhQ
+LM9/22YXSUfHd+aNkJHaXHqj2+ftbFptrAdKn1wIVKqBjb6SL+bgXoMvtLAx/pU2
+nZ2majYCicftlATYIFMVO01Wtb7JoDjqWxkThqM1dPbfeHt5AM0yeNkKKh98CVp1
+4bThvPTN6cAHHlfYTl6qjPmUv55nzGSCYfnVZr/FJnvc5jp3ZzA=
+=FwgR
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 40c01c9d6cc7..f784de797a40 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Jul 2022 15:39:39 +0000
+Sat, 09 Jul 2022 16:39:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index d33a4c59b70f..192407ddd123 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index cfb0ac524b53..1cb5fff40cd2 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.20 b/metadata/md5-cache/app-text/xapian-omega-1.4.20
new file mode 100644
index 000000000000..9e1859763441
--- /dev/null
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.20
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=~dev-libs/xapian-1.4.20:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
+DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
+EAPI=8
+HOMEPAGE=https://xapian.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=~dev-libs/xapian-1.4.20:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
+SLOT=0
+SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.20/xapian-omega-1.4.20.tar.xz
+_md5_=26949e44d3dcffd2ef9c96eaa59248c7
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 5ceb68aceb0b..b211ea75e3cf 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.20 b/metadata/md5-cache/dev-libs/xapian-1.4.20
new file mode 100644
index 000000000000..fc6754df6665
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Xapian Probabilistic Information Retrieval library
+EAPI=8
+HOMEPAGE=https://www.xapian.org/
+INHERIT=multilib-minimal
+IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/30
+SRC_URI=https://oligarchy.co.uk/xapian/1.4.20/xapian-core-1.4.20.tar.xz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c1c6ecc699886be111b4b895e90a71d5
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20
new file mode 100644
index 000000000000..c881e93a1565
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=>=dev-libs/xapian-1.4.20 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
+DESCRIPTION=SWIG and JNI bindings for Xapian
+EAPI=7
+HOMEPAGE=https://www.xapian.org/
+INHERIT=java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
+IUSE=java lua mono perl php python ruby tcl java lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php7-4 php_targets_php8-0 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/xapian-1.4.20 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
+REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) ruby? ( || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-4 php_targets_php8-0 ) )
+SLOT=0
+SRC_URI=https://oligarchy.co.uk/xapian/1.4.20/xapian-bindings-1.4.20.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=15a7c41f2dd9520ac27ab041b60bffff
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8657d46fc3e6..c48e6831c3b6 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.8.0-r1 b/metadata/md5-cache/dev-python/ansi2html-1.8.0-r1
new file mode 100644
index 000000000000..0a078eeeb95a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansi2html-1.8.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/six-1.7.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Convert text with ANSI color codes to HTML
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ansi2html/ https://github.com/pycontribs/ansi2html
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-python/six-1.7.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.8.0.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=4f3db9dbce90c528f8d1befe50b8855c
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index db03b0476df3..d90d6c0f7f46 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/mcomix-1.3.0_pre20201123 b/metadata/md5-cache/media-gfx/mcomix-1.3.0_pre20201123
deleted file mode 100644
index da2e849bc502..000000000000
--- a/metadata/md5-cache/media-gfx/mcomix-1.3.0_pre20201123
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK image viewer for comic book archives
-EAPI=7
-HOMEPAGE=https://github.com/multiSnow/mcomix3
-INHERIT=desktop python-r1 xdg
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/libjpeg-turbo:0
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/multiSnow/mcomix3/archive/cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8.tar.gz -> mcomix-1.3.0_pre20201123.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=851d8a83d688eae55370462136ee10ff
diff --git a/metadata/md5-cache/media-gfx/mcomix-2.0.2 b/metadata/md5-cache/media-gfx/mcomix-2.0.2
new file mode 100644
index 000000000000..6dbb4c772832
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/mcomix-2.0.2
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gettext python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+DESCRIPTION=GTK image viewer for comic book archives
+EAPI=8
+HOMEPAGE=http://mcomix.sourceforge.net
+INHERIT=distutils-r1 optfeature xdg
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/pillow-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/libjpeg-turbo:0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/mcomix/mcomix-2.0.2.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=48b1dbcf913be0118aa1ecde67df724e
diff --git a/metadata/md5-cache/media-gfx/mcomix-9999 b/metadata/md5-cache/media-gfx/mcomix-9999
index 9c7de82ae1e7..92394dbcff3e 100644
--- a/metadata/md5-cache/media-gfx/mcomix-9999
+++ b/metadata/md5-cache/media-gfx/mcomix-9999
@@ -1,15 +1,16 @@
-BDEPEND=sys-devel/gettext >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+BDEPEND=sys-devel/gettext python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
 DESCRIPTION=GTK image viewer for comic book archives
 EAPI=8
-HOMEPAGE=https://github.com/multiSnow/mcomix3
-INHERIT=desktop git-r3 python-r1 xdg
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+HOMEPAGE=http://mcomix.sourceforge.net
+INHERIT=distutils-r1 git-r3 optfeature xdg
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/libjpeg-turbo:0
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/pillow-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/libjpeg-turbo:0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=249b832e2faf40894b348505c60d8f1f
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fcf8ff7a4479151f1b9179840f88c25c
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index cfbee8ecf067..452984f44537 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/wmbio-1.02 b/metadata/md5-cache/x11-plugins/wmbio-1.02
index 078d7d0eb4ff..b1927f4ea579 100644
--- a/metadata/md5-cache/x11-plugins/wmbio-1.02
+++ b/metadata/md5-cache/x11-plugins/wmbio-1.02
@@ -1,11 +1,13 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=A Window Maker applet that shows your biorhythm
 EAPI=6
 HOMEPAGE=http://wmbio.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/wmbio/wmbio-1.02.tar.gz
-_md5_=08c5f066433cfc5ec44b55a93bd7ffae
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=26d916e803c1c168b7e6657c7aa8aa0d
diff --git a/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1 b/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
index 9dea94b31e0c..c5be46f9fb53 100644
--- a/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmcdplay-1.1.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c10d583a83472a32aa68036ced34caad
+_md5_=785e4c3efa6262e8947f641b89eb35f1
diff --git a/metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4 b/metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4
index 2603b95be08d..dc7e7f62d3d8 100644
--- a/metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4
+++ b/metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4
@@ -3,8 +3,10 @@ DEPEND=>=x11-libs/libdockapp-0.7:=
 DESCRIPTION=WindowMaker CPU and Memory Usage Monitor Dock App
 EAPI=7
 HOMEPAGE=https://www.geocities.ws/neofpo/wmcms.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.geocities.ws/neofpo/files/wmcms-0.3.5.tar.gz
-_md5_=328769f515b3721634087a2176274f71
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d2d96d1d62c83cef2bebe34eefe902b1
diff --git a/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3 b/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
index c30ef9ab8563..2837aff2b518 100644
--- a/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
+++ b/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
@@ -3,9 +3,11 @@ DEPEND=x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 x11-libs/gtk+:2 v
 DESCRIPTION=dockapp which provides a drawer (retractable button bar) to launch applications
 EAPI=6
 HOMEPAGE=http://people.easter-eggs.org/~valos/wmdrawer/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://people.easter-eggs.org/~valos/wmdrawer/wmdrawer-0.10.5.tar.gz
-_md5_=b6a9feca8037f748e7e7039c71206473
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a933170e42621b1d6868b0e7b3b7c473
diff --git a/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2 b/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
index 9b349e97bc0f..87f48f8d2d87 100644
--- a/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
+++ b/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
@@ -3,11 +3,11 @@ DEPEND=>=net-misc/wget-1.9-r2 >=media-gfx/imagemagick-5.5.7.15 x11-libs/libX11 x
 DESCRIPTION=wmGrabImage grabs an image from the WWW and displays it
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmgrabimage
-INHERIT=desktop
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=net-misc/wget-1.9-r2 >=media-gfx/imagemagick-5.5.7.15 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmGrabImage-0.72.tgz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
-_md5_=2ba3724f0ef3626a0bcd9c14af86f170
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=59b792fb68a48e3cb2af30ae7a9fa5f8
diff --git a/metadata/md5-cache/x11-plugins/wmpager-1.2-r2 b/metadata/md5-cache/x11-plugins/wmpager-1.2-r2
index 84b956245912..2d90a0c703d8 100644
--- a/metadata/md5-cache/x11-plugins/wmpager-1.2-r2
+++ b/metadata/md5-cache/x11-plugins/wmpager-1.2-r2
@@ -1,11 +1,13 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 DESCRIPTION=A simple pager docklet for the WindowMaker window manager
 EAPI=7
 HOMEPAGE=http://wmpager.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~sparc x86
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/wmpager/wmpager-1.2.tar.gz
-_md5_=707a81a8e8fc352f78f1905ddc5b43e2
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6df6c3d25f3e7cca14fce76fbcd4711b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d090c7ee5b8c..ae4f8acde9c0 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17708 BLAKE2B 4ce2223644596204d9c2bb3f48afce531273d698d0831b6c63489b590dab9b0f76b97e01974eb386fd4ee731e91da53e23679e783c4d88a79a610f95158b28ce SHA512 a1f139db9aee3a21dedb41e88e0ac33c6c041d7b8c88c3e9baf0cdb441d1f610d920165d40c97cd51b23366513243ae6bbe2d000a224c900523cffd5ea695cf8
-TIMESTAMP 2022-07-09T15:39:42Z
+TIMESTAMP 2022-07-09T16:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLJoT5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLJr1FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBmOxAAglXocR3W4SizMiv7rAA08gZmkYHSceTYZZ2jkva1WrhsfoLQA0g1wx7o
-mJK3Sv1EB4Pbd82nz8xSEzZD+t5D/jGvF+jJtjvo8gUBW8RmMigAgmhMlIy5Z4b+
-Bbq3PnekREjiV1AJ2pGmeDFY3lhHmuP+LQR5zqX9g0CSZrZKEwjPg68DMIt7V80l
-0rR6/+mVwYNvApgqDu7tmXBcy+w4q0ps1BdciMicFe/msYkY0J5tklPNa8hVBRpW
-V3EY0UdfnS7UnzeDPrxKc4nhPEKwtxoAT0jK/MfvS5ptD56cAxgmU6mFWWVeM36u
-ouMOkvPb6+5jzZmBXUa0tiGqB1TGLylQDjWqHDcwDW2Bi2wBzKBsetJzp/38uCKF
-9H1MaDlgMVuGu1hQ5KZg7Q8YZ0QGIFAEEtOsrA8edh8hrKSlySxZfVz7kMZ/qTaP
-9hlQLCNe8kdWVgtAAlVcU7Il6QPnSRTAAAicJJ89DukTAhRs88SbJ4J81FtC9jOT
-IZyV6ExAM3FzFhq0biKzwZW9AbcfKl5sgsZQUuOaFacE5QVvDdFzuTfcYWI7ATFq
-+UGYfjAj1FdeMQUnFAhOwrtBhLAkPMXES1MrGf2+OPueRyxRFH+is9uhQ6Wlhfl+
-8Zfh7eKrHKsG2jd270ME/r4Pu71oVnPj3HEMZWEVvbL1gW7mRkU=
-=6lr9
+klCswg/8CUA1ktyJzVHZVliPd5vQJJoC6pKu40tLd/qpg8qyVZ6W5ZFYEcnSnvsN
+5hi458l0Q8p/7YR3n8KoC9gGwOP0IIQUkbEDlBkImOTWDjYRNKgSZL+aSdGU+5k5
+yIdEaaVKdqe91elaYSsRQIDNaN1FWnadABL5iPm5O2QKkgcEVIamk2l5hlpLYVAy
+rVWC9RStBiXY//Q8WwZDF7B813S13nsnK7sRAuCwYwyk54c9ncr74wh3b1edVvwz
+PvTmkwsdTtYPsi8ouXW23n4wyi9prct85vhxbLGDxilUKhoc3oDwa6hqkleezumx
+EsF+VUWgqG98WC3kooT1EAqizCTSGf0ibjhEgHBpDmdj6OfNLm7OdjSJieLc3URG
+BwR8mUrE+jrFALVNM+Z6qZAblzUTsBF0j4c+hLTmnGm740yVcfbS7uHfrA7DxaSH
+FlVcakXprYTS+9/fAGWbuPTfe4Uzaydc+IiIIy19YweNEYJKiOSRMA7+0kaxJI2p
+xpq5S+O7hRd83j3rQiXknph3XNeN20gQV1xVzpVb0C4aOcd5m84i51vM7CN66w84
+RgdgaNzkhJjIKwG+Tkct2Xv6NHKM2MX+42ZT6hidlDWaLmoT8GUA/65syxSxe7ES
+OOzHrNTQu5PvjjbIxlBgkM4ERNaoyPafI9vOxJLdFqMGKXivjeA=
+=RCLR
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 40c01c9d6cc7..f784de797a40 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Jul 2022 15:39:39 +0000
+Sat, 09 Jul 2022 16:39:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b28da74b9fbc..571c187fc7ed 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jul  9 03:39:39 PM UTC 2022
+Sat Jul  9 04:39:42 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e9e78375bb31..6b04578aef5a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Jul 2022 15:45:01 +0000
+Sat, 09 Jul 2022 16:45:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 75954207222d..0198ffa54b8c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-83d94add3a06eeb205c1b39e84477aa6a68fb825 1657379636 2022-07-09T15:13:56+00:00
+bbc29e4337bd59f4860145152d8fed0bf57a38f4 1657383137 2022-07-09T16:12:17+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a9996e34bfa6..83ae415ecc41 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1657381201 Sat 09 Jul 2022 03:40:01 PM UTC
+1657384801 Sat 09 Jul 2022 04:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 40c01c9d6cc7..f784de797a40 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Jul 2022 15:39:39 +0000
+Sat, 09 Jul 2022 16:39:42 +0000
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index f5be6a0eb592..37b5e9236476 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmbio/Manifest b/x11-plugins/wmbio/Manifest
index 658c52e97709..bc05fb0d44fc 100644
--- a/x11-plugins/wmbio/Manifest
+++ b/x11-plugins/wmbio/Manifest
@@ -1,4 +1,4 @@
 AUX wmbio-1.02-fno-common.patch 740 BLAKE2B d53e54a24ee0a7271746632cffed02475406ce5048bf8c37d3b1b7ee0932e8c8927db8cd22aa32e7d509dbcac0e1438c2aa44cd62e48822edffe28802aef05c6 SHA512 38881970a52f20ec721ab944c43c80586a65c35f704e4103f996d6276897850754a5f912386e01c6f4c32ee48f03ca4ccef504a8c8c7fc367c4c982cab9061a7
 DIST wmbio-1.02.tar.gz 21799 BLAKE2B f3736ad83e4441f027b8091d398f7f819de79d29d9d48dff0f1ab3c159e1da2fc367f8faa92addedb770d7137e7a93f8e91a29935264a6505d16c9598daad64b SHA512 bebe8de364f782c38164fdd3910c3f63ff8313fa46fce1215218a4d14b9be0c793ee1d234fdb694798c1ab49b17eca90957d22c076920bf50ecf24b563a07d5b
-EBUILD wmbio-1.02.ebuild 768 BLAKE2B 67390e3a14265a6e0215fe4ea704e21cf2c347c7cf80c6acb9f9178f44b61d7888e73d0da986d92cbfe6ad6780e855444f71409c7bde0a2154937785752d7e11 SHA512 e0b3ded12d598815617f09f5a97a3aedf29b326e8bf1f83075fcdb509226e9c9805c91b1778d65144148a29e3a5272fe6f64eb879b5243d3368431dc68491378
+EBUILD wmbio-1.02.ebuild 834 BLAKE2B ea312ddbd8105bb454a40ee025e4f730e32c2f9047a4da3f519ba9663f30a8d6998ca44e0266fd84644c38cdfeb971728281eb7475dc726810afaa15daca3a18 SHA512 62289c981e8fa9c1876af7205b64bb7b5046bc40eafc963c5f497cd12309ab5b91e6e3978fcb9c8bcf32b9122527d4b4c69e7dfc34db5b90ca5cdc51281441e2
 MISC metadata.xml 604 BLAKE2B bfc37c2cedb9d900bd0e2846248b572f362c786018c7e5a67879d587510ba791804db5d04af7bd3ae87be8bc4f09764d84ff9ca7b66ba69c49dfef1ca555a18e SHA512 cefa27b984a5959d8f13454f4376c5cbdd8c2bcc6900689d64cc12e1bb0ff262bcca0bbda0c6a23b5064671b98747ecf040ec3bca105bb9df3106f2ad843b8e4
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index d2d2e7ccc5fb..4c7d53c862ea 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="A Window Maker applet that shows your biorhythm"
 HOMEPAGE="http://wmbio.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wmbio/${P}.tar.gz"
@@ -23,10 +25,14 @@ S=${WORKDIR}/${P}/src
 
 src_prepare() {
 	default
-	# Honour Gentoo CFLAGS
-	sed -i "s/-g -O2/\$(CFLAGS)/" Makefile || die
-	# Honour Gentoo LDFLAGS
-	sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile || die
+	# Honour Gentoo CFLAGS, LDFLAGS, CC
+	sed -i -e "s/-g -O2/\$(CFLAGS)/" \
+		-e "s/-o wmbio/\$(LDFLAGS) -o wmbio/" \
+		-e "s/cc /\$(CC) /" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-plugins/wmcdplay/Manifest b/x11-plugins/wmcdplay/Manifest
index e5c504e9cc49..4273df1d1ee6 100644
--- a/x11-plugins/wmcdplay/Manifest
+++ b/x11-plugins/wmcdplay/Manifest
@@ -1,4 +1,5 @@
+AUX wmcdplay-1.1-cpp11.patch 1315 BLAKE2B 5ca7792045a6c64be012a1b1474bfe5722f9365e2e3c0b3ed956b30e0afd7cea99cc4a672fd0e236c5cc4d76bb4f948699e699fccb959f37dcf0cf94ca955fdb SHA512 4774a3de25ecb5de09ccf32318f6e19d98560c05a438d39bf4bbdd47b38e1a5eeea13a2f615c969eb3efd48fdc83b013d830b8b3f11518f9c12c90b0993a5437
 AUX wmcdplay.desktop 178 BLAKE2B 74f1f10064d6e3e1738bb21b135ba479ce2bec97e084d4d3b402b823abbeb6db9b0590c2e12c427661518f099c478f7de35b161d788d01359053bed88224d69c SHA512 54e48ca979d5348e58b7b7057665dab9ff1429be534ea2dee970900c14b853ba9616487ff27500bf4a28145ca2b8809b4d6fffebbc99ac684238fa708a946293
 DIST wmcdplay-1.1.tar.gz 32082 BLAKE2B 5fd8f57aca1d3d53d34a31f9814c132a98241b848ac04e69c367065ea291add5f025598b7b03c44033024d20e24271690cdb38830e56d3795f6232b02f1d81c6 SHA512 db657ee2cf0a1a7e323e1a6fbf2ec70251005b84fb18808661cd44a50b4203786e56e90329d81957d2496a6e79d76e9d87620680186c85e476b7f94d8f234133
-EBUILD wmcdplay-1.1-r1.ebuild 598 BLAKE2B 21ab0b04f3d40cc8c58c1dc706abc3a3a4d6a29c5c6698e0f34e7f2634e0dc4a42e47019623eb3b2a42ecb8afae2680560c9693c5a8fcba0b8884b210d24c961 SHA512 d1c542bfa8931ae139aa92463e03cce12c6c5d813bd7e76a57cc0c91cb821f1dce88e98e8a1dd00655422ee7d5f42e977550936e64104aae763b03629d9e1761
+EBUILD wmcdplay-1.1-r1.ebuild 639 BLAKE2B eaf576cb722ad44210fda5bf6c71bb63a158fba3ae0b40e552c1fc0876fc3fc2dee511c4ac4af6e09a476fc275280952e3032deedef450f442618eed6a20348e SHA512 bc255c8689916b6a7ef6b7853919e2891814d5ca504da37aa62dd13908807d5b4c62f777d98f907846934aa8f510fcb4a14c5db5c5dcfd81896d9cccf68fbe9d
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch
new file mode 100644
index 000000000000..7fdd1021dab3
--- /dev/null
+++ b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch
@@ -0,0 +1,30 @@
+From bd69f80f597ca589683d6f606e979b8f77e9e0a4 Mon Sep 17 00:00:00 2001
+From: Doug Torrance <dtorrance@piedmont.edu>
+Date: Wed, 29 Apr 2020 11:01:30 -0400
+Subject: [PATCH] wmcdplay: Add spaces between macro and string literals for
+ C++11
+
+We may get compile errors (e.g., [1]) otherwise.
+
+[1] https://clang.debian.net/logs/2020-02-24-9.0.1/
+    wmcdplay_1.1-2_unstable_clang9.0.1.log
+---
+ wmcdplay.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wmcdplay.cc b/wmcdplay.cc
+index 46ae03a..675b5dc 100644
+--- a/wmcdplay.cc
++++ b/wmcdplay.cc
+@@ -353,7 +353,7 @@ unsigned long mixColor(char *colorname1, int prop1, char *colorname2, int prop2)
+ void scanArgs(int argc, char **argv){
+    for(int i=1;i<argc;i++){
+       if(strcmp(argv[i], "-h")==0 || strcmp(argv[i], "-help")==0 || strcmp(argv[i], "--help")==0){
+-         fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease "VERSION"\n");
++         fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease " VERSION "\n");
+          fprintf(stderr, "Copyright (C) 1998  Sam Hawker <shawkie@geocities.com>\n");
+          fprintf(stderr, "This software comes with ABSOLUTELY NO WARRANTY\n");
+          fprintf(stderr, "This software is free software, and you are welcome to redistribute it\n");
+-- 
+2.11.4.GIT
+
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
index 4751907aadbf..47fa6c9faf43 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/dockapps"
 
+PATCHES=( ${FILESDIR}/${P}-cpp11.patch )
 DOCS=( ARTWORK README )
 
 src_prepare() {
diff --git a/x11-plugins/wmcms/Manifest b/x11-plugins/wmcms/Manifest
index e90e975e8e11..8f9a881747e8 100644
--- a/x11-plugins/wmcms/Manifest
+++ b/x11-plugins/wmcms/Manifest
@@ -1,4 +1,4 @@
 AUX wmcms-0.3.5-s4t4n.patch 8562 BLAKE2B d1b99dc03a8dd0fd2f1e5d387ee8b763a0b1633199c20ab231fa8496a253f9124ad7508bd66cf742660b7aa9ddca16b5eaa887f08ddb4e8de0dd10b7cf490370 SHA512 ad25dead5271907845ae96efec52844de1005f31ddbf4d2e43996633ef8c54c89f9137421b019079462227a16052df950c7f589d112815c8b02b435f863e8b09
 DIST wmcms-0.3.5.tar.gz 19855 BLAKE2B ac97dc403e6adeebc85b386ae7c78a8537c33858950f41059aadb750909b22fabef5bed3114e9552b381d3fb9d603e90236c88a614ee168a46214f64b9ca50f5 SHA512 ef57e6b278c14163de0792e6af8be40ef721020594fb2871aad34543471869ecf468210c173861a93b4f22e1dfca8f1e4254aec6508adfdf143f3a0f1a49f549
-EBUILD wmcms-0.3.5-r4.ebuild 710 BLAKE2B dc90bba96a414e8d91bd704f86b847b782fde93b8385e4b9557f730f365691f98c4921bf1cc54e102143a656ffd283524c3dc20f1b815b56dc5e2e2214b5ac34 SHA512 ea7f7584dbf73efd20cde1315124f0a328f3f83d2918403a203552e4bdf32114b7e64340d7a2f28d2a5f5b8189adafdbe74648af595529208fbc31079025a9b0
+EBUILD wmcms-0.3.5-r4.ebuild 752 BLAKE2B 8f13e3eaf86f6ff5ee644ff152b5d6abea58f8c2d34256b35505ea59f0632ffafb994640b3b1cf8602f9e04856cd08c1859f218981441c58d76962dc2056c168 SHA512 0790ae9be3951f636fceddb50dce8a5023ca580f6371122d159819d50f47e808eb24685e52f6df63859cf9ba4988a7155c5907674ff7f305d98e169fb2a78421
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
index 70c2fcf3f058..af360d3fe27e 100644
--- a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
+++ b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="WindowMaker CPU and Memory Usage Monitor Dock App"
 HOMEPAGE="https://www.geocities.ws/neofpo/wmcms.html"
 SRC_URI="https://www.geocities.ws/neofpo/files/${P}.tar.gz"
@@ -27,7 +29,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}"
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index e31c00a69084..24384fe6b503 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,4 +1,4 @@
 AUX wmdrawer-0.10.5-gtk+-2.patch 370 BLAKE2B f308ef901a7d609bd257253ed092b2bf8a53e8b87afc973024b4249f56c4ae0a9b757a203ce5df180a31feb512bf6dff559a93081c0ae5314d6b3afe3785fa84 SHA512 4ee57e974cb4828a20fe5313746a0c646f793793a89ce70fb3bbdf28cf397fb4112121eb7f4274a67601f5e18487cbabf2b655161d575b8a58740eaa6aec87e6
 DIST wmdrawer-0.10.5.tar.gz 49413 BLAKE2B df77a7e7fedc1a648fccb6efc4315f1f7c4d316a475b3d0044578df0cc0ef5f5d481eec11a23a33682fd8f8bb5faeedb66e82916becb668546cbc5b9e5a61dd7 SHA512 f1e7cb7dc16841a7176e628f42ba5834200707dc162838e62fc7233e383d0aab6ce7fe22017286d26ce6ddc2e3cb6f1d0d21acd176fd36a0cdcd7ab04a2dbae1
-EBUILD wmdrawer-0.10.5-r3.ebuild 1182 BLAKE2B c9c0af7bfd790d38fb15b0b64042bbf6ffb93ba91646752d77b6aa3bdca73032ee1ae97dd7f2a7305e5beb9cdcafabbf81e70f7795d90ab2322e8b85f286f045 SHA512 a3e32a02315339ef851d6e58f3ccd883d678be30a55f1a907cba2fadb2178a35778195194afaece381425862c6be6202245acce37f3685c6fea1f2a91e9ac6de
+EBUILD wmdrawer-0.10.5-r3.ebuild 1228 BLAKE2B 217e4d49d5925e100040814368e505641ba330a0c5958b29004cc3c8bc9126abfd783827ec313aa914e5a159a4c9c5f32396ad589c13dfa3aebb5ff303b6efe6 SHA512 85b04baf700cf55e72f464caf804e06cfffda66163b8bc20608e110db69513830ea01131eb3b2fe981a89e68ec1e81f1461b4476c4825a598c3a8faa5c427dbd
 MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
index 8ed75478b444..d72e2c0e4a88 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="dockapp which provides a drawer (retractable button bar) to launch applications"
 HOMEPAGE="http://people.easter-eggs.org/~valos/wmdrawer/"
 SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
@@ -33,11 +35,11 @@ src_prepare() {
 	# Do not auto-strip binaries
 	sed -i -e 's/	strip $@//' Makefile || die
 	# Honour Gentoo LDFLAGS
-	sed -i -e 's/$(CC) -o/$(CC) $(REAL_LDFLAGS) -o/' Makefile || die
+	sed -i -e 's/$(CC) -o/$(CC) $(GENTOO_LDFLAGS) -o/' Makefile || die
 }
 
 src_compile() {
-	emake REAL_LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" GENTOO_LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-plugins/wmgrabimage/Manifest b/x11-plugins/wmgrabimage/Manifest
index 08d095f9f8e9..61d7b2f822b1 100644
--- a/x11-plugins/wmgrabimage/Manifest
+++ b/x11-plugins/wmgrabimage/Manifest
@@ -2,5 +2,5 @@ AUX wmgrabimage-0.72-gcc-10.patch 1009 BLAKE2B aa7be547c75400ec11afada57b8466eec
 AUX wmgrabimage-noman.patch 295 BLAKE2B cb10ee8ea0e98a2c77fe51fb333ce722efa8d0ce7b4296cdae925deae9a4ac946cc88d97e5da6805ba3385381fbd4651fd4a4b75eedac0678b6d52b6b9d59496 SHA512 adaace112266f179c120fac600d5b4eb016806ac7075f69663880c5f518e09ee213f899318b74feb2777e5504c06fdc72f4d54e733fc9f2ba9bd533490c42307
 AUX wmgrabimage.desktop 165 BLAKE2B 8faac723c7263861d7c348c33310882b39e4ca864e275d139a970d1377f4531c939dfffb569e29dcb952468e0d0dac61477125b77c4b6adb0ed3c1e76aaf227e SHA512 3d08f5a93d1ff356adb86b8636f092bf89fee18e238b8cbd2f7739239e996dd524f5fddc3821bf24f8c7271f1d9c7cd67300d58e31814a117697cfd9f3fd1458
 DIST wmGrabImage-0.72.tgz 19902 BLAKE2B d9000c03e4f9a3584f356c18fd4e4767ccc235708e0d3554fd6a0defa6108de3f52a90825b4ed7d334b545340ec9e463e67aae89062f5b0e2622c9e6d851a796 SHA512 64909db71d141ccf849eacbb100072a53770601fdf23949f76a45d1d25f5015ebb8f3a3da99e8f311977967d44a6db6596c2bcbe961fb8e313e41cad4960c92e
-EBUILD wmgrabimage-0.72-r2.ebuild 1108 BLAKE2B b8ba771cb7d67ebe95d82a667b8319d501de210edcbfff1a9b1d1dd2f9607013ba69253f00eac2298c3b793951624f16dbd3364863190733825749a9b67d9416 SHA512 976065532662b03bb110d6479d55bca9dc6b7d6aadb90bde747b66842fcda762ce1916fda4cb3078edbe9e2ef70cef7dd79ad1c89714da73006ffa66c842fc35
+EBUILD wmgrabimage-0.72-r2.ebuild 1141 BLAKE2B 33a876c94272ca777049c36d46be69b39cec3df2f86a6f71831a84651f14c082a74215e6d55560f964375a68388f7d478edfc1c767a9768054f12cb116b47638 SHA512 7520b3315ea5b298c4435664ce0b7116a241f699fd865270e97c3e98b1a15bd05e0b66e214cc351b2e55bb73aff09217f96ca14a401cce528e558065f8ab627f
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
index b1d7ff43dabc..126ad0294ba9 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop
+inherit desktop toolchain-funcs
 
 MY_PN=${PN/grabi/GrabI}
 
@@ -39,7 +39,7 @@ src_prepare() {
 
 src_compile() {
 	emake clean
-	emake CFLAGS="${CFLAGS} -Wall" SYSTEM="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" SYSTEM="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-plugins/wmpager/Manifest b/x11-plugins/wmpager/Manifest
index 203aef76ada2..5e6018366eb6 100644
--- a/x11-plugins/wmpager/Manifest
+++ b/x11-plugins/wmpager/Manifest
@@ -1,3 +1,3 @@
 DIST wmpager-1.2.tar.gz 24255 BLAKE2B 7ca18094ad1cb51793249072e530366cd4b4c02d8d5a2a8f49bae4e4742fbfdb6dad9a20d79142cd6776a17dfa078c6e6a7dbf84e98611f6024166f1bdf0a977 SHA512 6abd4ea28bba9bb809a8e0ce96df2b4491f32eaa39a16fa57727581c63ad6f96515e761392564af1515b92a6c463f7efee5fd84b96ae730fa0ff19094f5fec3e
-EBUILD wmpager-1.2-r2.ebuild 813 BLAKE2B 8a239d3ac459b2a89f3e5c9fcc725b47643f28f9b44260350f9cdee5f47f44776044c80017f2aa1438340d8721d7da7e783f0a445c984f7592de47eb03a0207f SHA512 67ddca8fc38f75f4b47c814af45fefbf8e039089b16a9e69e480a06b7e55b24f672747808fc517d595384cfe51f9278f5c9830dfbc6f90c87287a58e9964d231
+EBUILD wmpager-1.2-r2.ebuild 918 BLAKE2B bfcd82e73f0c5272f86cc48c5c50f39a53657fabdfc80cee3218e95978ddbe05f642a10a9610be4b840ce353e8786b0d0a7ad8273630c60972e4f644d7d8d8a0 SHA512 1a3003dd2aaacc6d5a2d6e5932afe04320b47a12019f1466bd5cd59755612179d970401afd09dc6528b97988cda3afa2ccdd98daa4b49173a58054df91e7ff55
 MISC metadata.xml 335 BLAKE2B 84ea6f161a5cf64fc1e9e42acb9f07936feab59f93f718fea55648446d52ed31a392e499729635894777433e1727d679da7761be79fd8adfe4abc4aba7a1257e SHA512 64fd9abf4714f12fee918ed90e7a6b67660a1ce73b15f341217892465ed655b2c0ada154a26f1fff87df7748d974d5f1a50846daf16f60e93ef7612fb2a247c3
diff --git a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
index 920a6e876ac9..541b6e136aad 100644
--- a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
+++ b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="A simple pager docklet for the WindowMaker window manager"
 HOMEPAGE="http://wmpager.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wmpager/${P}.tar.gz"
@@ -21,12 +23,17 @@ src_prepare() {
 	sed -i "s:\(WMPAGER_DEFAULT_INSTALL_DIR \).*:\1\"/usr/share/wmpager\":" \
 		src/wmpager.c || die
 
-	#Honour Gentoo CFLAGS and LDFLAGS, see bug #337604
-	sed -i -e "s/-g/${CFLAGS}/" \
+	#Honour Gentoo CC, CFLAGS and LDFLAGS, see bug #337604 and #726286
+	sed -i -e "s/-g/\${CFLAGS}/" \
 		-e "s/\${LIBS}/\${LIBS} \${LDFLAGS}/" \
+		-e "s/gcc/\$(CC)/" \
 		src/Makefile || die
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
 	emake INSTALLDIR="${ED}/usr" install
 	rm -rf "${ED}"/usr/man || die