gentoo resync : 31.05.2021

18 files changed, 10 insertions, 477 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index b535addddc5b..5770f9bc3336 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index df44cfb9bda4..36dfaae06096 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,5 +1,3 @@
-DIST gtk-4.2.0.tar.xz 25772584 BLAKE2B 38c29475050ff6d0aa41299201343d506e051387c44058f8d3e970470e49046bb11eae57d57d8d869577ca2d5f01da507edb3a87f79c98828ec938a0d87e6989 SHA512 12e825245b92f5dc652530c35b9a48a0bb284641d4128d054a19a35cb7814babe78bfbbdfd7fe3f2472d5028d078ae209a6da5d614b023c2b438223e4c5a04a0
 DIST gtk-4.2.1.tar.xz 25809520 BLAKE2B 63183950703375b092ce451be93d16d1149eb2095b5f304578a064422821546ae161235b46617647cd67a7d8898e2c3854d87bf31ede0cd6db2138d7e5c36c30 SHA512 a2721d6b9a72be481460081aedfbd713842cb5abdb24d810ec48e346342d0d91271f4ace321a9697214477ad4829d0b0ca67754ea316e719784f01c43f0fe732
-EBUILD gtk-4.2.0.ebuild 4452 BLAKE2B 26ff8af4001096d0515b3322e3feb36f3f535eadfc0cd5f07384f51c0e92e28752fa5a8ff064fbd6c6cac9b24fd224ef7bf92b1768308ff9c0a46cc9695b6448 SHA512 f8ddee9dda3d44ecf27fb4dfea414ea05fe308b01b62bb71c8e2f0ec0582ba90e2d93fbad7dcce6962b4bf90357b829dd7a8e303b6f50162b4194af42936fc01
-EBUILD gtk-4.2.1.ebuild 4722 BLAKE2B f695e6f40466f64fa521e512d37ced9f9644b4463b20c69abc10da5ca45bd12fd7fbf0442b32de218d6f721b2508e171783cd0f2676b0caee31389520ec0b9bc SHA512 7e7d49494b3c765561e418895f55fabbff5a66d805b6d6865ab300f258af00956bb3982aef9e4f31ec39e1b50a0ecd75eda6b93fa2b3b627f82532f1bef6a2e7
+EBUILD gtk-4.2.1.ebuild 4719 BLAKE2B a91711f088fbebc52c00650b0aed2299a63390f550183f2c4d96aa1507e4840be32b4f02b4867f7fc6ac3a2f49b2df2852f18aba84286fae6fd21e8146674aec SHA512 400cb59c2fb440d0865b4e41084465c3fea8e30b2679f2dd6bab1fb5f4ebda40f950764046a80a5319aa8e23697c81d521de6cf1b0abff9996d658e2e41aada6
 MISC metadata.xml 762 BLAKE2B ba9cb841a877cab910c5517bd4ddd5ade8eeeee9730842412ea371c745a90c5b69d06d95d2f77adff6b90daff589173525914139bb6bde699f241c3ddaa5662b SHA512 8678e380c257cb7cdbee752bec79bc53632b453bbb72a6c05c9ecbd791285e964ea3a57197dd247b0cd881757f3e5210551755e043126a3db9913f96a0f142ae
diff --git a/gui-libs/gtk/gtk-4.2.0.ebuild b/gui-libs/gtk/gtk-4.2.0.ebuild
deleted file mode 100644
index 2ab650d33e30..000000000000
--- a/gui-libs/gtk/gtk-4.2.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
-
-LICENSE="LGPL-2+"
-SLOT="4"
-IUSE="aqua broadway cloudprint colord cups examples ffmpeg gstreamer gtk-doc +introspection sysprof test vulkan wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	gtk-doc? ( introspection )
-	xinerama? ( X )
-"
-
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="
-	>=dev-libs/fribidi-0.19.7
-	>=dev-libs/glib-2.66.0:2
-	>=media-libs/graphene-1.9.1[introspection?]
-	>=media-libs/libepoxy-1.4[X(+)?]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
-	>=x11-libs/pango-1.47.0[introspection?]
-	>=media-libs/harfbuzz-0.9:=
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7
-		>=dev-libs/json-glib-1.0
-	)
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-2.0 )
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	vulkan? ( media-libs/vulkan-loader:= )
-	wayland? (
-		>=dev-libs/wayland-1.14.91
-		>=dev-libs/wayland-protocols-1.20
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		media-libs/fontconfig
-		media-libs/mesa[X(+)]
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.5
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.38:4 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-lang/sassc
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.3
-		dev-util/gi-docgen
-	)
-	test? (
-		dev-libs/glib:2
-		wayland? ( dev-libs/weston )
-
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc
-	)
-"
-
-src_configure() {
-	local emesonargs=(
-		# GDK backends
-		$(meson_use X x11-backend)
-		$(meson_use wayland wayland-backend)
-		$(meson_use broadway broadway-backend)
-		-Dwin32-backend=false
-		$(meson_use aqua macos-backend)
-
-		# Media backends
-		$(meson_feature ffmpeg media-ffmpeg)
-		$(meson_feature gstreamer media-gstreamer)
-
-		# Print backends
-		$(meson_feature cups print-cups)
-		$(meson_feature cloudprint print-cloudprint)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		$(meson_feature xinerama)
-		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-
-		# Documentation and introspection
-		$(meson_use gtk-doc gtk_doc)
-		-Dman-pages=true
-		$(meson_feature introspection)
-
-		# Demos and binaries
-		$(meson_use examples build-examples)
-		$(meson_use examples demos)
-		$(meson_use test build-tests)
-		-Dinstall-tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	if use X; then
-		einfo "Running tests under X"
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
-	fi
-
-	if use wayland; then
-		einfo "Running tests under Weston"
-
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-5
-
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
-
-		exit_code=$?
-		kill ${compositor}
-	fi
-}
-
-src_install() {
-	meson_src_install
-	mv "${ED}"/usr/share/doc/{gtk4,${P}} || die
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.2.1.ebuild b/gui-libs/gtk/gtk-4.2.1.ebuild
index 8376849026ce..53ecf01d29ca 100644
--- a/gui-libs/gtk/gtk-4.2.1.ebuild
+++ b/gui-libs/gtk/gtk-4.2.1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index d27a7aa62195..0066afc0610f 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,14 +1,8 @@
 AUX 0.0.13-glade3.36-compat1.patch 1655 BLAKE2B fcc6be57b5eea5554e5ba0149fdc6fe9067a436b333c299f2b6366c98798e821d6d1c861b0fc299c6de145e9f310ea5822505591e678c36f938802accecbe0e6 SHA512 beffe74c8f78767113930193870165c751443d0f9c3cf5c6df89f1f872c892a559c1d34c63f84090d6187afa4495bc2c6a557335db5a98afc3820fe688a48a6f
 AUX 0.0.13-glade3.36-compat2.patch 1879 BLAKE2B d21b874a52028e2b7e4c09da9fb1b97296872a2a7d1665124813a644c9524e56fdeba2afbca218519edf524e91efb76f6182009319e3b098e2464e478b4b5b2d SHA512 c154ee41052dadc97afe99350a08eb141c61dad7201fe2421ae0c27e9cbd5fad8af057e44ae277a2dac9b22d3e1bf945345791bc764783a8bd19448da63bde95
 AUX 0.0.13-glade3.37-compat.patch 7101 BLAKE2B 5c49a13403f5ee41d2aeb99036925c4d94c9174f55abb3f92a27ea631f641d3678caf250319d9199b68506099bab1617013652fa062535d0fc4ec88655394f7e SHA512 8c758b47afe3c0e79c55561a8e93d1ddc3220073659889eba3b0a245f271ef44f35ad8599bdb30ab524102c41b4b344c0debffc5188bc57fcc7d8fee73b73b94
-DIST libhandy-1.0.3.tar.xz 389068 BLAKE2B 2892103a672551f9a48a2f877568548fe771aeddbf156427baf03f8654488b5a0a8218f621366a47097030eb0ecf5abeb4f021d320046602cda0a028d91ec566 SHA512 cc304acc53e0819dce4931292e395ba44c1eb8630ebfa56390637bf376de226f4545906892967815c3e144423409b5a85e293568d3ed8069a6c4775307aeef4f
-DIST libhandy-1.2.0.tar.xz 481120 BLAKE2B 327a2b1d9bec68a705f0e1cd7ebecc35706a95fd9964482244ebc6fd36f84e1563918286e507b77ec70ba4bab118b0e508a2cebef7514685221b918994d2fa6a SHA512 34f84479fcef6fdd3b46a03a0b4806887708ce8295461eae655e34febdec5b62de56e34e58696545f086be8de1e2c0ac13a61a4bbe0a945a87e7d8e860a5f919
-DIST libhandy-1.2.1.tar.xz 488324 BLAKE2B 9266671b0503971b80d9466673431624600c1ed0d061693187ab2dfe5a017235c985ba997882493f03bd7d6bb0d32c78a8858591dc57f6c101e64987d37eef4a SHA512 0474d1f15a1572ab3f622ec703fc4167beb3ed6062f566d8b50c20894a217c66d00c5b4616d54e65fac312b9836428e8cb83753566cf67abffb9eafbb87dc926
 DIST libhandy-1.2.2.tar.xz 488508 BLAKE2B 1b764c90710de8a7960308b6441657799e6c3a12de9688f720748ca57653f6592fb4ba9f75841d76ae477af7c1709dc4f303658cc543c8de3f6f64d1de7d03cf SHA512 2135d3e15931fa143698de9200803c90e93c87b82c96b4fff90b75075c218a8ef2f69a26210bda8c10fb7195f115b11b804bb6de0b2f65cd464a7cefe35d0af4
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
 EBUILD libhandy-0.0.13.ebuild 1641 BLAKE2B fdbb3a2bc50d3ddbbce1bef684846a33b96d73b59bbbe7bbe8f609cd62fefdb4951c949da4c5e50e641a6d473f7e8bf7ee4c102cb24f6691b2eae3cddb3a8e83 SHA512 0ca4f29996d3749799c7e8c55aec00598a14099ac1aff8eb70d374e80ae1be985339080eba22bf19d498131428d1201a16c210f381255e3491bfdd0d7f4d6ace
-EBUILD libhandy-1.0.3.ebuild 1247 BLAKE2B 071fce1a5906628b0a40e326287628c1fa2a9e2c0d9b71e1671601f73833b43054656c3aa4b0af5a68d0224453f30bc9c5cb1801e73ff7996f65dd5c2415eec1 SHA512 d49db8606c70cc79b425b2ef553205901543e4715fedca7b9122ecb86933ba3b2f2393fcddee584962c23d36218efc303c734247907ca13b1bab03dfee39861b
-EBUILD libhandy-1.2.0.ebuild 1250 BLAKE2B 2c5ada7d0266a55cb68169de0a8d21049a10ae962bd6f7c80c3acf79cc650c3772531db2a0f455e486bc762d7845851b196b28b49c34914cc86b0ff5f291d910 SHA512 1a1b98c0a7346d0f8f84d86375f52faba3a39e007e910d681f237f13fbe8d4758c4dd39c8100a47d826ef77aa4288d14803de3735317683b1f4816d9e122a5b9
-EBUILD libhandy-1.2.1.ebuild 1250 BLAKE2B 2c5ada7d0266a55cb68169de0a8d21049a10ae962bd6f7c80c3acf79cc650c3772531db2a0f455e486bc762d7845851b196b28b49c34914cc86b0ff5f291d910 SHA512 1a1b98c0a7346d0f8f84d86375f52faba3a39e007e910d681f237f13fbe8d4758c4dd39c8100a47d826ef77aa4288d14803de3735317683b1f4816d9e122a5b9
-EBUILD libhandy-1.2.2.ebuild 1250 BLAKE2B 2c5ada7d0266a55cb68169de0a8d21049a10ae962bd6f7c80c3acf79cc650c3772531db2a0f455e486bc762d7845851b196b28b49c34914cc86b0ff5f291d910 SHA512 1a1b98c0a7346d0f8f84d86375f52faba3a39e007e910d681f237f13fbe8d4758c4dd39c8100a47d826ef77aa4288d14803de3735317683b1f4816d9e122a5b9
+EBUILD libhandy-1.2.2.ebuild 1245 BLAKE2B 54b5828a1d8a93caf902fb91b0398bc315e707e12ac211f4f9541bb3fe008f7d1701f3bfec9d841306df9b93b3998be3b1e82f284e05b8bacaa0526e81221328 SHA512 c0a3d0e87fb45b874271695706d5680e2d8f6f521fb62a3896929deda2d810fa094f8e79c62a9f22d14aeea8f74d1d5b0a1dbafc2fa54861f0476f30ad182e0e
 MISC metadata.xml 353 BLAKE2B 7857afbafa45ea4d3230afa20992cf7196bdd23430ba09bd032b5965b3ce6b7ebadf8122b412549a84d798107adbce3f0b1d6ed79975f315889f7a7700187504 SHA512 f54a7b013a4b5f2e94efda2de95f8063a8755fb2162262a2734ea561fa10cd48be737ddbc3ab7ea93f5d1cf3f59dd91c70da25db5d331828aa74194109c5d36f
diff --git a/gui-libs/libhandy/libhandy-1.0.3.ebuild b/gui-libs/libhandy/libhandy-1.0.3.ebuild
deleted file mode 100644
index 2e4925e780a0..000000000000
--- a/gui-libs/libhandy/libhandy-1.0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Building blocks for modern adaptive GNOME apps"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="examples glade gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.24.1:3[introspection?]
-	glade? ( dev-util/glade:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofiling=false # -pg passing
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-		$(meson_use examples)
-		$(meson_feature glade glade_catalog)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gui-libs/libhandy/libhandy-1.2.0.ebuild b/gui-libs/libhandy/libhandy-1.2.0.ebuild
deleted file mode 100644
index 1df7e54eddb4..000000000000
--- a/gui-libs/libhandy/libhandy-1.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Building blocks for modern adaptive GNOME apps"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="examples glade gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.24.1:3[introspection?]
-	glade? ( dev-util/glade:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofiling=false # -pg passing
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-		$(meson_use examples)
-		$(meson_feature glade glade_catalog)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gui-libs/libhandy/libhandy-1.2.1.ebuild b/gui-libs/libhandy/libhandy-1.2.1.ebuild
deleted file mode 100644
index 1df7e54eddb4..000000000000
--- a/gui-libs/libhandy/libhandy-1.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Building blocks for modern adaptive GNOME apps"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="examples glade gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.24.1:3[introspection?]
-	glade? ( dev-util/glade:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofiling=false # -pg passing
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-		$(meson_use examples)
-		$(meson_feature glade glade_catalog)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gui-libs/libhandy/libhandy-1.2.2.ebuild b/gui-libs/libhandy/libhandy-1.2.2.ebuild
index 1df7e54eddb4..4caad0a11e8b 100644
--- a/gui-libs/libhandy/libhandy-1.2.2.ebuild
+++ b/gui-libs/libhandy/libhandy-1.2.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
 
 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 IUSE="examples glade gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 12dd5a679eb5..bc3b2835db93 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,5 +1,3 @@
 DIST libwpe-1.10.0.tar.xz 52004 BLAKE2B 3088cb103b99ab626a74c37910d91fe8abdb07d14d0846bd202716fa1a7d8087e4095e65977e25d9a6f2b97bdfcef664f3872abd8de447ffe3e841a613ebc116 SHA512 b5634dd71cca70eb960f3c045ad109346ab6ce6b01aa8c8bc8f326d232eb16ac1600757896a4b99720af3c77084351ea4f69e2e2c81b9c32cc8bc12a5c66ba3c
-DIST libwpe-1.8.0.tar.xz 51260 BLAKE2B d5f5249e3fffba03a0e87e6a8b2a261e426dc25c2a57d5e060d81f7618e957884c1c74a86a79216d4e5e85f9e173e7629be9c6a674898b20e701fd59d487bd32 SHA512 38b02d97f9ee40a1bb345ba0766acd1852500c704447bde224ac79f41e91abc06fb3047119f9843a11c78cdd5899287ab86ccedbcaefb51e366a1810f2f42fa8
-EBUILD libwpe-1.10.0.ebuild 574 BLAKE2B e323db6c7038585cdf007c602f2ff7239d5819ac5aad73dd753446dcde203f7fa47a4d625eded6c8ecd82da84d7e9ccc856166e5d81c7542d2bfa1bfc12b0399 SHA512 f3a0e17c6ccf24943fccc2071005e8dcec1f992f6d2322d38e62145525aed6275986bcc4831bf52b600451585fd75771f6b6dab9dc0895ddc881f63a14664308
-EBUILD libwpe-1.8.0.ebuild 577 BLAKE2B fded65fffdd22fdec9c06cba3bdb82c107ebe0567e389a375277b8c908c5a41bea7df0ea1425986118b9773748a18b6e3f0fbe5c49e479a4ef5ada2092447ec5 SHA512 e4e49304c2e6edc4883ac650e2be9304e712ee7784d20b22422c46567229001034530ccb8629881a682237047e1de7623437ef923ae74973964582840184f083
+EBUILD libwpe-1.10.0.ebuild 569 BLAKE2B 4da2ada649ea6b56ca62b3e53f272d12b6d3b63695a7b089ef8d8881ecd99bb395a5665e07959836eb1716c6bf50ada851ba93a2b88c61634d6d182ceacbbb02 SHA512 a5edd445e3949e8fdb32cc7dd5a2f183b150f46068fbff63d72a25beadc8d7e8dd6f6f99c732b1bcc34a095733410631fa878c3aa4a4fd0287c6d7ecbb24f474
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/libwpe/libwpe-1.10.0.ebuild b/gui-libs/libwpe/libwpe-1.10.0.ebuild
index 0e9f6488f905..8da027550a75 100644
--- a/gui-libs/libwpe/libwpe-1.10.0.ebuild
+++ b/gui-libs/libwpe/libwpe-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/gui-libs/libwpe/libwpe-1.8.0.ebuild b/gui-libs/libwpe/libwpe-1.8.0.ebuild
deleted file mode 100644
index e789badfc169..000000000000
--- a/gui-libs/libwpe/libwpe-1.8.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Platform-agnostic interfaces for WPE WebKit"
-HOMEPAGE="https://wpewebkit.org/"
-SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="1.0"
-IUSE=""
-
-KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~sparc x86"
-
-RDEPEND="
-	media-libs/mesa[egl]
-	x11-libs/libxkbcommon
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF # hotdoc not packaged
-	)
-
-	cmake_src_configure
-}
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
index cd7e316321c1..fdfeb1db244e 100644
--- a/gui-libs/tepl/Manifest
+++ b/gui-libs/tepl/Manifest
@@ -1,5 +1,5 @@
 DIST tepl-5.0.1.tar.xz 126068 BLAKE2B 2c3038326660f6326c5030cb944f8cee885b794a481f6d8f1b5d87a8ea7121ded381d28b36246a99b57bbea5fd9e6d2d4f65f9dfc54d8154ee8aabbccd7e3cb5 SHA512 f363d182185976447d235cf1201148e5201cdabd1fa8b88d7a763a965896f87bd222a0161c11e93662afaf4e474bbd0308643d28559aadc27b9d48974f4c458d
 DIST tepl-6.00.0.tar.xz 141908 BLAKE2B 200693a8cf760d18e1c53647abb8156f7e067557b4cefbd05b03c5a3ec83c3c5807ab93e0464178b68fc9f2572c3175fbf9355f4131df1fe7f79b5e2deb3961e SHA512 e36877b9f33943715a50546d82ed61e65fc07b71dca2c85ff350a305767e96eda74dc14f30b2a430e14deacd4ee8d49697fe01df1f5023afab3747e5e9c95e2e
 EBUILD tepl-5.0.1-r1.ebuild 927 BLAKE2B 2dfcfb346650914ac2496bd26a9da3c9ec3d5eca68bd2a99ce91e11672c832821bc8fcd9b351824c4d0b5f2a0b96886268fe84b91f35aa713c85f22670464fd9 SHA512 dd545be1bd92fa38a5d1239866ec06b1d4f6f0b4fcfdb4e0c12fa59ff40ad8de94141ad190b41bede8d9ff2ccbe94b562389bbb1f96ad0071e5110e37a96de71
-EBUILD tepl-6.00.0-r1.ebuild 929 BLAKE2B 70f2d5d219ffe211209711dfde8a836d259fb8cc66b55662a3ba8a66fa61245f959e1f6812bc645797566057b202fa6346f429a8ebfd209460c8a64a396551d5 SHA512 f2289840ba49cc01aa6d16e2f9008a7381a27314028935073a8e505caff3f39d71daf4d57dc44fbeb74eca49be6d8b89319519fd078b5ba8e317eaa173fc2e9b
+EBUILD tepl-6.00.0-r1.ebuild 927 BLAKE2B 2f6d76da2ead400eb18263d9538e7f25d05af50e4fcda0e576471801450df27d44bf814fe2405546261a77fa665138dca6c4ded61bde6e6046bf16118d5eb809 SHA512 0a6162b132accd754f822888656e71355c3afcb5b6f610a2bfa28ea57baf2ba79607e65583560a727e2a9ade7fc47db2a21e9f974f08d835d0047a64b5de7133
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/tepl/tepl-6.00.0-r1.ebuild b/gui-libs/tepl/tepl-6.00.0-r1.ebuild
index a4e0efb8bc4f..08aea215fb0a 100644
--- a/gui-libs/tepl/tepl-6.00.0-r1.ebuild
+++ b/gui-libs/tepl/tepl-6.00.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )"
 
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index 3dd99b7b4e3e..fe6e04286447 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,7 +1,3 @@
-DIST wpebackend-fdo-1.8.0.tar.xz 42520 BLAKE2B 885a1eee84d040e176a4f9d06e3cd527a6f619c3a85f19f2331b18a84460a102692aec3f3a1a5eff96e9fe858aa45df5ab5785db5c8c71f76cee5dc3a49f0338 SHA512 e885a169e89f90bdd38149894406af368ddd951a17612975a459bd958fef3adf46f39f80c2264a9a2eae965984a8f1f61b36440836780e73cb4e7b8f433335a6
-DIST wpebackend-fdo-1.8.3.tar.xz 42976 BLAKE2B 9c155f7da5bcfb9a485ffc9aca24bf27aa423cf1f456deec628de9ba1cbfc92c30041572562148403889442caf3953bc4bd075df980cca12db5e30f97bfaeb5d SHA512 5b53604d192d78d92644dd9d266f06ac149fc404850e2c68ad0cef04b98931bd8417791450d96d60bdf8f02fae6c486c2d53c61dbf3da5d556bc4daba0b7b528
 DIST wpebackend-fdo-1.8.4.tar.xz 43276 BLAKE2B 03973e94ea19db6f9a3e8e9855d970d6b2bdc546a5a69e5e80d07aec3c2aa48739653c596138c798f766816fbc4b1df4da0a5ed5bf42969812a87b4670db502e SHA512 a92fea7e16b48c89789ffa35427f716900071d4e65d7f06acc94d28f49688f3ff344623cc4801d4f5b7ebbd740a8349cce064467826c41a7983cc90811805a64
-EBUILD wpebackend-fdo-1.8.0.ebuild 633 BLAKE2B d2bf545e94c9f923d7f38e73bd2d65a719c954e727cac98ad6acb062ffe2c86e3ada6016cae5141b0811fec7dfc3b27f706ada0ada4a5c3058ba1e0e5638cbe5 SHA512 8c46f7c93cc9fba12d29dda2430b9e8ab4cac4b0d34f4295939a02df6fbb850358cd4ab00b37aa2ead724cc828876283610026e0ee90200ed3de3b9d87e7ba16
-EBUILD wpebackend-fdo-1.8.3.ebuild 630 BLAKE2B 5aa71f6425525ca425523167e5694e092d8477e01c4a5f5010013944ce864e638f2954c2514a3f91d5ed04d5c114157c7a99d54e11eba849f748b0182dd47d2f SHA512 9870a58f33f416ee4a5717ff0dc9397c2bb2a0ecb4b8f38f4994ced2c7fb0342c81bd80b6e87d3d7bff953bffa3e1b7754665b8c97a646d0c4381072d7278f3e
-EBUILD wpebackend-fdo-1.8.4.ebuild 630 BLAKE2B 5aa71f6425525ca425523167e5694e092d8477e01c4a5f5010013944ce864e638f2954c2514a3f91d5ed04d5c114157c7a99d54e11eba849f748b0182dd47d2f SHA512 9870a58f33f416ee4a5717ff0dc9397c2bb2a0ecb4b8f38f4994ced2c7fb0342c81bd80b6e87d3d7bff953bffa3e1b7754665b8c97a646d0c4381072d7278f3e
+EBUILD wpebackend-fdo-1.8.4.ebuild 625 BLAKE2B 351130f764ee315ed53b4b46a7b344d5de12bc94cd2269d12013919d2b1879d7a86f7cca98325eba864763f94010612e0183bd615524f67f5ac452050ab7882f SHA512 d39294f91061c3459980d572bfd8c9088bfbb8d601791f8df9c3ff08d50f4fcc921e080555e2c14f3f9b21ad73d2de326c39cfc269def483c731efd2394a3dd4
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
deleted file mode 100644
index 12d265896de4..000000000000
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="WPE backend designed for Linux desktop systems"
-HOMEPAGE="https://wpewebkit.org/"
-SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="1.0"
-IUSE=""
-
-KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~sparc x86"
-
-RDEPEND="
-	media-libs/libepoxy[egl]
-	dev-libs/glib:2
-	>=dev-libs/wayland-1.10
-	>=gui-libs/libwpe-1.5.90:1.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF # hotdoc not packaged
-	)
-
-	cmake_src_configure
-}
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.3.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.3.ebuild
deleted file mode 100644
index d71374deea58..000000000000
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="WPE backend designed for Linux desktop systems"
-HOMEPAGE="https://wpewebkit.org/"
-SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="1.0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	media-libs/libepoxy[egl]
-	dev-libs/glib:2
-	>=dev-libs/wayland-1.10
-	>=gui-libs/libwpe-1.5.90:1.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF # hotdoc not packaged
-	)
-
-	cmake_src_configure
-}
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.4.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.4.ebuild
index d71374deea58..6885d3b4d7ce 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.4.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~sparc x86"
 
 RDEPEND="
 	media-libs/libepoxy[egl]