gentoo resync : 28.11.2020

4 files changed, 46 insertions, 13 deletions

diff --git a/app-misc/rox-filer/Manifest b/app-misc/rox-filer/Manifest
index ec74a95ceb5a..ba26763fc314 100644
--- a/app-misc/rox-filer/Manifest
+++ b/app-misc/rox-filer/Manifest
@@ -1,5 +1,6 @@
+AUX rox-filer-2.11-gcc10.patch 694 BLAKE2B 4f701a9df153045d92490ae590bd001b67059b5956240970594471016607538e703ef09acc6881a9d2995bc8fa8eda059e8bc8232fddd35afd656db6f1c2e46a SHA512 bdae97a9a005b8993ffd96a22d6584949f01c28e1ac1494ad41bc2b20ac8b44d9b60e8f960f3259867455ae269dafdf7fde51e3a0852638a5414aa34eac70b31
 AUX rox-filer-2.11-in-source-build.patch 429 BLAKE2B fdbc342e0f6a7abaf01fe0a2f5411a6aea7a833f2679d9f47a783631443bf2618a4d6be293e5ce14da295713bd7b97af36edaffa3aedbfcea3de513ac1fd455b SHA512 28cb208bc51c500ad766bf832f8098bd44813626be2ed3c50c37d0cff5193e1dc1a4430ec40ee7290befb1f20b4a506f03c8c327760b75e06d08ec646b24638c
 AUX rox.desktop 157 BLAKE2B e13b788f78bb5f3af73e6f9c0e5cc9729b7221cf37a7b1952d78ed9d1f3ba8ada67d523ae08d7280d5152e3e5f0cafbf55e65bbb75d558d4c77b14095ac7fffd SHA512 968b930f97a25c58a0aeee0789161b98b0bfa93978beb0d7e57e40affe45b65940f67b612df93ac64c0c5244de7dbf913b1083cf7aa4a357e929a7f9f4ab366a
 DIST rox-filer-2.11.tar.bz2 1907026 BLAKE2B b1afd0e2df7152bd1160632c0e7eee71c1d3e9140d453f0fafb2d8049b593513db7ca051282ecef2ce06831883d2f057774e3d37175a64d4bd5a8158e4bbb4bd SHA512 2ef5e7a5d6f4bbb825d6f01725ad4149b9cabfb6fe82c33631bb145f5a3c84e345c372b7698170c1ef78b30ffbc4665495cc266da4828cc8b4b256b592b2c50b
-EBUILD rox-filer-2.11.ebuild 2340 BLAKE2B 8edd0494da53afc35242be35c3cba96153755335c1b4d9687addf34ef357eff4c057e63c30bba6c28c984a6751e40aa6c075b98bbc13aa67d77ee853a45d6f40 SHA512 e38547fde5f3d627498049fb8db64aee190fd0a3b9730d2a30474739b8906edd8aceb0389de09defb3589f70338434e19416ed4fb96ec98e0be7c08d5062f442
-MISC metadata.xml 1128 BLAKE2B 16ca555c11ddd1a0de2ac5381be54c415f16329fdf10e6523ab078db320c57f6c35e1656fb1d026ce0615da9eb4bcf08b9f565a5aea34e8a1ac3fbd0b20e2bae SHA512 23fe490bc592c9d4288966aaf41bff4a68605c15ae9778dc1a89f89e5b2fea2c4e0e9c9e12b8080c744d79a5b7d4b7abb534ce02744dc517aaf7af679764b453
+EBUILD rox-filer-2.11.ebuild 2410 BLAKE2B e4eda414d50333d7b3320e71b34591b31753765c237332f7075c555a03e74da7a4825a8e8b193fa895de197c564bebf3d71560c202a6c14109a815a3133e9aeb SHA512 52639330b112b1c0006bdefb285aeb8e192b680af4e4db50e6220934d962dc131498199cbe77c3ad821d2bb0a5b9c8dd8be22224ec8529e263796d29d64f9a24
+MISC metadata.xml 1188 BLAKE2B fb150cdb9a5d058579d48b6c0af7e328693ea8faf80ee0d54272892ccaa9a7095875cae2e09bb8ba72fc6fc1ad834f624230e5f1a1b2bc8a3f88a9ad7f3815c3 SHA512 e4697b62759e1c589a964016a1d18889843e16ada402d7f295fee8077dcef4178c02870f696485079c98d3c18b032a981b6d887741d7e22dd7882d5dec6f9c9d
diff --git a/app-misc/rox-filer/files/rox-filer-2.11-gcc10.patch b/app-misc/rox-filer/files/rox-filer-2.11-gcc10.patch
new file mode 100644
index 000000000000..d969757eb7da
--- /dev/null
+++ b/app-misc/rox-filer/files/rox-filer-2.11-gcc10.patch
@@ -0,0 +1,27 @@
+From 86b0bb9144186d51ea9b898905111bd8b143b552 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Tue, 30 Jun 2020 00:22:06 +0300
+Subject: [PATCH] Fix compilation with GCC10
+
+Fixed compilation when -fno-common enabled (in GCC10 by default). See
+https://bugs.gentoo.org/710330.
+---
+ ROX-Filer/src/session.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/session.h b/session.h
+index 7734996a..31341bc4 100644
+--- a/session.h
++++ b/session.h
+@@ -10,7 +10,7 @@
+ #include <gtk/gtk.h>
+ #include <X11/SM/SMlib.h>
+ 
+-gboolean session_auto_respawn;
++extern gboolean session_auto_respawn;
+ 
+ void session_init(const gchar *client_id);
+ 
+-- 
+2.26.2
+
diff --git a/app-misc/rox-filer/metadata.xml b/app-misc/rox-filer/metadata.xml
index 65dec56d6380..740d871edf39 100644
--- a/app-misc/rox-filer/metadata.xml
+++ b/app-misc/rox-filer/metadata.xml
@@ -16,6 +16,7 @@
 	</maintainer>
 	<bugs-to>http://rox.sourceforge.net/desktop/lists</bugs-to>
 	<remote-id type="sourceforge">rox</remote-id>
+	<remote-id type="github">rox-desktop/rox-filer</remote-id>
 </upstream>
 <longdescription lang="en">
 	ROX-Filer is a fast and powerful graphical file manager for the
diff --git a/app-misc/rox-filer/rox-filer-2.11.ebuild b/app-misc/rox-filer/rox-filer-2.11.ebuild
index 6b9abf2b53dc..966f2750cf96 100644
--- a/app-misc/rox-filer/rox-filer-2.11.ebuild
+++ b/app-misc/rox-filer/rox-filer-2.11.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit desktop epatch virtualx
+inherit desktop virtualx
 
 DESCRIPTION="ROX-Filer a drag and drop spatial file manager"
-HOMEPAGE="http://rox.sourceforge.net/desktop"
-SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
+HOMEPAGE="http://rox.sourceforge.net/desktop/ROX-Filer.html"
+SRC_URI="https://download.sourceforge.net/rox/${P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE=""
 
 COMMON_DEPEND="dev-lang/perl
 	dev-libs/libxml2:2
@@ -22,13 +21,18 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
+	sys-devel/gettext"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${P}"/ROX-Filer/src
+S="${WORKDIR}/${P}/ROX-Filer/src"
+
+PATCHES=(
+	"${FILESDIR}/${P}-in-source-build.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-in-source-build.patch"
+	default
 
 	sed -i -e 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' \
 		main.c || die "sed failed"