gentoo resync : 18.08.2019

3 files changed, 16 insertions, 7 deletions

diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index 506c94c817da..ac62fe8e3fec 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,6 +1,6 @@
 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.8.1.tar.xz 7298888 BLAKE2B 57def43a8d8794ea813e6520c436d86f3fb9218e64f0b1e7280e03370870a29887737006e056ee0e2af78e12e225a8f5789c4f86f68eac13e27420cbef0fd2d7 SHA512 76efb88e1ee8843fcb9cf17c421dda1769d39b1bfd9d5c97e3ff570117bcac44dfd17a2efbda5079155115611b10b75644ec12df541bd6f7f8d0f65e471f6b32
+DIST gnome-commander-1.10.1.tar.xz 7424500 BLAKE2B 6abddf8dae4bc0a1d740ffee49ccc7d816d783bdb5c2b90c9d0681c1db5fa3f42700e65a780881400c1af038d7dfe7f458a98cf2f8f1c1b0fc6f93a3d58dc069 SHA512 b5bc548444149e00f29e6e3b7f785c99a08d27a0a2642cf78c203411a8d2937341a76685b09172047162afe3e0fc92ff13c82bdbd8105281d360c1df44b4702d
 EBUILD gnome-commander-1.10.0.ebuild 1668 BLAKE2B f1fdb58b4851d43fd8c61a723e2e0c098be69a9a6ea0d09cc00e15e13c8dcdd7e494f559c3760d4d9d27eb33048f5efcbb92b0fae0327e15f81424d023e0ad45 SHA512 c145196cfd3bd938a66709acde9d51282ab81bdcc7ae2fd8a9e88f9ffee9be3dbbf271afad149e1ce26d8420cfc9a9b4c732a266375131a9a11136ebd7053d6b
-EBUILD gnome-commander-1.8.1.ebuild 1392 BLAKE2B d1c67d019e1a24dc28f3122012cd10aa208b9785f3e902124177c0c847ed12142b531b1c4ee7e53181837f3d33dc359a5b69e100c5819d79692a607edc2d29d4 SHA512 adc3f88d893737c1b9d2a4cb8f56260f40733d2e39a7e6a53bc813d8225b57b4321c88751935e916cb7329925ca016cf45de226dd0ba4dabb3646354431d5b1e
-MISC metadata.xml 1204 BLAKE2B 5a53c4f7ba14099a6875bca04d8a91d79c910265f89af7e2227f03b892406fd3be0137a10d096d41d18fe10fb7d4790d649d7c6c4b42f58014d3c30dff884200 SHA512 48f0f626f08698e731b0359ba63ef2a5a25e41a6cf9a1d848f0784d14a8214747e750d30ab5d2759d8fb92278a38690da25c20d5c751fcea72af04e224c41028
+EBUILD gnome-commander-1.10.1.ebuild 1688 BLAKE2B 2bdb6d08851149dcaf422ad18a3e600b45612f4ecf766587a99428c6bb587a82707ce3a1ebfcd11fd968362989c85b7dc71e6a5b7cea3de30031f850328af2c9 SHA512 70e6924474ba6e79d6fd2288cc4de024017e1e9f47f9053180fe52ea4b7937a0659360337cf0b0e8bc6dbf9607f7934d805f7163f3bd0e58437ca90ff9b1f87a
+MISC metadata.xml 1119 BLAKE2B 0b7dcdf724e6f9b2041aea2da4468c081e6d14b2fc698424e7e8c6edd0675eb07f904813a3f07a512beb6cace17977f6d234442c6eb5155d2da4e74cf8eb48f1 SHA512 05354f8bc13305c98d1e7ac7590db2e3ba47fbb9e60d099d989c8790d3807ce5568b080bd6f6d2a582693fd056b2654d7ad7992b4b1961b54d982b761c369fb6
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild
index 7fd4b9933cc6..06cd772cfedb 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+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"
+KEYWORDS="~amd64 ~x86"
 IUSE="chm exif gsf pdf taglib samba test +unique"
 
 RDEPEND="
@@ -31,6 +31,9 @@ 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
@@ -51,6 +54,13 @@ src_configure() {
 		$(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."
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index 57d7ba357950..61e540ddb048 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -23,7 +23,6 @@
   <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
   <flag name="unique">Enable single instance support using dev-libs/libunique</flag>
   <flag name="pdf">Add metadata support for PDF</flag>
-  <flag name="samba">Add support for SAMBA (Windows File and Printer sharing)</flag>
   <flag name="taglib">Add metadata support for ID3, Vorbis, FLAC and APE</flag>
 </use>
 </pkgmetadata>