gentoo auto-resync : 12:08:2022 - 02:20:53

23 files changed, 300 insertions, 425 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index c9db43a1f3c5..84e3ef75ac47 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/balloonchase/Manifest b/games-arcade/balloonchase/Manifest
index 826163366a82..b5e1b7b693d0 100644
--- a/games-arcade/balloonchase/Manifest
+++ b/games-arcade/balloonchase/Manifest
@@ -1,4 +1,5 @@
-AUX 0.9.6-gentoo.patch 6154 BLAKE2B a8729b678e4d8ece1ad327e0d35b63fddef5b28f9878efc89802ee8c4263dd9a758f1d13f66ce7125d069dc1874de680ff96888461516f142716b668a46ec687 SHA512 a16b70a3c1ba071b8e058e252843827e8a5b63d5b87e2332a93cb8d43e00ccbfd6b7aa13406275980c7a7cffd32b1b1453bf5d1f9c9c0b585cc969f5b9c6ae81
+AUX balloonchase-0.9.6-gentoo.patch 5319 BLAKE2B 165951c23ecf7f49f92600a5e90e7707e9d5e2bbcd91d2a32eca01c7dec1ced472e55c3b2ffba6be95a393d70d13818c9c029dfce982f4a6be7e9636859a86e6 SHA512 c76167877a6f5ac413f610fbb17ed5a164c0806af6823652f4e7d53c3b1db2df6cd2a3acef5d397eec7c5fdeb7e16eb224c96c27eebcc51857bca005f974d865
 DIST balloonchase-0.9.6.tar.bz2 523085 BLAKE2B 50e453327d51da3fe40f52850cb2fbb7a10e897f59bac5d6f4a676d3211d3dcdae00359304ad119252ebf98e9f46482ad801078762f16ddc609bc94b68c3fc18 SHA512 ab5617713c96187564926fd5ecbdbf5186f78c23cfb43b26b28b9d18e71330efd77700cf7cd02e04be7fd8e33f2d30bf59f64954135ac82802d1d839dc2e7767
-EBUILD balloonchase-0.9.6-r1.ebuild 823 BLAKE2B 8fe0e1701765087731667d8a6fbbf97c4151fcbbca003f21c6ffbdf4306b35dd26f52b4313ebc862609d981793113957094fad8e2017208b4bf013c6a8f98178 SHA512 86eea2e2b37420a01a4bc9993c0b7e81590a2331fb702dbf57a8bbdad0d14cf5c8aaaa43267301987862552f5d8b584c18697f6f040ba5427532e8097f7efd90
+DIST balloonchase.png 1744 BLAKE2B d78e636c0cb2ef521967035ce96fbee0e7b2659cb5127ba32cd3437394a709941fd915dfc0f376d47c2ad5ca81f6392f5942c2737cb2524ec3a041dc5b8c6c26 SHA512 bfd32d65b5cb290df90881cb7a953f1cac38f4e91151c672e4320b9b41f7bff46ef97d6c123aa7267b241710dccf4ade409ff129c945af1ee06d33fdf490f169
+EBUILD balloonchase-0.9.6-r2.ebuild 846 BLAKE2B 6972cefef5fdc8fea1501b68b0f3118ea56a97a1cd59810253a77b7c58930e08c6e1648af4ef75918b02a155f3e6f550c0b42ce96536531fe45e27f651886b05 SHA512 be9e3eb831205a0e866f3ea344e9879afe006a18ca8c6e5db57fd259a39249710d745a07b2b6d32ae94f54432ce9c3f3e6d200d3c77c72c72e68b38eda16de22
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild b/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild
deleted file mode 100644
index 36976cc63a40..000000000000
--- a/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Fly a hot air balloon and try to blow the other player out of the screen"
-HOMEPAGE="http://makegho.mbnet.fi/c/bchase/"
-SRC_URI="http://makegho.mbnet.fi/c/bchase/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PV}-gentoo.patch
-	sed -i "s:g++:$(tc-getCXX):" Makefile || die
-	sed -i \
-		-e "s:GENTOODIR:/usr/share/${PN}:" src/main.c || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r images
-	newicon images/kp2b.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Balloon Chase" /usr/share/pixmaps/${PN}.bmp
-	einstalldocs
-}
diff --git a/games-arcade/balloonchase/balloonchase-0.9.6-r2.ebuild b/games-arcade/balloonchase/balloonchase-0.9.6-r2.ebuild
new file mode 100644
index 000000000000..aa65b89196ec
--- /dev/null
+++ b/games-arcade/balloonchase/balloonchase-0.9.6-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Fly a hot air balloon and try to blow the other player out of the screen"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libsdl[video]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "s|GENTOODIR|${EPREFIX}/usr/share/${PN}|" src/main.c || die
+
+	tc-export CXX PKG_CONFIG
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r images
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "Balloon Chase"
+
+	einstalldocs
+}
diff --git a/games-arcade/balloonchase/files/0.9.6-gentoo.patch b/games-arcade/balloonchase/files/balloonchase-0.9.6-gentoo.patch
index ff232693422b..c847f0677660 100644
--- a/games-arcade/balloonchase/files/0.9.6-gentoo.patch
+++ b/games-arcade/balloonchase/files/balloonchase-0.9.6-gentoo.patch
@@ -1,26 +1,18 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1,4 +1,3 @@
+@@ -1,2 +1 @@
 -LDFLAGS= -lSDL -lpthread -s
  CFLAGS= -Wall # -DDEBUG
- PKG_BCDIR=balloonchase-`cat src/ver`
- PKG_BCVER=`cat src/ver`
-@@ -9,8 +8,8 @@
- clean:
- 	rm balloonchase src/*.o
+@@ -11,4 +10,4 @@
  main: 	src/main.c
 -	g++ -c -o src/main.o `sdl-config --cflags` src/main.c
 -	g++ -o balloonchase src/main.o `sdl-config --libs`
-+	g++ $(CXXFLAGS) -c -o src/main.o `sdl-config --cflags` src/main.c
-+	g++ $(LDFLAGS) -o balloonchase src/main.o `sdl-config --libs`
++	$(CXX) $(CXXFLAGS) -c -o src/main.o `$(PKG_CONFIG) --cflags sdl` src/main.c
++	$(CXX) $(LDFLAGS) -o balloonchase src/main.o `$(PKG_CONFIG) --libs sdl`
  pkg:
- 	@echo $(PKG_BCVERSION) >VERSION
- 	rm balloonchase src/*.o
 --- a/src/main.c
 +++ b/src/main.c
-@@ -333,47 +333,47 @@
- 
- int InitImages()
+@@ -335,35 +335,35 @@
  {
 -	back = SDL_LoadBMP("images/back.bmp");
 +	back = SDL_LoadBMP("GENTOODIR/images/back.bmp");
@@ -71,8 +63,7 @@
 -	font2 = SDL_LoadBMP("images/font.bmp");
 +	font2 = SDL_LoadBMP("GENTOODIR/images/font.bmp");
  	font = SDL_CreateRGBSurface(SDL_SWSURFACE, 1288, 100, 32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
- 	SDL_SetColorKey(font, SDL_SRCCOLORKEY, SDL_MapRGB(font->format, 0x00, 0x00, 0x00));
- 	DrawIMG (font, font2, 0, 0);
+@@ -372,6 +372,6 @@
  
 -	blobtrox = SDL_LoadBMP("images/blobtrox.bmp");
 +	blobtrox = SDL_LoadBMP("GENTOODIR/images/blobtrox.bmp");
@@ -81,27 +72,17 @@
 -	balloonchase = SDL_LoadBMP("images/balloonchase.bmp");
 +	balloonchase = SDL_LoadBMP("GENTOODIR/images/balloonchase.bmp");
  
- 	TMP = SDL_CreateRGBSurface(SDL_SWSURFACE, 259, 200, 32, 		0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
- 	blursurface = SDL_CreateRGBSurface(SDL_SWSURFACE, 640, 480, 32, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
-@@ -578,7 +578,7 @@
- 
- void createdat(int winsneed, int option_wave_effect)
+@@ -580,3 +580,3 @@
  {
 -  FILE *OPTFILE=fopen ("balloonchase.dat", "w+");
 +  FILE *OPTFILE=fopen (".balloonchaserc", "w+");
    char datmsg[60];
-   sprintf (datmsg, "Balloon Chase settings file -- Do not edit manually!");
-   char tmp2;
-@@ -588,52 +588,32 @@
- 	}
-   fputc (winsneed, OPTFILE);
+@@ -590,3 +590,3 @@
    fputc (option_wave_effect+2, OPTFILE);
 -  fprintf (stderr, "Saved configuration to balloonchase.dat\n");
 +  fprintf (stderr, "Saved configuration to .balloonchaserc\n");
    fclose (OPTFILE);
- }
- 
- void checkfiles()
+@@ -596,42 +596,22 @@
  {
 -  char found=0;
 -  #ifdef WIN32
@@ -161,23 +142,13 @@
 +		createdat(2, 1);
 +	}
  }
- 
- Uint32 rgb(Uint8 r, Uint8 g, Uint8 b)
-@@ -1257,7 +1237,7 @@
-   SDL_WM_SetCaption ("Balloon Chase", 0);
-   checkfiles();
+@@ -1259,3 +1239,3 @@
  
 -  FILE *OPTFILE=fopen ("balloonchase.dat", "r");
 +  FILE *OPTFILE=fopen (".balloonchaserc", "r");
    char datmsg[60];
-   char varmistus[60];
- 
-@@ -1275,7 +1255,7 @@
- 	{
- 		winsneeded=fgetc(OPTFILE);
+@@ -1277,3 +1257,3 @@
  		option_wave_effect=fgetc(OPTFILE)-2;
 -		fprintf (stderr, "Successfully loaded balloonchase.dat\n");
 +		fprintf (stderr, "Successfully loaded .balloonchaserc\n");
  	}
- 		else
- 	{
diff --git a/games-arcade/cob/Manifest b/games-arcade/cob/Manifest
index 8c5a0c31da56..f47fa1447e8d 100644
--- a/games-arcade/cob/Manifest
+++ b/games-arcade/cob/Manifest
@@ -1,5 +1,6 @@
 AUX cob-0.9-gcc43.patch 618 BLAKE2B 211bc0f4221b05ed761b8d214ebb11e6cf4262d89ba01beba75a10297d70547ea0d66c6c85d313fdc0826706bd8270e5741ae5e44ad5e97b4a078e25163eac32 SHA512 15cdb6cfacdd49e37fd41e337f425e9f3f020f9d019ea8d1fb860d14b0cebb04dab558c0bb1aa923d0d58fac56c6d579398b0ca7c18e70989c3efd924452d7e5
 AUX cob-0.9-gcc44.patch 1147 BLAKE2B 01a069e45b39b2d4bdd3d066ff295a2e99d2d782c5e924ab2aa5a4614e9b9482acf52735a0f48e6d7d312d101ba3652987fad9fa675897d1b49054fec85d0ffa SHA512 169559f882eba5f34558f845c44c09ba6821db689ae5a73dc6e8cd14ae12d4299fbad3e67b4c828fa3de435c20e948fb8c0266e3267b52b5bb87302047d4034d
 DIST cob-0.9.tar.gz 712618 BLAKE2B f73bec711f4e2c7907cf987fdd12207556752e05f5cf98f9818ef470c2bc2fa95f03c8c4a2f6c114b87d5c00cf3b17da3a1d127869b7ee548d5bd0d05d4c4114 SHA512 1a329bb06a25137c1dc9d65cff949ed1b0ca7445ecf897375be71581c35f0bc563008fc7607d650a660a405f2282b0329148487bd29b6a053478b61d932bdf4d
-EBUILD cob-0.9-r1.ebuild 583 BLAKE2B 8030b1b863e19a856d1f2e22c1c5a0fa162c8bc8e6a01eda0e154d941dcdc52f6954493a136280e579b4e00c6900f72d3c2c51be87b70069c8adc07ff0345421 SHA512 c90b912a22b8beab6f639f766fb0f8066d1042421562405dbd4c55259bae7287a2675176fa9bbafff6b04c1762e485c6f306a5b6a5eef2224f1b4f4e2a23faa4
+DIST cob.png 755 BLAKE2B d560e5b72275c174d4285f54e900f8fb82e54fd358df7aa07c37e9e75974fc776293faa9cb9c26c4aacbe28961462432b3d97193365533851b7c5179e291a6c2 SHA512 201e8c4d534532d22417e6a96832061e0286ade7e2fc768b9391114e86565cb38365674dbee19f13029e43b55dba7332ccd9536ff26629e3f7382090b8224882
+EBUILD cob-0.9-r2.ebuild 644 BLAKE2B 18b90f0ce826ba8d80b71c9eda8e39130305abb4f70d1f47e2638a1adffb20b77d3f47c7111dfa41a05ebbc864de04f989fb0d111f010ccf5ec39cc90736e783 SHA512 1aeba0deff1b71acda28b000c9211eb5af182846413b3f5408ade987bead7927c99db081997ad3a2b4bbf10334039167b88ced43ee11dddddd51c4562c32d46d
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/cob/cob-0.9-r1.ebuild b/games-arcade/cob/cob-0.9-r2.ebuild
index 8851838f489d..b45c2ee9e74b 100644
--- a/games-arcade/cob/cob-0.9-r1.ebuild
+++ b/games-arcade/cob/cob-0.9-r2.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit desktop
 
 DESCRIPTION="Cruising on Broadway: a painting-type game"
-HOMEPAGE="http://www.autismuk.freeserve.co.uk/"
-SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[joystick,sound,video]"
-RDEPEND="${DEPEND}"
+RDEPEND="media-libs/libsdl[joystick,sound,video]"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
@@ -23,5 +25,7 @@ PATCHES=(
 
 src_install() {
 	default
+
+	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "Cruising on Broadway"
 }
diff --git a/games-arcade/conveysdl/Manifest b/games-arcade/conveysdl/Manifest
index 8f3211d719ed..e419d281aace 100644
--- a/games-arcade/conveysdl/Manifest
+++ b/games-arcade/conveysdl/Manifest
@@ -1,5 +1,7 @@
-AUX conveysdl-1.3-arrays.patch 997 BLAKE2B 6a243b48ee809c86a02a6c49117a0e86a1b0dbce80cb9c761e693b66a576536b92ffb1c61e0bb3676d2b6850f1b8985d52d0c0d67de4bf9e6aaf186fed2e1bac SHA512 c4d52d0da7bedb4941d7438203e7c1d25d72960ab739e1a4c359628424a95f95001340b74b7926ae22c7c837f2f7a241891381f16c3a15f75e51ad908cc6b56e
-AUX conveysdl-1.3-speed.patch 1410 BLAKE2B 2e0716f1a40e2a42cd9e30e3154f3b79dd4691e97a530761d8f4b6d3f1069382c5e430b56df5f60928f1c249257652c8c4b5800ba08a5d6881bd9d8267dfd378 SHA512 8766d4c522b58f9def8d7f1a9b928287643068daf6594fde91ba1fe9aa6363eea36958d98ca3aa40eead761eda7a253209cf74143b4a6333f2e0ed9bdc116fbf
+AUX conveysdl-1.3-arrays.patch 757 BLAKE2B d5a54bf0bbc751c631f3aefb62a316f45710b9b3e1e4a114f932217b4f6eacc02bcec0a4cded626e08e738e9fb30df9dfc46a944d6bef83b06079d1ec2deeb00 SHA512 1e78cc3053085b8a352d57c964d2509b98f54efdf00bb63ee1988c85b392c6364835757eef687caeec517de856d0b55b55b6efe610731d38f1d71bd4f52d03ce
+AUX conveysdl-1.3-audio.patch 323 BLAKE2B abc409c5c369aed932c020f58271918f76f00088b44d3f25d8cba6f72333b9d47c43c4d9eccdab543de67b3c5d6ec667615102ee7c85e04a953687de6ea29468 SHA512 7974f0fd495767e4211866898ffff2f7517aa6e2e52fb489c812f52c4a458bcf9ccd8e4b57d1a752a46ce8044bbe25788d07bdf077473f94fe974449b0c98176
+AUX conveysdl-1.3-speed.patch 980 BLAKE2B c8909d766aaea88f80f0d2ff778f8b9eb2e3e7e1db9773836fa53beff91d68ba3479cbf15ce0a76c6b27f2eee53726ba789510846f6f48cd3fbe21fb806ca7af SHA512 0526e9260b7b72b16e463f02de379e47f05f725dd0a41dbab073b8f99a171e36274e87d96625f9d8bc504bcfcbc58c526291d81a14c142f744d9d21b280f870e
 DIST conveysdl.1.3.tar 429568 BLAKE2B 950952ad311bb51855bbd1cf3bf25b750d067db1cef8333f44ac3a96f30033f700efb9771d3050be6a3acc63c79b49fa8d64a1a11a088a777a13f21fb82a4c81 SHA512 fe6f91cdd63ae1019cb99613618e44ceeddb4080ad5e50bd8ce0abf27e057617d3658a29b2faf668cbc3b0887f1a4a05cadadb060f69d850c3d85c9e7190dd8a
-EBUILD conveysdl-1.3-r1.ebuild 1182 BLAKE2B c1cb698ccf522954912d7c83c68c3504cbf214e617d5297c656ce6c4b7da0a263ee564583957cf9327bf629a4a46dcb3a936c69cbb3de1c6c865915fa3f626ac SHA512 d3208c340112cdced7d2309548266842ea8ee936f1e26358e479a67684365722fbe893d858f8935f91501f2990c02b1f3c4f5411ee5f5aefd8b1bb051a72a5f9
+DIST conveysdl.png 328 BLAKE2B a62da06757da9e103e7156a5fbda7b9a7e0381aa6d203fe4ed7e46568073eef6287a955303a227975f9e073dbab3bad990a8033200da204059887bb8078203c8 SHA512 dcf99bc5112189a5d33a183a8a6ecad3b70456a75112a3caece1d87f967fcb14279f6a2f9a47dc67967806c09b5725cb2f239c29be9370336c0f76bed4db1867
+EBUILD conveysdl-1.3-r2.ebuild 1113 BLAKE2B a1ba37672517d336b58d5b2ede87aa49b77e6ad4749cf2622406cfe288afe3409fd0a884763e6b9ddc6d06739837319381615eba98625d852a7f65a893b32dc7 SHA512 067bcb64c8b7c011f2c91491729d09b05c9a4a2a243ac160bafae3c4a0ea5e3dd97da12c18b6806358fbcde59def38852ebeaca40ebde6e6a8fdf0de438d30a0
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
deleted file mode 100644
index 904ee87c07b4..000000000000
--- a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs"
-HOMEPAGE="http://www.cloudsprinter.com/software/conveysdl/"
-SRC_URI="http://www.cloudsprinter.com/software/conveysdl/${P/-/.}.tar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# Incomplete readme
-	sed -i \
-		-e 's:I k:use -nosound to disable sound\n\nI k:' \
-		readme || die
-
-	sed -i \
-		-e 's:SDL_Mi:SDL_mi:' \
-		main.c || die
-
-	eapply \
-		"${FILESDIR}"/${P}-arrays.patch \
-		"${FILESDIR}"/${P}-speed.patch
-}
-
-src_compile() {
-	emake main \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} $(sdl-config --cflags) \
-			-DDATA_PREFIX=\\\"/usr/share/${PN}/\\\" \
-			-DENABLE_SOUND" \
-		LDLIBS="-lSDL_mixer $(sdl-config --libs)"
-}
-
-src_install() {
-	newbin main ${PN}
-	insinto /usr/share/${PN}
-	doins -r gfx sounds levels
-	newicon gfx/jblob.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Convey /usr/share/pixmaps/${PN}.bmp
-	einstalldocs
-}
diff --git a/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
new file mode 100644
index 000000000000..a45ec62f1a9e
--- /dev/null
+++ b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P/-/.}.tar
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-arrays.patch
+	"${FILESDIR}"/${P}-audio.patch
+	"${FILESDIR}"/${P}-speed.patch
+)
+
+src_compile() {
+	tc-export CC
+
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags sdl SDL_mixer || die) \
+		-DDATA_PREFIX="'\"${EPREFIX}/usr/share/${PN}/\"'" \
+		-DENABLE_SOUND
+	append-libs $($(tc-getPKG_CONFIG) --libs sdl SDL_mixer || die)
+
+	emake main LDLIBS="${LIBS}"
+}
+
+src_install() {
+	newbin main ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r gfx levels sounds
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Convey
+
+	dodoc readme
+}
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
index a6286d96f145..b733159425e6 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
@@ -1,29 +1,18 @@
---- a/main.c.org	2010-07-28 13:16:20.552161148 +0300
-+++ b/main.c	2010-07-29 20:43:14.714543259 +0300
-@@ -22,7 +22,7 @@
- 
- SDL_Surface *bletters;
+https://bugs.gentoo.org/330161
+--- a/main.c
++++ b/main.c
+@@ -24,3 +24,3 @@
  SDL_Surface *letters[100];
 -SDL_Surface *tiles[9];
 +SDL_Surface *tiles[10];
  SDL_Surface *btiles;
- SDL_Surface *blob;
- SDL_Surface *jblob;
-@@ -51,7 +51,7 @@
- FILE *file_ptr;
- 
+@@ -53,3 +53,3 @@
  
 -int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[7],bloby[7],blobp[7],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
 +int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
  /* Keys */
- int quit = 0;
- int spacebar = 0;
-@@ -452,7 +452,7 @@
- static void info(void)
- {
+@@ -454,3 +454,3 @@
    int monkey=70,munk;
 -  char scoremonkey[10];
 +  char scoremonkey[16];
    if (lives>1) {
-     for (munk=1 ; munk<lives ; munk++ )
-     {
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch
new file mode 100644
index 000000000000..9f76cb2dc0a9
--- /dev/null
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch
@@ -0,0 +1,15 @@
+Fix header and add lacking instructions to readme.
+--- a/main.c
++++ b/main.c
+@@ -8,3 +8,3 @@
+ #ifdef ENABLE_SOUND
+-#include <SDL_Mixer.h>
++#include <SDL_mixer.h>
+ static int soundv = 2;
+--- a/readme
++++ b/readme
+@@ -6,2 +6,4 @@
+ 
++use -nosound to disable sound
++
+ I knocked this game up over a couple of days, and can't be
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
index 6d6d13eb11be..06d518597d94 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
@@ -1,31 +1,20 @@
---- a/main.c	2010-07-30 10:41:21.392783010 +0300
-+++ b/main.c	2010-07-30 10:44:35.791690958 +0300
-@@ -52,6 +52,7 @@
- 
- 
+https://bugs.gentoo.org/330161
+--- a/main.c
++++ b/main.c
+@@ -54,2 +54,3 @@
  int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
 +int realspeed;
  /* Keys */
- int quit = 0;
- int spacebar = 0;
-@@ -140,6 +141,7 @@
-   char path[256],jib[50];
-   int lvspx,lvspy;
+@@ -142,2 +143,3 @@
    bpointx=200;bpointy=400;pointx=200;pointy=400;jug=1;death=0;jump=0;jumpf=0;jug=0;blibs=0;blibo=0;die=0;speed=4;
 +  realspeed=speed;
    strcpy(path, DATA_PREFIX);
-   sprintf(jib,"levels/level%d",level);
-   strcat(path, jib);
-@@ -212,15 +214,16 @@
-     if (jumpf==jumpoo) { jump=0; }
-     if (jumpf==jumpoo*2) { jumpf=0; }
+@@ -214,3 +216,3 @@
    }
 -  score+=speed;
 +  score+=realspeed;
    /*crap*/
- }
- 
- static void plotfloor(void)
+@@ -220,5 +222,6 @@
  {
 +  if (bpointy==400) realspeed=speed;
    int nob,nx,nobx=48,ek,ej,el;
@@ -34,23 +23,13 @@
 +  bpointx-=realspeed*2;
 +  bpointy+=realspeed;
    pointx=bpointx;
-   pointy=bpointy;
-   imageplot(bb, blobx[6], bloby[6] );
-@@ -542,7 +545,7 @@
-   }
-   while ( jump_down==0 );
+@@ -544,3 +547,3 @@
    leveldone=3;
 -  speed=4;
 +  speed=4; realspeed=speed;
     blankscreen();
- }
- 
-@@ -563,7 +566,7 @@
-    if (quit>0) break;
-   }
+@@ -565,3 +568,3 @@
    while ( jump_down==0 );
 -  speed=4;
 +  speed=4; realspeed=speed;
    lives+=1;
-   level+=1;
-   getlevel();
diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
index c42713f0fa9e..316537cbfffc 100644
--- a/games-arcade/criticalmass/Manifest
+++ b/games-arcade/criticalmass/Manifest
@@ -1,8 +1,7 @@
-AUX criticalmass-1.0.2-cflags.patch 868 BLAKE2B 5e4179592ab03bbc34e14e7649ebfca2268a8f22728f7afb92f4978aeb09461588b7daa6642fa07c8ce007597ee40296d28c44b9381bc734184c5c82f6eb2106 SHA512 545f822a3fb2709c52e4c9bbacc8ea56a7aee229acdaec1af3024928d67395de8f3f0014b5647bb48afa1a85478854945490c482c96486e908c5342eba2538e9
-AUX criticalmass-1.0.2-gcc43.patch 3150 BLAKE2B c039896207f59cc4e0c4c4e81ced2266ca91c4731cb853c6e4120b1962cef0b7ebce1094d0b38081fbec44c098d3e109fe3a2e2d294c483caf1008611c4a5209 SHA512 a3a23367de54d99b3e47951477c3c85fa861a6a48c3a2d81e2352e55d0a32d6c319f5fd37ff287c93a5b9b0dfa230c89a90a507219960bb72a567977058f3bd6
-AUX criticalmass-1.0.2-libpng14.patch 449 BLAKE2B e27405000136410be47bb241208c1321bbbf8540b8707244271e9368cfaaf7cd058172cc952ff0dd1d84a5e693f0373f2ec8ddd47db1b05b8768f242fa037488 SHA512 976cb237901945119fe54bf8b7e8856d70d7104ff7071b80cdeb7fdab64e783c3f69a6099bd1ee11aae2eb5bd94dcac681869328e44bb74c4808b3c67a23e975
-AUX criticalmass-1.0.2-libpng15.patch 686 BLAKE2B a96af03a21e1e12606acd4ea07631c9688d80b377d126b44e1ace016e5aa727446d2c8c18606983fa6b2288f83b19130488e96e4f3364dc1e2d42b543d1e3766 SHA512 c2a68f80f0f775e5b6acbb6ed3a565200f481c83f505320488073783a30265769ba32f545590f2756a1d4974b0cc65462f559f23237ce206cfb80be370195d97
-AUX criticalmass-1.0.2-system_curl.patch 976 BLAKE2B 8af3bae1f2653e882a8d2f0955ef7973af93058bcf646f2264ccacc7b804a622b6104c50cbfc5531775bd9da22660317d2fb00804566014f543ef8e5a1d231be SHA512 6ce040132b9b3a4d4cf7a14c48a3e33320cd95ae440512f8c1c78e78200e6936fe95140e1e16607a225ec0ed1421e03bc09ba065552bc5419cbb42ac74f44b47
+AUX criticalmass-1.0.2-flags.patch 510 BLAKE2B ce561318375725702e28dcecd0da17bf0a0f87d214a17ddfd275af10701ca8e121621d20973df684af934fb6babe6acb158c3382a1a3509d4001ceab761146b8 SHA512 d953c639e2dae75d6e2638daa52c0dd322e3a059277dc71cacb0e9345ae3601e95895c75b8c33fea687658608530126a50d6d15b604172d1df938a6912966593
+AUX criticalmass-1.0.2-gcc43.patch 878 BLAKE2B c66f75c86894f99a9b60b9bbdb545a56c9d98ceb7c67e306cfee489d7fc825863bc31c9e55a5f3f0799b3ca7f799df94c31348db91c9725c2f3e15867e3450fe SHA512 b02c1580b7f0e9d3a57345e08817857bee81f6b8f821081d71ca5dc538e2c57eb9688c660ad5c200f46110f39e94e76f8bce5f2b237ccd0586f063dbdb0396fe
+AUX criticalmass-1.0.2-libpng.patch 767 BLAKE2B 489aed2c08011dd48c97491150b78b520fa91b57b6e1a4b8e29afa4bb1e3ff013b3c1cc3dfbd931d6056b54c6c93f5eb45d19bb6226a1e51f7a946f65f68cdcf SHA512 a33d54c8353311c01639368c5522d3ac6c4fdef802303f0df878065a82282ef705c24be370358ddc19abfd3cc824d706738923342643df80a2dcbfebcbd50edb
+AUX criticalmass-1.0.2-system-curl.patch 619 BLAKE2B 7e0df192cf53b9ab3b6b860e7e06091622c1d803b93001766c006e0b2c85a32da38be3aa4ac79c6e11dd57ccd434efc380b360013054ef57c37cad3c8354a796 SHA512 b4e6ae1d4c3a529b3bc2dff438813cddbfa1b97aa2b824dec0ab1030feda7f81a44586dbf0df80ef4b75fe8106daf97444df85199fe168ef79fe414e8cbfd8ff
 DIST CriticalMass-1.0.2.tar.bz2 5122126 BLAKE2B 91642309270aa9a76c1639b213b14f5b1feecce9a1bd9a516b84618e33d454542e31a34ffc974bb0e584b2ff5d5bad6b9112906a0c818662df7eb1ad0d812470 SHA512 af3200adc4b6ed9f24eaa89ef5b2f31e8d09e402d0c2eef8db604afcbb2d36bad48e76c3c11c1b2410d2d4e0ffd8554e2e9749a8c8cc4752b4636b8919a66037
-EBUILD criticalmass-1.0.2-r1.ebuild 1277 BLAKE2B 1d5b5a0b6941f8aab5ebcb29660e245d82a8db33046cf39b33efad6dbefb1d022413383540cb51f7948a8bbefea8057fafcd2afdc37c21e471e28a640e0c7064 SHA512 b0560a8d03dc9dc3b921d421949fcc3314055605d69af9ce20d354547a189819300fc36d01aaa919a8806f9ade279f5ef9660581b368be6405e01481eafc747f
+EBUILD criticalmass-1.0.2-r2.ebuild 1042 BLAKE2B 51826c148183c1b8ba53ba29edd6b00fc77bfb23d0e09070bce711e16ff311769686afb2cf6ff2d669b90cc425dff2f6f6ac1f348945efd3f98a35cf60ea2b15 SHA512 eb191b24b563aebc30ce508aa68c8273fa2ede8522004dd6dde3c18bfe9133fce6fd5d04438320687dda6cb57d1bfc8fd70277a537eade53aa4eea588d3cbd9a
 MISC metadata.xml 336 BLAKE2B ab745e031c331036c976bdc93264f212e9535e5e338a57c5d03b1e88321bf32f7301cbb632a368629ea68e211f15c784bb3542aa607b9731b3d3018cc3d056ec SHA512 8190699a3e41b2d66670117038d9446f4a70e745eeaaeec50161a9e9c8a60c254c3e31c251cf43518a013f9eb5458042db2b10841ab5b1b8a3a24418b1c86f7c
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
deleted file mode 100644
index 5191beb0107f..000000000000
--- a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="SDL/OpenGL space shoot'em up game"
-HOMEPAGE="http://criticalmass.sourceforge.net/"
-SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/sdl-mixer
-	media-libs/sdl-image[png]
-	media-libs/libpng:0=
-	virtual/opengl
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/CriticalMass-${PV}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-system_curl.patch \
-		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-
-	rm -rf curl
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=gnu++98 # Bug 612758
-	default
-}
-
-src_install() {
-	HTML_DOCS="Readme.html"
-	default
-	rm -f "${ED}/usr/bin/Packer"
-	newicon critter.png ${PN}.png
-	make_desktop_entry critter "Critical Mass"
-}
-
-pkg_postinst() {
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		ewarn
-		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
-		ewarn "with the \"mod\" USE flag turned on."
-		ewarn
-	fi
-}
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..550a1493e02e
--- /dev/null
+++ b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic
+
+MY_P="CriticalMass-${PV}"
+
+DESCRIPTION="SDL/OpenGL space shoot'em up game"
+HOMEPAGE="https://criticalmass.sourceforge.io/"
+SRC_URI="mirror://sourceforge/criticalmass/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libglvnd[X]
+	media-libs/libpng:=
+	media-libs/libsdl[opengl,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]
+	net-misc/curl
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-system-curl.patch
+	"${FILESDIR}"/${P}-libpng.patch
+	"${FILESDIR}"/${P}-flags.patch
+)
+
+src_prepare() {
+	default
+
+	rm -r curl || die
+	eautoreconf
+
+	append-cxxflags -std=gnu++98 #612758
+}
+
+src_install() {
+	local HTML_DOCS="Readme.html"
+	default
+
+	rm "${ED}"/usr/bin/Packer || die #247449
+
+	newicon critter.png ${PN}.png
+	make_desktop_entry critter "Critical Mass"
+}
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
deleted file mode 100644
index 0d9063c37538..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure.in.orig	2011-07-20 11:23:19.849122541 -0400
-+++ b/configure.in	2011-07-20 11:24:28.169713094 -0400
-@@ -35,9 +35,6 @@
- AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE)
- AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32)
- 
--CFLAGS=""
--CXXFLAGS=""
--
- if test "x$GCC" = xyes; then
-    CFLAGS="$CFLAGS -W -Wall"
-    CXXFLAGS="$CXXFLAGS -W -Wall -fno-exceptions"
-@@ -51,14 +48,6 @@
-         CXXFLAGS="$CXXFLAGS -g"
- fi
- 
--AC_ARG_ENABLE(optimize,
--[  --enable-optimize=level      Enable optimization [default=2]],
--        enable_optmize=$enableval, enable_optimize=2)
--if test "x$enable_optimize" != "xno" ; then
--        CFLAGS="$CFLAGS -O$enable_optimize"
--        CXXFLAGS="$CXXFLAGS -O$enable_optimize"
--fi
--
- AC_ARG_ENABLE(dyngl,
- [  --enable-dyngl               Load GL library dynamically [default=off]],
-         enable_dyngl=$enableval, enable_dyngl=off)
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch
new file mode 100644
index 000000000000..5677211c78a2
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/375739
+--- a/configure.in
++++ b/configure.in
+@@ -24,2 +24,3 @@
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+@@ -37,5 +38,2 @@
+ 
+-CFLAGS=""
+-CXXFLAGS=""
+-
+ if test "x$GCC" = xyes; then
+@@ -52,10 +50,2 @@
+ fi
+-
+-AC_ARG_ENABLE(optimize,
+-[  --enable-optimize=level      Enable optimization [default=2]],
+-        enable_optmize=$enableval, enable_optimize=2)
+-if test "x$enable_optimize" != "xno" ; then
+-        CFLAGS="$CFLAGS -O$enable_optimize"
+-        CXXFLAGS="$CXXFLAGS -O$enable_optimize"
+-fi
+ 
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
index e57c11f5af28..82207f52aec0 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
@@ -1,101 +1,46 @@
---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.cpp	2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -21,10 +21,12 @@
- distribution.

- */

- 

- #include "tinyxml.h"

+https://bugs.gentoo.org/218299
+--- a/tinyxml/tinyxml.cpp
++++ b/tinyxml/tinyxml.cpp
+@@ -25,2 +25,4 @@
  

 +#include <cstring>
 +
  

- TiXmlNode::TiXmlNode( NodeType _type )

- {

- 	parent = 0;

- 	type = _type;

---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.h	2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.h	2008-04-18 19:40:35.000000000 +0200
-@@ -28,10 +28,11 @@
- #ifdef _MSC_VER

- #pragma warning( disable : 4530 )

- #pragma warning( disable : 4786 )

- #endif

+--- a/tinyxml/tinyxml.h
++++ b/tinyxml/tinyxml.h
+@@ -32,2 +32,3 @@
  

 +#include <cstdlib>
  #include <string>

- #include <stdio.h>

- #include <assert.h>

- 

- class TiXmlDocument;

---- CriticalMass-1.0.0.orig/tinyxml/tinyxmlparser.cpp	2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxmlparser.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -23,10 +23,12 @@
- 

- 

- #include "tinyxml.h"

- #include <ctype.h>

+--- a/tinyxml/tinyxmlparser.cpp
++++ b/tinyxml/tinyxmlparser.cpp
+@@ -27,2 +27,4 @@
  

 +#include <cstring>
 +
  const char* TiXmlBase::SkipWhiteSpace( const char* p )

- {

- 	while ( p && *p && 

- 	        ( isspace( *p ) || *p == '\n' || *p == '\r' ) )

- 		p++;

---- CriticalMass-1.0.0.orig/utils/ResourceManager.cpp	2005-01-02 03:59:29.000000000 +0100
-+++ CriticalMass-1.0.0/utils/ResourceManager.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -20,10 +20,12 @@
- #include <ResourceManager.hpp>
- #include <FindHash.hpp>
- #include <Endian.hpp>
- #include <WalkDirectory.hpp>
+--- a/utils/ResourceManager.cpp
++++ b/utils/ResourceManager.cpp
+@@ -24,2 +24,4 @@
  
 +#include <cstring>
 +
  #ifdef WIN32
- const char PATH_SEPERATOR = '\\';
- #else
- const char PATH_SEPERATOR = '/';
- #endif
---- CriticalMass-1.0.0.orig/utils/Value.hpp	2004-12-18 03:41:24.000000000 +0100
-+++ CriticalMass-1.0.0/utils/Value.hpp	2008-04-18 19:40:35.000000000 +0200
-@@ -13,10 +13,11 @@
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
- //
- #ifndef _Value_hpp_
- #define _Value_hpp_
+--- a/utils/Value.hpp
++++ b/utils/Value.hpp
+@@ -17,2 +17,3 @@
  
 +#include <cstdlib>
  #include <stdio.h>
- #include <string>
- 
- #include <Trace.hpp>
- 
---- CriticalMass-1.0.0.orig/utils/zStreamBufferImplZLib.cpp	2005-07-31 22:06:14.000000000 +0200
-+++ CriticalMass-1.0.0/utils/zStreamBufferImplZLib.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -10,10 +10,11 @@
- //
- // 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
+--- a/utils/zStream.cpp
++++ b/utils/zStream.cpp
+@@ -14,2 +14,3 @@
  //
 +#include <cstdlib>
  #include <Trace.hpp>
- #include <zStreamBufferImplZLib.hpp>
- 
- bool ziStreamBufferImplZLib::init( void)
- {
---- CriticalMass-1.0.0.orig/utils/zStream.cpp	2005-07-31 22:06:14.000000000 +0200
-+++ CriticalMass-1.0.0/utils/zStream.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -10,10 +10,11 @@
- //
- // 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
+--- a/utils/zStreamBufferImplZLib.cpp
++++ b/utils/zStreamBufferImplZLib.cpp
+@@ -14,2 +14,3 @@
  //
 +#include <cstdlib>
  #include <Trace.hpp>
- #include <Endian.hpp>
- #include <zStream.hpp>
- #include <zStreamBufferImplLZMA.hpp>
- #include <zStreamBufferImplZLib.hpp>
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch
new file mode 100644
index 000000000000..c2ea21bb2d63
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/206258
+https://bugs.gentoo.org/383207
+--- a/configure.in
++++ b/configure.in
+@@ -101,3 +101,3 @@
+     CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
+-	AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
++	AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed))
+ 	AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
+--- a/game/main.cpp
++++ b/game/main.cpp
+@@ -30,2 +30,4 @@
+ 
++#include <zlib.h>
++
+ void migrateConfig( void)
+--- a/utilssdl/PNG.cpp
++++ b/utilssdl/PNG.cpp
+@@ -47,3 +47,3 @@
+ 
+-    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+     if( check != length)
+@@ -74,3 +74,3 @@
+ 
+-    if( setjmp(_png->jmpbuf))
++    if( setjmp(png_jmpbuf(_png)))
+     {
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
deleted file mode 100644
index f8a0eec2ad57..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then
- else
-     LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
-     CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
--	AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
-+	AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed))
- 	AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
- 	if test "x$TARGET" = xUNIX; then
- 	    if test "x$enable_dyngl" = xoff; then
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
deleted file mode 100644
index dbdfc9f32275..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/game/main.cpp
-+++ b/game/main.cpp
-@@ -28,6 +28,8 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-+#include <zlib.h>
-+
- void migrateConfig( void)
- {
-     //if onlineCheck is not set, default it to true
---- a/utilssdl/PNG.cpp
-+++ b/utilssdl/PNG.cpp
-@@ -45,7 +45,7 @@
- {
-     png_size_t check;
- 
--    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
-+    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
-     if( check != length)
-     {
- 	png_error( png, "Write Error");
-@@ -72,7 +72,7 @@
- 	return false;
-     }
- 
--    if( setjmp(_png->jmpbuf))
-+    if( setjmp(png_jmpbuf(_png)))
-     {
- 	fclose( fp);
- 	png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch
index 1ab1a2d5ce52..084efbc05cf2 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch
@@ -1,33 +1,21 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,3 +6,3 @@
+ ## Any directories that you want built and installed should go here.
+-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
++SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
+ 
 --- a/configure.in
 +++ b/configure.in
-@@ -115,8 +115,6 @@ fi
- AC_CHECK_LIB(m, sin,, 
-     AC_MSG_ERROR(libm is needed))
+@@ -121,4 +121,2 @@
  
 -AC_CONFIG_SUBDIRS(curl)
 -
  AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
- 
- echo "Configuration:
 --- a/game/Makefile.am
 +++ b/game/Makefile.am
-@@ -41,7 +41,7 @@ critter_SOURCES = \
-         main.cpp
- 
+@@ -43,3 +43,3 @@
  LDADD = \
 -	../curl/lib/libcurl.a \
 +	-lcurl \
  	../utils/libutils.a \
- 	../utilssdl/libutilssdl.a \
- 	../utilsgl/libutilsgl.a \
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@
- AUTOMAKE_OPTIONS = 1.4
- 
- ## Any directories that you want built and installed should go here.
--SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
-+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
- 
- ## Any directories you want a part of the distribution should be listed
- ## here, as well as have a Makefile generated at the end of configure.in