gentoo resync : 22.05.2021

3 files changed, 51 insertions, 2 deletions

diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index abb2dce51d8c..2fd667a590df 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,7 +1,8 @@
 AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
 AUX snes9x-1.59-build-system.patch 1303 BLAKE2B 48a349bc5d56fcf154faab76cf76fcbb98808ce7933ff5e6da2cbf2b22d62819367e2ac1224f66735108de44419375d6f6eb2c2a4a104a4d492148866b6e829e SHA512 abbd0bfea5ad23f652e8249adbdf1118a4efa2ed43301b1786bbd91a253e98fb7ff99f68ff62c128972fe0af47aee9fa48fa9e3218b0a33c9e68f468fbe2b9e8
+AUX snes9x-1.60-gcc11.patch 1805 BLAKE2B 0639b425266be59ac472f92154ce488bf0b6f631f00c2025104f6dfb31f1c72d1202657d182e47a47198606ce92a55bf8769662c9a4e81add171be547b7ced08 SHA512 600291b2c32e4099207eb31e7b6b19d4ec043b43d88b9eb5efe935c971ae8bcb02e821a6653246417481db0d46c5a3e1a4af3ea8c17894549b293e588f6fab79
 DIST snes9x-1.59.2.tar.gz 2819803 BLAKE2B 3e077fe68dbc6ae9acf7625c1371971300cfb72143e0e98841dc8d75be5ccc45812d79d7810d28d1a5dc5c17a69cf0f9483e9c69e91437d864a4cbaf34852b35 SHA512 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4
 DIST snes9x-1.60.tar.gz 2863228 BLAKE2B 0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b SHA512 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
 EBUILD snes9x-1.59.2.ebuild 2723 BLAKE2B e365643b7c13bae7577eeda034963a946e3dd78153696f09f95503d0c758115294f4295d797b6b7be2950c0e584afcb3aeaea57d55683f7988ca286aa7b70f96 SHA512 9a474aba0c8fd071f090bec4694ebc036733b6831cfb01e35a9b1fffea049340fe2cc0b1fe840dae93df03b3740faf65ac000ec58d71adfd465d11767cf917d7
-EBUILD snes9x-1.60.ebuild 2991 BLAKE2B 9a2d5693b97f433019ae14e810e0af21ecc555db588529c6a2e8134fd59ffd40376d7f34f04eb354c580aa4a32c0c00f2663203cdd6f9ba0ac49d64639916a7d SHA512 3d78def81d6043e51dbc1a3ce764d71d3c9830bf7691bf3c20f0f986e3fb4c1d54b5b3d0ed5cefb76eee1e76072ed40463c96a0b02c588a43d3aa81b129fac9e
+EBUILD snes9x-1.60.ebuild 3029 BLAKE2B 2e8b7ab81a10a48aad64a09cbaae2ab2e7c8706af990ae18425be76ff6de2a58800563990f2de320cd959fcc1bcdb893595b47839a8d218244c8a7b7e6471e40 SHA512 bdc32f1d423acfce19d9672f057a228e763c8276333de0db4184eb53780edaa4af721a824d1c65dff04c7c14008ec1592139513694db6b68582e8b064bb72d12
 MISC metadata.xml 540 BLAKE2B b42e960fcbc0ab7f001494ebc804c0cbd617d452eaffbdcb2c46a89ebfac6ddf2968f4eaea83fc522138e13f6898584acee695aa3f1c8e96b2a3e620a480ecbf SHA512 cc3155bee496b7a1061f6f23611c39d909eb893b43a6cae0400ef02884267b7a674a865a848b5b38945bd334984cda2ae20da16ce793d21481baac24c428f4bb
diff --git a/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch b/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
new file mode 100644
index 000000000000..453771f5139c
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
@@ -0,0 +1,47 @@
+From 7f6d9d6432d912cd90763c64f7c92270b3e6c182 Mon Sep 17 00:00:00 2001
+From: gocha <gochaism@gmail.com>
+Date: Sun, 19 Jan 2020 12:48:06 +0900
+Subject: [PATCH] win32: fix compilation error in vs2019
+
+---
+ conffile.cpp | 2 +-
+ conffile.h   | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conffile.cpp b/conffile.cpp
+index 817afae7f..fa7de3fa2 100644
+--- a/conffile.cpp
++++ b/conffile.cpp
+@@ -452,7 +452,7 @@ void ConfigFile::ClearLines()
+     }
+ }
+ 
+-bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) {
++bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) const{
+ 	if(curConfigFile && a.section!=b.section){
+ 		const int sva = curConfigFile->GetSectionSize(a.section);
+ 		const int svb = curConfigFile->GetSectionSize(b.section);
+diff --git a/conffile.h b/conffile.h
+index ba69812df..d92128cba 100644
+--- a/conffile.h
++++ b/conffile.h
+@@ -90,7 +90,7 @@ class ConfigFile {
+ 		mutable bool used;
+ 
+         struct section_then_key_less {
+-            bool operator()(const ConfigEntry &a, const ConfigEntry &b);
++            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const;
+         };
+ 
+         struct key_less {
+@@ -101,8 +101,8 @@ class ConfigFile {
+         };
+ 
+         struct line_less {
+-            bool operator()(const ConfigEntry &a, const ConfigEntry &b){
+-				if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
++            bool operator()(const ConfigEntry &a, const ConfigEntry &b) const{
++                if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
+                 if(b.line<0) return true;
+                 if(a.line<0) return false;
+                 return a.line<b.line;
diff --git a/games-emulation/snes9x/snes9x-1.60.ebuild b/games-emulation/snes9x/snes9x-1.60.ebuild
index 14b09f9d7545..b44ac4ece5bf 100644
--- a/games-emulation/snes9x/snes9x-1.60.ebuild
+++ b/games-emulation/snes9x/snes9x-1.60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,7 @@ S="${WORKDIR}/${P}/unix"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
 	"${FILESDIR}"/${PN}-1.59-build-system.patch
+	"${FILESDIR}"/${PN}-1.60-gcc11.patch
 )
 
 src_prepare() {