11 files changed, 334 insertions, 4 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 5c74335182ce..7172dd3af584 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 0d2b4eab4bae..f5d936770d5e 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,6 +2,8 @@ AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aa
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.40.2.tar.xz 4625240 BLAKE2B f7c966e0e092ce46157e55d1a096e5ce69ae5103c0d777f262b62cac4185bec88c4cf84b9da4927cd8e008310f09bedcc017cb4ec39e4c90b3a36c1444b3507c SHA512 495e264cc92b31e6bb76b205641f4c030e82a010f0cf58f712d5c05b5a06f0a60c5b83b31f95ececf9e553f2e816bb9bab2df54cd9982a81eb2bb7f936016639
 DIST evolution-data-server-3.40.3.tar.xz 4625980 BLAKE2B 7b344c1bb279367c9eca136b9f4689f049ba126b9ffd6ba1a1a819c5f86db66bae4082ebab83c8895831e97a4ed4384bb923584146b6081ffbbc24c327d5f3d4 SHA512 ba5db9850d68c23ddc77e53ccb2500f613dcdc5689234b3365edbc97eb6e73c4f15c13df5dee0b2aab1d0af5a22d543c6aeb814c4abfe1dc652b46712c0e2e79
+DIST evolution-data-server-3.40.4.tar.xz 4622640 BLAKE2B 93a4570da53fb34b496cd471e5daff07fa044ed5c230f7de85276ab9aacd0f2e6c6f749a0d63d076fc192e695f68a0c451a7a6573621ff5092cd5ea6a9302ee2 SHA512 664c2d41b6f212e6ddef554767ca651e4179ce861898cb11ed373f30473c2a1a3a47191ae504be7d38beb0e721782564b70f5f519a3184216a02be1bd89678b5
 EBUILD evolution-data-server-3.40.2.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae
 EBUILD evolution-data-server-3.40.3.ebuild 4240 BLAKE2B 174c00b54304e86aa8197988fe2f5352ac3f53513d6f3e8ae4d98777a812dee8fdaa6697f6b6506b2dbb8dba21583a840b1c4f9778e5fcc37d32a40a221f885b SHA512 9dafa06c7614caab9ca4b8ccd07d783c6d3a31294e6a5c38df0534883edf784b920a9bfdceb9a8c35f424694c44ac2cf41216e4bfa1bd833038ba0945ae2c96b
+EBUILD evolution-data-server-3.40.4.ebuild 4323 BLAKE2B 3013eb3818ef0595b5c2068d53d6c76206c880b78ea9ab5b7097e98e92d2044d641963667332a79959b46a397f2f11431b61dfad5a4f6b7dd14b39f92415b4ab SHA512 119e1c9ba15e8abafd9d4e77ad13eba4c67acbf2adf80ec925b075d8eba9de02e87569cad2be49b7d7d33c40eff0ca1f3ea9d8ac911cbf2ec267b868d42b0abf
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild
new file mode 100644
index 000000000000..a3cd86ee1363
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild
@@ -0,0 +1,154 @@
+# 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:="
+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]
+		oauth? ( dev-libs/libgdata[vala] )
+		gnome-online-accounts? ( dev-libs/libgdata[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 7395ce446fa0..cc6ca7f8112c 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-ews-3.40.2.tar.xz 673592 BLAKE2B 0b11b77c729102ecc0602abde323817782b9d56939a708bf9a506f2dc2d9d0edb43f7607e0a970db3144965aa669691d2041d99841d70ac604feece721e11979 SHA512 a42f8ee092aa1fdfff07729bb1c3d0f80a25f6073f07135f0fecb8f431cd5273c2afd292752457515b0be71f106025d413948a97f2a4d3d43b049989dc296175
 DIST evolution-ews-3.40.3.tar.xz 673800 BLAKE2B 4d8cbce33552a40551db08f25bb784ec1b54df0672bab95cd278de6a761a0ed05d5d21754107043fcfde1b533edfbce6a25b2d7fc3c6e885bc7618efd8c89763 SHA512 c35da74f1c52dabf1d3373654a70a7fa005cbc8ebb30a64c3315cffae222221a049918eb9821773020a7178c64caac0b9360ea562eda748b1e26911fcb4fcb90
+DIST evolution-ews-3.40.4.tar.xz 673888 BLAKE2B 532b708795db3ffdff69b44d31c49ff9c4800b527b09d4440b383a16f6ad283cea5ebdfae5cf104e08d8f2166d7269d6810d4ae6ead2c55af7f77633292d7376 SHA512 7f89e8cebf5931bd7d2f636b1780d914f069fb62ac4e14ad0ab2c9759e4553bc5d58a53b65a635c7b5be298fc017f375f9ca4d1c96002804093b9f47107455f2
 EBUILD evolution-ews-3.40.2.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
 EBUILD evolution-ews-3.40.3.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42
+EBUILD evolution-ews-3.40.4.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.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.4.ebuild
new file mode 100644
index 000000000000..2088827c2022
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.4.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/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index efc915965938..407912a9f248 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -3,5 +3,5 @@ AUX 40.3-drive-menu-indicator-visibility.patch 1132 BLAKE2B 2b8580182ace34e99fec
 DIST gnome-shell-extensions-40.2.tar.xz 218032 BLAKE2B f4b8daf2fcd62eaef0ad0960c930fc9368bd426b867a31351b39a2a628dfe9c0631419a5f067b4ac1eb03d2df931ba3a8ea99d4e72043459463b86eb00f6787b SHA512 f02a02a8410e77e8c8b0a764bb7949727974e9a4c0125ac2b6e68c1b20b663ef2de82ddaaed882dd5ffb3a6fd9898b372b6201d53da33f11677c32e82272d2aa
 DIST gnome-shell-extensions-40.3.tar.xz 218108 BLAKE2B 33174ef4c80caf375d48f11b7678ec78bfbe60a9d4456e21856b09a0a83e99ee7b68598c719a6913a29d9686317015fbc8d8bfae856e433414889e59e82e5ca3 SHA512 3773b0a5ec81b6663a3b2c5f5d1f8e7619fdba49ce67b25ee0f5555d17ea7c9740c3698b7a4e4f7fa78241c8738663c602cb5ed1ff9874b8ad2321fec0dbc737
 EBUILD gnome-shell-extensions-40.2.ebuild 1747 BLAKE2B dea69b28f618b887447800e85a3f06b775fe0b73842ab6c258c5f7df4a5f6a66b47b2338380a583bc3559e6e8ecc1fb7000a617609361b06d958770b6362f6bd SHA512 e4ea0fa97656ab0150d7895ea9c258d0ff4c26634abbf92c00f13298550b75619e215139992c495dd53d01da74a5328dbfe8cf01d478e9af54d5393e84e6ab69
-EBUILD gnome-shell-extensions-40.3-r1.ebuild 1870 BLAKE2B 44a78c5e700d42b694cfc41271df3e958981e11813fb5297c74fda52ec696ee8ff17056d14e4d9e63e61d0cd964b1f8968704254c604f909b77006234be20027 SHA512 75c36a7415a181ea0ab876e64b21688a8580911dda8818124f74db8821b257e6f8715067008c74328263cb4dee37835c7bd6c5d1c3f69198395be08a432f88ef
+EBUILD gnome-shell-extensions-40.3-r1.ebuild 1868 BLAKE2B d2b5894c719e76dcc05fef97ef9115058ee80924c2c35125f97614897658f6b11729721c2f7e0e460f26019791b182b6dea8b702774921ab2b91f39a22e28c94 SHA512 adada7db70e8ef7b36d45c257a1b04ef427f63723d64e3788aa0fa907fbb794a1898b9215ba752c37188a780bbc0bf5b4e21d778be80cd0ea08cf1cbced4eb0c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
index f879892a324f..114c39cad749 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 24c4bf7044f8..262c6fc1adaa 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-software-40.2.tar.xz 3093012 BLAKE2B 0d51e7e752b9399f79c2fc16ea12b99bb58a486fe050e38a8fd606a2afd9db32d67d14b4ed50d21da163238b30fac20f93f8947b165d8ae611c27057dd572d34 SHA512 ded29be4c59130a4016d43d3e18a67c8cf3fec4761a7a57c067bf075a6f1da5b7726000172e2303ba129b3b5cb8bd22ebfad8fbf0e3248285a4864350f3a1679
 DIST gnome-software-40.3.tar.xz 3108332 BLAKE2B 2b271db8994a252fcaf784452231585dd430b5e8363e6f2fed8e5bc0e7d1287e0cb5b22fa323a99a6f448cb23b0995ecef55b5a7675960f5dfb891cc5cb9aeae SHA512 6070f8f59fa9872282a081b6ba4f740616a799cffae43a8a541ebf4e0d7b189710dbdce679b1e5136a3fff5f8da29ec8e1ed9df7289c0a6ed697eb0ad693271f
+DIST gnome-software-40.4.tar.xz 3108460 BLAKE2B 696736d94fe245f98a619a58c8df1a3c6196a9f3f07ccc82f0c92c3226ab4914ee5bdbf2f6414b8e8fca99215451d08ef03b164b5cd885af36d69b1cc9043b7a SHA512 5ef7ad754cb161ad5e181dc9b189fe57066a92ebbe3a5871412b638896a02d6e9114e5fdce91e3225af990a580a1f534b936008ff3a2d50a59154406f055a3e7
 EBUILD gnome-software-40.2-r1.ebuild 2934 BLAKE2B 3d551cb5032801a734b265f9f3f295e21429d5f2f5c22681a599471288ed0d83c22dbaeec6ff9726b16db2c32475078904c5358cc3b0517df05aa9c8475391ea SHA512 8773115d02f5009d92f3cd07beadbc7184e885c114a640008576be74d5507301ae942d4ec0b73b94d83d241dbc47d82f2945e2fa275c87af8ada0acdc8acee79
 EBUILD gnome-software-40.3.ebuild 2934 BLAKE2B 3d551cb5032801a734b265f9f3f295e21429d5f2f5c22681a599471288ed0d83c22dbaeec6ff9726b16db2c32475078904c5358cc3b0517df05aa9c8475391ea SHA512 8773115d02f5009d92f3cd07beadbc7184e885c114a640008576be74d5507301ae942d4ec0b73b94d83d241dbc47d82f2945e2fa275c87af8ada0acdc8acee79
+EBUILD gnome-software-40.4.ebuild 2867 BLAKE2B d8a554fc78b90119096851fba15410f6cf4f9ed2c42d05fbf1f282cbba3b800fe0f177af3db93dc5513869f01b3f2b471426581f31500d0c4c7a1983e619e34c SHA512 8a4c87e6443f45e2a45ceb39d7cd7f5a141a9476155d4242200939d3060f5b9f5327140f2ce7333a095aed9f3b5152fc44f694bbfa94a077c743227d39749ad8
 MISC metadata.xml 657 BLAKE2B 964e35ceecdb7cb6299ca103520f1c0b67859bbc2a020994f5b9a58d9b48c0457787fc3b73d756074d36b33aa445f266cfc7ce953959378da020c2000c581575 SHA512 436225bf3076aa82432b72103209ad101824d20d3e37be6225a627c15e1cd1e52697b91c77021f83e4009d06e057e8e97dfc05860122764a82e59b356c282bc1
diff --git a/gnome-extra/gnome-software/gnome-software-40.4.ebuild b/gnome-extra/gnome-software/gnome-software-40.4.ebuild
new file mode 100644
index 000000000000..4f2ba4e19e8a
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-40.4.ebuild
@@ -0,0 +1,102 @@
+# 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 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.40.1:4 )
+	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
+	spell? ( app-text/gspell:= )
+	sys-auth/polkit
+	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
+		-Dpackagekit=false
+		# -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/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 44f3d9feec0f..f37b9867e9e3 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,3 @@
 DIST yelp-xsl-40.2.tar.xz 660556 BLAKE2B 1cc5605f8a272c968b1deff85917e755d6ae13c826ccb21b8a14f8e6d2d21ea2d5ce5781350370994ba1f84009fea15789389b392f8ce111e67e3f948d042b42 SHA512 d365d6d873878a640244053efa9f2b9f7330a8bbca1c47073f0617c1f9150f58e91b48ac7d28e5b65fd113d612afd65b5f9c3d16a6958a957130f85d2f866483
-EBUILD yelp-xsl-40.2.ebuild 561 BLAKE2B 4a655fc2d410531316481bd762b2b7f2ee6ca4cbbba77dfb4b5152a9b39a00d669f9aed1aa33b83202ef9d825db7eb2cd9c65662d9f4f09b9ba05b0063fb90e6 SHA512 5cd83a4655215478ad72cbe3f9d38439084dbdcee9ef52d5254c1dadd5e1661bef5e9122dafd3658ff61a03399d2933de50765870126c9ce99cfdcb5f3585c2f
+EBUILD yelp-xsl-40.2.ebuild 568 BLAKE2B b7ff5cc343c6aecb3947cf50b198acefc6f0954211b64cb3a6d65e959f80720e54f1fc6a19ad0f259ac7447e998147e4620faf4de92ea75b337b556a7b31a972 SHA512 f83159a3674d363019e0dbb80cb50222b3d0cee8da2dc3560fbe7ebe8e32cdef8cbc730fd2f73dfa29571eac59ba46ad4f9280169ded9b5145cbaf82b6759ce3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
index 7ac0da7d4694..207fdba66c3d 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=