gentoo resync : 21.06.2020

13 files changed, 226 insertions, 139 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 766e4692a592..cd2eb2f20f91 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 bfb11118d6ab..6037e74277d7 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,6 +1,8 @@
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.34.4.tar.xz 4627704 BLAKE2B d1b93f17eec1dc71b31c9a842af369646c7412c63461a63a0c42026795d97f8b282c498ca56e14b258e7764ce333fad159d4fae534891cd02b99be6166bfbc23 SHA512 e353724591216f472faabaab468d6a8555e05cafda4a8b2c55fa3113226475f0ec9edad65d8acbf95c92844d33f36cf32d49ddc14fe934a2b8c127c32cc7b74f
 DIST evolution-data-server-3.36.2.tar.xz 4631984 BLAKE2B 946a2c30a631f3e7efa5f084bdc3a7267c6ebeea63fc84d8a5f23aeddbdd9c81d95ff87ae34519f9faf86fbac54cd4faa8749fc57017a7aad78b9a3eedcc2f66 SHA512 3549d8ce4cf47080c426a023b88d4a1f4432096018d69c1cf6628f96c4b56312b487ba53c4813968a7aea051c3cf9e8d5438bd3fbdb9605e49eb4f1402b8c8fa
+DIST evolution-data-server-3.36.3.tar.xz 4632948 BLAKE2B e2830bd8340280f56e0fd1d32b6a85b5ee73b5704ad9ffaa73e83ef0aee395d23a80aa59aa5bd4b1e2211bf3020368b1f0e2d9a1d8eeaa6e047fbf406137e80b SHA512 bde03a84d262606ba8e43f084735db3072b7fa5641dda6053ad798ce8cffb3003aaa7065fab0f684cfbaaa8300855bb42b259ac1c22a8f4bb8b50032263ea75d
 EBUILD evolution-data-server-3.34.4.ebuild 4329 BLAKE2B 32512b88545711e9bddfcec3b7efdf6e384ac0397751eb5fa41f47ce97d3fc726a0f63a8e174d07137b8b0d42433cc837b35f27d098800fb1180099921f56a39 SHA512 d708438396f55a08e7a407a3e0967779afa38e7e08e0da61ae01b8e18d37a972ccee4c937d974fe14d8fb8cee210cc6a3e27578654bbcd1d338e018dc46e811e
 EBUILD evolution-data-server-3.36.2.ebuild 4202 BLAKE2B 720a0c22cc6bd7d06d1f7d3425f03907f099e441a8636ea5a968b336ce03133707635c268360f3d7a12264cacca4dff03e6b0f4311ec6a9e25a5455184494297 SHA512 cf6a4418e275ae0da4152f6d7db564878ccefc9975050c6c80a68906535c98af769eb1282cb20a992fc3365e99a319c90d7fec4697b0a441b429e83d6d9d1352
+EBUILD evolution-data-server-3.36.3.ebuild 4202 BLAKE2B 720a0c22cc6bd7d06d1f7d3425f03907f099e441a8636ea5a968b336ce03133707635c268360f3d7a12264cacca4dff03e6b0f4311ec6a9e25a5455184494297 SHA512 cf6a4418e275ae0da4152f6d7db564878ccefc9975050c6c80a68906535c98af769eb1282cb20a992fc3365e99a319c90d7fec4697b0a441b429e83d6d9d1352
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild
new file mode 100644
index 000000000000..5089f36061ec
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils 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-24-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.42: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.11.91: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}
+	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
+	vala? ( $(vala_depend)
+		net-libs/libsoup:2.4[vala]
+		dev-libs/libical[vala]
+	)
+"
+
+# 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-utils_src_prepare
+	gnome2_src_prepare
+
+	# 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-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_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 aa24bc01702a..3d85d69c623e 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-ews-3.34.4.tar.xz 538964 BLAKE2B 3b23dee72b13bd7da0efdacc13bf16052b52287dfbdeb913100244cfbdc726fdd6dc526fa38eb3da849ea5e9c95e9bb59fedadbe0238c37698cedefdda05f82d SHA512 397dd89c81c986501aaf5c0460735577ebe2aa0bfe549359073e211e912e3622c7ba61eb90898ec00a06bb1c4d02a565446a3b0620ff8515088d706d5c246c91
 DIST evolution-ews-3.36.2.tar.xz 552680 BLAKE2B de7b0d9155de895401d52ad4b82126f048c23ffe63d13e97505c9767f89d850d9e58e84ba26940835a066af4c53f78c465e015f6a473f052bdd6a7ffe18c9a10 SHA512 662828afa7eefec720016ec2d7c70fddd376c4a3ae974287516f7ce063c293665172fdbffa8a25333a0564b74632d8409140cac60f35cd3f169d063cecc337c8
+DIST evolution-ews-3.36.3.tar.xz 553676 BLAKE2B ec9c0e167c05f7606585d5bbce8c0f53ec9c48b3f8b68c6ec5b6f3776cce12e34a75eae658df704519111022f60353a0b114d3aa186b93c8a8b3ded3240ccd79 SHA512 d625a70410db238ce0ad9dc8bb048346d20c43053406aa98bc81e0c087621b5d0701644a548d525be5a21b283923bb505499b8826e3a23a753465411f2c600a8
 EBUILD evolution-ews-3.34.4.ebuild 1408 BLAKE2B 4c50c511fc049d334447938e4e2027bc4e3b353a684f453e90d4e20c3988e113632826b9107ed5726b5cbf59991bca285512cb80ab51071d45eb9e5eb307bfd0 SHA512 b845c4d3b3cfb3760e89c2f8cb8787f5a09db8840984cbc43ab427808db7436b9d58584514b4d83c5eb8e4ad6286f86bf2014c9656e32bade0c7b5dba307b91a
 EBUILD evolution-ews-3.36.2.ebuild 1410 BLAKE2B 0d8b0f84ad75a021656eb7dac6207d129ed4e8fdf4af60f31bbee26a0692d570a113bc04647f03d03f6a3567152fcc2d515d02dc4890afe9198b82916985f93e SHA512 76193cf66e8908e03cad8da4d315939ebc5daf657483b53119ec50e0d2a38655fb218767f31ff44157d7af1f9ea4f0063dbb4adcacaf9dc470903d4366329afd
+EBUILD evolution-ews-3.36.3.ebuild 1410 BLAKE2B 0d8b0f84ad75a021656eb7dac6207d129ed4e8fdf4af60f31bbee26a0692d570a113bc04647f03d03f6a3567152fcc2d515d02dc4890afe9198b82916985f93e SHA512 76193cf66e8908e03cad8da4d315939ebc5daf657483b53119ec50e0d2a38655fb218767f31ff44157d7af1f9ea4f0063dbb4adcacaf9dc470903d4366329afd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild
new file mode 100644
index 000000000000..b3b87637eb31
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.36.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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/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}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( net-libs/uhttpmock )
+"
+
+# 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-utils_src_prepare call, if that works
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index c5a54f3d18ba..d792942b6e7d 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,8 +1,5 @@
-AUX gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch 832 BLAKE2B f4f730badc7ee5392091e5bce78d7389dd7d5c8612e1747e05d59983252b6e1ca13b27428055166b494d910fe672762b50877c37ac2de6d67d3175a3bda92e2f SHA512 0e3c3643949ad9d2e7bea7ee7b2a688ab2b64c8804220752e21f77573c20daf9259f8001fef9214755387568220f61a5d17ef6f3a374ba6cd07258a409e43087
-DIST gnome-commander-1.10.0.tar.xz 7421328 BLAKE2B 4cfb6a5d445217de10007d4371cd5cce95319dd68a6e7f071def2258cd965cfbeab671c6016e624ef474501608214f309c56360216cc53c83a1660b38dbe77d9 SHA512 76e2cca3af7e11ae7f327fa25bb175ad28d36d8b71c4908ce8b91533ed53a444a30d861a24cf94ee34dd7954d1f9dd0a14d26c2214854424b80f8e7c107db60d
-DIST gnome-commander-1.10.1.tar.xz 7424500 BLAKE2B 6abddf8dae4bc0a1d740ffee49ccc7d816d783bdb5c2b90c9d0681c1db5fa3f42700e65a780881400c1af038d7dfe7f458a98cf2f8f1c1b0fc6f93a3d58dc069 SHA512 b5bc548444149e00f29e6e3b7f785c99a08d27a0a2642cf78c203411a8d2937341a76685b09172047162afe3e0fc92ff13c82bdbd8105281d360c1df44b4702d
 DIST gnome-commander-1.10.2.tar.xz 7433468 BLAKE2B a62a39490b154a8dc7a5e05c4d4c59fc79447b7b9ddae139542552f809b7a53cf729d636f1fabb85c6390520a25d84477ec6dfcd4394eefe59a8039b51b0ddf2 SHA512 7a411ca6f604771445119cb2b9d14f7f5d91622d28975e92ae5f5da3fc4f76fe51cca0de3712377ef95064879089c1c723dce9a824e5784cfcd484b869702dad
-EBUILD gnome-commander-1.10.0.ebuild 1695 BLAKE2B 7b9ede3cd802a7eb6582c4fd60694fd5fe1941a5a0226a5e936eaa9c5567e02eb52f2b6d81bf9868112712cf8e38fcc8a578fc03e07c7090cad06626ce74cedd SHA512 b67b77112f488e8b2642f908bded2e38f59249203b3c04c571b8dfb936553b741296d514398c648fc46637acc040bcf846da000ed6c53b5050a6b4545ae4c583
-EBUILD gnome-commander-1.10.1.ebuild 1715 BLAKE2B 14b9293f21ba40f2c199895b23c7d243f7ff9e64e9b036e920f07a364113c27aaa358832e2da1c1f71ae704a54a80147c665b92e4f90ce13a216d6625db43934 SHA512 c65bcdcf1362acea5903de785f1b48e278005d18386a96229d5e9f5718928a7813890965bdbd1e7238dccbbb785e4f474555270788e1d49f60807673ef04282c
-EBUILD gnome-commander-1.10.2.ebuild 1633 BLAKE2B 0ec4ae457c4ab11d0804224711f32e8a787a4e16776573543bd354fe97d5a6c454dffceb5cd4fea81ddf1f7643287483e48a88cf8772463cf6a19f0719afb530 SHA512 00a41a32a5bf110e06c0cac3e387fbfc97749d66193d097d4b2b3650bb4fb73019b7465a1fe3658a3b0b5f556103ab948d1f8c108d16bca9e258bd0eb3c95170
+DIST gnome-commander-1.10.3.tar.xz 7474512 BLAKE2B f27f86a470bc919327980ba21c577241034290d74b663d4479195fa21249ce9bd238b12a0fae70c3cc6ab26953a595414efbe04508c73f8deb5e7c6e2de6f784 SHA512 87c4df1534747f21b15e48141180601aef02152b1eef097986b0f8675a6d24e75a81ccb7d0b41b2df38cd40eadae2b0bd09f8e0274a5e5cd8bbd8d23df6ffd7f
+EBUILD gnome-commander-1.10.2.ebuild 1628 BLAKE2B 40fc3001f8fe0b58d2c7f9dee7d1bc595d63ba2da9d8e07067f916986d05246cd7f31acdf16548d41a788f4e31226cbc6f8b8a6d62ef7927d47ade4c0ea66fe4 SHA512 a6ebfb3340918098967cef277a616438c0de4a617bddb6c0fba61bf74c005476edef258d9a7af66e3953186aa02c26dcecdf07c7422c5991d5e4175ed64e12f3
+EBUILD gnome-commander-1.10.3.ebuild 1547 BLAKE2B 34af84604facd72fde3444443212dfb7fd76c0732c7b10b2fa1b2d5816863db61b053de70cb6b413a4a27ce3aa867d33db68998b54968079cb2dd6379009581c SHA512 a329ffa2978acc56521959eee1c952ba39889ea3c39de2b9d42fa57f42857f0b6e3cc8448f51e3ab8486a19d2b52409e6a7aad31d28ef9305512d0dc7f70263a
 MISC metadata.xml 1154 BLAKE2B a63442239df95b58fab2bce3dd1fcff690b37b5ffd90ada27ae772e118205bdab1567d5a9eabe0140827e30aefe5521d9646f46ccd18b9a5db7de8bbf9a40d75 SHA512 e38f3268f6c44152c0c071d0efc66b805872a67de1a81f19379ccccfc599c6bb0355bf1f37ee0d034f1384ca95e3c2527dadf2bcd5358cb506380f8488b00afc
diff --git a/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch b/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch
deleted file mode 100644
index 01772528c4bc..000000000000
--- a/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f98b4a87df3d68b8dd6a2eef24521db7a4d5c75 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Wed, 15 May 2019 18:13:29 +0900
-Subject: [PATCH] Fix compilation error with exiv2 0.27.1
-
-Due to the change in https://github.com/Exiv2/exiv2/commit/71498411c19e6b97a24245b5a1a22063c76a972a ,
-gnome-cmd-tags-exiv2.cc does not compile with exiv2 0.27.1 .
-
-This commit is to fix the error.
----
- src/tags/gnome-cmd-tags-exiv2.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/tags/gnome-cmd-tags-exiv2.cc b/src/tags/gnome-cmd-tags-exiv2.cc
-index 807e6f43..e4b269f3 100644
---- a/src/tags/gnome-cmd-tags-exiv2.cc
-+++ b/src/tags/gnome-cmd-tags-exiv2.cc
-@@ -33,6 +33,7 @@
- #ifdef HAVE_EXIV2
- #include <exiv2/exif.hpp>
- #include <exiv2/image.hpp>
-+#include <exiv2/error.hpp>
- #endif
- 
- using namespace std;
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
deleted file mode 100644
index b145aee0dcb2..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chm exif gsf pdf taglib samba test +unique"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/yelp-tools
-	>=dev-libs/glib-2.44.0:2
-	unique? ( >=dev-libs/libunique-0.9.3:1 )
-	gnome-base/gnome-keyring
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.4.0
-	>=x11-libs/gtk+-2.18.0:2
-	chm? ( dev-libs/chmlib )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( >=gnome-extra/libgsf-1.12.0 )
-	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
-	pdf? ( >=app-text/poppler-0.18 )
-	taglib? ( >=media-libs/taglib-1.4 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1-missing-header.patch" )
-
-DEPEND="
-	${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with chm libchm) \
-		$(use_with exif exiv2) \
-		$(use_with gsf libgsf) \
-		$(use_with pdf poppler) \
-		$(use_with samba) \
-		$(use_with taglib) \
-		$(use_with unique)
-}
-
-pkg_pretend() {
-	if tc-is-gcc && [[ $(gcc-major-version) -lt 8 ]]; then
-		eerror "Compilation with gcc older than version 8 is not supported"
-		die "GCC too old, please use gcc-8 or above"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.2.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.2.ebuild
index 4e3d4aa193bc..5b66bd795ba5 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.10.2.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://gcmd.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="chm exif gsf pdf taglib samba test +unique"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.3.ebuild
index 5087c582cc0f..a6d873b281f6 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,11 +20,8 @@ RDEPEND="
 	app-text/yelp-tools
 	>=dev-libs/glib-2.44.0:2
 	unique? ( >=dev-libs/libunique-0.9.3:1 )
-	gnome-base/gnome-keyring
 	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.4.0
-	>=x11-libs/gtk+-2.18.0:2
+	>=x11-libs/gtk+-2.24.0:2
 	chm? ( dev-libs/chmlib )
 	exif? ( >=media-gfx/exiv2-0.14 )
 	gsf? ( >=gnome-extra/libgsf-1.12.0 )
@@ -32,9 +29,6 @@ RDEPEND="
 	pdf? ( >=app-text/poppler-0.18 )
 	taglib? ( >=media-libs/taglib-1.4 )
 "
-
-PATCHES=( "${FILESDIR}/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch" )
-
 DEPEND="
 	${RDEPEND}
 	dev-util/gtk-doc-am
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index a34c5ce2f947..8f855b88af2e 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,3 @@
-DIST yelp-xsl-3.32.1.tar.xz 528412 BLAKE2B 0e35757b8bd4139ebf436f69c6254cb26ba92f13d6ce345093b023151d3127f70a866572e6d42c9c93d2faf85abd6dc0ef2720955f5defab3c3415605eaf9152 SHA512 05a03e045c8278faaf39604d6cbccb449130d2c85e3231c8c9737e344fc249cd2949011fb1a0e4fb6085dc21374e7804fc7fa4161f51607d93b301cbcf5453be
 DIST yelp-xsl-3.34.2.tar.xz 640968 BLAKE2B 108d3fb52eb0548a9592442287513d3deea4ef595a252d3a46f6936243404bcdb31bb3adc234ba69e28a4de03ae35b1a5cac5ea2b2ffd4c6e4d4245c00b457b6 SHA512 ec31a46c8ee2f751f84fb309bf9a1ee3af090856b313375afb8db0ba17e9758b1616cddda4945de7c65f163893bb89a94a7372f90040b37a836f5d6173c80472
-EBUILD yelp-xsl-3.32.1.ebuild 574 BLAKE2B 0c51d2be30a2bedf87ce1fb8b4d88e4e6b7b00a2962fe6c31b4d94e1a6d0476f1dbb8552196714407c5dc4ada3d02a704c68b9148557c24b9753e9f7977130bb SHA512 4aab22ce9fd16d45da239a51f1c09c87a4d2f0af3b4b7f43c7684f85232b11731a392f0d347d70abb7359b9a311453814f8e7d27b5d20c05fafe09252d0eff83
-EBUILD yelp-xsl-3.34.2.ebuild 558 BLAKE2B 6281415c2ea7f7d594c1a91da58023efb420454883cf8ff3c2df76f1e495e0e8396c6161c3de8080dc885cce248cbb01d9d73d5fbd8e31077e39e1533b18d15c SHA512 31eff035feff616a50afa0cff7e161b60fb9769d93ca4f59ba8927aef03b885ed62b25cf70e0dff397aeda49edb16c04ea69f92ad8a00ce241aa2dd9f0f45f39
+EBUILD yelp-xsl-3.34.2.ebuild 557 BLAKE2B bddb7cd5cdb86a227e7d952822af17583748910343f306e30637d3bc790357be2cbfdca80afc280e454ba5b44b5b004dc889cb78345e36ba090509b05a0fd73b SHA512 780b30ae2432561ba7d207d25d5101fdedf3fc749dbc2ac01522b74814795049c5057b84e80b20b8755dd813abaee9441b64b0d3cb001f4f1572b0630baa7c33
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
deleted file mode 100644
index 8b8dfbd2609c..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="https://git.gnome.org/browse/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"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12:=
-	>=dev-libs/libxslt-1.1.8:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/itstool-1.2.0
-	sys-devel/gettext
-	virtual/awk
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
index c8cbe0e6a05c..185ba651964a 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/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 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=