gentoo resync : 04.05.2021

23 files changed, 760 insertions, 5 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index d3ced5c4008c..86364b66370e 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 4a309fe5aa5c..445759d5f931 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -3,6 +3,8 @@ AUX 3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch 2610 BLAKE2B
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.38.4.tar.xz 4663372 BLAKE2B 1be9159e210b88577dd367a64967aca1facea1c2f4a1611bdf773f8d01c2f4bacfa0eaaca37a9f094570c7897fc4a7be89bd303ce0739bd7f2fc925ac148bd84 SHA512 0b70850519316dd361e6d04607f3f9e4afe1bd0869a34e8403f02cefa7cc5ee683645031e337b6dcba4d89461aa7954e8d36d9c5b1c5bf12fd53b5411b908c3f
 DIST evolution-data-server-3.40.0.tar.xz 4623568 BLAKE2B 4c0b8de1eb9129e351f90477f06bcaa6b9f37b0d616df3dc2c53635e0f2ea3520546be7f88dd1ee68d32a37b385e68f5c48ca79d36c63a0f9d10261b557162c4 SHA512 d31ef0d270ef64909150c0e087835bb6308125155664eee3375be6a59c9c43cd251e9617adbf819846a7d9bb73309ec51699159ee06465266193ad5dea3c0a00
+DIST evolution-data-server-3.40.1.tar.xz 4625316 BLAKE2B d795183d07bc7b58a00e3c6f60d3704cf7e0cc6237b079c49f2e21dd7c22098c2b7b3fd2ca50fd3d9268aff8e5eaeea2e0e6c65d09c8bd68b7364445eb926c7c SHA512 47964a0965d412c329743423483c6694d078835b375d457aabe7e45a2b1b3406e4e0d4c1b855460f3c9b327d4d9320e659b0e43243816ec1e9bc49d0fea90f7d
 EBUILD evolution-data-server-3.38.4.ebuild 4316 BLAKE2B a60df67c9cba4bed928bddf01032f8ee669333fb3633f855912e1a03226b80808d46519e0c45aba4bc8bf417421ce803b899ba52d1a3abd8af990216f45f87f4 SHA512 4f821b8f78ae200a5f33e26323d0ec878356e3605ed151b63fe5dfad481e11cd56f25fc65aaca1f822e9d154c227ac7ac34b181d37f059fd5dc8842d5c4a6419
 EBUILD evolution-data-server-3.40.0.ebuild 4326 BLAKE2B 1711c611fc19269812011ed6d0a771ba03991ad9114081d971a40b8bb61f0cdf8e302c7e69ef9f5966fb7620fbc3a2017cddaf80cd8dde077ce041aab80c2344 SHA512 3eb72fd7633a1f2611ca72536ad0700e2ee6df037fddf1eef6f9cdc36ec28919335e3d91e9bf36a9bb9545628ccdb8291e7156a0de820070773dcb9c560313a8
+EBUILD evolution-data-server-3.40.1.ebuild 4240 BLAKE2B 174c00b54304e86aa8197988fe2f5352ac3f53513d6f3e8ae4d98777a812dee8fdaa6697f6b6506b2dbb8dba21583a840b1c4f9778e5fcc37d32a40a221f885b SHA512 9dafa06c7614caab9ca4b8ccd07d783c6d3a31294e6a5c38df0534883edf784b920a9bfdceb9a8c35f424694c44ac2cf41216e4bfa1bd833038ba0945ae2c96b
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild
new file mode 100644
index 000000000000..02f51c3698ce
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake db-use flag-o-matic gnome2 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/62-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+gdata_depend=">=dev-libs/libgdata-0.17.7:=[vala?]"
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-3.0.8:=[glib,introspection?]
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.58:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.16:3
+		>=media-libs/libcanberra-0.25[gtk3]
+	)
+	oauth? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.28.0:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend)
+		net-libs/libsoup:2.4[vala]
+		dev-libs/libical[vala]
+	)
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	use vala && vala_src_prepare
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_enable
+	if use oauth || use gnome-online-accounts; then
+		google_enable="ON"
+	else
+		google_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=${google_enable}
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 294fb5b60d96..9bc00a5d9254 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,6 +1,8 @@
 AUX evolution-ews-3.38.4-cmake-3.20.1.patch 2499 BLAKE2B 169eff8e666f732cf0040df67b834c32c351a6b6cfa09ff200dd5bb5aad6fa0be59a02722747c708ce1d7d448303d617054d2ccb1685cf2ab5c7aca3a80f4c1b SHA512 b5013334535f2fcfbba3a03767d9a8207dd5d6c7390ebbf97317973c481b93819c117eb103698bc4aa980f8fa27cda04671eba1f25d8ce62dfb22c05225017a3
 DIST evolution-ews-3.38.4.tar.xz 651384 BLAKE2B e4f71d38ddef6347ba3c137bac2246a6f4ffb5990ac2b6d3be72549326ae579c0a0f2bf11d19ce578ea37b99d0f8613d8d6a7e2ac75b9381e3b8c96646e483fc SHA512 98c1fecfa45bb2fe8337a1da54f09ef620128e4bba28b008aab3117291f7df708e6676421f3b8514448d035f1288591e54642f1426830fca7ba0320e3f3a99fc
 DIST evolution-ews-3.40.0.tar.xz 666148 BLAKE2B f8d7f6c917114e57bcc8ea93072f520069f7f183ce67ef5a5304c6721b3b9dae262ad5a2a8fc78b8ea75495f7f31f565b5db8e5bb02acaa5666ced15c0c3c5f2 SHA512 c5b0fdfbe455941444974738853a1c0346b77b96a483db8ff5b509a7c7dda90a0c1795749f3b17eeef4b3c2aceb06e51d2c5f9d784c0b6c17c78f8c37bc1c9af
+DIST evolution-ews-3.40.1.tar.xz 672448 BLAKE2B ac6548c2567dd1ca303def27a21974f93d44c1175e8474bebaa6576dc63f8624c32e9357186e2c1412ca2091412b17e0f244c60919652ede55fb77e1bb384b90 SHA512 8d0477b500ee1b0c6a9527f2d63fe0b4238862425a079729478a8df880f35e6a1166d2f8f77cafa73844351f0cffe171d857366c4527770d7436d8b4ace29b99
 EBUILD evolution-ews-3.38.4.ebuild 1462 BLAKE2B 8a7790c3a372f799b23060f14e13b0bb5bf8923f17cc7100c74af2fa48676dbc94bfb0fc46ea867e098beefce5ae46b06c93e52a15c935176a649d9e22404b4d SHA512 61760df6be1c7848a3ab1e5cf04b33f9d6f1ad393bad54b26138f9154861e4b09d45c44534c85db24cef85891a7e2a426b0264ecbc1871c27635a411f8910b46
 EBUILD evolution-ews-3.40.0.ebuild 1464 BLAKE2B aa9cf2a2aafed9c1900d7506e80b65dc55270618ee3978e8ccbeef37605617ec72f6c75c6ee304728a51ff8d659992c2af2859d0ecfa569c02d2a8149d1abfe4 SHA512 12890f61f4ce66e79156d6f507865b6aeebadd9fcc9df79b1d8ecbeae5cf84e212385dd77167ec825420ed94202d237dec888d112b801166f2c8ca96ca371bf2
+EBUILD evolution-ews-3.40.1.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild
new file mode 100644
index 000000000000..2088827c2022
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# libical-glib currently (2020-02-29) oddly behind USE=introspection
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.62:2
+	>=dev-libs/libical-3.0.5:0=[introspection(-)]
+	>=dev-libs/json-glib-1.0.4
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.58:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/uhttpmock )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/gnome-extra/filemanager-actions/Manifest b/gnome-extra/filemanager-actions/Manifest
index 2cdeb87e26d5..60b6adf6a822 100644
--- a/gnome-extra/filemanager-actions/Manifest
+++ b/gnome-extra/filemanager-actions/Manifest
@@ -3,5 +3,5 @@ AUX fix-help-file.patch 1076 BLAKE2B 8689ef4b36cf5a2226b8a8c559d1cbb7e65e21e5a29
 DIST filemanager-actions-3.4.tar.xz 3280320 BLAKE2B 140da4441c4408b57ee0e5de04a792b7376eb89e77ea6132b679058af117149f69c1dca0b614f1dd1153f5663b867859d98036bfc3d9b9d313453f1b4ee1510e SHA512 05e47832e5d97a664be617c7ad998ac94022f272369b7d23704f3f809e72f21b5087653ecccda663cca2c61553ebc3d009742004b2c59d3c99af92fa39af2010
 DIST nautilus-actions-3.2.4.tar.xz 5148812 BLAKE2B e81edf846219b89f3585743d8a3601f21483dff86d601415a968d7f50f9fb4b889038593796d1b442f0395f0c649e7c5c3639b2fc0a42dc05bb7ba6588247709 SHA512 1f8e90fe040b76b0ce9a26f99725e717e6c60a1a838339ec1e26acb5db46b1382e6468e6cabc542e51438b63da2501728cd117e9f77a1710a296e9bd59e402f0
 EBUILD filemanager-actions-3.2.4.ebuild 1253 BLAKE2B 74f2918cc126ec18beb6c6aa8f3cb9e8b990df12ff55054d4be9b22b4d0f7b6650662627c52c43b3033400ac57d5e5a66610a06d268a06959186d6c0b54a85ce SHA512 91ee195089c4534315900754362d75b9ebe9bca7e68d713a68e63a233a48749d65dbcc9691bd85e2f397b9c3c97e6adfbeaf4b16928d2dd302f41901514113f1
-EBUILD filemanager-actions-3.4.ebuild 1976 BLAKE2B 6cfd3a4cfddb83d094af9cb9ebd1c944d59998381854aff7a982639cf04c7317b707584e6860507806f78743088a8df31c575a8e263de3e7838fb44239c6708f SHA512 e6ad63150f5bbc2edc7a00d12ff2cc43c2252e381bd6ca60572655370e46ac68a6ad772526c75b736e8a35ec55f868363923d9e175ec1dee220148b27ebcf3e7
+EBUILD filemanager-actions-3.4.ebuild 1975 BLAKE2B cb64bfbc94c111cff38781fece40c5a3fd079c332bbdfb830628ad8e9a70a804171901076ebd8b334af118ef1300470203b682f688d64495ffb9001b9e806c8b SHA512 a090fab0e2145f74f2bcc8151ec70d205e0e2f920900253b228a6ebdb047d8f68434ff4a132b4a2a6dcfb939854a88c9a5c912a69c398020cbb07aca4326ce02
 MISC metadata.xml 495 BLAKE2B c4215a3c06445cfc6d281058d6d4a18a6d6e58ce10f1b3cac8dd95c6fda7c937b02b9766cdfb5bd874eacbac466c488011b1b19acb0c33eca8bc588e2b3a46f2 SHA512 849883913086efb500105e737f8e12d32911012e687dff4398c6e3beaef0f36b91331b707ebee2b21176d2eb3a4e5039243068d0db666331c6cfbd3e9928dbfb
diff --git a/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild b/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
index 1ff9887b3ded..397e5f5cdc0e 100644
--- a/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
+++ b/gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/filemanager-actions"
 
 LICENSE="GPL-2+ FDL-1.3"
 SLOT="3"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="caja +nautilus nemo"
 REQUIRED_USE="|| ( caja nautilus nemo )"
 
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index dc5e7d5dc478..46dad7fcc89a 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-boxes-3.36.6.tar.xz 1275972 BLAKE2B a4b6bc98a8ed644020dce7ce5f5f08ae75291e2ac3351d1b3354d495a0579a59a245d63ba22754679b9641088bb71f96cd3abc7944f9996526ad7e6db9552458 SHA512 a37f34ea54d60d2d927dfe07a6ace6bd74910054b63a58bc2782f6dcd087d4a2153db0662d715a1bc67e2687742a162b3f66ff97b7678eb280f46b53765c7f73
 DIST gnome-boxes-40.0.tar.xz 1693528 BLAKE2B 15065fc28dcfa734ae2eea8b927042520466f56dd311b5328d224e220992b3db4ac24bca689a6f4d35c134721ba83ecb4f5a5a4760050a156069a45854c3218a SHA512 2ac569e5a423b67dc6b770eb754de6ce996e381032ce8610baf4de999dd45480eeba086211db783f440d465f3f50b06666c33e959270d8c87306e591b9aebeaf
+DIST gnome-boxes-40.1.tar.xz 1696528 BLAKE2B 7a593d535d2a6f0b0750c542a86a8210ac697fe8340f44830134c840d3a7500a6f6ecbbf901d6f37273f3354342b68cb1bdaf4cd7a5a98fc3047ee2ca5cc8b6a SHA512 a035454f3bdecc75222b27b6c1bf9807b21b9b3846300f2afafa3f30d4069b32a258e4d82f38cfeb407b21bd40d84031f57ddd63322dd6ba576c9795f355f33d
 EBUILD gnome-boxes-3.36.6-r1.ebuild 3855 BLAKE2B 54715fa7e8e2faf4ea26c9cc88314aad095a36497715893ed5ba18cf8d62a276a24c4fac0fc483d2c52ee53989adf43d585faa23f86e15ada600f9d2402f85f7 SHA512 842decd476504943ba29bdb8f18f3f5f3303dc14f71794f1770a4a9dab1baa392585081142a381eab7d78af0b136935b7ee56fe343c7e8d2cb58c90c408936f2
 EBUILD gnome-boxes-40.0-r1.ebuild 3884 BLAKE2B d9321b6bfec5b631ebd52e1bd318fd58ceae6753c5119f9d9dbfeb5c8bbc96509fc8dfcfedcb4d2641de18420a72d288817dd8b541289f39142a2be661603564 SHA512 1740b1ec84b0d53783463a5c3ffce68a42b17aa5546e8b2a00cc0f219bfea60644dba9e489a9b12924a07c2666805405a21bba6a9d172981cb792be3cfb98d06
+EBUILD gnome-boxes-40.1.ebuild 3884 BLAKE2B d9321b6bfec5b631ebd52e1bd318fd58ceae6753c5119f9d9dbfeb5c8bbc96509fc8dfcfedcb4d2641de18420a72d288817dd8b541289f39142a2be661603564 SHA512 1740b1ec84b0d53783463a5c3ffce68a42b17aa5546e8b2a00cc0f219bfea60644dba9e489a9b12924a07c2666805405a21bba6a9d172981cb792be3cfb98d06
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-40.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-40.1.ebuild
new file mode 100644
index 000000000000..2078408e917a
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-40.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+IUSE="rdp"
+KEYWORDS="~amd64"
+
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+# gtk-vnc raised due to missing vala bindings in earlier ebuilds
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	x11-libs/gtksourceview:4
+	>=sys-libs/libosinfo-1.7.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-4.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:3
+	>=net-libs/webkit-gtk-2.26.0:4
+	>=gui-libs/libhandy-1.0.0:1=
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+	rdp? ( >=net-misc/freerdp-2.0.0:= )
+" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	app-cdr/cdrtools
+	app-misc/tracker-miners:3[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	sys-auth/polkit
+"
+# gtk-frdp generates gir and needs gtk+ introspection for it
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	rdp? ( x11-libs/gtk+:3[introspection] )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		$(meson_use rdp)
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index d3782ac0d04b..d73153132209 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-calculator-3.38.2.tar.xz 1004684 BLAKE2B c2b6a0ff2e6a91c43a1670945af989b715f0f7369050dac13bec02898ef6780ec4484c6ee9f6e6bb19b8ecc9d7d8c2df0c824ac9c3309783cbc89b96fe1f16b9 SHA512 41e58b34640e795108a552aa0d95b03f0c84c4d5af6eef7fe8350c5f4e031a0fad7cad73034b38b2121f09687815b6b10a6a86fb00c7cbf720ccb06a8eea0403
 DIST gnome-calculator-40.0.tar.xz 1022596 BLAKE2B 9522c8698492eeb07fbd86e8baeaee67433a1d43b2c97c4c895ca7ac8958a01c4e05c73598b1c14a2b333bfbc156b824669b20e878fcb681ade99c1ceef5ce72 SHA512 f22e9a9ade2f236142b7ebc3e54ed07834b049087ed8606571730e3bef2ab86317718df622368515266ba9578f660d7cd892cf87cf43bca9441369c838967c5d
+DIST gnome-calculator-40.1.tar.xz 1023164 BLAKE2B 977fc227adaa50efa271776035a11ca79166a703c9c8d618c13af477056622a9faa42c3a8876257a117486399e91fceec7a19b930293883078846a645db912fe SHA512 f46acc802ef130ec59e4376a02032ab683e6d166d691d7c5f626e2a978f017f171c0e8ad50991d1828cb325b1bd53f63ef256b9b24860842224fa3dd7e27f4da
 EBUILD gnome-calculator-3.38.2.ebuild 1595 BLAKE2B 508741b5f8eb80e83d16e3d035b61baf96253db07ef3f9dbdf08d4c0035d926be754087c6118cdf7186c9bf6c57f966363a5a388fcb76437faf0c711940d729d SHA512 7d1667034f9041836fcae738b6c197efd02126da6f95bf868da200040eea10ccc36e66a7aed61a49c546ab3578abee95ce9b4a5ff71bada6d0bd522c73943921
 EBUILD gnome-calculator-40.0.ebuild 1690 BLAKE2B 8a4c93d1c5466668b3bb2a8ac40124e15eba2ae5ade32cc1bb2a5282fb717bde09734f7a11fb791bacd6bf07ced3391691155f248d9c7d1a8706bee9a605b1a6 SHA512 bcf726e99cd69ee997aaa32d4059f328a3a93bf18633719bf44b7533303520bc12cb0f0cc4c815cff2b665134adb059a6b581f09f2420b123e41359f30ebb962
+EBUILD gnome-calculator-40.1.ebuild 1690 BLAKE2B 8a4c93d1c5466668b3bb2a8ac40124e15eba2ae5ade32cc1bb2a5282fb717bde09734f7a11fb791bacd6bf07ced3391691155f248d9c7d1a8706bee9a605b1a6 SHA512 bcf726e99cd69ee997aaa32d4059f328a3a93bf18633719bf44b7533303520bc12cb0f0cc4c815cff2b665134adb059a6b581f09f2420b123e41359f30ebb962
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
new file mode 100644
index 000000000000..17bd94f4fdf8
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+introspection test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
+# altogether, thus we need them installed by gtksourceview[vala]
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	>=dev-libs/libgee-0.20.0:0.8
+	dev-libs/mpc:=
+	dev-libs/mpfr:0=
+	>=x11-libs/gtk+-3.24.1:3
+	>=gui-libs/libhandy-1.0.0:1=
+	>=x11-libs/gtksourceview-4.0.2:4
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	net-libs/libsoup:2.4[vala]
+	x11-libs/gtksourceview:4[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+	# Automagic dep on valadoc - don't bother for now
+	sed -e '/subdir.*doc/d' -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-ui=false
+		#-Dvala-version # doesn't do anything in 3.34
+		$(meson_use !introspection disable-introspection)
+		$(meson_use test ui-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index d3fcb3d53ae3..db3a39ac17bc 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extensions-3.38.2.tar.xz 209904 BLAKE2B b9a32e9c20046cb480dae3ed27791958799f534dc19026631290d2d0bcfac04955e77b2779f9a18e32d7ee56f837e8e17167bd40b575ff531b8cc328a9c0cc35 SHA512 5106946c10ea34b339ef413d5cf6bc3e1cd7f54f73b0ca773ae4076c1280e2b235327c9209e8269c5aca787035b489f73a76c7163380f191cb246c8591bc838c
 DIST gnome-shell-extensions-40.0.tar.xz 217772 BLAKE2B de2f88dd37a0b9bbbbcbd7373e18b8589d4a35a9497404a4e46a0e4aad7058890c6b596edd553cbb68dd6ab9db6bc81d8ae5457be02a4af2b2cc4b8fd2d8691d SHA512 9f4b4a5d91201c11246c2df880b568d69264ad875bfdc2b69d217aca0e4354223aeed51007396a339fb9a693eab9849362641fa9a064a5efdda7fad5b886af85
 EBUILD gnome-shell-extensions-3.38.2.ebuild 1756 BLAKE2B 253307671aa10bfb66558f553c6ca3535f434f610ff74b4ad739523896df76ee7ea680dc3e2376ce3f3a69586f2b25f5987e3a6bdb2de0a3d3c808750fc4c06f SHA512 77d33546cceb52dc441ccffd769f6c26de76df4d8483eba73d6595febdadc034617d434ea842c32ecdf8def2ece8a33249bab4623175439df7f7d81ce31d5800
-EBUILD gnome-shell-extensions-40.0.ebuild 1742 BLAKE2B 6a2d129435e6dce06178fa5352ed34a05596c4069ab92c3dadf8594cb883d80dbaf5fed7e13a0ba4c88c79b7c08404f98709f106bd4bd27a7bd3a4efc577c9b6 SHA512 10872a5bb3bb28723392eacc539f53bfa214db8ce094e0bf407ed810428598dc58232452117346f7464827eb617d9011ce55a2e312139350efa64d8b90e29ac0
+EBUILD gnome-shell-extensions-40.0.ebuild 1737 BLAKE2B 5a6d834841242477919c384418106fb94314d4eec58a8a52af6fa5cc84de0afead7a8f2cb0caec7dd211139cda3bbfa49f95cec75304394a98783635568636d7 SHA512 3b38210fb7bc5ad78a609008bd6f2dd2c07437d92d7953b76b498be83ee2878264c92e1ae9d1a7f8f051771932a37d05530d7f063de1ec059f431be84ec337e5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild
index 3c33ad2de500..82d61f22a48c 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index f2d848a7535c..9d18cc67c013 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,7 +1,9 @@
 DIST gnome-software-3.34.2.tar.xz 5945736 BLAKE2B 89e7e0a606a832aedbfa32024f201e71b3edb3c8df527efea1be72236b4bfb86901f3af689b10bf706f9c4f16e6badc00080a1244ce30eb09dfd1dad5833e8cf SHA512 4deb09530fbeeadd54e69d03ef4cecaef47c6766bce0ec5230bb090d27e54664577a227416933b6ec4780249f4565e51202a25517fba5dd040fd895bd3a26397
 DIST gnome-software-3.36.1.tar.xz 8277796 BLAKE2B bf3d5f3f67b211cfd4af87ae500691085ab83aed9f85e211972d408a1bfa5d7c6de162acc2088bf9ba9323369e73dba27a06b2491745ef2ceb04943e4acbf72d SHA512 7d0e8c16192bbbc8f166db137dbd2e6ff9e85f7d3d37f63f41211ba3838e392bd87a8d9bf09d31b43f6d21e1a099ecdeff9114ae27fae40d563671f0bcbe50d4
 DIST gnome-software-40.0.tar.xz 3087252 BLAKE2B 4b834113c0770a3acfbcf21b5db3d6da57a885e6b235c3328947f218f28daf70c6f636253283dd77d0c4a1fc59f8ac66a140412694a61352147c13c27e7a76af SHA512 052c520ab25af4257bb978aaa9e1c7a555f8d24dbd782d9f12f3c3def22e65588d3c76d16e4b3dc26f034a762c2ee3e773026b158d468e9e169369dc3d156a2a
+DIST gnome-software-40.1.tar.xz 3093832 BLAKE2B 0da79bd28f8db55816543490518dce880878a7619d05d789d4ab1795728025e9eb5ec4ad330018bfae036d3cc79b712178bea9e219b357bb231ee898eb0e1744 SHA512 ae805d01896d761dd82a21dedbfafba7e8ffd2d98e99da4548d846aafdf07f9a26dfa2e083ac2dda576f8b1db05bb3f26642d3a6558da86921450049870767fe
 EBUILD gnome-software-3.34.2.ebuild 2575 BLAKE2B a3f3577b57b71d05e902ab9b9ef9fc036abe6af0c77508fd04f8b918be16a0d9fd0aeb6d050202cf97f30d01ba52dbf42d430d37760b714bff81276bca52e155 SHA512 cc26a7d5fdde91d32e878cceb9d04811809dcee768519a271d0b950fd6806c2f10c501a403c78b8ca6e1b5e4013978ceb18d63ad74894866e4a3d546ddcbef6e
 EBUILD gnome-software-3.36.1.ebuild 2839 BLAKE2B d98fbd6f2300d6fb96c26b0f2dd06abed0610d982136ac571d245ff1560d3e306f638ef015d5bbe190ce696f1e815ed6108c05a2daba6358c0a137ce78d5b8da SHA512 ab945043f956b40f1131b96a4adb6942b5383086ac81cf37171950de5e81e27d5b409b00e07cf116d9d4578a46484d7ea2be2b486cbb4c248a7373e368c0029f
 EBUILD gnome-software-40.0.ebuild 2934 BLAKE2B 81514c43f2dbce4137c71089ca76d7557b023091f402636d929e7b729d593f5458180a0fa314d91dd1ba607adcaf5e1866f680aa3f017d7d281ec964ac357816 SHA512 ea3da637de40af1487c8fa561e1b7c38f0565f78e5df91211c127e9f776ca399546a8b22fa7e15c9c6d02b67dbeede720e06a58b912784d8718314218d400f11
+EBUILD gnome-software-40.1.ebuild 2934 BLAKE2B 81514c43f2dbce4137c71089ca76d7557b023091f402636d929e7b729d593f5458180a0fa314d91dd1ba607adcaf5e1866f680aa3f017d7d281ec964ac357816 SHA512 ea3da637de40af1487c8fa561e1b7c38f0565f78e5df91211c127e9f776ca399546a8b22fa7e15c9c6d02b67dbeede720e06a58b912784d8718314218d400f11
 MISC metadata.xml 657 BLAKE2B 964e35ceecdb7cb6299ca103520f1c0b67859bbc2a020994f5b9a58d9b48c0457787fc3b73d756074d36b33aa445f266cfc7ce953959378da020c2000c581575 SHA512 436225bf3076aa82432b72103209ad101824d20d3e37be6225a627c15e1cd1e52697b91c77021f83e4009d06e057e8e97dfc05860122764a82e59b356c282bc1
diff --git a/gnome-extra/gnome-software/gnome-software-40.1.ebuild b/gnome-extra/gnome-software/gnome-software-40.1.ebuild
new file mode 100644
index 000000000000..c81ec02d2b52
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-40.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flatpak +firmware gnome gtk-doc packagekit spell sysprof udev"
+RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
+
+RDEPEND="
+	>=dev-libs/appstream-0.14.0:0=
+	>=x11-libs/gdk-pixbuf-2.32.0:2
+	>=dev-libs/libxmlb-0.1.7:=
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.22.4:3
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/json-glib-1.2.0
+	>=net-libs/libsoup-2.52.0:2.4
+	>=gui-libs/libhandy-1.0.2:1=
+	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
+	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
+	spell? ( app-text/gspell:= )
+	sys-auth/polkit
+	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
+	firmware? ( >=sys-apps/fwupd-1.0.3 )
+	flatpak? (
+		>=sys-apps/flatpak-1.0.4
+		dev-util/ostree
+	)
+	udev? ( dev-libs/libgudev )
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+"
+# test? ( dev-util/valgrind )
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
+	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
+	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
+	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
+	# TODO: Investigate; seems to work outside ebuild .. test/emerge
+	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtests=false #$(meson_use test tests)
+		$(meson_use spell gspell)
+		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
+		-Dman=true
+		$(meson_use packagekit)
+		# -Dpackagekit_autoremove
+		-Dpolkit=true
+		-Deos_updater=false # Endless OS updater
+		$(meson_use firmware fwupd)
+		$(meson_use flatpak)
+		-Dmalcontent=false
+		-Drpm_ostree=false
+		-Dodrs=false
+		$(meson_use udev gudev)
+		-Dapt=false
+		-Dsnap=false
+		-Dexternal_appstream=false
+		-Dvalgrind=false
+		$(meson_use gtk-doc gtk_doc)
+		-Dhardcoded_popular=true
+		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
+		-Dmogwai=false #TODO?
+		$(meson_feature sysprof)
+	)
+	meson_src_configure
+}
+
+#src_test() {
+#	virtx meson_src_test
+#}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index d5b045c5d3bc..ad4ba3a59d30 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,8 @@
+AUX 40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch 1728 BLAKE2B 00c009a738b3144e7d097ae6ade1edb6b6f8ce373087e501a67569a9cfc2e860bd9cfdd67fe25a15d97aa55ffc4256359ba6755cbbe587ec3ac39a7b9cf84804 SHA512 22038ac59ac904089c4ad9d704cfdddbf0224f3a99f63887412fddd5ad88430985a4f650d55e8478a30fe1288e05f340e827ab5be07a3c3c870f185052dbb9f8
 DIST gnome-system-monitor-3.38.0.tar.xz 712320 BLAKE2B a59fbe39a8c04793c5584f645dbe0e0bcb9747394c0b923532afc95443aadeeb17ca211248a5c61747699eb95d4f8530fcc18076753bcc6d28cf2ce47a4f6825 SHA512 9f54045fa837b85d40a80bc8b519f91513ae27ca157e07f415860e906444bf144b7a7a66e4a2a9a5b1fea4e69305414cf081bb34624c91d1476265b37b59368c
 DIST gnome-system-monitor-40.0.tar.xz 763344 BLAKE2B 3a9b0f7a823eda4a00b58ece53604a127047a0d087fdc74584d5e1453744063332bb084ab32dc624812d80fa233a0fbbb39c20e2cc18b962dbd248799d587a3a SHA512 b0e326c3abdca0a3b5807976a04b7090861717840b11829d75fe5da91ef7adb34b80d2952aee4c1ff843bd5356dab7490d1c2e403712fd3c1381baddb8542501
+DIST gnome-system-monitor-40.1.tar.xz 763720 BLAKE2B 50d69ed95173301a566078d5bf32c48c011eb297a7fcb598dad1c515ee2900731362c9637dbf7793bb95d31a5584f7f84192b1c726b1a8362dc364b695f54263 SHA512 a6c870ae4e58c5fabdc87c290e10326b051398b3408f7ff159c854eef5c7940371e83766f37c6a713631d49ee5ee7b2670f441a462e2453fa849cba2f3255be4
 EBUILD gnome-system-monitor-3.38.0.ebuild 1158 BLAKE2B 5e44fb20f0873e29a0b965d1e8f40365bdde874694bd4d01906f88f62170e61cd46a1f7865df998970ab34b57a4e1305c5b76413ae82498ae4d2b553a398dd99 SHA512 68584c47b3c529ac63d605e19d8a36aedbbfecc0f92844a9a9a70f470cc9a043a8bc3e7b86f2f57fcba76f2641519fe1f97e068f39c9e2d093d03b30af57ed6b
-EBUILD gnome-system-monitor-40.0.ebuild 1214 BLAKE2B bd64c30c1463b52acd4d1f9e5341fc98a15059349253d7ed3a7dbe9e62f46f7b7a773ab5f90294e6d19fd849cc9cbf207994626f5fc4306efaa6d05b6bf2891c SHA512 29c824fe1ac1b93c3a4965ed147fa03a9f101e4d96a8a827ff0333d1f2b615491535a9eb39acfc47bfe07fa6e0e9ffa805fc0f17db3f6d314ab5fa0eb175be34
+EBUILD gnome-system-monitor-40.0-r1.ebuild 1307 BLAKE2B 6b9f3d4e3b26300f95509ee9ef6e029b057d12e544dc84f49bb8f179678f3fa1140691ac902997d1b947af1a3a1aa9c333c9166954776f1de04440e867783a36 SHA512 216f16f1e128463cea0d8c277e727f6f1b7221d9f5eb7ffdbe7215c903a4398d6a7b18a3bf8eb49554576f6717a7ee95d7b07ddc5e926c6d085bd708d7870076
+EBUILD gnome-system-monitor-40.1.ebuild 1214 BLAKE2B bd64c30c1463b52acd4d1f9e5341fc98a15059349253d7ed3a7dbe9e62f46f7b7a773ab5f90294e6d19fd849cc9cbf207994626f5fc4306efaa6d05b6bf2891c SHA512 29c824fe1ac1b93c3a4965ed147fa03a9f101e4d96a8a827ff0333d1f2b615491535a9eb39acfc47bfe07fa6e0e9ffa805fc0f17db3f6d314ab5fa0eb175be34
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch b/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch
new file mode 100644
index 000000000000..595870bbabe2
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch
@@ -0,0 +1,44 @@
+From ba93af5b3e429db5a9c4dd7e2d06b800735a9071 Mon Sep 17 00:00:00 2001
+From: Robert Roth <robert.roth.off@gmail.com>
+Date: Sun, 28 Mar 2021 20:33:40 +0300
+Subject: [PATCH] Dropped non-gnome workaround causing crash (fixes #182)
+
+---
+ src/interface.cpp | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/interface.cpp b/src/interface.cpp
+index 48b42d0b..65e52682 100644
+--- a/src/interface.cpp
++++ b/src/interface.cpp
+@@ -698,7 +698,6 @@ create_main_window (GsmApplication *app)
+     GdkDisplay *display;
+     GdkMonitor *monitor;
+     GdkRectangle monitor_geometry;
+-    const char* session;
+ 
+     int width, height, xpos, ypos;
+ 
+@@ -715,19 +714,6 @@ create_main_window (GsmApplication *app)
+     gtk_application_window_set_help_overlay (GTK_APPLICATION_WINDOW (app->main_window),
+                                              GTK_SHORTCUTS_WINDOW (gtk_builder_get_object (builder, "help_overlay")));
+ 
+-    session = g_getenv ("XDG_CURRENT_DESKTOP");
+-    if (session && !strstr (session, "GNOME")){
+-        GtkBox *mainbox;
+-        HdyHeaderBar *headerbar;
+-
+-        mainbox = GTK_BOX (gtk_builder_get_object (builder, "main_box"));
+-        headerbar = HDY_HEADER_BAR (gtk_builder_get_object (builder, "header_bar"));
+-        gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (headerbar)), "titlebar");
+-        gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
+-        hdy_header_bar_set_show_close_button (headerbar, FALSE);
+-        gtk_box_pack_start (mainbox, GTK_WIDGET (headerbar), FALSE, FALSE, 0);
+-    }
+-
+     g_settings_get (app->settings->gobj(), GSM_SETTING_WINDOW_STATE, "(iiii)",
+                     &width, &height, &xpos, &ypos);
+     
+-- 
+2.26.3
+
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild
new file mode 100644
index 000000000000..61f0a37382fa
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="systemd X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.22:3[X(+)]
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/atkmm-2.28:0
+	>=gnome-base/libgtop-2.37.2:2=
+	>=gui-libs/libhandy-1.0.0:1=
+	>=gnome-base/librsvg-2.35:2
+	>=dev-libs/libxml2-2.0:2
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+	systemd? ( >=sys-apps/systemd-44:0= )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=sys-auth/polkit-0.114
+" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use X wnck)
+		$(meson_use systemd)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
index 2a765ffce9bf..2a765ffce9bf 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index d2b480f48f1b..4c8a40131799 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-user-docs-3.36.6.tar.xz 10607064 BLAKE2B 2b6173905f16a72885ea684e79930ee9425adea7b98b11f324df48c5f788a6f72aafcf9b782aae764eca3db451bd232be6f2572eec6278e179ae04102c863a1f SHA512 62384715c9cfa82fcf39f93d574e61aa2a127060f558f7f68b7ce1a3a724cf1670affeff165cff16b6c019b2c4135a517d39da6be859e8756c850763c912f3ab
 DIST gnome-user-docs-40.0.tar.xz 8974868 BLAKE2B 4598074620fa08c4e9f9bb8d7267252abe4f0a026668d1236cd516f832b457e675326789ed0c8ac6efb71b81a75a1e40aa8dee6049a188d79c289a8af3991661 SHA512 0e878c28a1d8fa74dd44b5be0562f0a45056ab1eabd1f00e81db46d69fc39e9a5a833cbbd42704fd998a5f724c323902323ab5b100be6c58089d9051302a14b5
+DIST gnome-user-docs-40.1.tar.xz 9264892 BLAKE2B 3c27662d516839d411444b811d2c60da51b055a7200958ee50908092bd135e182c2b359f47b711b276a6a9b6b029b767b23bd88fecc32f2c80fa2652ace40184 SHA512 a5ebd9bfbdf13c6922db2035c740f729dc89a2dfa991e74cb835d1c8e28ec4d0d08aaf7388d00d6df83f53a6261bebc1ea32e5b57287c13b2237221a56a34332
 EBUILD gnome-user-docs-3.36.6.ebuild 947 BLAKE2B 62a259e51c3b2c24f6b108740464fc607b7d80343f993c5fe89572842d1d678ea60346a6641c7b09213f56ad3878ed0a2f5b7a3cf4687c256e50da6cb10e8479 SHA512 84de2f588a357757ad2b31a6cb949b997080d1e9b0d8e0447972cb3a9f0a0b3202119d0fda88d71cf17a13444710e77afaf2e4c9bba27fa27adfd6876ad6480e
 EBUILD gnome-user-docs-40.0.ebuild 936 BLAKE2B d817b396cd03ca3252a5839e2beafbf11e305308771b289632506ffea0b6122da84bb24d868d247131bbfb11f51528f7d60cf39447c9d1501fc0e611a0d0ecc5 SHA512 6ea8dfed0f8e5b8d9a5a8ec59d023761a0f2b44831a8ad9adc1aa2d771dfb7cb2ab4a9413b5375d1f77e23f0ab8af4344e92d49d2ade8e34397b62f74937d7ba
+EBUILD gnome-user-docs-40.1.ebuild 936 BLAKE2B d817b396cd03ca3252a5839e2beafbf11e305308771b289632506ffea0b6122da84bb24d868d247131bbfb11f51528f7d60cf39447c9d1501fc0e611a0d0ecc5 SHA512 6ea8dfed0f8e5b8d9a5a8ec59d023761a0f2b44831a8ad9adc1aa2d771dfb7cb2ab4a9413b5375d1f77e23f0ab8af4344e92d49d2ade8e34397b62f74937d7ba
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild
new file mode 100644
index 000000000000..9b013790bb62
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+BDEPEND="test? ( dev-libs/libxml2 )"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip
+	!test? ( test )"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index a5d9b3bbfdde..eaa5ab2a24da 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,6 +1,8 @@
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 DIST gucharmap-13.0.4.tar.gz 1900442 BLAKE2B 83925f04b23a5984e0180ae86d39842e419fe723604d3e93785241ed33ba56b80d68bfd8c99514ef542e515c78a0b64748781faa962d3a32e26746673ba4d2f0 SHA512 919f3298040962cf1b8636fe82a900e667d1f63c0f92c99b013d10cee7e7d5f074f3ffaa0ab8a8e3685b6764915a4e683e459fb680aeb65247c82c5a8a326bf9
+DIST gucharmap-13.0.7.tar.gz 1919890 BLAKE2B c90b09f2e52b27ea652a32c4a502a57767eb4f4cf5895a61f3a871f1f5fb81c27083938fc9394d2a74881bfd4c23fdf2cdbce2dc07a55cd3a7d9422e6da40ff9 SHA512 9ed3cea9560cfb53af61863b0811a4d62c347e404880154acd47c5e4148d5b5cf3c31a4ad3b8440081e0bc7b33666c6b0fed35c26f8ee9c0a1746d9ed61b19ca
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-13.0.4.ebuild 1496 BLAKE2B 12ea9277f7a0f28f9ceeb1faccf80f65c70fca1bd1896b254d5060d179c8ac11a0e636e2ba9bf19bf28d8089db4c40abb05e06c910ad6158514d982d9d678f4a SHA512 3d6269ed657e97cdc9828980911f295940b9381e19ce8cdc0e5cb764dcdfd7b5f76fad844a40ab7026566445a41683f0ab0ee9f3d8d5646315bfae2e09ada179
+EBUILD gucharmap-13.0.7.ebuild 1503 BLAKE2B b1faaa7368f584453e45e518776334178272058057717ed9cebd884dc37f26dcafd133e69b1ba92f1cf14f937017d087cbf066e375edb605db37e874640c84d6 SHA512 a7aa5ac15dc53308d3bd5b509992c501d9f3d7d0c680a18fa292e5f88ab5f2538e5fd432655d4f23f291f221e4f7afdc976c480c8ccbcc11038fd8fbbc572cba
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild
new file mode 100644
index 000000000000..efc145ee7aae
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+UNICODE_VERSION="13.0"
+
+IUSE="debug +introspection gtk-doc vala"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	$(vala_depend)"
+
+DEPEND="=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=dev-libs/glib-2.32:2
+	media-libs/freetype:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/pango-1.42.4-r2[introspection?]"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
+		$(meson_use debug dbg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}