gentoo resync : 04.05.2021

15 files changed, 307 insertions, 69 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 4c86c13061dc..96a4a8557656 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/berusky/Manifest b/games-arcade/berusky/Manifest
index 8c1081673b4e..8ad0358f85bf 100644
--- a/games-arcade/berusky/Manifest
+++ b/games-arcade/berusky/Manifest
@@ -2,5 +2,5 @@ AUX berusky-1.7.1-r2-gentoo.patch 1162 BLAKE2B 86c6baa7ea3355e1681c044ed167a378d
 DIST berusky-1.7.1.tar.gz 483794 BLAKE2B 8e1d6f6c2c47d72fdba73506f8d3ea231649b4eb4fae3e663e9111ed99fbf300b2a160573d54781f9dcb3f9bf62bcb57634d0b3e8abb77f8baffc70254b4640e SHA512 0b0c4d736bfd9b0b62accf11d932271e355cbcbf911e35adb0ccd0bb1b45e06c392d60830bddef04a24689ccfcee7302f2653f6357474ccceba4fd66c44d4383
 DIST berusky-data-1.7.tar.gz 5366663 BLAKE2B 88dbb0063be83b2cc60208e9e5d95ee3014ad381ba1a070d5e781b527324d9d1d4d8a8a56da64e76672995e09f9b57630cd7ba282e2da543dbc6773628362403 SHA512 1ccae352b8033df0dd8fe6f09b1daa83b0e25a67999d41a0f21019014620825551a4e22827f96bc28ccdf0958df85c9f3cfd2e8f1e83dd7edac5b0479413d438
 DIST berusky.png 1714 BLAKE2B 31c8c9c820fa030c5329c3a990bd2430797794e460c22301bb8f7f9577a4d5cfaae23e1ba0640389ffea7dad0146afd5d20ff2ca0fa3d65085207af1a0f625df SHA512 a8a5f7f8dca8d686bc05239adda10673e937361514b1aea07dc9fe66f2e009ae7c20b75ab63fd4db8ed206026a009d8620af3471bbb966b5e9b576ce89f66e54
-EBUILD berusky-1.7.1-r2.ebuild 1013 BLAKE2B 7e5e131aef673f489d2320c14fdd3c6f3eb4bf5ec375ab09d52eabc509f2b7a1d5d136b6c301535db16362ffaeed6a8cd7df60c8d4b9acca22d3d9a7fd4404db SHA512 096423bc6de331213caea01bb58ebb4aff7cf1de69a05f2979b784c3d4b283514d143acf1af5cb9556d33c508c3f1a63aa2785026e80efc8521fa3b42c847846
+EBUILD berusky-1.7.1-r2.ebuild 1013 BLAKE2B 92b832c49f574e329bdb4ea8fcc181bc835f04d9e78738a2a25763aa499772ab4fd61d9f8c7fd7d7309a351eaea166561fcf7a0b36934806fb100febde151eba SHA512 2b288d03aae575579900ec5e59928c4bcf0d92b5b021036fcada7294a38a797cf53a3842b09412c351fd47fa22fafaf7834475536cda896b479e93a46f1c3572
 MISC metadata.xml 763 BLAKE2B 8aca8e43b681e917a1746a8e8932dee1aeaf0485f32a5e253874c28765b85e90c7a13c722d1c959a12ab5a419936df968f6e5d99fe54d6c4b432a8ae09441f4b SHA512 07baeac7dc22893b3e6bdf8c7ab687ba05ea622bd044e92d364d32358b2961bced3ea1263fb3434cb4ca386d9f90818834a5a3bc8d016cdc69a06e248d694ee1
diff --git a/games-arcade/berusky/berusky-1.7.1-r2.ebuild b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
index 66d347e826c9..c14feec00747 100644
--- a/games-arcade/berusky/berusky-1.7.1-r2.ebuild
+++ b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.1-r1-gentoo.patch
+	"${FILESDIR}"/${PN}-1.7.1-r2-gentoo.patch
 )
 
 src_prepare() {
diff --git a/games-arcade/burgerspace/Manifest b/games-arcade/burgerspace/Manifest
index 6d89612a99ad..65690163381d 100644
--- a/games-arcade/burgerspace/Manifest
+++ b/games-arcade/burgerspace/Manifest
@@ -1,3 +1,4 @@
-DIST burgerspace-1.9.2.tar.gz 505314 BLAKE2B 8a6de753e41de791fdc3a2ceb106f193da3de6c04c80c19b9f84cb03f569982ae8f3fe2e5541c1c389e16085d51867733d4911f04266497420eafd170d085095 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee
-EBUILD burgerspace-1.9.2-r1.ebuild 1072 BLAKE2B 6fe0998fa8432b88aabb3a678f1896663d04072ebba2898f004ba53367a69fe3fc07da253204b49ce26ff21ad180625e0969a5f3baa21b6399e4514dabb80b55 SHA512 0df0d428714509daeb313ba90170a84187df0a076ffb3e3453ff311d949a1a437860c20d6a8bd65be402196c9e23404b6e6cc3a735b48d06e1a1714bacb41a7d
+AUX burgerspace-1.9.3-autotools.patch 1637 BLAKE2B e607d152b43d1fe19cbff8d6504a1408deea1eb65a84f4e6054abb3fbe39ce68381c8f0433ec4b86814920ef6feb6ce9e1054a58ea488ac797d4a67bf47a35b0 SHA512 d084a6fc21e8d8ff2141f4a2869ce22d93962f035317568bd93fcc9af544b44449d53e8edb91642cf9af81a3f8d64f4dc8a144fac8e9174feda884f684693a91
+DIST burgerspace-1.9.3.tar.gz 517492 BLAKE2B 6d3cf554580a1a370720f349ae71edab7228c18426d4ae39a8f5bb9177071204715e527beea52aa6b11b9112db5a168951d92b0de60189cfdb1882c85c79d1f2 SHA512 59629ca497a0a379858ba69bb444182f935b58be6554109fb9b309713bd6bde0d771e63858802f9153a4e46bbfe63b5edf58f857bb94ca337dbba89ff3c610cb
+EBUILD burgerspace-1.9.3.ebuild 667 BLAKE2B 2b3e8e1ac52adc8693e984480f38a04bcedbf35dfcbaabd24e73439db8c3f832e3e71e06755f874994ef94c58f71cec330cc69aae6321013f80071fe632a3c0b SHA512 e96c6d8d1ac0dbfba7ba31065e7f066e1107724942b034fe474931e0984fb0a8d5fa42649bd804b7276f78c77144ebbd5f1ee2da7cfe11e832c21d5657fee6df
 MISC metadata.xml 335 BLAKE2B 5b9037f7c7ada3f92d51b965d65b0f47af853b60c4409d1e04522485eeb3a3783f58c4e6e5cb1dfb759d27d09254fae5593f0d12947ae3eb286d7867a6b7ca99 SHA512 78b9833542c259f024f8041b1e26710f42ab792919970e8d5e73c8da539c74e62bec318f5ee18d09b26baee3c17bc49f14f3e70a1032da46acd587c934407cd4
diff --git a/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild b/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild
deleted file mode 100644
index 11de206aa181..000000000000
--- a/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
-HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
-SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="network"
-RESTRICT="test" # doesn't really test anything
-
-RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
-		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
-		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
-		src/Makefile.am \
-		|| die
-
-	sed -i \
-		-e "/Categories/s:Application;::" \
-		-e "/Icon/s:\..*::" \
-		-e "/Terminal/s:0:false:" \
-		src/burgerspace.desktop.in \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with network)
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	doman doc/${PN}.6
-	dodoc AUTHORS NEWS README THANKS
-}
diff --git a/games-arcade/burgerspace/burgerspace-1.9.3.ebuild b/games-arcade/burgerspace/burgerspace-1.9.3.ebuild
new file mode 100644
index 000000000000..8e1c711405ca
--- /dev/null
+++ b/games-arcade/burgerspace/burgerspace-1.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
+HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="network"
+RESTRICT="test" # doesn't really test anything
+
+RDEPEND=">=dev-games/flatzebra-0.1.7"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.9.3-autotools.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with network)
+}
diff --git a/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch b/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch
new file mode 100644
index 000000000000..cd7db7a1d73a
--- /dev/null
+++ b/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch
@@ -0,0 +1,62 @@
+* Install "doc/burgerspace-server.6" only when installing the server
+* Use "$datarootdir" for FDO specified paths
+  This is recommended by Debian, as $datadir could be specified to lie
+  on a different file system, whereas icons/desktop/pixmaps are specified
+  by freedesktop.org and are based on $datarootdir
+  -> https://blogs.gnome.org/hughsie/2014/06/16/datarootdir-v-s-datadir/
+* Do not install LICENSE
+  The fact that the source is licensed under the GPL doesn't require installing
+  the COPYING file along.
+* Nested sound files in "$pkgdatadir", i.e., $(datadir)/$(PACKAGE)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,12 +2,13 @@
+ 
+ SUBDIRS = src
+ 
+-man_MANS = doc/burgerspace.6 doc/burgerspace-server.6
++man_MANS = doc/burgerspace.6
++if BUILD_NETWORK
++man_MANS += doc/burgerspace-server.6
++endif
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA = \
+ 	AUTHORS \
+-	COPYING \
+ 	NEWS \
+ 	README \
+ 	THANKS
+@@ -17,6 +18,7 @@
+ 	$(RPMBUILD) -ta $(distdir).tar.gz
+ 
+ EXTRA_DIST = \
++	COPYING \
+ 	bootstrap \
+ 	autogen.sh \
+ 	$(PACKAGE).spec \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,10 +74,10 @@
+ 	PKGSOUNDDIR=$(srcdir)/sounds ./$(PACKAGE)
+ 
+ 
+-desktopentrydir = $(datadir)/applications
++desktopentrydir = $(datarootdir)/applications
+ desktopentry_DATA = $(PACKAGE).desktop
+ 
+-pixmapdir = $(datadir)/pixmaps
++pixmapdir = $(datarootdir)/pixmaps
+ pixmap_DATA = images/$(PACKAGE).png
+ 
+ 
+@@ -193,7 +193,7 @@
+ 	images/digit8.xpm \
+ 	images/digit9.xpm
+ 
+-pkgsounddir = $(datadir)/sounds/$(PACKAGE)
++pkgsounddir = $(pkgdatadir)/sounds
+ pkgsound_DATA = \
+ 	sounds/ingredient-bounces.wav \
+ 	sounds/ingredient-in-plate.wav \
diff --git a/games-arcade/holotz-castle/Manifest b/games-arcade/holotz-castle/Manifest
index 61fa0df300c8..f4c57eb2aa87 100644
--- a/games-arcade/holotz-castle/Manifest
+++ b/games-arcade/holotz-castle/Manifest
@@ -1,6 +1,7 @@
 AUX holotz-castle-1.3.14-build.patch 2278 BLAKE2B 1fc9e92fcbce33277a9535becb700d8159db7dd66581efe87ed272399b67c704535422c6d3484d3e7480cb1934aaf5dd2704e401d9a867867817c02827ac540a SHA512 fd19155ff5f372306b987a4998b0ef9a3ae194bdc75c99d5f276cae50910fef5998dfd244c6ca4cae0b33741334d072876bff7710fabf365712531502345d101
+AUX holotz-castle-1.3.14-gcc-11.patch 679 BLAKE2B 22de663f4fef24146be4a5f102e507f45a92e5f5280c5a6b298878852704f212eccddbdc4c867f711cc97ed946a6eef0bacc04f7fd2147037505bb2b922f25e5 SHA512 77a7c5bcafcba9ce3e9466bb12414f80ce24185bdb1e10d79cb31f2a509f49ac03661eecfed2520425ffa98e266a449c1d8d7e418812979a1ba25aa70f0734eb
 AUX holotz-castle-1.3.14-gcc44.patch 292 BLAKE2B 9a287237f52ef832839280134263a10c95752bdd131dc9340c1b2731c844f1af9e40785f1219816d1ac5bbdfde1e58013de8c960c3db400c50ab23a17bcdeece SHA512 89ea8aa06c23adc21a88031f02da88476e086ab9ee3147bee1a545cbc6a9b631de2d8b504b0b1b3081a3a62c11df7720ac124ceda788518937652f2ca5a2a118
 AUX holotz-castle-1.3.14-underlink.patch 540 BLAKE2B 443ee944d5f92d81fca16dd7d1ed450edb1e8bc9f93e97fc89dc40b30c8e99dcbd7035b20a11868c9575e3af3304369086c07dcbf012a4bc5d4c6cebca298705 SHA512 29d01cd2404018def02cc7bc44afb9752f7b6fe58f1f8dcf01ce6d41865eae663e26fa159206f55a1d70320aaf5a1556012c0fd0199fdb001f9257571b93d46d
 DIST holotz-castle-1.3.14-src.tar.gz 3691364 BLAKE2B 82ec9336410634d5649eaabe55f69b4cce94d983b1713aa2e7472cec59cd7c1b843a4512a2e11b79c74cc869d96259ea9e21e4bd6d88ddbeeaf8437b63ab13b8 SHA512 129f15a51b13bc80ca068b1ec18cc4ae8bb5b80f11f852b81bff4492dab5bf4edbae714fcaafb197cdedf2b079070ab2f8750790b0b1680204ee7520f1d74576
-EBUILD holotz-castle-1.3.14-r1.ebuild 1157 BLAKE2B 09579ecdefcdab731b4002fe3421f8da07d4624017bf8be63400eedb35aceebb80d45341b210fd1cee18ae073221fb9acf4333f2933a473b0d365da1686df5ff SHA512 dc67b5ad93ae62a8f93084b72a64905a10555f6672a5af2dc19f3c5c802ced5e6b968daf35585119dfc454049f1be053ccf6285b4bbc8ce8eb7fffc0d6a26283
+EBUILD holotz-castle-1.3.14-r1.ebuild 1191 BLAKE2B c550862dd39ceb2c5b2715a3ff30ded223f4ac6eb8c895df9af3cf84a171475ec3aa024685fdf571aa488c3ab2a1142ee32111eb12d87dab77a5081a0d90ddea SHA512 752c53c504d9a937ab45c81c8891e98f2afd24572fadf3d47432b2d2d674cf64b8ae51ac906a3cbb32db79e308f6ebe084b5e9ef155697ad001221188d17dd74
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch
new file mode 100644
index 000000000000..311c352731d8
--- /dev/null
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/739092
+--- a/JLib/JLib/Util/JTextFile.cpp
++++ b/JLib/JLib/Util/JTextFile.cpp
+@@ -145,7 +145,7 @@ bool JTextFile::FindNext(const s8 *str, bool jump)
+   
+   tmp = strstr(ptr, str);
+ 
+-  if (tmp > 0)
++  if (tmp)
+     ptr = tmp;
+   else
+   {
+@@ -153,7 +153,7 @@ bool JTextFile::FindNext(const s8 *str, bool jump)
+     {
+       tmp = strstr(buff, str);
+ 
+-      if (tmp > 0)
++      if (tmp)
+         ptr = tmp;
+       else
+         return false;
+@@ -233,7 +233,7 @@ bool JTextFile::ReadQuotedWord(s8 *str)
+ 	++ptr;
+ 	end = ptr;
+ 	
+-	if (0 >= (end = strstr(ptr, "\"")))
++	if ((end = strstr(ptr, "\"")) == NULL)
+ 	{
+ 		// No hay comillas de cierre
+ 		ptr = org;
diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
index 16ed5d364bad..6b5db838ab75 100644
--- a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
+++ b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit desktop toolchain-funcs
 
 DESCRIPTION="2D platform game"
@@ -29,10 +29,11 @@ PATCHES=(
 	"${FILESDIR}"/${P}-build.patch
 	"${FILESDIR}"/${P}-gcc44.patch
 	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
 )
 
 src_compile() {
-	tc-export AR
+	tc-export AR CXX
 	emake -C JLib
 	emake -C src HC_BASE=/usr/share/${PN}/
 }
diff --git a/games-arcade/sdb/Manifest b/games-arcade/sdb/Manifest
index 6e545909480f..26fda55522af 100644
--- a/games-arcade/sdb/Manifest
+++ b/games-arcade/sdb/Manifest
@@ -1,6 +1,9 @@
 AUX sdb-1.0.2-endian.patch 9118 BLAKE2B de2bbe81f5d1fcf571a5b8eedf97892ff6eaccaa7a0acb74427740f27fdfb8f517cc38c1ccdaee59480fb1e224f8c7a768355af50bfd1cb66fea338eea2133a0 SHA512 65b623d93e2369353cc2c900e38b8dfb56e6896cf34447305870c3c01a97770371ecff6c9586f7b758c64b1de4f85da3e0c79264587be325e226488545ea0754
+AUX sdb-1.0.2-gcc-11.patch 1117 BLAKE2B bd63596fa7b332f8de3d2c4d873cce779170abc05e7363f6f5239d4a98c05da48215cc94a4a92f31c28237639df2ae9035937cc213356e43dfddcc2d8d94fd7b SHA512 ffb5dc5995a1e7ba73666fae9325d59f0f289361883cb76be41c9d69c47e4215d0cd48dfe2d92a18b35832891f9cf2e6dae1c522e1a4189756b2212b6ef982b4
 AUX sdb-1.0.2-gcc43.patch 173 BLAKE2B a00d2ea25dc4f90ddf02bac62c099c9b47089f16c123384e00495050a26bb30f06131892f496f93349a55574810e8c0e4406ea6ca6eda703d890e3c141115392 SHA512 663b0edd244f6fd50166f053f1631f9a2fe239f97ee16bf77a7b79d5afcf3503c5f2a55370b79b5413e91be6dca23d580cc1afc9875385a8ed04981e7dfc2552
 AUX sdb-1.0.2-ldflags.patch 322 BLAKE2B edfffa4f3821726f15729d93e6e52eec5c70ef87e716fa61a081e156d7ef55197dd064af6ad68397a0df0d5509a9d271f10c3c125dc63282e30916860c6e8d0e SHA512 45795b614ec967237a1d5a24075f7238e041a21b18a3e7a4f5608e4d5fc33734b05f80993aa54a044783a8a8b099e065db278ca5dfbda23704d848133b14dc2a
+AUX sdb-1.0.2-return-type.patch 1984 BLAKE2B ec585269c96bcf1e46870cf55bb71d7beeb7c6f1ed638fd3019b1f6c030338c4ade54ce37b41358b4ce45f116086377099f5cc5da9a250baf05df5c06efdb407 SHA512 75dc51313b6f6d092ee29173043e2e28ea25e295ed32fabc1fea383f2d488f913a4dca2a96c4c5f40b6c3696d2d4796a389f4b3e7662981590b4769204c46638
 DIST sdb-1.0.2.tar.gz 10342311 BLAKE2B faedcd26a55df724514b4222f617146e4590861166c49e45768982aa4ea2bb427cca5ae1c3a622eac4ba5d2b1b65fe948792902703cdf2be9e09b8171968c5b3 SHA512 670d43717224d564bfecac44a3570167e19b7b4c50a21afab6903b0b0f2f6092a5551fd2cc63b659d2c2eadff5156c97876b96db3a10beabbbadc689b1d46efc
-EBUILD sdb-1.0.2-r1.ebuild 1154 BLAKE2B 003f66329d1918d69c1726981fb22af69724066453be51dfdede9cb686d4d10b53a882accef74f8358b7ad4a8beae328fdf5ae488f46c096437a62fc6a517df4 SHA512 b1b13ddc7606536b4325d77f6960ff30d9a7dff7a788a0c1e2b11d65b0f61ea5c1362ce451ab12d351db2c254daeed1c8e77753e0ed89b83cb4077ab5510c949
+EBUILD sdb-1.0.2-r1.ebuild 1236 BLAKE2B 9cdeb3272ff1953a5eebe245d40169fec788f91dde73c2190202dd749650adaba53cd25f0ce67bb1d0f3003354916c3f0b9c886c96a7b31b3037af5bab7d4753 SHA512 5a1c50f64fc963aa688a403e5fbcd3fe33cecd5c88d86448acffc9478cc8d7673037c188714ce6da29492bc4173b9444be2665988a8642514e0022701decd6a4
+EBUILD sdb-1.0.2-r2.ebuild 1274 BLAKE2B fc72ea7266dcf84e7b3956510fc40bf48fe26c57b07edd73dab1250a72947bbd8a9ad71d16bfc0ecd50c6e009bd1335a44885c3e200f0a63b760359625e1b700 SHA512 21fcb89630e9759f65a64a4002b03c88b4397fc3897691d890c8d36cc0103927108fec5ad65b203cafc9a9cbb5e1a22c08b42b0e9d909b28c34b3a7e88c76c66
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/sdb/files/sdb-1.0.2-gcc-11.patch b/games-arcade/sdb/files/sdb-1.0.2-gcc-11.patch
new file mode 100644
index 000000000000..f0a20657b900
--- /dev/null
+++ b/games-arcade/sdb/files/sdb-1.0.2-gcc-11.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/787710
+--- a/src/md2.h
++++ b/src/md2.h
+@@ -68,7 +68,7 @@ struct tMaterialInfo
+ {
+   char  strName[255];
+   char  strFile[255];
+-  byte color[3];
++  sdb_byte color[3];
+   int   textureId;
+   float uTile;
+   float vTile;
+@@ -151,8 +151,8 @@ struct tMd2Header
+ 
+ struct tMd2AliasTriangle
+ {
+-  byte vertex[3];
+-  byte lightNormalIndex;
++  sdb_byte vertex[3];
++  sdb_byte lightNormalIndex;
+ };
+ 
+ struct tMd2Triangle
+--- a/src/models.h
++++ b/src/models.h
+@@ -43,7 +43,7 @@ struct tMaterialInfo
+ {
+ 	char  strName[255];			// The texture name
+ 	char  strFile[255];			// The texture file name (If this is set it's a texture map)
+-	byte color[3];				// The color of the object (R, G, B)
++	sdb_byte color[3];				// The color of the object (R, G, B)
+ 	int   texureId;				// the texture ID
+ 	float uTile;				// u tiling of texture  
+ 	float vTile;				// v tiling of texture	
+--- a/src/sdb.h
++++ b/src/sdb.h
+@@ -175,7 +175,7 @@ using namespace std;
+ #define MOUSE_BUTTON_2   -2
+ #define MOUSE_BUTTON_3   -3
+ 
+-typedef unsigned char byte;
++typedef unsigned char sdb_byte;
+ 
+ enum TEXTURE_NAMES {
+ // Fonts
diff --git a/games-arcade/sdb/files/sdb-1.0.2-return-type.patch b/games-arcade/sdb/files/sdb-1.0.2-return-type.patch
new file mode 100644
index 000000000000..9750eedb9919
--- /dev/null
+++ b/games-arcade/sdb/files/sdb-1.0.2-return-type.patch
@@ -0,0 +1,56 @@
+Fix -Werror=return-type warnings to prevent gcc-8+ from
+corrupting caller's stack.
+
+Also detected by -fsanitize=undefined as:
+runtime error: execution reached the end of a value-returning
+function without returning a value
+--- a/src/input.cpp
++++ b/src/input.cpp
+@@ -103,5 +103,6 @@ float InputHandler::bindingState(int key)
+   }
+   else
+     return 0.0;
++  return 0.0;
+ }
+ 
+--- a/src/objects.h
++++ b/src/objects.h
+@@ -545,12 +545,12 @@ class Object : public LevelObject
+     bool Augmented() { return augmented; }
+     void Augment() { model[1].set(MDL_PLAYER_TORSO2); augmented = true; }
+ 
+-    virtual Weapon* Wpn() {}
+-    virtual int CurrWeapon() {}
++    virtual Weapon* Wpn() { return 0; }
++    virtual int CurrWeapon() { return 0; }
+     virtual void selectWeapon(int wp) {}
+-    virtual char weaponState(int wp) {}
+-    virtual char keyState(int wp) {}
+-    virtual Vector2D* WeaponPoint() {}
++    virtual char weaponState(int wp) { return 0; }
++    virtual char keyState(int wp) { return 0; }
++    virtual Vector2D* WeaponPoint() { return 0; }
+     
+     void giveKey(int key) { keys |= 1 << key-1; }
+     virtual void givePowerup(int idx) {}
+--- a/src/sdb.h
++++ b/src/sdb.h
+@@ -370,7 +370,7 @@ class Vector2D
+     void set(float nx, float ny) { c[X] = nx; c[Y] = ny; c[Z] = 0; }
+     void apply() { glVertex3fv(c); }
+     void print() { printf("(%f, %f)\n", c[X], c[Y]); }
+-    Vector2D operator = (Vector2D v) { c[X] = v.c[X]; c[Y] = v.c[Y]; }
++    Vector2D operator = (Vector2D v) { c[X] = v.c[X]; c[Y] = v.c[Y]; return *this; }
+     void operator += (Vector2D v) { c[X] += v.c[X]; c[Y] += v.c[Y]; }
+     void operator -= (Vector2D v) { c[X] -= v.c[X]; c[Y] -= v.c[Y]; }
+     void operator += (float s) { c[X] += s; c[Y] += s; }
+--- a/src/weapons.cpp
++++ b/src/weapons.cpp
+@@ -135,6 +135,7 @@ bool Weapon::fire(float x, float y, float head, float h)
+   }
+   else
+     return false;
++  return false;
+ }
+ 
+ void Weapon::releaseTrigger(float x, float y, float head, float h)
diff --git a/games-arcade/sdb/sdb-1.0.2-r1.ebuild b/games-arcade/sdb/sdb-1.0.2-r1.ebuild
index 155c5d3a4e9c..6456cfc460cb 100644
--- a/games-arcade/sdb/sdb-1.0.2-r1.ebuild
+++ b/games-arcade/sdb/sdb-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A 2D top-down action game; escape a facility full of walking death machines"
 HOMEPAGE="http://sdb.gamecreation.org/"
@@ -19,6 +19,13 @@ DEPEND="virtual/opengl
 	media-libs/sdl-mixer"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-endian.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
+)
+
 src_prepare() {
 	default
 	sed -i \
@@ -27,16 +34,14 @@ src_prepare() {
 		-e "s:sprites/:/usr/share/${PN}/sprites/:" \
 		-e "s:levels/:/usr/share/${PN}/levels/:" \
 		src/sdb.h src/game.cpp || die "setting game paths"
-	eapply \
-		"${FILESDIR}"/${P}-endian.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_compile() {
 	emake \
 		-C src \
-		CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)"
+		CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" \
+		CC=$(tc-getCC) \
+		CPP=$(tc-getCXX)
 }
 
 src_install() {
diff --git a/games-arcade/sdb/sdb-1.0.2-r2.ebuild b/games-arcade/sdb/sdb-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..842841e9cbd8
--- /dev/null
+++ b/games-arcade/sdb/sdb-1.0.2-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs
+
+DESCRIPTION="A 2D top-down action game; escape a facility full of walking death machines"
+HOMEPAGE="http://sdb.gamecreation.org/"
+SRC_URI="http://gcsociety.sp.cs.cmu.edu/~frenzy/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	media-libs/libsdl
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-endian.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
+	"${FILESDIR}"/${P}-return-type.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:models/:/usr/share/${PN}/models/:" \
+		-e "s:snd/:/usr/share/${PN}/snd/:" \
+		-e "s:sprites/:/usr/share/${PN}/sprites/:" \
+		-e "s:levels/:/usr/share/${PN}/levels/:" \
+		src/sdb.h src/game.cpp || die "setting game paths"
+}
+
+src_compile() {
+	emake \
+		-C src \
+		CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" \
+		CC=$(tc-getCC) \
+		CPP=$(tc-getCXX)
+}
+
+src_install() {
+	dobin src/sdb
+	insinto /usr/share/${PN}
+	doins -r levels models snd sprites
+	newicon sprites/barrel.png ${PN}.png
+	make_desktop_entry sdb "Shotgun Debugger"
+	einstalldocs
+}