gentoo resync : 21.06.2020

5 files changed, 7 insertions, 110 deletions

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