gentoo resync : 22.01.2021

11 files changed, 284 insertions, 5 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 61b24e630507..093139d1c00a 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 54935354d50f..d42b4b22d97c 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.36.5.tar.xz 4636800 BLAKE2B 5708ec1f064b723cb5421dad50145d2377c2c683ef37fe82d24b6f27a895b89e43c55ae6c900797d477b1af052e0cc6381649c790744d8591010d928822917f1 SHA512 65ec23a665e3a547b10ad6a6be5f0533db269406c3e8db64a63cffb8e1b410e83b9c39bd7cd5dac5ecd5cf61ef96dc529ba1bd00ad0a09b3bf2c4e98f3d156e3
 DIST evolution-data-server-3.38.2.tar.xz 4662216 BLAKE2B 7c1cf2d921d1f1b656c972ec0a1d91673684f9a27ba5474a9f736b7f34b883bc921a10e986a40bced2d61d8cff81d7537d7ea76dfdc32bbc796ccb72127857e8 SHA512 6db1943a5b31ccd6bd6b4e5845c083973c9e436a9c48f876f446ef130c2d8fe9b2ba3452fd64774061fb368248bfcdd4285dad22b7053459767ca958312d64d5
+DIST evolution-data-server-3.38.3.tar.xz 4662120 BLAKE2B df126b275e59963bd965fd741f9d516f998e304d42afb3eeff56df038464cd5492c590320305d58b9cb26c3c877dd9fdab486387d8a48057e4e7bdeebdc282a0 SHA512 08f8a3c85370ac195bd42b4dce2d65be06b7d43d7d19ea784ef62234b339315137560fcdf9808be5c6629687e5b244b59455cd702e994d5ff890d829248fa6b9
 EBUILD evolution-data-server-3.36.5.ebuild 4255 BLAKE2B 6fd03b8970ba47efeb5d309b921ec5408040182c2ae21132c302717d96b8da3c8f66561851e2d5578bd55fa9bdc6181e4b9cb065add8054ec54433616d7130da SHA512 fae5318c170006755829ca6009a12060c4020f61244bca05d4a0701800c70f5dc915d1419dc898e21f1dbefa08ba76a4c4e12dd8f583ba152976cf7d0d43cd0e
 EBUILD evolution-data-server-3.38.2.ebuild 4233 BLAKE2B 15748294256a86951d99798573df873a102c3f9b2bdae2f5a534fefedd5a69ec3838c335513a2141eaa02486df1086494119bed685842990b4030215171428c2 SHA512 6f44f2ce14c4cee7bc881d0459b51ab1effc78c022cf9a815ef629f1e67b9e36696a821f0d6f852ed9d9897a598f7f6c7405ca3f5455c24ac0276091396d91ae
+EBUILD evolution-data-server-3.38.3.ebuild 4233 BLAKE2B 5c14544e440d26ee5da8e22b8f14f60f5aca34c796080d4fd28adcee05915d67b02fae50030c2bb04b1df10a70e3f82d96bb39195bb28b41a914dfcd174151d0 SHA512 8eab4f060b4db8e7e8207dfef65b0e48f84015202d501b2a0b593f45785e592fb53a8acb9b6b5144bb54393214e518150e15b6ab4651357df10fe7bce70ca13b
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.38.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.38.3.ebuild
new file mode 100644
index 000000000000..517bce512d68
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.38.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-25-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.10: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 2f22bd4df763..30d86955eb68 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-ews-3.36.5.tar.xz 558900 BLAKE2B 059a72b087287d0e553e085dc764a928d838bc8bd011c16b00f240b29d12bc7cfda98d33f8dc102866f5747313975e32506dc016435342bdb6c35f7d73749b52 SHA512 9cc40ae5d56bc86a8aa4e7aaa36fa10b0841278dd1edb075155bfe3666da4051e4fc4843398f74d00d77f550aaeb93bf576007828da4c574a17d4f17c41bfb7f
 DIST evolution-ews-3.38.2.tar.xz 650188 BLAKE2B a1e296a15269191ecc9ff02108daed90bbcaefbabdc989f919dfc25532cb31a7afa73d897bcc0f2dbaf22b0e9b250af61db9900bc2dec740b08786dad7808e8b SHA512 5f441ecbf2753243711b605e085ae8fddcfaf0f91f822b76d8a8453aca0f55c2e7788d74d726651d58b97160db3581e269e6b9f05d7c4258bd28cf13ff14efe4
+DIST evolution-ews-3.38.3.tar.xz 650292 BLAKE2B 56b84c6bcb07db5ae0579bdfb55351d323133d3b4a00d2b82a0d774d19111b293b92d9c83118bcc0bd3bef3c0b99b85ad093028a71d3b6b3ae7728c6e633ecc3 SHA512 8e3718ad6500e24cdc7594c09155df621bd8448769e0510d4010f5b77042fe6fb26e09edd82abdb863c36c5cb8cbd74dad22d51bc27237584d0743d0fd6abf45
 EBUILD evolution-ews-3.36.5.ebuild 1408 BLAKE2B 4c50c511fc049d334447938e4e2027bc4e3b353a684f453e90d4e20c3988e113632826b9107ed5726b5cbf59991bca285512cb80ab51071d45eb9e5eb307bfd0 SHA512 b845c4d3b3cfb3760e89c2f8cb8787f5a09db8840984cbc43ab427808db7436b9d58584514b4d83c5eb8e4ad6286f86bf2014c9656e32bade0c7b5dba307b91a
 EBUILD evolution-ews-3.38.2.ebuild 1408 BLAKE2B 7740c3a35f67e3be891044153a2f8b66027fe299d57f963abed1378240eeed2ba1759143f36c07618d7464a245d005d5948906d42b65e748ae625f19f725ed2a SHA512 7225d0d716b14af8e1ab8e5c1c998dade4cfdb6bdf072a9bbc5893a4adf8bc6134575ad772a0ca0d84d7979ed011b6e1761fc63902c1e87d73c161b9f2526da1
+EBUILD evolution-ews-3.38.3.ebuild 1408 BLAKE2B 9ebe3a70ed98b69de0fdc15102ee5396554b02e0fdc337e2dc9a81162806a9467725113932b1f0a609c89e3b2dd55bbfcfaa14cddfccab80b0773dec9ad119c2 SHA512 753fa5498f63787812da6fe6c312ce98c523f064398693aad4b480a29d739c4d3c13e8b59ab2e21bd7392ac207f6f9408ea2dfd23587d8132fded9e6d5c14ab7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.38.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.38.3.ebuild
new file mode 100644
index 000000000000..aacb97f3c637
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.38.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.46: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-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 0234ebf60744..c78abc3d59ec 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-clocks-3.36.2.tar.xz 364544 BLAKE2B bee9d987726cab95d6d447b33b8baf4e684950354e5ee3febe01522ee30574db495aeb4fa1cb9aa070756d611dd6da7bb84d2d164dc9172233d04c37b22daf86 SHA512 7b55a72e10c857e3dd0e6726b46647cb544bcee76f151af9b17a65e83b8a2e06564ed6875a0ac52dcdae6ac0f700b7b39aaf25194af52a5cb5449b2653316af6
 DIST gnome-clocks-3.38.0.tar.xz 375400 BLAKE2B 3fa3a10c9bf42b9dacc9bc8b3b6b2193d97ec310fa324298a02c31b97b63b8d1c11e9a849f3cab79e63725fefb61f07bded9118357e71f25111420b9115e9425 SHA512 ecee2117b55e9b61ef380d9257d24ddfe8b5b4fa6d8c0372c92e8d30b5eafe5fa4736e6aa14708460b3c9fc598912cc29a8c32f3f8585ad18b0b2eb9f15fee14
 EBUILD gnome-clocks-3.36.2.ebuild 1058 BLAKE2B b80af52d9fe65dbe3868aedd6a0239559fe70cdf39b95488c6475759122af617701fff945a348f9dd321a95e6971048014971193eab7080b19abf71d90faed43 SHA512 c6c8215ded9bd27e54fc9e6c6d820add3eb359e570c5e219c4b9c3bf7aa653ec37a4381211b2be8a129995ef99b5e5dac608ca52886626bed062fe11d22f58e3
-EBUILD gnome-clocks-3.38.0.ebuild 1055 BLAKE2B 24bb9174bc4134cf4a0efb2369fd641ed9828429b0a52bb7b31bd3511a36c72a5025782a5ea9bbf4951cfdcb68ea01f7a7f629f490e3f2df33f4d2c1e9bbe70d SHA512 74781996275f01832674da269dae27d6286db3233e552390bc51a2f740036d3db4040648ca87d5ae56a8a05ebf658634c6d45da12f3f6230125c45ddf998a6e5
+EBUILD gnome-clocks-3.38.0.ebuild 1047 BLAKE2B ce68f7137321ce1110cebbe802783a9d482e07e722fc3da130203b46dd494db5779b666d85d0e3482b6108f0f40238802e3b25055e656878ec213c797dcfdce7 SHA512 949930f4b7c2d600a021f34e1600721c94f79ddae96182c3e394b681fa7d0fcd4a4a155f4532585e9351c6136ff482fa5f81d5df46f0a2945e272fbc06952817
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.38.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.38.0.ebuild
index 4ee3f08f89a0..be0e8ac94804 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.38.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.38.0.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 	gui-libs/libhandy:1[vala]
 "
 
-DOCS=( AUTHORS.md CONTRIBUTING.md NEWS.md README.md )
+DOCS=( AUTHORS.md CONTRIBUTING.md README.md )
 
 src_prepare() {
 	xdg_src_prepare
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 293abbf9f1fd..9ee12a374fcc 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-system-monitor-3.36.1.tar.xz 705024 BLAKE2B 93f0bee524797ef76a8c90c9675d12fe4a9bc8c63a48fb86e3212f8be6bcebc26d5098f163b585748ac9832fc38f8591b8fa2509e1a541ed7637aa7c47ce0bca SHA512 52443c0dbcd4fffb7451f540f0e48088a956a4e176af708d198c6ac2054f454dbf910df21925daca484a30d6c1c3526ad634c38ab01f905a08a64b11938c0c2d
+DIST gnome-system-monitor-3.38.0.tar.xz 712320 BLAKE2B a59fbe39a8c04793c5584f645dbe0e0bcb9747394c0b923532afc95443aadeeb17ca211248a5c61747699eb95d4f8530fcc18076753bcc6d28cf2ce47a4f6825 SHA512 9f54045fa837b85d40a80bc8b519f91513ae27ca157e07f415860e906444bf144b7a7a66e4a2a9a5b1fea4e69305414cf081bb34624c91d1476265b37b59368c
 EBUILD gnome-system-monitor-3.36.1.ebuild 1158 BLAKE2B fe1cda5e2a1686b675f516dafdb55852f585e992d33883a53833ff75b73f990a0b90747e4c26362aded27b02bd8a64775519ab349fc3f693ef108e5ee0595554 SHA512 0bfb1f3db867a78a44e56bf1fa57049da56d30179368e4563d87faac6ac0e6a1c7e2518ee69c3910636ec32a57303aeb791a9a18da14f7a8d6b7d5196ba6f9f4
+EBUILD gnome-system-monitor-3.38.0.ebuild 1160 BLAKE2B e9a9907a99437c7de2115af8bbed58f20f4d322c27217c71a6ad6d2b92286669b4a056d4b7d36cfd96a0ba81b25a00533f9a77dfaafa7b689f1778941b137f22 SHA512 55b357353bf1c28e933f9ab05ea825fc69d1b82c3ad5254c177c5fd25d7929f0733df2ce36269a3047b0c219913b54fb82d8eb1aa196cb112f8861018e9cea1d
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.38.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.38.0.ebuild
new file mode 100644
index 000000000000..54e7f7abffe2
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.38.0.ebuild
@@ -0,0 +1,52 @@
+# 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
+	>=gnome-base/libgtop-2.37.2:2=
+	>=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
+
+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/zenity/Manifest b/gnome-extra/zenity/Manifest
index 4fa9d1251b4c..b24f1fb7e9b3 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,3 +1,3 @@
 DIST zenity-3.32.0.tar.xz 4753752 BLAKE2B 220fbd374f2564b345f4668c0583f2678a296bbb0d344af55b849b4e7e718f29856bd43f7ae2b0fa492e3d1d8180ca160236fcc806cd483716f680d03aa019d0 SHA512 d057df25dbb2d780c6be184ec167b0f569eadf0ac1c460d63509843157f14dfdcebe46bb6f93b17c6069ef0208902ce9ecbb4025933f7dc7572323032ec34fda
-EBUILD zenity-3.32.0.ebuild 1063 BLAKE2B bde976cb06e8963480d109ee619e745187284f0342feec8ec24f7a68501a7d4443c97ce86b28c4aa0a2f260c3e289919b27ba8ee38178af5af7023b615f4fe30 SHA512 27561f4aa7ad6a320fe4bc6d80dafa783fce6f13205af25c2e5af1eb47011d6b35db584f78c60c28bbe42dda9ed9e0ffe95d73fc5f34700260349574357682a8
+EBUILD zenity-3.32.0.ebuild 1074 BLAKE2B a02d0106c0bd58586588af8cdb50723eca45742c39d539f9bcdc226eca3767d61f899e2e9b987a9af64f564e6afc4f20ed6a7835a0e0e70e4b8491de00560cdc SHA512 59aa87003c9dbb18405c023f71a41a97f20db236c4ac297ce8e06c28e15240e8d86ac9e7296b5387cacc234fbacdd8a197d0428a558184b57982e12938a2cd60
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/zenity-3.32.0.ebuild b/gnome-extra/zenity/zenity-3.32.0.ebuild
index 64bf0a289f70..5d5ab54c9b12 100644
--- a/gnome-extra/zenity/zenity-3.32.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.32.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit gnome2
 
 DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
@@ -22,7 +22,8 @@ RDEPEND="
 	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
 	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig