gentoo resync : 25.08.2020

5 files changed, 82 insertions, 558 deletions

diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 3474dcbe2026..97b2c4fe5fa3 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,19 +1,17 @@
 AUX zsnes-1.51-CC-quotes.patch 740 BLAKE2B f41e66a5d2f9b54c8ed4f17fafc7afdd73e35202c083d1db375b26b89f03b991d36d279d10c7c17076f31b87d1fbad276e5c5c4ce333d2cb0f0fc7641b562845 SHA512 2347910158934a7c8b90a6739f923d7a1f94e963515dca42d45eb97e6165c5f80c30d28fd151537a7a80bba16d2462568ff1c1dac93a855990f0418aaf059776
 AUX zsnes-1.51-arch.patch 2484 BLAKE2B 036f749d832efc976a7225e47d6b7ac5e1b69af235a4196e9706fe46d447793a1e3f88e49fe34229cd71353b987b7ef123bbebf7c822ca32025c60b0c9813b57 SHA512 cc75584780e442d7fbcd4e26a9395d8e85570883f93f63b1fcb604d601acde88295861e15a6cee1d50bca836fc52efd4f5df9c84fb73fbe04fa76ec34ae3b4a1
-AUX zsnes-1.51-archopt-july-23-update.patch 12672 BLAKE2B d12246a4913d2355a7c2c26686714e61ff3791c29f93f473619225b9bd180d329c48d07123141d657faf3fe75de4e49d31b80b4577f9a646a531774abba24b4a SHA512 ac30370957721ccc4bc8681dc00110bd68dee6d65a2c3daa39df2fe45a4fa7106f9c3097b2bd9cc3dbc83e3c6344811e8719f48ba6e4896768c17357730c5719
 AUX zsnes-1.51-buffer.patch 3091 BLAKE2B a87e0b6547aeaa9f585d76a8ee080895573015fe42b0df2161268754ff01c046fd234997000ef484f66710dfd30e145d9d4db2f373a568e99deec2a8637db285 SHA512 0faf34338ff3fd85985dc16d2a58aa9e2ac1887db8d26bc210fc6965f6cc743c6c56b8b58bea72341d8ee1fed59c438db801000be5ae6bf4e26789e9bed89d25
+AUX zsnes-1.51-c++17.patch 2520 BLAKE2B 0295b0e211e2ec8f4988f42299a78d477ba29128519fdb6542f3495d7770b44c245d76264d3dbf97008a9a857da270ce753b90974b705af4b6a319f3389b47dd SHA512 abb9dd3cbc24ace02f132e44a44c3454402c34dcbcf40b2d3118befbe7553e71111382bd48ce281f05ecf2832ce814001f17b1598d155b9abb20943500ab5e99
 AUX zsnes-1.51-cross-compile.patch 934 BLAKE2B be18829454407c99aba00cb8126573f5f3e3ed8e18b2bb50811b855ba81137a16b90601c28cab9fce8d865e522cb66bb797d46a22090dd994c71aef672be99f2 SHA512 ece4a9f51314c7318babaf689fb44c1502ec5bc32808613211865daf1368cc1069b70ad4c1c4ec7b127cf707a0b093c356a8b50e5357099894656c78cf28738f
 AUX zsnes-1.51-depbuild.patch 559 BLAKE2B 38309177599aee8dafcbded6a027d66b991e85aac4c77fda0485b7777467c056386797041223a556b3cfff4b926e5a0b4004baae4264a765354a6dc2cb39ac75 SHA512 46955153ec6d2ecd5a295117c3ecc911a566de69f29f4d29decc98867d03e4a53a980a3c75d8ff19bbd1655eb291069fbbd598e002a73ebdbdc94c135f852c6e
 AUX zsnes-1.51-gcc-10.patch 409 BLAKE2B 4508e17379148a504a171110ddb121df3666dc9430a477d67b33fbd3544dff6799b159c9fe1f8c51fe2ffdf6d5c3fd1d809181942b774639cb7aad03fdaa2929 SHA512 28f1e215c0b85ffaae8f5128a79778532119bb51a89f7e4a6ee655aee0bcf520086f25c60ff303a5a3f8ea0b976aa4c29a3f68db0d320109ecd4349311bfedfe
 AUX zsnes-1.51-gcc43-20071031.patch 739 BLAKE2B 798bb1b45bd82a7e25c5923a2653aa61e2f2b197e26ca1e6cecdf5d55ecd83263c5aae17aee18419d0a14f58c6a24b02d0c31212189561d4a355d9f3e2fc386e SHA512 0ab19c1fadaf0ac07a7641366a56c5a2f7227e2fc39fe904e27954596ebee64174242b98a873abf6ee52b8e8335ce277189606e7a376ae02d4a95498cce24a40
-AUX zsnes-1.51-gcc43.patch 913 BLAKE2B 7ac3d5b8f556d577c1a1065bbe4e275742fdde0486411cc82f2dc552e8d90b82eb7dceefcdd87252633154b8249213f9dfe6724f4f0ee4eef3f8f691081355c7 SHA512 8684b9b8c01d2d9f27bf27a86e4705b3408a2891347045266040397b649eb162962e8384746930c9837ac9b21bfd626d6e241d8a6c73b46a0e348274dd8688d3
 AUX zsnes-1.51-gcc47.patch 312 BLAKE2B 927c6179fbbcd3fb161b5b18e025090acce178eae0586b7c20e48cdba091572d30c224aa80bb8a49c16d29fb9045c0207b26692651a15a53c2b4b90780c3f0c2 SHA512 aa9f111359e96118729e684562618d72231c5c475e736c53862cfe9d21b8c4db29056ec0476dcc7e50dd501a77619671fb8834be093086c7e752100c917060fc
 AUX zsnes-1.51-libao-thread.patch 667 BLAKE2B 76bc0abf16f68c9752a727817cff209daa2c0c29f31e6045441e202083f47559cb50c1a6a998c12621a298fa3901bc1d52701b176b8fd594ca116f990d3c5208 SHA512 43c28d4539df5c8ea4d3d0415c65afec3eb9215971a5ff0532b3b147b2fa3f870aadf07eb1e643e986c39d56760c0292447d467418865826ddc8c7aea64cc005
 AUX zsnes-1.51-libpng.patch 858 BLAKE2B f0ad46176cf5729d0a5be9e4307a28628e38c3d18043f0ff897dfd1cf901f0f9fb7ff80d25095fdaa9b6b1be52fe3c95f4e28b65042b4c4aad33a27125c7eb02 SHA512 2c25fb3294357a38ed8e119d4b4d60f7bd6f28724b2274a620465962e96e008f2a29273f46d4813e91b9128879218f401bb91b1a6df4c156b9ff7856b26657b0
 AUX zsnes-1.51-libpng15.patch 510 BLAKE2B 6281a27c6029ee94947b282fe5c06a67e7670d3168d5f4ae90573d12e8e6d5c467a9691cdd161158f117e341466bc7a3e99d516b95624534773027279aba4f7a SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532
 AUX zsnes-1.51-stack-align-v2.patch 1451 BLAKE2B b4570fa9d614d516375f1b7d2a9b3b7c9bf432f453425d2ee3035e78d8d946355551044d712528907c3a1f29b3531034b5949224398801e04270df85ada5ab00 SHA512 c3be01f36973615c55c643d1d916742f8e3a34e9957b42d1d7224a99790713025bb154e5e8c2833fd1e8d26240c6251a70c8a9f36fefe661480077b1b06871c8
 DIST zsnes-1.51-20071031.tar.bz2 1072340 BLAKE2B d67c92e382ca130d4138d21fbb2effc06539d1c7e3aabf0339c9b7e773521daf2d3cb0bcef75991e1a4453fcc86903d3dead48d90806489c8b4bf7677f8ebf3b SHA512 b10373cf81b201a33dc60c728431d4f69d36de31fcf6f137b623ea206a2998f722dcd6132daec1d0bf14a05ae52f3ee9ecee4334517039be554db85c9f7b8274
-DIST zsnes151src.tar.bz2 1071712 BLAKE2B e942c699bd227942563deb23b105339aa9ffd8a5623200ca142a777508b4ebaf47859170016490f53a3af2bfb15293c17a99a7658e1f3f0afd7df8cd63200b9a SHA512 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353
-EBUILD zsnes-1.51-r7.ebuild 3226 BLAKE2B a5f1e0480df9f23cc17dd87cf033d9c750961dd3028d601ac6d8f58e0849ce65b4291f0ab151470351cd473e1ec807980dc4904971944bb87d8887dc82149324 SHA512 82a0e10da417343361948e18fed08fdc5da7283540563b450c8897bf76d08f9ba05436810aeabe5ec43a82ff5a7632892cea7cc06d5d59ba7093f13c997e3c68
 EBUILD zsnes-1.51-r8.ebuild 3211 BLAKE2B e6d0c1a02743df48f3aacd130559ecc1d0b0d6002ce927bb73747149eb3a8da200365dbeb3b926f091ffc23514f73c14b13e3f9ad742d55983dacfbde451c9a7 SHA512 bef59012c2fb36aef65dcdebe2450a6b52f036fa13fe0c7ede478caafdf67084129d5a6c38fa68fad3f083e054a0af6cda13a3622a32211b59bb0c7b67621463
+EBUILD zsnes-1.51-r9.ebuild 3243 BLAKE2B 988d654c846b770dd0486bb0cfa6bab4444293e9e86fb3387ab9ce84c8dd0f8d4c5731dd3fd62f805f97da05008b777597865ac6e9960e2d6bc6d9001fd50ee6 SHA512 4711041845575e2e5aaaa146ab50731cc678957a783b16b2152a396bf6e29a06e21cca6024abc8e0560f1f4feea264264426aaf4a0d64ff881dd98910b85e502
 MISC metadata.xml 413 BLAKE2B 4e4199d8263368534eb4e2971fd30f0ef32af1537a7131ff150c6aee178c6a804083536c3ec249547f0826064ffe476e6c777b8c0aa519fc99d9d3d6284052c0 SHA512 235a3739eb5641eb444fb9ae47c661f05140c3b348173b65b342971850c2e0e7e32c416315904e48fcd8fa9241c93b0e0cc030851b61074c78566d3603f41973
diff --git a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
deleted file mode 100644
index b3e466036f22..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
+++ /dev/null
@@ -1,502 +0,0 @@
---- a/tools/archopt.c.old
-+++ b/tools/archopt.c
-@@ -1,8 +1,30 @@
-+/*
-+Copyright (C) 2005-2007 Nach, grinvader ( http://www.zsnes.com )
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+version 2 as published by the Free Software Foundation.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, write to the Free Software
-+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
- 
-+#ifdef _M_X64
-+#define __x86_64__
-+#endif
-+
-+#ifdef __GNUC__
- #ifdef __x86_64__
- #define cpuid(in, a, b, c, d) asm volatile("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
- #else
-@@ -13,6 +35,22 @@
-   movl %%ebx,%%edi;\
-   popl %%ebx": "=a" (a), "=D" (b), "=c" (c), "=d" (d) : "a" (in));
- #endif
-+#else
-+char cpubuf[256];
-+int z_in, z_a, z_b, z_c, z_d;
-+void cpuid_run()
-+{
-+  _asm {
-+    mov eax,z_in
-+    cpuid
-+    mov z_a,eax
-+    mov z_b,ebx
-+    mov z_c,ecx
-+    mov z_d,edx
-+  };
-+}
-+#define cpuid(in, a, b, c, d) z_in = in; cpuid_run(); a = z_a; b = z_b; c = z_c; d = z_d;
-+#endif
- 
- char *x86_flags[] =
- {      "fpu",        "vme",        "de",         "pse",        "tsc",    "msr",      "pae",    "mce",
-@@ -62,6 +100,7 @@
- {
-   int have = 0x200000;
-   #ifndef __x86_64__
-+  #ifdef __GNUC__
-   asm volatile
-   (
-   "  pushfl;"
-@@ -76,6 +115,23 @@
-     : "=a" (have)
-     : "c" (have)
-   );
-+  #else
-+  z_c = have;
-+  _asm {
-+    mov ecx,z_c
-+    pushfd
-+    pop eax
-+    mov edx,eax
-+    xor eax,ecx
-+    push eax
-+    popfd
-+    pushfd
-+    pop eax
-+    xor eax,edx
-+    mov z_a,eax
-+  };
-+  have = z_a;
-+  #endif
-   #endif
-   return(have);
- }
-@@ -196,238 +252,268 @@
-   cpu = "native";
- #endif
- #endif
--
--  if (!cpu && *cpu_family && *vendor_id)
-+  if (!cpu)
-   {
--    if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-+    if (!cpu && *cpu_family && *vendor_id)
-     {
--      if (strstr(flags, " mmx "))
-+      #ifdef __GNUC__
-+      if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-       {
--        #if __GNUC__ > 2
--        if (strstr(flags, " 3dnow "))
-+        if (strstr(flags, " mmx "))
-         {
--          if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
-+          #if __GNUC__ > 2
-+          if (strstr(flags, " 3dnow "))
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
--            if (strstr(flags, " sse "))
-+            if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
-             {
--              #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--              if (strstr(flags, " sse2 ") && strstr(flags, " lm ")) //Need two checks to protect Semprons
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-+              if (strstr(flags, " sse "))
-               {
--                if (strstr(model_name, "Opteron"))
--                {
--                  cpu = "opteron";
--                }
--                else if (strstr(model_name, "Athlon(tm) 64")) //Also athlon-fx
-+                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                if (strstr(flags, " sse2 ") && strstr(flags, " lm ")) //Need two checks to protect Semprons
-                 {
--                  cpu = "athlon64";
-+                  if (strstr(model_name, "Opteron"))
-+                  {
-+                    cpu = "opteron";
-+                  }
-+                  else if (strstr(model_name, "Athlon(tm) 64")) //Also athlon-fx
-+                  {
-+                    cpu = "athlon64";
-+                  }
-+                  else
-+                  {
-+                    cpu = "k8";
-+                  }
-                 }
--                else
-+                #endif
-+                if (!cpu)
-                 {
--                  cpu = "k8";
-+                  if (strstr(model_name, "Athlon(tm) 4"))
-+                  {
-+                    cpu = "athlon-4";
-+                  }
-+                  else if (strstr(model_name, "Athlon(tm) MP"))
-+                  {
-+                    cpu = "athlon-mp";
-+                  }
-+                  else
-+                  {
-+                    cpu = "athlon-xp";
-+                  }
-                 }
-               }
-+
-+              if (!cpu && (atoi(model) > 3))
-+              {
-+                cpu = "athlon-tbird";
-+              }
-               #endif
-+
-               if (!cpu)
-               {
--                if (strstr(model_name, "Athlon(tm) 4"))
--                {
--                  cpu = "athlon-4";
--                }
--                else if (strstr(model_name, "Athlon(tm) MP"))
--                {
--                  cpu = "athlon-mp";
--                }
--                else
--                {
--                  cpu = "athlon-xp";
--                }
-+                cpu = "athlon";
-               }
-             }
- 
--            if (!cpu && (atoi(model) > 3))
--            {
--              cpu = "athlon-tbird";
--            }
--            #endif
--
-+            #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-             if (!cpu)
-             {
--              cpu = "athlon";
-+              int model_num = atoi(model);
-+              if ((model_num == 9) || (model_num >= 13))
-+              {
-+                cpu = "k6-3";
-+              }
-+              else
-+              {
-+                cpu = "k6-2";
-+              }
-             }
-+            #endif
-           }
-+          #endif
- 
--          #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-           if (!cpu)
-           {
--            int model_num = atoi(model);
--            if ((model_num == 9) || (model_num >= 13))
--            {
--              cpu = "k6-3";
--            }
--            else
--            {
--              cpu = "k6-2";
--            }
-+            cpu = "k6";
-           }
--          #endif
--        }
--        #endif
--
--        if (!cpu)
--        {
--          cpu = "k6";
-         }
-       }
--    }
--    else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
--    {
--      #if __GNUC__ > 2
--      if (strstr(flags, " mmx "))
-+      else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
-       {
--        if (strstr(flags, " sse "))
-+        #if __GNUC__ > 2
-+        if (strstr(flags, " mmx "))
-         {
--          if (strstr(flags, " sse2 "))
-+          if (strstr(flags, " sse "))
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
--            if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
-+            if (strstr(flags, " sse2 "))
-             {
--              if (strstr(flags, " lm "))
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
-+              if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
-               {
--                cpu = "nocona";
-+                if (strstr(flags, " lm "))
-+                {
-+                  cpu = "nocona";
-+                }
-+                else
-+                {
-+                  cpu = "prescott";
-+                }
-               }
--              else
-+              #endif
-+
-+              if (!cpu)
-               {
--                cpu = "prescott";
-+                if (!strcmp(cpu_family, "6"))
-+                {
-+                  #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                  cpu = "pentium-m";
-+                  #else
-+                  cpu = "pentium3";
-+                  #endif
-+                }
-+                else
-+                {
-+                  #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                  if (strstr(model_name, "Mobile"))
-+                  {
-+                    cpu = "pentium4m";
-+                  }
-+                  #endif
-+
-+                  if (!cpu)
-+                  {
-+                    cpu = "pentium4";
-+                  }
-+                }
-               }
-             }
--            #endif
--
--            if (!cpu)
-+            else
-             {
--              if (!strcmp(cpu_family, "6"))
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+              if (strstr(model_name, "Mobile"))
-               {
--                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--                cpu = "pentium-m";
--                #else
--                cpu = "pentium3";
--                #endif
-+                cpu = "pentium3m";
-               }
--              else
--              {
--                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--                if (strstr(model_name, "Mobile"))
--                {
--                  cpu = "pentium4m";
--                }
--                #endif
-+              #endif
- 
--                if (!cpu)
--                {
--                  cpu = "pentium4";
--                }
-+              if (!cpu)
-+              {
-+                cpu = "pentium3";
-               }
-             }
-           }
-           else
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--            if (strstr(model_name, "Mobile"))
-+            if (!strcmp(cpu_family, "6"))
-             {
--              cpu = "pentium3m";
-+              cpu = "pentium2";
-             }
--            #endif
--
--            if (!cpu)
-+            else
-             {
--              cpu = "pentium3";
-+              cpu = "pentium-mmx";
-             }
-           }
-         }
--        else
-+        #endif
-+
-+        if (!cpu)
-+        {
-+          int family = atoi(cpu_family);
-+          if (family > 5)
-+          {
-+            cpu = "pentiumpro";
-+          }
-+          else if (family == 5)
-+          {
-+            cpu = "pentium";
-+          }
-+        }
-+      }
-+      #if __GNUC__ > 2
-+      #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
-+      else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx "))
-+      {
-+        if (strstr(flags, " 3dnow "))
-         {
--          if (!strcmp(cpu_family, "6"))
-+          if (atoi(cpu_family) > 5)
-           {
--            cpu = "pentium2";
-+            cpu = "c3";
-           }
-           else
-           {
--            cpu = "pentium-mmx";
-+            cpu = "winchip2";
-           }
-         }
-+        #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+        else if (strstr(flags, " sse "))
-+        {
-+          cpu = "c3-2";
-+        }
-+        #endif
-+
-+        if (!cpu)
-+        {
-+          cpu = "winchip-c6";
-+        }
-       }
-       #endif
-+      #endif
- 
-       if (!cpu)
-       {
-         int family = atoi(cpu_family);
-         if (family > 5)
-         {
--          cpu = "pentiumpro";
-+          cpu = "i686";
-         }
-         else if (family == 5)
-         {
--          cpu = "pentium";
-+          cpu = "i586";
-         }
--      }
--    }
--    #if __GNUC__ > 2
--    #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
--    else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx "))
--    {
--      if (strstr(flags, " 3dnow "))
--      {
--        if (atoi(cpu_family) > 5)
-+        else if (family == 4)
-         {
--          cpu = "c3";
-+          cpu = "i486";
-         }
-         else
-         {
--          cpu = "winchip2";
-+          cpu = "i386";
-         }
-       }
--      #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+      #else //MSVC
-+      cpu = cpubuf;
-+      *cpu = 0;
-+
-+      if (strstr(flags, " sse2 "))
-+      {
-+        strcat(cpu, " /arch:SSE2");
-+      }
-       else if (strstr(flags, " sse "))
-       {
--        cpu = "c3-2";
-+        strcat(cpu, " /arch:SSE");
-       }
--      #endif
- 
--      if (!cpu)
-+      #ifdef __x86_64__
-+      if (strstr(flags, " lm ")) //64 bit
-       {
--        cpu = "winchip-c6";
-+        if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-+        {
-+          strcat(cpu, " /favor:AMD64");
-+        }
-+        else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
-+        {
-+          strcat(cpu, " /favor:EM64T");
-+        }
-       }
-+      #endif
-+      #endif
-     }
--    #endif
--    #endif
--
--    if (!cpu)
-+    else
-     {
--      int family = atoi(cpu_family);
--      if (family > 5)
--      {
--        cpu = "i686";
--      }
--      else if (family == 5)
--      {
--        cpu = "i586";
--      }
--      else if (family == 4)
--      {
--        cpu = "i486";
--      }
--      else
--      {
--        cpu = "i386";
--      }
-+      puts("Could not open /proc/cpuinfo, and CPUID instruction not available.");
-+      return(1);
-     }
--    puts(cpu);
--  }
--  else
--  {
--    puts("Could not open /proc/cpuinfo, and CPUID instruction not available.");
--    return(1);
-   }
-+  puts(cpu);
- 
-   return(0);
- }
diff --git a/games-emulation/zsnes/files/zsnes-1.51-c++17.patch b/games-emulation/zsnes/files/zsnes-1.51-c++17.patch
new file mode 100644
index 000000000000..537f32540c58
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-c++17.patch
@@ -0,0 +1,76 @@
+--- a/jma/jma.cpp
++++ b/jma/jma.cpp
+@@ -48,7 +48,7 @@ namespace JMA
+ 
+ 
+   //Retreive the file block, what else?
+-  void jma_open::retrieve_file_block() throw(jma_errors)
++  void jma_open::retrieve_file_block()
+   {
+     unsigned char uint_buffer[UINT_SIZE];
+     unsigned char ushort_buffer[USHORT_SIZE];
+@@ -168,7 +168,7 @@ namespace JMA
+   }
+ 
+   //Constructor for opening JMA files for reading
+-  jma_open::jma_open(const char *compressed_file_name) throw (jma_errors)
++  jma_open::jma_open(const char *compressed_file_name)
+   {
+     decompressed_buffer = 0;
+     compressed_buffer = 0;
+@@ -229,7 +229,7 @@ namespace JMA
+   }
+ 
+   //Skip forward a given number of chunks
+-  void jma_open::chunk_seek(unsigned int chunk_num) throw(jma_errors)
++  void jma_open::chunk_seek(unsigned int chunk_num)
+   {
+     //Check the stream is open
+     if (!stream.is_open())
+@@ -257,7 +257,7 @@ namespace JMA
+ 
+   //Return a vector of pointers to each file in the JMA, the buffer to hold all the files
+   //must be initilized outside.
+-  vector<unsigned char *> jma_open::get_all_files(unsigned char *buffer) throw(jma_errors)
++  vector<unsigned char *> jma_open::get_all_files(unsigned char *buffer)
+   {
+     //If there's no stream we can't read from it, so exit
+     if (!stream.is_open())
+@@ -396,7 +396,7 @@ namespace JMA
+   }
+ 
+   //Extracts the file with a given name found in the archive to the given buffer
+-  void jma_open::extract_file(string& name, unsigned char *buffer) throw(jma_errors)
++  void jma_open::extract_file(string& name, unsigned char *buffer)
+   {
+     if (!stream.is_open())
+     {
+--- a/jma/jma.h
++++ b/jma/jma.h
+@@ -64,12 +64,12 @@ namespace JMA
+   class jma_open
+   {
+     public:
+-    jma_open(const char *) throw(jma_errors);
++    jma_open(const char *);
+     ~jma_open();
+ 
+     std::vector<jma_public_file_info> get_files_info();
+-    std::vector<unsigned char *> get_all_files(unsigned char *) throw(jma_errors);
+-    void extract_file(std::string& name, unsigned char *) throw(jma_errors);
++    std::vector<unsigned char *> get_all_files(unsigned char *);
++    void extract_file(std::string& name, unsigned char *);
+     bool is_solid();
+ 
+     private:
+@@ -79,8 +79,8 @@ namespace JMA
+     unsigned char *decompressed_buffer;
+     unsigned char *compressed_buffer;
+ 
+-    void chunk_seek(unsigned int) throw(jma_errors);
+-    void retrieve_file_block() throw(jma_errors);
++    void chunk_seek(unsigned int);
++    void retrieve_file_block();
+   };
+ 
+   const char *jma_error_text(jma_errors);
diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch
deleted file mode 100644
index 4650bc12a7d1..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/parsegen.cpp
-+++ src/parsegen.cpp
-@@ -31,6 +31,7 @@
- #include <sstream>
- #include <set>
- #include <stack>
-+#include <cstring>
- using namespace std;
- 
- #include <errno.h>
-@@ -1828,7 +1829,7 @@
-   }
- }
- 
--int main(size_t argc, const char **argv)
-+int main(int argc, const char **argv)
- {
-   const char *cheader_file = 0;
-   bool compile = false;
---- src/tools/depbuild.cpp
-+++ src/tools/depbuild.cpp
-@@ -24,6 +24,7 @@
- #include <iostream>
- #include <string>
- #include <cstdio>
-+#include <cstdlib>
- using namespace std;
- 
- #include "fileutil.h"
-@@ -183,7 +184,7 @@
-   }
- }
- 
--int main(size_t argc, const char *const *const argv)
-+int main(int argc, const char *const *const argv)
- {
-   if (argc < 5)
-   {
---- src/tools/strutil.h
-+++ src/tools/strutil.h
-@@ -25,6 +25,7 @@
- #include <string>
- #include <vector>
- #include <cctype>
-+#include <cstring>
- 
- struct ci_char_traits : public std::char_traits<char>
- {
diff --git a/games-emulation/zsnes/zsnes-1.51-r7.ebuild b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
index f06068a089fe..a56e1e85d8de 100644
--- a/games-emulation/zsnes/zsnes-1.51-r7.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
 HOMEPAGE="https://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
-SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
+SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2 -> ${P}-20071031.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -36,8 +36,7 @@ PATCHES=(
 	# Fix bug #214697
 	# Fix bug #170108
 	# Fix bug #260247
-	"${FILESDIR}"/${P}-archopt-july-23-update.patch
-	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc43-20071031.patch
 	"${FILESDIR}"/${P}-libao-thread.patch
 	"${FILESDIR}"/${P}-depbuild.patch
 	"${FILESDIR}"/${P}-CC-quotes.patch
@@ -56,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-arch.patch
 
 	"${FILESDIR}"/${P}-gcc-10.patch
+	"${FILESDIR}"/${P}-c++17.patch
 )
 
 src_prepare() {