gentoo resync : 04.05.2021

3 files changed, 65 insertions, 1 deletions

diff --git a/games-roguelike/scourge/Manifest b/games-roguelike/scourge/Manifest
index 4fe344423987..91335974bec5 100644
--- a/games-roguelike/scourge/Manifest
+++ b/games-roguelike/scourge/Manifest
@@ -1,10 +1,11 @@
 AUX scourge-0.21.1-Wc++11-narrowing.patch 570 BLAKE2B aa29346cff63b56753b5b5716a389fe193a7b491c5ffc29f72cbf79d399270b402ad78c4b6fa4f5ace391ccb0637358c96afdbb49e8ac124214ceb8359201472 SHA512 a1d3798042186ca1f75c2191d8e6afb419fae8e3a8209b9500db2ebe0f7d363c78991ba7fc902a57b250958a6ec9fde37c10a9edbda07e0d20bd1d5c8386f9dc
 AUX scourge-0.21.1-automake-1.13.patch 288 BLAKE2B e9e9673b357b9ba5b52f5404d7587dfad3eac5bc714a201c9d94cbe6a113cfcd9ef58fc40a34d48c49cd6bfd3cb781a0000f5d00d18b9fe0e3e623d9940e2195 SHA512 24b212c1053fa3445507cc6808abd37cabf43997275f003eb929d7c0671663919b984c2491dc33083d20a09cd67d8e695140ff6957e662ba66f43ddbaf167394
 AUX scourge-0.21.1-freetype_pkgconfig.patch 944 BLAKE2B 7aa97a5dea38a9ee25cb2f1ef91bc1ff11475e697e2f97de67882f75a1d3a78b1f4e10a72411f2c387ba4c815aae730307f0ce7db049243c2319060898e89820 SHA512 ad7fea238417c9140337728b0c5a92f98bc1bf57dc8184bd18af61c5aa3091941e6697b2677639867860bb89097b1827dab9f6374b4d604d39225a33b057df20
+AUX scourge-0.21.1-gcc-11.patch 2834 BLAKE2B 6067756d9bbe0dfe8f5a6754abdf03af2376bae588897322293576ec9df5dcaf86a057a404019cf5b8e35817b623432e61a408bc3b51b341ebcfad25b439765b SHA512 509fad7212e081f329f03815ccbe96cedb0cf76bd92acf4028324a7f845a97aed07f3fac86340f8f2713f55fe6626143e8dc928363e919e87745d90b17c11a9b
 AUX scourge-0.21.1-gcc47.patch 445 BLAKE2B 623b1a84ce9560d7a0aeda0e795a70962248f5f7c8c82cb11b32eddd960594291b7595397e18eacadd075b7bf55a23b3104df4ae4770444b56c95b25a38286d2 SHA512 04319bceb1820d2345d21f17ef4c693fbe91cbfe4433a915ede223e68eef476690d7983336c48ed65ae5a1c59dc6ddcbc6dda41ed85c2e08054baabc62ac3cfd
 AUX scourge-0.21.1-gcc6.patch 601 BLAKE2B 78114f97ac4258cde239926c7012568f76b33c7b0fe3e6a52fc0550910f547e6e70e262ab70ecb89052d126406f94a693432ec2c9a9dd05d828c461b9d822ea8 SHA512 521f5ab76423925cef7f2ead25c947fb042bda67d82c6ccdcf55757d9412c017a8eb3ca7ecb09ffd369cd69fcac919c5ed6928b5c1d16149d64b0b03a70a2104
 AUX scourge-0.21.1-respect-AR.patch 207 BLAKE2B ed9e5f7476668cb1a6063be30cc76c1d9b4dc6574ae3171c5dc2e89e6f74db3fdd3c1a83e50056b9b784dec358ed98adf96ef7f05be1cfbd695b9532ece940a7 SHA512 2254db48095c2bc64319b253e002174849601d05cd8312d3fe1a0487b3234b30522ce6cede66db6499221ce8a934ea70967468fb60714c607dfdeb4f0d2125b2
 DIST scourge-0.21.1.data.tar.gz 142093436 BLAKE2B 68e4cc0bfb40e9a92bc38b3db75f36df665974595ba4978cc34e077901522ece9ec5e15203ad9ab5044a61484d6850367306eb60a0da5d168a33e03130fe5774 SHA512 3701aba0f70d71aeb0e185e808e34cea62a637809a9b4c14fd19bdfbf91d36cf8dafa2a4cfddc3ee493827b40eea657fcdddc8277c57a635bc8ca8e3286376be
 DIST scourge-0.21.1.src.tar.gz 8146157 BLAKE2B ed48b29a54df1b8c7444ac2985ad069f82568b1e7a5aa98e922fb4fcf10c48840c2c38361a4bf15044c71547cd41d06fdd270b379ae0827b9b5f8063b92c1d18 SHA512 e530a8f7bddc1969a02a8b9a8b272f6f60d2c4830d23d96fc671cb79a2c4097fb9c5c0c262004a8157448b601bf58f9bbff95dd6d98275a28d3d404c339ce2ad
-EBUILD scourge-0.21.1-r1.ebuild 1473 BLAKE2B 9f42f5a0d1763ad98b844064d645757a127bef5fca6130e54f25f9a91456e39239f49f46662c1046dc62c90f538f3d37cb9943e4950742fcb2b3da1a788c51a2 SHA512 9e510403fe2c069b9b31aac02349dc28c3789dc99baf617c0c82ec27f1ccb764c6493e25ac52a8c7470865f815fa4f2c3c0dd86ce88b42c6b2c4e0dc89ced379
+EBUILD scourge-0.21.1-r1.ebuild 1506 BLAKE2B 37cd9e79116b1ba21a326ccadfae68278a7a006c3678ab4be9c843d0cf8ca1647c0513d6302d567ee9641e4729b2eada8fe04f8d3ea11b5ac10e7ba75859f1bb SHA512 cf6bfa6112ef60ebb4138d0f51dd524a95f2d21b52f3246c561848862bf78b56f82c12c30d252bc1cfc947b66f47d1dd210c245f5596930825eaad9a00e1132d
 MISC metadata.xml 330 BLAKE2B 126bd0ac9b4d619acfe8978859d29f75e84e445fef6c96117d18d8fc93ad58e69c55096ed3c0e47e1907354bffe3f9e08ce105eedd183c65afe70ea7ce3dec46 SHA512 d47d4afa0adafc93aa43d05190f0a65ac486b6ad4aee54bac96b2f99da7c4a55c6df99b512e4c113c2b4232b8ae294f58966b06081eb89d31fc20b8d9de2e07b
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc-11.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc-11.patch
new file mode 100644
index 000000000000..7e5dc45199c4
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc-11.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/787845
+--- a/src/common/constants.h
++++ b/src/common/constants.h
+@@ -970,7 +970,7 @@ struct t3DModel {
+ 
+ char *getAn( const char *name );
+ 
+-typedef unsigned char byte;
++typedef unsigned char scourge_byte;
+ 
+ extern void ComputeNormals( t3DModel *pModel );
+ extern void CreateTexture( GLuint textureArray[], char *strFileName, int textureID );
+--- a/src/render/Md2.h
++++ b/src/render/Md2.h
+@@ -52,8 +52,8 @@ struct tMd2Header {
+ 
+ /// This is used to store the vertices that are read in for the current frame.
+ struct tMd2AliasTriangle {
+-	byte vertex[3];
+-	byte lightNormalIndex;
++	scourge_byte vertex[3];
++	scourge_byte lightNormalIndex;
+ };
+ 
+ /// This stores the animation scale, translation and name information for a frame, plus verts.
+--- a/src/render/glshape.cpp
++++ b/src/render/glshape.cpp
+@@ -35,7 +35,7 @@ class Map;
+ // poor man's dynamic lightmaps: shaded sides
+ static GLuint lightmap_tex_num = 0;
+ static GLuint lightmap_tex_num2 = 0;
+-static unsigned char data[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3];
++static unsigned char data1[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3];
+ static unsigned char data2[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3];
+ 
+ GLShape::GLShape( Texture tex[], int width, int depth, int height, char const* name, int descriptionGroup,
+@@ -514,11 +514,11 @@ void GLShape::createDarkTexture( WallTheme *theme ) {
+ 			if ( !theme || !theme->getMultiTexSmooth( 0 ) ) d = Util::roll( 127.0f, 255.0f );
+ 
+ 			// purple
+-			data[i * LIGHTMAP_SIZE * 3 + j * 3 + 0] =
++			data1[i * LIGHTMAP_SIZE * 3 + j * 3 + 0] =
+ 			  ( unsigned char )( d * tmp * ( theme ? theme->getMultiTexRed( 0 ) : 0.8f ) );
+-			data[i * LIGHTMAP_SIZE * 3 + j * 3 + 1] =
++			data1[i * LIGHTMAP_SIZE * 3 + j * 3 + 1] =
+ 			  ( unsigned char )( d * tmp * ( theme ? theme->getMultiTexGreen( 0 ) : 0.4f ) );
+-			data[i * LIGHTMAP_SIZE * 3 + j * 3 + 2] =
++			data1[i * LIGHTMAP_SIZE * 3 + j * 3 + 2] =
+ 			  ( unsigned char )( d * tmp * ( theme ? theme->getMultiTexBlue( 0 ) : 1.0f ) );
+ 
+ 			d = 255.0f;
+@@ -542,8 +542,8 @@ void GLShape::createDarkTexture( WallTheme *theme ) {
+ 	glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+ 	glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR );
+ 	glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
+-	glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, GL_RGB, GL_UNSIGNED_BYTE, data );
+-	gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGB, LIGHTMAP_SIZE, LIGHTMAP_SIZE, GL_RGB, GL_UNSIGNED_BYTE, data );
++	glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, GL_RGB, GL_UNSIGNED_BYTE, data1 );
++	gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGB, LIGHTMAP_SIZE, LIGHTMAP_SIZE, GL_RGB, GL_UNSIGNED_BYTE, data1 );
+ 
+ 	glBindTexture( GL_TEXTURE_2D, lightmap_tex_num2 );
+ 	glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index 9d4f7eec6a20..a0ae342f3b0e 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
 	"${FILESDIR}"/${P}-Wc++11-narrowing.patch
 	"${FILESDIR}"/${PN}-0.21.1-respect-AR.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
 )
 
 src_prepare() {