gentoo resync : 24.07.2021

14 files changed, 297 insertions, 15 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 06524c109043..05c4a7ed42b4 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index 208476b1ca41..fdf5669d4235 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,3 +1,3 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r4.ebuild 1431 BLAKE2B 17ae1a8ed0849172f4cb90d3a8f889a0c4962a7456a5937fbbdb1c217ecdaf66dfc882aa73f503e22b20ecf46198850d22ee8df3fd9bed998d74843eebb1488e SHA512 9dcd0b4f09e07d8ef366411af1e5e7728bfc50e5b66c6f7e942791d182bcbe3a919ce585216d5814a56e33f6939b9254950ba75b87700becd8bcb27b7f26e894
+EBUILD chrome-gnome-shell-10-r4.ebuild 1417 BLAKE2B 208ef492ca6d94dd0fc6e2266e591ac72bd73289287f75969fe6649c1ee128500773e3941b81250e41349f44b85bd574f2881f2383f04eeca797343c2fd9ba87 SHA512 882a55531e8a71ff709aee74112b346b4c6b7b0098235392e806d2e9353fc9cf93576d6db564ffb4118196324fc90c7aa336be5a89220dd1ace299d0cac9d37a
 MISC metadata.xml 568 BLAKE2B 2627bf6f826c898bcc4e42086b4f5804130f5bfca3bbabb3ab6b1a981ba1e3020e2dc3b03ca024276d432a496d82d8cdacc478364482a1424f7228b3ace35ce9 SHA512 a5f1ef966622d4b1bb6afa50b10ca2cf5cb4b5903cd39f2ee6319e3afafc9a2a86bbf76e4f96b4830b7cd911b16e0486cba7ab15ec172b4fbeca2fcc51b90b5b
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
index 50f322f7a5c0..d8e3cc5328de 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake-utils python-single-r1
 
@@ -24,8 +24,8 @@ DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	')
 	gnome-base/gnome-shell
 "
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 8af594fa5c48..7706e685ab88 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.1.tar.xz 4625316 BLAKE2B d795183d07bc7b58a00e3c6f60d3704cf7e0cc6237b079c49f2e21dd7c22098c2b7b3fd2ca50fd3d9268aff8e5eaeea2e0e6c65d09c8bd68b7364445eb926c7c SHA512 47964a0965d412c329743423483c6694d078835b375d457aabe7e45a2b1b3406e4e0d4c1b855460f3c9b327d4d9320e659b0e43243816ec1e9bc49d0fea90f7d
 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
 EBUILD evolution-data-server-3.40.1.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae
 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
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild
new file mode 100644
index 000000000000..02f51c3698ce
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.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 cf08e4637337..fb612f763ce7 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-ews-3.40.1.tar.xz 672448 BLAKE2B ac6548c2567dd1ca303def27a21974f93d44c1175e8474bebaa6576dc63f8624c32e9357186e2c1412ca2091412b17e0f244c60919652ede55fb77e1bb384b90 SHA512 8d0477b500ee1b0c6a9527f2d63fe0b4238862425a079729478a8df880f35e6a1166d2f8f77cafa73844351f0cffe171d857366c4527770d7436d8b4ace29b99
 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
 EBUILD evolution-ews-3.40.1.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
 EBUILD evolution-ews-3.40.2.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
+EBUILD evolution-ews-3.40.3.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.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.3.ebuild
new file mode 100644
index 000000000000..2088827c2022
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.3.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-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 0433aeb5d219..5fb4d46af20f 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,4 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
 DIST gnome-tweaks-40.0.tar.xz 251908 BLAKE2B 4280e7565da3f95d7bcd81ba874d2f15e8c3834ab052cb4cf7cde8060eaea016670acf6f441d2cbce4b7566ba0bb7a7f9666b257893bc7b22b1cdc4d5a0edee2 SHA512 c3467f40af6bb79c2b10cb429e93aa29261066c2a5fd744bf2801c4e596cc270d45302ebfa942ee0c40067849c12e1ccd404c40e7f594bcff4c44cfe3f90bb97
-EBUILD gnome-tweaks-40.0.ebuild 1352 BLAKE2B 443d4bda82c501ffc17da0b8bd7d03d2ec1352a1552da2cdb19233783d809d490e21df5aeafaf50755471bb23e3bab3305b77fd2bf2a93c8c20dbe76c90bc57a SHA512 4ac05156ba3accd58e98197aa21e0f49cf7999404dd5e90c80bc947e3e43b368970af52c6817482770adf3fc876aa369b1cdefa9d2e057fa1a6c2ba287385bc1
+EBUILD gnome-tweaks-40.0.ebuild 1346 BLAKE2B 894dd852902211c4f2052cbc627e8da4591496ba623cc1934f2d3a59d5b27ebfb08bebe476580026590ab3444810a3cc5d20e321c87a55cc5ad95f3e0dff11a7 SHA512 f7aa67c45b538ec3cb9c8a2aa21cfbdbdc2ef2e7f92a7fbb858c784dafe857af4b347b238be2e6196150a467f0c473d8b09626293c1c8fa3a9692988551922be
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
index 9b3b4d59ea7a..ee0cf7fb6a6b 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -20,7 +20,7 @@ DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.10.2:3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
 	')
 	>=gnome-base/gnome-settings-daemon-3
 	x11-themes/sound-theme-freedesktop
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index d1b4ebbf8535..a28a0b86b659 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,6 +1,6 @@
 AUX nautilus-dropbox-2019-system-rst2man.patch 464 BLAKE2B c0f25a56ee504a6070efdae70670e1a925a1718cfb5e1345d3acfdb0face02d1278d10f2f7172e172056834f99f309d50bbf5899f37fa6023e743042f6ffd7b8 SHA512 98c9e85a491991fd2afee3a12c8be4ab708ee47a42d08d4a11daefc1e964cb3031ffb94a27ab7758b3f1c71f7343dd4b0a49d24cb8aa2848baf65f83879a6cfb
 DIST nautilus-dropbox-2019.02.14.tar.bz2 381416 BLAKE2B 0765196974d88caa477d962311efe05941cd2d25e35fa028720c8abed5120fea5abede74f39e00cb2ac9eb08d6d4bbdf1d1fe6db8d604c1803570209e654d55a SHA512 c5758d97fa40af1b27388c23289e5d1d98ef1c6db04ed7fb5cfee387723f72c34f3583fb6e0158a39f30d5ff649cb2de6d92fc4ad6e976e301dc239bda9d554b
 DIST nautilus-dropbox-2020.03.04.tar.bz2 387351 BLAKE2B ff25716ef10759e014cffec8a7e9b1a40931686d6de3c69e9060c77cbf3aee65ffeed91ba809ba8cffc372f284180c74a8cb5b0ca4b342aa137d9e574a2a1abf SHA512 8f26165a48d1767b3bccb34f95f19357e8fd209f383270ac2d40f773df139d640c3fb33db28cf1fa7e2d7063a7a37b15ed7f4f22f85019e05885c097cea39a48
-EBUILD nautilus-dropbox-2019.02.14.ebuild 1348 BLAKE2B 47bad42c76c9dc763e2ff956b74c58ce37d9adfcfd53ec39299fc157aabf46677dc8ad3f309dff84223a51e28a54388bbfde391c0987a833ce3aaed70b2d887a SHA512 bc706d9ba742f574f105364922bfa96645aaa701e2891d037236d2f3ca649719776d8b6680a9f771745a589e972fd1d65e8c591f103d635ba96489a4e222f761
-EBUILD nautilus-dropbox-2020.03.04.ebuild 1393 BLAKE2B a80af45d8842c6968845d99cb5960b280778e279742592ce347bc54333efee605efcb58a2d59823c694e575fb80e6a684483a7fd3fcefb6a2d712e570b4bdb1c SHA512 576ec079ec212a6ba01c326fc2d20f77187ebf71cbd7a2fc9c0bd8d244a9249ad6b8a36a16a61e54ac91f88615bd51bfaca5d9d159feee9557bcfe9e98e99a57
+EBUILD nautilus-dropbox-2019.02.14.ebuild 1338 BLAKE2B 3b2e205cdd6c28489a02f45e859713388597c66a30493d8b72977d46e596a96471c171182e391561cda8d757d36eea3b9b797f15c6c327215533649c78ab76b7 SHA512 9ae4eb6d7c9534ec48d25ef4c85728459992f6b393ca81b87cbfecfa3c9d98e2025a2049c0c5305e260d5b9edd39592d67ce26d52fb55c16b90629f1b19bad7a
+EBUILD nautilus-dropbox-2020.03.04.ebuild 1379 BLAKE2B 69127a6a87c06b0fb446116df5367f8ec0bd95ba4c193db097df15f4e1a375efd0457a32ae223900f5daf39bddf0b7f96bc55de3c7207ab74624dd9c86539f9b SHA512 57fec409e6f60acf2b8048e0abece035072be3d85d1aefe383af0d7bed5165052650c0f7a54054ff21d7b683f91ded69416cb527bddf66f9ecccd828adb3393b
 MISC metadata.xml 582 BLAKE2B eb358f22a425af53f12ca27a47f82d8eae8b3bd0529f36492e70d1335337a1bd0c7f430494d2431e19ea3305f8e29decfd7c056ab5d9fe8069fbff00e567b38c SHA512 24032cabaf2db87514114e49410d67eda72e5365486941bd76507ae7a4645142b493ec88fdf47952603e36d84d5089606fa0bcc5f1d9a6cdd8831e457f15688e
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
index 0e5c5cb2b921..bd8415d16fba 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit autotools python-single-r1 xdg-utils
 
@@ -22,7 +22,7 @@ RDEPEND="${PYTHON_DEPS}
 	gnome-base/nautilus
 	net-misc/dropbox
 	>=dev-libs/glib-2.14
-	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )"
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )"
 
 DEPEND="${RDEPEND}"
 
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
index e882654d4eb2..76ae97342d8f 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools python-single-r1 xdg-utils
 
@@ -19,7 +19,7 @@ IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )
 	dev-libs/glib:2
 	gnome-base/nautilus
 	net-misc/dropbox"
@@ -27,7 +27,7 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 
 BDEPEND="
-	$(python_gen_cond_dep 'dev-python/docutils[${PYTHON_MULTI_USEDEP}]' )
+	$(python_gen_cond_dep 'dev-python/docutils[${PYTHON_USEDEP}]' )
 	virtual/pkgconfig"
 
 # use system rst2man
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index de84553e5886..b8e0cf819291 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,6 +1,8 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
 DIST yelp-40.0.tar.xz 1526456 BLAKE2B de76ce11775b2940a5590a72a0f9f821a3b083810087c65f870cfaf4d6bb0a34653025d87b28d01e11ce5e3dbd7bca8331c62d701d8c050938756c53797198d0 SHA512 efe88bc8d75d00b48b8a0a8d2a07cc95771a4fd8e7068003333f79336f1272f07f1738d91a6978e3c3a9258c6742551d25e8cd899a77cfa262f22e6cf9632590
 DIST yelp-40.2.tar.xz 1527112 BLAKE2B e588b533cd3b59c200904a54bdb2e1ecea620e447ddbae3645252f134fd0f92fb920b512ff7d27d213307b6bc5bec333faafab291af872681813f710de03a587 SHA512 adb6f5781c13cf7b91c0b2b97a34a271d7f72328a8affb379342aedf6cb0c8ed72f5874b0d67802bab6be9a3e1ad77910c8be872724c89477454d35043c5453c
+DIST yelp-40.3.tar.xz 1506144 BLAKE2B e9cb9f2e1390fca1c3cf144a1c0278e6ad8506f6177b84c6966fa4a1088ba316afc3eec2e5292e49878c45bacedeb06c1980e4f16d7ec1c8bd22d8fb10ba07fe SHA512 d043273884daf1b9ea45065deaf6839b776cece48fcd0bee6b81d9d7d384422f98005340adee2f00a6013e09cf5455a340ac5b9a40fc02b58b163352be907c28
 EBUILD yelp-40.0.ebuild 1214 BLAKE2B e4124caf8f33cd19ef9c0f926909b284618f9239614bfb2e5cd11003698a7db76fae13ba33753838a609c1c8640663fd582e3baffc6bc218b4787211cb604f37 SHA512 74c0a8c23930ff82c0d6d6be556a199f5ac6acd310f8b2832cd631c732433a1b9c83fe44494757741777087ec20f608bd84137160738321f198a3a2f1f44c2e2
 EBUILD yelp-40.2.ebuild 1206 BLAKE2B a2ae94a13c94fc2efae9792aaa3f0ee50060a0beebb2fb4dc46175c66af89d59621b59fa8e989e536e16c5c1050797cffb88373c2dd8aaa87d94b26bf90633df SHA512 b2e09bce0909db5a998c88f5d28e89e59dcebc43bc71b342263c83808cc7b5f1591249b551f29a3576c8391c0f75006a744b6f337db2eb6b4ce42aad63c9db83
+EBUILD yelp-40.3.ebuild 1208 BLAKE2B 4161f42721caf7f10f9f98af2b8f4021c57723b66b9a92f62171c6fbd37be9e98e962210498342f5642f7a9beb6029fbcef7a0f0f113affc2633a0953ae38eea SHA512 749383ebd2412a9adc0bca4e562a2e4c3a678f6a73ad5da823c9b9acbb0b39c1ccf560696f1cdac8f45094f521a76d672ea1679c0524a4bb4ae086e73363d60d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-40.3.ebuild b/gnome-extra/yelp/yelp-40.3.ebuild
new file mode 100644
index 000000000000..ddb5e4d5603f
--- /dev/null
+++ b/gnome-extra/yelp/yelp-40.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.27.1
+	>=net-libs/webkit-gtk-2.19.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}