gentoo resync : 11.05.2021

3 files changed, 258 insertions, 4 deletions

diff --git a/games-emulation/advancescan/Manifest b/games-emulation/advancescan/Manifest
index cb18238da653..613718620540 100644
--- a/games-emulation/advancescan/Manifest
+++ b/games-emulation/advancescan/Manifest
@@ -1,5 +1,6 @@
+AUX advancescan-1.16-gcc11.patch 7709 BLAKE2B f1036183787c7c7e52c9bfe3c9ae064436d2d90001905d06b8cc2adf0fd23a97a84420d39740bbab6f427d6f56d10904a94c88fe15b418cb6df502b9bb372cda SHA512 dd540886454ffbc4b7ccefb61cf53a132b9eb9290bda05a3a91010c32bd6190c1cc7c11a6b5e1efca80400696b008eb37276cba59338803e95171eca79c669a7
 AUX advancescan-1.16-sys-expat.patch 1543 BLAKE2B 72143e1dec74c828c4051a5b198f706caf3385e1a982eca142fd6f2f4c7a2f3797fb732fd1086b4f3c5cf93560f67077720c14945f52ed388ce981db559230c4 SHA512 a9dc80b75a8b9dbad3fe6c156c4de0cafee171d820845ea7ff2f042b7f73fd6cd10d710c60fb8bf4cfdea139f527008958b445d01838a8fdf6c96d3e76c530f4
 DIST advancescan-1.16-gcc6.patch 24440 BLAKE2B bd7b25859798cc3935fedc6d60ea822189301232426e2b071665aaf6af3a85f16d93c22373e8ad1b46da96ab577fceebe681e86021452aa20e24b0e0fd9b2a8a SHA512 e758ba7d900f1ca5fd6f32c3572fbf4c2a7cf77877f926511bd724ec5ec8ddb9697244f5a582eeb5275188ae2c8a14e8388cac93365ac348e9cc60835884a499
 DIST advancescan-1.16.tar.gz 316895 BLAKE2B 1ce2ec88a80cca8ff8d1fa09cba7b9c5583e42a3419bfd561bb184b53fe071c011b864ee813f0107667881112ca4adf01cd2b8e8148712927af1c82bc73f43c1 SHA512 6d359c160d54a0a1cd13db10f5fc9986fae4f1151e205024e40c21b0f933723351907156faec22a92561ad523151e3b7d4ff70a6eebbb6152bd3767063a31031
-EBUILD advancescan-1.16-r1.ebuild 833 BLAKE2B 6b0ce1ea3af395cacf473fc9aa0a07af7c0a221ec421c0dd1e4aa1fe0d47e0dee9f4ab6ca3a0bb833281546cec7d3c05af41b1f3ee2c357c45ea1f6e538de456 SHA512 3224725f4f1174fe6418b887f084e7ada20c983552e017bb2036cfde5ed91ef435c577a1d9c39fb51d79824c5f177b11baf38e8d86c35a6d8f5fe6f8f802588f
+EBUILD advancescan-1.16-r1.ebuild 866 BLAKE2B 8b1bcdfc93688b49bef49b369fdd0db5e6ef7e946b2e159b72edabf7d99cd9caf608edafad8ba982e09c43eab616d27268e33610c116c7775c5086cfa9aa6f5d SHA512 3e32699024cc500284554f0a6f123f31fc4d264b4b40c847f9458d307129552f5e344f4387f7c8c5ea31481e3096803400a208960747db58e7030aea78bba988
 MISC metadata.xml 334 BLAKE2B 9c8f19757cfe814fe5650009b03d9eb653e3937cf30b4288dfa616a894560bdc81edba8b1ad235f34f5200a2c7ae8e9b19ba0e9f1e0ec5a2560b806ac9e184d8 SHA512 18cabfd831489b32b4449794c06a28425d91dab0c2868038fb48c94728fc16ccca268ae93a4f4a51be01c5901591582e6df2523460ba4ba98719436944577e1f
diff --git a/games-emulation/advancescan/advancescan-1.16-r1.ebuild b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
index cebee4ad876a..6a0026200b4a 100644
--- a/games-emulation/advancescan/advancescan-1.16-r1.ebuild
+++ b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
@@ -7,7 +7,8 @@ inherit autotools
 
 DESCRIPTION="A command line rom manager for MAME, MESS, AdvanceMAME, AdvanceMESS and Raine"
 HOMEPAGE="http://advancemame.sourceforge.net/scan-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/advancemame/${P}.tar.gz
 	https://dev.gentoo.org/~juippis/distfiles/tmp/advancescan-1.16-gcc6.patch"
 
 LICENSE="GPL-2"
@@ -16,13 +17,13 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-libs/expat
-	sys-libs/zlib
-"
+	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sys-expat.patch
 	"${DISTDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-gcc11.patch
 )
 
 src_prepare() {
diff --git a/games-emulation/advancescan/files/advancescan-1.16-gcc11.patch b/games-emulation/advancescan/files/advancescan-1.16-gcc11.patch
new file mode 100644
index 000000000000..eae86c192d63
--- /dev/null
+++ b/games-emulation/advancescan/files/advancescan-1.16-gcc11.patch
@@ -0,0 +1,252 @@
+--- a/conf.cc
++++ b/conf.cc
+@@ -28,7 +28,7 @@
+ 
+ using namespace std;
+ 
+-static void expand_tree(const string& path, filepath_container& ds) throw (error)
++static void expand_tree(const string& path, filepath_container& ds)
+ {
+ 	DIR* dir = opendir(path.c_str());
+ 	if (!dir)
+--- a/file.cc
++++ b/file.cc
+@@ -98,7 +98,7 @@
+ /**
+  * Check if a file exists.
+  */
+-bool file_exists(const string& path) throw (error)
++bool file_exists(const string& path)
+ {
+ 	struct stat s;
+ 	if (stat(path.c_str(), &s) != 0) {
+@@ -114,7 +114,7 @@
+ /**
+  * Write a whole file.
+  */
+-void file_write(const string& path, const char* data, unsigned size) throw (error)
++void file_write(const string& path, const char* data, unsigned size)
+ {
+ 	FILE* f = fopen(path.c_str(), "wb");
+ 	if (!f)
+@@ -134,7 +134,7 @@
+ /**
+  * Read a whole file.
+  */
+-void file_read(const string& path, char* data, unsigned size) throw (error)
++void file_read(const string& path, char* data, unsigned size)
+ {
+ 	file_read(path, data, 0, size);
+ }
+@@ -142,7 +142,7 @@
+ /**
+  * Read a whole file.
+  */
+-void file_read(const string& path, char* data, unsigned offset, unsigned size) throw (error)
++void file_read(const string& path, char* data, unsigned offset, unsigned size)
+ {
+ 	FILE* f = fopen(path.c_str(), "rb");
+ 	if (!f)
+@@ -166,7 +166,7 @@
+ /**
+  * Get the time of a file.
+  */
+-time_t file_time(const string& path) throw (error)
++time_t file_time(const string& path)
+ {
+ 	struct stat s;
+ 	if (stat(path.c_str(), &s)!=0)
+@@ -178,7 +178,7 @@
+ /**
+  * Set the time of a file.
+  */
+-void file_utime(const string& path, time_t tod) throw (error)
++void file_utime(const string& path, time_t tod)
+ {
+ 	struct utimbuf u;
+ 
+@@ -192,7 +192,7 @@
+ /**
+  * Get the size of a file.
+  */
+-unsigned file_size(const string& path) throw (error)
++unsigned file_size(const string& path)
+ {
+ 	struct stat s;
+ 	if (stat(path.c_str(), &s)!=0)
+@@ -204,7 +204,7 @@
+ /**
+  * Get the crc of a file.
+  */
+-crc_t file_crc(const string& path) throw (error)
++crc_t file_crc(const string& path)
+ {
+ 	unsigned size = file_size(path);
+ 
+@@ -227,7 +227,7 @@
+ /**
+  * Copy a file.
+  */
+-void file_copy(const string& path1, const string& path2) throw (error)
++void file_copy(const string& path1, const string& path2)
+ {
+ 	unsigned size;
+ 
+@@ -249,7 +249,7 @@
+ /**
+  * Move a file.
+  */
+-void file_move(const string& path1, const string& path2) throw (error)
++void file_move(const string& path1, const string& path2)
+ {
+ 	if (rename(path1.c_str(), path2.c_str())!=0
+ 		&& errno==EXDEV) {
+@@ -271,7 +271,7 @@
+ /**
+  * Remove a file.
+  */
+-void file_remove(const string& path1) throw (error)
++void file_remove(const string& path1)
+ {
+ 	if (remove(path1.c_str())!=0) {
+ 		throw error() << "Failed remove of " << path1;
+@@ -281,7 +281,7 @@
+ /**
+  * Rename a file.
+  */
+-void file_rename(const string& path1, const string& path2) throw (error)
++void file_rename(const string& path1, const string& path2)
+ {
+ 	if (rename(path1.c_str(), path2.c_str())!=0) {
+ 		throw error() << "Failed rename of " << path1 << " to " << path2;
+@@ -291,7 +291,7 @@
+ /**
+  * Randomize a name file.
+  */
+-string file_randomize(const string& path, int n) throw ()
++string file_randomize(const string& path, int n)
+ {
+ 	ostringstream os;
+ 
+@@ -310,7 +310,7 @@
+ /**
+  * Get the directory from a path.
+  */
+-string file_dir(const string& path) throw ()
++string file_dir(const string& path)
+ {
+ 	size_t pos = path.rfind('/');
+ 	if (pos == string::npos) {
+@@ -323,7 +323,7 @@
+ /**
+  * Get the file name from a path.
+  */
+-string file_name(const string& path) throw ()
++string file_name(const string& path)
+ {
+ 	size_t pos = path.rfind('/');
+ 	if (pos == string::npos) {
+@@ -336,7 +336,7 @@
+ /**
+  * Get the basepath (path without extension) from a path.
+  */
+-string file_basepath(const string& path) throw ()
++string file_basepath(const string& path)
+ {
+ 	size_t dot = path.rfind('.');
+ 	if (dot == string::npos)
+@@ -348,7 +348,7 @@
+ /**
+  * Get the basename (name without extension) from a path.
+  */
+-string file_basename(const string& path) throw ()
++string file_basename(const string& path)
+ { 
+ 	string name = file_name(path);
+ 	size_t dot = name.rfind('.');
+@@ -361,7 +361,7 @@
+ /**
+  * Get the extension from a path.
+  */
+-string file_ext(const string& path) throw ()
++string file_ext(const string& path)
+ { 
+ 	string name = file_name(path);
+ 	size_t dot = name.rfind('.');
+@@ -374,7 +374,7 @@
+ /**
+  * Compare two path.
+  */
+-int file_compare(const string& path1, const string& path2) throw ()
++int file_compare(const string& path1, const string& path2)
+ {
+ 	return strcasecmp(path1.c_str(), path2.c_str());
+ }
+@@ -382,7 +382,7 @@
+ /**
+  * Convert a path to the C format.
+  */
+-string file_adjust(const string& path) throw ()
++string file_adjust(const string& path)
+ {
+ 	string r;
+ 	for(unsigned i=0;i<path.length();++i) {
+@@ -400,7 +400,7 @@
+ /**
+  * Make a drectory tree.
+  */
+-void file_mktree(const std::string& path) throw (error)
++void file_mktree(const std::string& path)
+ {
+ 	string dir = file_dir(path);
+ 	string name = file_name(path);
+--- a/file.h
++++ b/file.h
+@@ -67,27 +67,27 @@
+ crc_t crc_compute(const char* data, unsigned len);
+ crc_t crc_compute(crc_t pred, const char* data, unsigned len);
+ 
+-bool file_exists(const std::string& file) throw (error);
+-void file_write(const std::string& path, const char* data, unsigned size) throw (error);
+-void file_read(const std::string& path, char* data, unsigned size) throw (error);
+-void file_read(const std::string& path, char* data, unsigned offset, unsigned size) throw (error);
+-time_t file_time(const std::string& path) throw (error);
+-void file_utime(const std::string& path, time_t tod) throw (error);
+-unsigned file_size(const std::string& path) throw (error);
+-crc_t file_crc(const std::string& path) throw (error);
+-void file_copy(const std::string& path1, const std::string& path2) throw (error);
+-void file_move(const std::string& path1, const std::string& path2) throw (error);
+-void file_remove(const std::string& path1) throw (error);
+-void file_mktree(const std::string& path1) throw (error);
++bool file_exists(const std::string& file);
++void file_write(const std::string& path, const char* data, unsigned size);
++void file_read(const std::string& path, char* data, unsigned size);
++void file_read(const std::string& path, char* data, unsigned offset, unsigned size);
++time_t file_time(const std::string& path);
++void file_utime(const std::string& path, time_t tod);
++unsigned file_size(const std::string& path);
++crc_t file_crc(const std::string& path);
++void file_copy(const std::string& path1, const std::string& path2);
++void file_move(const std::string& path1, const std::string& path2);
++void file_remove(const std::string& path1);
++void file_mktree(const std::string& path1);
+ 
+-std::string file_randomize(const std::string& path, int n) throw ();
+-std::string file_name(const std::string& file) throw ();
+-std::string file_dir(const std::string& file) throw ();
+-std::string file_basename(const std::string& file) throw ();
+-std::string file_basepath(const std::string& file) throw ();
+-std::string file_ext(const std::string& file) throw ();
+-int file_compare(const std::string& path1, const std::string& path2) throw ();
+-std::string file_adjust(const std::string& path) throw ();
++std::string file_randomize(const std::string& path, int n);
++std::string file_name(const std::string& file);
++std::string file_dir(const std::string& file);
++std::string file_basename(const std::string& file);
++std::string file_basepath(const std::string& file);
++std::string file_ext(const std::string& file);
++int file_compare(const std::string& path1, const std::string& path2);
++std::string file_adjust(const std::string& path);
+ 
+ #endif
+