gentoo (leap year) resync : 29.02.2020

13 files changed, 234 insertions, 2 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 656efd674187..f30965a5e161 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 2a1888dd5a9d..f6c2d6726a41 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,8 +1,9 @@
 AUX 3.30.3-conditional-cups-tests.patch 767 BLAKE2B 7f92f98da527c96dd6c6cd236085af41a0292ad635c9c68f078eb0c9a54ada04c51d7fba805dbb0b1340b7de94f49d65d9492c942600722830719f6d551c10f2 SHA512 37481ac8ffcd2a56fb55521f179bee03007cc93ef40e74d7571be501ac4a4447099a17a41df78ae9ecf5f6f04138c31d74dfe41ecc656d870190027209a26113
+AUX gnome-control-center-3.32.2-fix-gcc10-fno-common.patch 706 BLAKE2B c53a8ba8e45682fb6af8114154724453bdaae589184b6b1eab85b8db33e8169e69b5cf1055c53857a20682e177a212640d60050351fd267346fa797eff0c2c13 SHA512 76c01a7f72230b7aad7b21dba9f58063a0ce93a945ac5a3c19a5a7c9af6dcb8225d3143b099e9ee6938b11107a511b1b1b580558ec57aa9c973e7cad0b26f1d0
 DIST gnome-control-center-3.30.3-patchset.tar.xz 65244 BLAKE2B d210f94e0058e628401ea74fa90582721aaffddfb0e3f8e78013edde0d2f712d4433c316b3da08c9ec1038200cfd4e9b1a315b224d2e881d056b0f685f7067eb SHA512 99519c54ef223b94d5101987b7d7dc203c447765ef79374a3f0911282cd77917f64dea7318d70c63b8df8506c058fa1fcb1d71b23488b3ca9be993667509b7d1
 DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f184f8831a8df218691fefd035842170871eebb6f17e34405e7c4c18da6a191b92c7b58fcd40b252cdb67154becdf7e7ac6a63aa8f SHA512 85c7b51d6bc32f73d7f4ad6df8d4cc14c59e19da88d7a17b7337f995483f41008213ca829247a3c9db43c4b31eae0be321ed6804570660fbe0356da3dd0948dc
 DIST gnome-control-center-3.32.2-patchset.tar.xz 62920 BLAKE2B 0268c048317c0ef267b1606b5eb85a40bff4f59a0baa8876cf1c893b96513c51708edeeb965933d54fe345bbce3e255e889c45eef98147b32d3d1208bf049fc9 SHA512 458ea50c1e95e2e005a1dbeb3c1d1a82d3399909a1367ad827ee3c5cef14cd3ecdfe27bc17bf24d6b037e1eae00df3235a75d0154178203b177b05b8d0688e6c
 DIST gnome-control-center-3.32.2.tar.xz 5953072 BLAKE2B 98206c6c7fd8fdca8bb6ba7c1178eacaa6e3364380c6faf7b1e98c0819c440e16d35f4299d323c27db8271a161be84e4e7520a4b8b03c4d654d195b25c93cdc6 SHA512 6f69f72e15d901935bd2fba90e0a598e6c6463d4b0f914d2a9c330c77378a461c8da86f198408045c07de370d3c1558046323a4c23a97ceed96602597e167c78
 EBUILD gnome-control-center-3.30.3-r1.ebuild 5835 BLAKE2B ec578aab0ddd1222a17109cde630aa2232c8f2ec549ada32423fec8bff8e75fe1c5f316816e6054b334e08f2df54e91233924eaddb5937b7a6d602a2ea60cb83 SHA512 15f9f0bf0dbc5cdd94a7fd3be253f404b35754d49d4112421a76f2d79d03592c3103a385a07e0cbbec864c78e1712e02db73b5439ea4d340f25ea3388f28f991
-EBUILD gnome-control-center-3.32.2.ebuild 5535 BLAKE2B 8ec228c256ef62b163f0f79f2d141c472db54249c8ce6e774d41a30cae21247950b21d2093e61332563b3425c89c5878b744ea887de013cb5d4ca18dbea7019f SHA512 4db12f7131d1b69052a5a91205c4fc315f1e0e61f2349d04c682978b12401280cdc6edcd51bfdd3954a05c4edf6d0ae4403d1e1c6d98e1536eace8e8c046da66
+EBUILD gnome-control-center-3.32.2.ebuild 5610 BLAKE2B e391e97ccbd730b900d0aee9991092f7eec2255f250896596cc9b77ba8a64a6e3f22d05c2d9f9af30f18d4975a214e908a5ce2b63241bdf3c6d84d7f6608fb0e SHA512 5d1b7cf4b3f53637009074baf3b6ef64d1ae4b2b10f185319a51d668fc3f7078365cb053e3c09cdfada9058065e6152783076399553b73568ea5bcf0d631eadf
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch
new file mode 100644
index 000000000000..b0a7a7026548
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch
@@ -0,0 +1,26 @@
+From 901ef8b0ff2b05692cbaa119097f70615ea77ed4 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Thu, 9 Jan 2020 21:34:12 +0000
+Subject: [PATCH] Thunderbolt: make BoltError enum a typedef
+
+Fixes error when compiled with -fno-common
+---
+ panels/thunderbolt/bolt-error.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/thunderbolt/bolt-error.h b/panels/thunderbolt/bolt-error.h
+index 39b3eee98..7d3823d35 100644
+--- a/panels/thunderbolt/bolt-error.h
++++ b/panels/thunderbolt/bolt-error.h
+@@ -31,7 +31,7 @@ G_BEGIN_DECLS
+  *
+  * Error codes used inside Bolt.
+  */
+-enum {
++typedef enum {
+   BOLT_ERROR_FAILED = 0,
+   BOLT_ERROR_UDEV,
+   BOLT_ERROR_NOKEY,
+-- 
+2.24.1
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
index cac1b28a4671..70a11f092400 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
@@ -123,6 +123,8 @@ PATCHES=(
 	# https://bugzilla.gnome.org/686840, 697478, 700145
 	# Fix some absolute paths to be appropriate for Gentoo
 	"${WORKDIR}"/patches/
+
+	"${FILESDIR}"/${PN}-3.32.2-fix-gcc10-fno-common.patch # fixed in 3.35.90
 )
 
 src_configure() {
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 1cb6f2c6de14..a1d0d8fab514 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,6 +1,7 @@
+AUX 3.32.1-fix-wacom-no-wayland.patch 811 BLAKE2B c817a6080438468d72c3633b878ba886c80aa1b4ffbb7890f661c517cd7a705648c38e4a6ad092b965654bb5d17c71417ec64c995fa65471efc06730d471db70 SHA512 d53df8ca76e272815fd077d902cef24ccb6b5d20aa3b515d2e06476003b43b4109b55dee6c1004e5a60b3bb35bf197f3bb76c2bbe7730e0f2361e2935301fd9d
 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
 DIST gnome-settings-daemon-3.32.1-patchset.tar.xz 9840 BLAKE2B 0b0249b6335fc64c111cfd4c221b408460105bd544527ca29a32b2ceb82d39c1ca8c9813916cde9afdac1cf146c1286ed937dadb07eb0263b5ab3ada2a95e0aa SHA512 175f4d0200b88b696b73fc7e7b10065b3e6f046e48955408cc438499fdc6464483420b4801dbb77b5ae819cb52a131e2594a628b9731eaa167b802b5b2cbe855
 DIST gnome-settings-daemon-3.32.1.tar.xz 1372968 BLAKE2B ba0596d9f2019f2ecff32b70c03d962dd7966c282d1fb0ea94c38fc895b7ef788d9dd179a037b74a319ca520811e985465578a725bf14d1eff92846f188445ea SHA512 8d6aca1041cbd50d7dda67dc711269a51c4a5148d55dc63969f47c21bf309126f5d5cb13c1e6fa9e6498fbb30dc70fa7a049fead7d32c6a20d550da0ce8828c3
-EBUILD gnome-settings-daemon-3.32.1-r1.ebuild 3947 BLAKE2B 69de41ed91223f040b9fb23eb6db0b4e1240f33dd217928f3e7d58aa4409c21faf1bc72f71969229874487ce320df82b8bb4df873c45169bf8b4d0a9c30eb445 SHA512 aa9d2c30d4c371e65a179df79082f0b3ee41773d4af4741954640defedb19424d6bab964b7567351db6a4b5175bb1abc38a7b231dde79609c2df6b8ca331fe5d
+EBUILD gnome-settings-daemon-3.32.1-r1.ebuild 4018 BLAKE2B 10afa9b5cb92b5fdef7d72741af5e64ca5e7e7a68d6d07a0b0524e4cbaca22421b45cf55d130df5c460167a4310a70160396e674eb8d7685f2438f229d2993bf SHA512 4ee4cd2f31279d371fc0b164338c56f5f979947250964c15ad5d1a369f9d8b0adfe849305a7675b612eb42d179aa950b754cc23221d8fb586acbaabfc43e4738
 EBUILD gnome-settings-daemon-3.32.1.ebuild 3834 BLAKE2B ac651b86c70636b0e182ec7d611e89e3f7e264ebac267f9027b3e14ca1781318cc584177b7b21ae8028f9198837974ba78ca25ef3202f834032af089646508a0 SHA512 620470bff1ddfa0360d7e7111e69583c32fa6e3d28ed7cfc5306d2aed99cf6fc7bb5be8da57a2d248878413e2a25dd7af6d6294ac028392105bb1c574c4a7e70
 MISC metadata.xml 454 BLAKE2B 271588e1f1a6a9799ba121f1da6f69ea1b5ba4c006f11c3a997833eac097143ba19bfe445759f17b7269414892af5efeb04eaaa752c0c330e1238c66004f30ed SHA512 ada9cf6a61a63bd96807bd1c4840a19ed2e59b7889d54af7796ec07af6b8250ce03953d907545c92aa75c59d2bee3ecb4120c571f1830a5c2b06e4ebf7005eee
diff --git a/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
new file mode 100644
index 000000000000..ea343c44b6f7
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
@@ -0,0 +1,25 @@
+From ec6982cc8b3fccc35dbd5df3c4e22ab94709c66d Mon Sep 17 00:00:00 2001
+From: Vlad Banea <vlb@xiphos.ca>
+Date: Tue, 31 Dec 2019 15:35:41 -0500
+Subject: [PATCH] plugins/wacom: Fix build without WAYLAND
+
+---
+ plugins/wacom/gsd-wacom-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
+index e1c8eaa7..92fd96c3 100644
+--- a/plugins/wacom/gsd-wacom-manager.c
++++ b/plugins/wacom/gsd-wacom-manager.c
+@@ -190,7 +190,7 @@ gsd_wacom_manager_class_init (GsdWacomManagerClass *klass)
+ static gchar *
+ get_device_path (GdkDevice *device)
+ {
+-#ifdef HAVE_WAYLAND
++#if HAVE_WAYLAND
+         if (gnome_settings_is_wayland ())
+                 return g_strdup (gdk_wayland_device_get_node_path (device));
+         else
+-- 
+2.20.1
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild
index ae8ba7216b15..10a45fa6a23c 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild
@@ -85,6 +85,7 @@ PATCHES=(
 	# Allow disabling udev and networkmanager on Linux
 	# Make colord and wacom optional
 	"${WORKDIR}"/patches/
+	"${FILESDIR}"/${PV}-fix-wacom-no-wayland.patch #677494, fixed in 3.36
 )
 
 python_check_deps() {
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index dcdc335d8430..be71e00c43dd 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,6 +1,8 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 DIST gsettings-desktop-schemas-3.32.0.tar.xz 628888 BLAKE2B 7d675597d861ee8ee8258f037d06d6f728e9705c7e121508a811bbad000b1ef10a7e2ef23066cec01c34865648f4f0a204716306643db1a4cbd505801ce939c1 SHA512 cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc
+DIST gsettings-desktop-schemas-3.34.0.tar.xz 650468 BLAKE2B a275cd011c255531b293ccb875159ea4465c79852a3d1be2a03faafa8dbb6ba7137d72c7a59bce93b6ce5f187ebf92aca334dc3c51c8de5ee3af3092fc250fe5 SHA512 6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1
 EBUILD gsettings-desktop-schemas-3.24.1.ebuild 752 BLAKE2B 8f7d95be28af86bda41b82519ff086770d757cd032b69e0b7b5ef23b9079a06a8a0d5ca23f9585d6cdfbff8adc364104f278ef011da33aafe9033c6037cee1d4 SHA512 88d5dea3a3c30c9ce4a2e8729407166c6bfbb8ded28b0409983a863c7a66cd2c5b88fc0a7f2c1bf7d5e713a91e024c921c41c9f9a8b688145e2b59859d1cb93e
 EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1019 BLAKE2B 10353a53c681042b3e3e887200c1996467ab691faa3f49fd48ce0bb5df7efc8b2e367f77a86b4d66b4809f936fb7415350e4e4855b3398f62cced86fb2bd211c SHA512 d2c2e119b408f3fc0b8ef9a04a1e02fac2b560169b70b8020a2c4c8dfa7a98d5ffa8b373588dda47b0eacad302094a8a2023522390f98f1fc9c978bd250bf67e
+EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1030 BLAKE2B e44f96af2952ee9c01bb890d15c9badef80659e3acfe80aaea85073498f7e6003640ba991b0990824338c4485fd9984f9e2dee0ffedeb1368575d3c654e74d9f SHA512 be94479a8200cc1b3fc6a0657aba3e5651d092d4a3f7bf93873945c0e51fd4b271f5169ab34ac3db14d80d6005fec46432949399107d50346ef124ff7ded739d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
new file mode 100644
index 000000000000..bd590c71c0ef
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+
+DEPEND="!<gnome-base/gdm-3.8"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
+	"${FILESDIR}"/3.32.0-default-fonts.patch
+)
+
+src_configure() {
+	meson_src_configure $(meson_use introspection)
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 8c417ac8efdb..cb92db337f3f 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,3 +1,5 @@
 DIST libgtop-2.38.0.tar.xz 729700 BLAKE2B 2296741d6c6bd1c9eb17be10e480dabd732e956826c859c176cbc6f8f03259a3b2f2f04d6c55d1c562b082f7e880bb4b7a3f07a66d7f24660085387dce078879 SHA512 96586b7f12a2b63c5ec7f69c51b6e28361a7458f24f20270fc589213bfae43ae99d1e39efb6101d189741bba084c887554f745131e99d8ed90b7db6d53c36e1d
+DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861
 EBUILD libgtop-2.38.0.ebuild 758 BLAKE2B 1f34cb208a28312fbe4fcadd1c2b82d97f173b8a3d0fe6f9fbc1e39332193e404b74cdd477187395362d99bfef8669557fd4382cc2f4666f172d1f7def31e46d SHA512 cb863280bcd41cb4ee196971b9ae57f6ee5e44211f882a618c40210033744ea0250a173b7aa4517a1c83b0906797654ae17ec1e7aee06c20c40a8fc63cc7e249
+EBUILD libgtop-2.40.0.ebuild 765 BLAKE2B 063797e84c04aaf42e1a9ae8430128e8aac6fb8e7ba7ae867fc5ed7597fc8ce3566c2c64982c18eb3b952aa2db07083e196c54d39dd0b43cc3d2ab9e78271d1a SHA512 be1e76881efb0e6ee66b70c4bfffdca56235a041bf51130be68ee716d0bfec005f9d8562a05f7cf6df90380d382b9433ac402538d174f19f3808422ab77347e6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.40.0.ebuild b/gnome-base/libgtop/libgtop-2.40.0.ebuild
new file mode 100644
index 000000000000..5413e13da05b
--- /dev/null
+++ b/gnome-base/libgtop/libgtop-2.40.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic gnome2
+
+DESCRIPTION="A library that provides top functionality to applications"
+HOMEPAGE="https://git.gnome.org/browse/libgtop"
+
+LICENSE="GPL-2+"
+SLOT="2/11" # libgtop soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Add explicit stdc, bug #628256
+	append-cflags "-std=c99"
+
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index f354262484b8..d5362b532383 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,4 +1,6 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 DIST librsvg-2.40.20.tar.xz 1796376 BLAKE2B ec8e7308a0255aa22038262d69019e810bb78b92e3de62662b53ab375110c8186e565e1eb7f5825c61c6d10bed1876ff3f7a06d1073e9676a3d2bb5dfb6b791e SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
+DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
 EBUILD librsvg-2.40.20.ebuild 2669 BLAKE2B 957a510ca87985882c595fbff7f8dc466922fe97636cf049939ea260b63e27c8a947305a8853ae71f26b1574818654cc2ab6d22136878e2e4ac95eb0be3a21cb SHA512 0ed53a0019845e8f007b16e65267217e654814a870fc04f43a8de7047bcb95e5185b3eb4ad0554656c5c6429b43b0ea62a4e75a155989d3243807fd4ebbe77d6
+EBUILD librsvg-2.40.21.ebuild 2676 BLAKE2B 1321f02104a8ea6eb3f25801bd2cfdcc0c5a2e46a4fb33290ead8a51b2fc95d543d55fa93bc7af80735d203b9561f4e789c2d4a05428cd9694675f98e218dc0a SHA512 621747dfa8fc91791f347884711dc3fc9d7dc65af58da72473cf4c300efe328e2e87c29c7d9b5a05108af6109ef1598ed7cda9aeece67eddafdacdff454a3ad5
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
new file mode 100644
index 000000000000..6999b67e098f
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils gnome2 multilib-minimal vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection tools +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+	tools? ( >=x11-libs/gtk+-3.10.0:3 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	dev-libs/vala-common
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+RESTRICT="test" # Lots of issues due to freetype changes and more; ever since newer tests got backported into 2.40.19
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
+	eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# -Bsymbolic is not supported by the Darwin toolchain
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --disable-Bsymbolic )
+	fi
+
+	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
+	# only for librsvg developers
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tools \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with tools gtk3) \
+		$(multilib_native_use_enable vala) \
+		--enable-pixbuf-loader \
+		"${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}