gentoo resync : 03.03.2021

21 files changed, 305 insertions, 218 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 26da89af83bf..f8a6e44b5dbb 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/asteroid/Manifest b/games-arcade/asteroid/Manifest
index cd6a6bb4cbfa..0944885d767d 100644
--- a/games-arcade/asteroid/Manifest
+++ b/games-arcade/asteroid/Manifest
@@ -1,4 +1,4 @@
 AUX asteroid-1.2.1-libm.patch 956 BLAKE2B c9d29ea30deb543bb0358ca4dfcc65eb94c9912022849e073d17f9057b1882de18b55a89d0ce8814623ab8ed2b7c36ff657523972c4889f19571936d73ec8f78 SHA512 d421eae4fc4ee5e7f5c00b5e6797f10e17030632a6224ed847d82e19b09e7dcac74d4fa84a19812eeeed9add4af3228f18e4d457b683a3adf73ed62d2671ca22
 DIST asteroid-1.2.1.tar.gz 307596 BLAKE2B c3f5363a0939cc4644425adfa9c3f2ca47ec04ae1beb9dd381fba912ee5e9d3330727fa82d4749b4f6402254988feaaaaef10f7f72aeea691656a1dd188ad5e2 SHA512 a88e0b85264d72bd40add0f3fc8b2b727b1acc0c190de6a60d4e1c79adcc484b17d0ed3537309b704667a6617f387219144cbec93df4fbff585d1237a9823b37
-EBUILD asteroid-1.2.1.ebuild 583 BLAKE2B 52a8bb5537acd53821953d0d23eeee689a5164fdab9804d91a442e8e78091ae464d17d676b3cf64381b7079b68d9f34d279af433f232a52a021f022e8153d887 SHA512 293eeee65a281c7627058990621acb67ceeba937a6efc8ce1336992696cfeb9775768b7eecb4dcfbeef1e2f35c88206fb1bf2a4398075004e486825c48a81b9d
+EBUILD asteroid-1.2.1.ebuild 670 BLAKE2B dd9238e71bf365db884ec07db5a0917f71219e70051b9c835db476ed60a3287f849a51942a0eefa5c0e50cd809b23794db04b949f4880d7a93c5ce1f8425e633 SHA512 2c92863bfc2baae17fb6e4ec6d92dd4816cbbcbc5a38718f622ba155c0828bd98e1fc1637ea7dc9d3163bab461fecca04b5054c661062568aca7cd3ec610241e
 MISC metadata.xml 334 BLAKE2B 651b210093aa77df8209cebb3e4cdb6c03064453e3ac2fa2f974388cdd8102cd2ab548d4b88bbb18052321360edf0d395395fb36e6c2ba1ce038932046c165c9 SHA512 e69632cf70047993dd2924f1bc7c42b428f6e2059482708c2b5cd72ae90263c11b76d4846c457d7f597dbff01ca6bb8296c2cff3e859551a9f5f57ea5ed7c794
diff --git a/games-arcade/asteroid/asteroid-1.2.1.ebuild b/games-arcade/asteroid/asteroid-1.2.1.ebuild
index 0272ee41549e..0f9fb6cd0973 100644
--- a/games-arcade/asteroid/asteroid-1.2.1.ebuild
+++ b/games-arcade/asteroid/asteroid-1.2.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils
+EAPI=7
 
-DESCRIPTION="A modern version of the arcade classic that uses OpenGL"
+inherit cmake
+
+DESCRIPTION="Modern version of the arcade classic that uses OpenGL"
 HOMEPAGE="https://chazomaticus.github.io/asteroid/"
 SRC_URI="https://github.com/chazomaticus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -14,13 +15,20 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	virtual/opengl
 	media-libs/freeglut
-	virtual/glu
 	media-libs/libsdl
 	media-libs/sdl-mixer
+	virtual/glu
+	virtual/opengl
 	x11-libs/gtk+:2
 "
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-libm.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DOpenGL_GL_PREFERENCE=GLVND
+	)
+	cmake_src_configure
+}
diff --git a/games-arcade/jvgs/Manifest b/games-arcade/jvgs/Manifest
index df9502140c34..fe29e2264417 100644
--- a/games-arcade/jvgs/Manifest
+++ b/games-arcade/jvgs/Manifest
@@ -1,6 +1,5 @@
 AUX jvgs-0.5-fix-build-system.patch 1028 BLAKE2B 644c07ed7374ec7677ca0f744d08e10a08e1d49a1c0d4bab7d9b87ce78ebb138582238873353ce25471e4a95555b016010ca04fe5672ef8bf256cdb74ea3a378 SHA512 0f049df4b986d380634837e1e5bc4e21d0fb228a7c61cc6765ebec7cc74f3e37ef71260a2d7a7cc830ac9ea22258702f9cad29d3941bf2dff0f3f6ea56817dc8
 AUX jvgs-0.5-unbundle-tinyxml.patch 8652 BLAKE2B 0da26995149bb1918e6b6a6b7884b06e66728d0b931341a00aeea932d0c9ac235efe99f95648ad78900a53154f3b1dbdd8f1da6961fb1adf93b14694b4576694 SHA512 f652c855fa70f7f4e836b14c175c3a68c082976396e8d3722d92a89ec50574eb3f79bca2a8a0f5de365bd89856dba09025e341075169aaf1c918ef623dca48bf
 DIST jvgs-0.5-src.tar.gz 25917861 BLAKE2B 8b7716a16cd7dfdb3f8f7eb2292a121b142a4487f8fb58d046db81cc579b61b3db56728f5ecef8272ec74d8cf898da5c3ee12fa7c492fd219de977ea37bc9ee9 SHA512 0a0a8e7a0e7dce6f61bcd328f579212115eb95e3dce8ca223c1d8a3432d9083bf9a313f02f46b799991aa32f10cb9c14e8ecb63a4578b1ffaabc374ba139b28d
-EBUILD jvgs-0.5-r1.ebuild 912 BLAKE2B 730c614d0ae0a3a125cd968a34679738fbb390da5fff9a252faf0d31091a6e6b05a518f7d95a94300dc2e379db04cefa7b71964af6f20491748f8017e7761e04 SHA512 a949652eb6da05eb0c458b9beca9c421665ddafc3fcf8c8e32ff5e5d859ad1ce31b734a38d0ea3c104015edaa6d55ca788c860d327117429f01d66e1167809ba
 EBUILD jvgs-0.5-r100.ebuild 1210 BLAKE2B a3aa5114ade74770a0fd14b11c7623e5845e39bb9e84795d3d5311a110cc374a842cf031465f3cbb9b06a4a418337240c10b4425bca1343bebe3ce308ce127ed SHA512 f6440f90003fd5214beea75d763f1f8b925b9203aaea2da8d6579dea85087ad01c16aeab1b83c1094f42775f863a64b144ba1e2abe07223afb5b377fc3433cbd
 MISC metadata.xml 327 BLAKE2B 3dfc4352c43df34b847d4ddbaefb6a830d685e7a4cdeabbc870665799e7d9b43a58b4e9c0c71bf1fbaafeb3148732dbb988971310041db7afb669a9235bf7994 SHA512 d37e6f081f28683f1071e57de49287534e6797902e24c681f87477af286a6227eb76abd63bd3091b077270e44061cd0676e49fecf4e74f54d455281fa67946bd
diff --git a/games-arcade/jvgs/jvgs-0.5-r1.ebuild b/games-arcade/jvgs/jvgs-0.5-r1.ebuild
deleted file mode 100644
index 6fa5af29b09c..000000000000
--- a/games-arcade/jvgs/jvgs-0.5-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="An open-source platform game with a sketched and minimalistic look"
-HOMEPAGE="http://jvgs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jvgs/${P}-src.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/lua:0
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/freetype:2
-	sys-libs/zlib:=
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-
-S=${WORKDIR}/${P}-src
-PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch )
-
-src_prepare() {
-	sed -i "s:main.lua:/usr/share/${PN}/&:" src/main.cpp
-	default
-	eapply_user
-}
-
-src_install() {
-	dobin ${BUILD_DIR}/src/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r main.lua resources
-
-	newicon resources/drawing.svg ${PN}.svg
-	make_desktop_entry ${PN} ${PN}
-
-	einstalldocs
-}
diff --git a/games-arcade/opensonic/Manifest b/games-arcade/opensonic/Manifest
index dc6e1b85b156..15fa2de7db5f 100644
--- a/games-arcade/opensonic/Manifest
+++ b/games-arcade/opensonic/Manifest
@@ -1,4 +1,6 @@
-AUX opensonic-0.1.4-r1-cmake.patch 4658 BLAKE2B 029d9d971a86ca7692aecef178de3ef35b29c409cf047e453a4e085d094b274abe07e606449174fbc40dfe7da5bad0dce519f7058020e0f1aece2f6bec34a96f SHA512 4764d967664c2c775696a4ccbfb17cf8d3051b1b96cc1f2c6314b8054059334374fca5d39153ec565f22b5716f34c4d0ff45f4c7b00500e2590437025f10fd06
+AUX opensonic-0.1.4-allegro-4.4.2-loggcompat.patch 1416 BLAKE2B 1c8ff37145b488914dd94151320bd0848a3a7e367bcd0f2769c4ed13c36c93ee6d22206a6cec342eab557429ef37f42980454ad66254f35c509f97f7317a4b0b SHA512 afc96537bf04a8beab47fb6ec3c3cd25233df6c4f8f0f7ea7bbb50e7cdfbe126fae878747896a543d12297a1a7d16be42ae800989cfcf7152092fc06ad2b0ad2
+AUX opensonic-0.1.4-cmake.patch 4658 BLAKE2B 029d9d971a86ca7692aecef178de3ef35b29c409cf047e453a4e085d094b274abe07e606449174fbc40dfe7da5bad0dce519f7058020e0f1aece2f6bec34a96f SHA512 4764d967664c2c775696a4ccbfb17cf8d3051b1b96cc1f2c6314b8054059334374fca5d39153ec565f22b5716f34c4d0ff45f4c7b00500e2590437025f10fd06
+DIST loggcompat-4.4.2.tar.gz 3105 BLAKE2B 846430f7a7252ee4de168274b21c9ffd18e9ba40733aaa45def8a8a4a7a938d00ab61267712008bc599ce91d5a283ab586a4dae77c3cd33af10e2dc641b8be12 SHA512 4d704f999fc3ae3caa094a8a32d5285549c40485c7af9015dc67f832255f2d3963ae1d0db9194b101d66a168b85609ec4926b8ebb39fb7ce7986f7df40f293af
 DIST opensnc-src-0.1.4.tar.gz 10525059 BLAKE2B d5cb825512dfeb614d146e6e7ec45cc3eb56dae0f2cf6c2582e022a1e8ac54e6c87f7bee8795b0e520fa6c24433cb7a748889892cd288f122d7b885e6e91c790 SHA512 239c7b4c7f9663e4d46c54d8bdaefed8d12274b71feaf9c637feb04f3567465f265c50bf3419f4c881ae3fa48a62ab339fe8a0b005c2b080b53d54ebf1e2f29d
-EBUILD opensonic-0.1.4-r2.ebuild 1219 BLAKE2B 705624d47ac5464a2de067b4e113cd2dbb5a6aa5c73b5d22700b643b2566f4214f182ec464726fa49fc0430a62e1f320847ff98737788471c817f0d710de010a SHA512 50c39b104eb0fc2cee336263ceb8ae8c7ff8029b19e4660afde6f6dfc2f1b50c0e14b4ff5882040a4a8ce7271892149a53565f0c207f7a16c168036a66a3247c
+EBUILD opensonic-0.1.4-r3.ebuild 1452 BLAKE2B 5a551e5809c08434fdd003fb71a36d26db03f6fbcc7f05e34dec288f61c6f9a84640b98cfa1551965495aa0d8681e013034ebd791ac7219b64226973fb27b40e SHA512 e05efcc86350804c89088c11b25fc2878d0c971d293fb48f782d8eec1838e6d7a67dd0f5ae9ec62173b44d7279b53712e79f4ac5d1baf18b1994eed49b39ab80
 MISC metadata.xml 330 BLAKE2B b93fe5bb5919cb60eb4e5f2179880bdd9848b9a5b33c368815feea1ee36d36494e169cd8839bedc2db9d15dea8d819d2ad6398769fa69ae7d61a2b142228caf2 SHA512 5ac408fe48351e3db869e0cf5af951fd441690505d16d826c4010d2d575fde0b7de6f9f9ef2594cd2006692e0682b2e62f8cb5726db5c80bc7974f942b7cd79c
diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-allegro-4.4.2-loggcompat.patch b/games-arcade/opensonic/files/opensonic-0.1.4-allegro-4.4.2-loggcompat.patch
new file mode 100644
index 000000000000..1289e846fe2b
--- /dev/null
+++ b/games-arcade/opensonic/files/opensonic-0.1.4-allegro-4.4.2-loggcompat.patch
@@ -0,0 +1,46 @@
+Source: FreeBSD
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,12 +82,6 @@ IF(NOT LJPGALLEG)
+   MESSAGE(FATAL_ERROR "Fatal error: libjpgalleg not found! ${RTFM}")
+ ENDIF(NOT LJPGALLEG)
+ 
+-# LOGG: liblogg, libogg, libvorbis, libvorbisfile
+-FIND_LIBRARY(LLOGG NAMES logg PATH "${CMAKE_LIBRARY_PATH}")
+-IF(NOT LLOGG)
+-  MESSAGE(FATAL_ERROR "Fatal error: liblogg not found! ${RTFM}")
+-ENDIF(NOT LLOGG)
+-
+ FIND_LIBRARY(LOGG NAMES ogg PATH "${CMAKE_LIBRARY_PATH}")
+ IF(NOT LOGG)
+   MESSAGE(FATAL_ERROR "Fatal error: libogg not found! ${RTFM}")
+@@ -150,6 +144,7 @@ SET(
+   src/core/util.c
+   src/core/v2d.c
+   src/core/video.c
++  loggcompat-4.4.2/logg-4.4.2.c
+ 
+   src/scenes/util/editorgrp.c
+   src/scenes/util/grouptree.c
+@@ -250,7 +245,8 @@ IF(UNIX)
+ IF(UNIX)
+   SET(GAME_SRCS ${GAME_SRCS} src/misc/iconlin.c)
+   ADD_EXECUTABLE(${GAME_UNIXNAME} ${GAME_SRCS})
+-  TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng ${ALLEGRO_UNIX_LIBS})
++  INCLUDE_DIRECTORIES(loggcompat-4.4.2)
++  TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m vorbisfile vorbis ogg jpgalleg z png loadpng ${ALLEGRO_UNIX_LIBS})
+   SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall")
+ ENDIF(UNIX)
+ 
+--- a/src/core/audio.c
++++ b/src/core/audio.c
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include <allegro.h>
+-#include <logg.h>
++#include <logg-4.4.2.h>
+ #include <stdlib.h>
+ #include "audio.h"
+ #include "osspec.h"
diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch b/games-arcade/opensonic/files/opensonic-0.1.4-cmake.patch
index 53d76faafae2..53d76faafae2 100644
--- a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
+++ b/games-arcade/opensonic/files/opensonic-0.1.4-cmake.patch
diff --git a/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
deleted file mode 100644
index 3e0e1b0c35a2..000000000000
--- a/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN=opensnc
-MY_P=${MY_PN}-src-${PV}
-
-DESCRIPTION="A free open-source game based on the Sonic the Hedgehog universe"
-HOMEPAGE="http://opensnc.sourceforge.net/"
-SRC_URI="https://sourceforge.net/projects/opensnc/files/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror" # unsure about legality of graphics
-
-DEPEND="
-	media-libs/allegro:0=[X,jpeg,png,vorbis]
-	media-libs/libogg:=
-	media-libs/libpng:0=
-	media-libs/libvorbis:=
-	sys-libs/zlib:=
-	virtual/jpeg:0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}"/${PN}-0.1.4-r1-cmake.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
-		-DGAME_FINAL_DIR="${EPREFIX}"/usr/bin
-		-DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local f
-	while IFS="" read -d $'\0' -r f; do
-		dosym ../../share/${PN}/${f##*/} \
-			/usr/$(get_libdir)/${PN}/${f##*/}
-	done < <(find "${ED%/}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0)
-}
diff --git a/games-arcade/opensonic/opensonic-0.1.4-r3.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r3.ebuild
new file mode 100644
index 000000000000..3aee65163017
--- /dev/null
+++ b/games-arcade/opensonic/opensonic-0.1.4-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Free open-source game based on the Sonic the Hedgehog universe"
+HOMEPAGE="http://opensnc.sourceforge.net/home/index.php"
+SRC_URI="https://sourceforge.net/projects/opensnc/files/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz
+	https://github.com/t6/loggcompat/archive/4.4.2.tar.gz -> loggcompat-4.4.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror" # unsure about legality of graphics
+
+DEPEND="
+	media-libs/allegro:0=[X,jpeg,png,vorbis]
+	media-libs/libogg:=
+	media-libs/libpng:0=
+	media-libs/libvorbis:=
+	sys-libs/zlib:=
+	virtual/jpeg:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/opensnc-src-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-allegro-4.4.2-loggcompat.patch # bug 711542
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/loggcompat-4.4.2 . || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
+		-DGAME_FINAL_DIR="${EPREFIX}"/usr/bin
+		-DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
+		-DGAME_HTMLDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		dosym ../../share/${PN}/${f##*/} /usr/$(get_libdir)/${PN}/${f##*/}
+	done < <(find "${ED}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0)
+}
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index 7f78554a18d1..62464af1976c 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -1,12 +1,14 @@
 AUX performous-1.1-boost-1.70.patch 1693 BLAKE2B 80c9d9d0f90cd43730ddb1bed8594533a028e06d935e45203a8db1aa448f9af2d8c5a0aa96ca9d1d797aac1075e577ae7ee36dabf424757ca063b6c4c63478c4 SHA512 d6cddff13a981911cbb689f589351782d7bead2fe5d10a4e115302771b1bbc1b80bb678185ae104d6f90d89979bd70c876b7da99fc14010ca3bab3ccf0688515
+AUX performous-1.1-boost-1.73.patch 457 BLAKE2B f6a2848b3d878b77ff87dc536ce0c23db1a3f64df1702528f4ee8735c08473cccd6188d3bcb1da9141991c17a060be3280775f5a466bece487d6e8afc77d9f4a SHA512 d95b3d1f6a9252252feea255417e6fe5ff0ff0ed79fa9eaa906b6f5bff5fecc298090c6a67d2e71fde1fab5a7c67bc40393bfb5fac026cf1229d46e58995b2e4
 AUX performous-1.1-gentoo.patch 474 BLAKE2B ff4bdbc43a1129bb4b2d44ac5e818f3f6dccd35ca743345f0934b3cfce66c25c914daf93a4463fa0a30622410737a5983602d1d19fa172bd41e01f3a321ac77a SHA512 b00f13c16dd87645ae3baea80a7430bc0ce46d827ef72ecad21ddac8318f4356bffffd24bd03710a529ca215f20b924f27bc69dd2b3e4870ae19388c8b857338
 AUX performous-1.1-jpeg-9c.patch 591 BLAKE2B 72aac804251366cbaa97c34cdcf9c87d55321059feba00fdc691f7134d9dd47ebf2396072329880bacd6d8e21c3697a2912e93469ba0c98049c0bab0c89622b7 SHA512 1952b59638ed5c0a20f1f4aa9abfd8fce98b7f39d597716c7901593c60fe7efa077ff93a0ad307febf1ac0b3aa88d74559899d511a137a62a77741fd421cfb61
 AUX performous-1.1-linguas.patch 1033 BLAKE2B b7fd8f8560d9e9dd1fb6120f8d0e72c11529f226fecaf482dc3ae351d28977b196816e8c84db0c9ab1c724b78bc4a757d6b1f854dffbc9ebb3aaea1a05eaaf80 SHA512 d3ca1b7fb271618ea1866328aedb7a49a92ea08b4e3d1d4f3755e0868dc380b97462158cda19c8d1e2e2dd4afb59a6db533a12510699c2082f4e4ff31b069597
 AUX performous-1.1-nomancompress.patch 2368 BLAKE2B e75377ade59604f8dbf2bbe38493d511db8c3b2cae870883881c3108538accc42d42a91334a668b8ab0dd4aa21bf85b024799d4e2edb849cd13f3e21dc4cb460 SHA512 a116b25974426931b3099b502fc8713acac0a5a39f3c0ad12ce76e71d95062970bb05dbd1b01611cb16c3a912e857d668e96b709b4d61f95f38d364fc30d1ad9
+AUX performous-1.1-pango-use-pkgconfig.patch 3594 BLAKE2B 7944704c25c03ecc94c699dd37f202c5d015d80726fe8ac964bf35f7cee2d1c410d8ccbdcb83f3fba659ff4d742647d0c6cebafe466551d4fb00d5ed2a1455c7 SHA512 afe353247fbd8c58b7aa9b7a7bf24477c90470dd47db3c019421b91c1e3ba29c0620eb3bd4dc38206a6dd6067033109a42e1131eb50c7b55294e8ad4680b2771
 DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
 DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84 SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea
 DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8
 DIST ultrastar-songs-shearer-1.zip 50411551 BLAKE2B b91896197b6750dce6998ad309a9aca42aaf11b48c92bd1c30a67befcaf4ac64b6c5207f492e0f8588b986033d297a37bc8c9e505baea809591aa3255034fed4 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b
-EBUILD performous-1.1-r2.ebuild 2464 BLAKE2B 834c8cb5933de793e3a74ba0534faf56ac404f2b6d8cde2d1cbc8ff622e4c8cee030156ce10e5b275c095e4a7f7259ab42eedc667c66b5f94f09e49c3e6f523a SHA512 1df98adeea374e069f6e568b292367805e3e75d7375ab55cd1e168b0295f0dd4aac18ca31fc15d7ecb7232ecc7766f17e1a03742c2361295b05194b0c9c8867b
+EBUILD performous-1.1-r2.ebuild 2458 BLAKE2B 56f64810ad811931f6adf29bde776cee91681568a1e9bb28685a5e2135fcd0b4aabe4db7afdc462cf5d29a291e417699ac1becbefba96fd831108c4fe1fb0021 SHA512 d6f7e2d0382f3c2a0babfeaad6f335075bf1d8f73c2b5aebbafffd4ccca4b4ebcf431199c9d0f9485e5811f1bfcb3f429a2c2f98004282bba9accaab43876f1f
 MISC metadata.xml 856 BLAKE2B d467d86270f2f571d310ceac4934aea595a62fa9e234e8897ef0b22871df612cdb335e7e3298a0991db6c98b78ea68b04882de8696150d5acb65944d9ff80c3d SHA512 24da96b0da902a2d54d92e2f74d8c57fdd1e84f35b96d416cb15898485f0387c70f3430e21ba7eebd5bc289f76f02695d246746abe7eb041f9f7e2e0e8e1e4e0
diff --git a/games-arcade/performous/files/performous-1.1-boost-1.73.patch b/games-arcade/performous/files/performous-1.1-boost-1.73.patch
new file mode 100644
index 000000000000..3d7147a5170f
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-boost-1.73.patch
@@ -0,0 +1,11 @@
+--- a/game/surface.cc	2021-01-18 14:22:05.876604740 +0300
++++ b/game/surface.cc	2021-01-18 14:23:08.908716258 +0300
+@@ -135,7 +135,7 @@
+ 	bitmap.resize(1, 1);
+ 	target->load(bitmap);
+ 	// Ask the loader to retrieve the image
+-	ldr->push(target, Job(name, boost::bind(&T::load, target, _1)));
++	ldr->push(target, Job(name, boost::bind(&T::load, target, boost::placeholders::_1)));
+ }
+ 
+ Surface::Surface(fs::path const& filename) { loader(this, filename); }
diff --git a/games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch b/games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch
new file mode 100644
index 000000000000..9019183206d6
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch
@@ -0,0 +1,113 @@
+From caea553262e1d40bf9caec84223b5d25989464c0 Mon Sep 17 00:00:00 2001
+From: Orivej Desh <orivej@gmx.fr>
+Date: Wed, 25 Mar 2020 14:17:06 +0000
+Subject: [PATCH] Rely on pkg-config to find Pango
+
+Fixes build with pango that needs -I/usr/include/harfbuzz (as specified in its
+pkg config).
+
+PkgConfig results can be overridded by setting e.g. Pango_PKGCONF_INCLUDEDIR,
+Pango_PKGCONF_LDFLAGS (see FindPkgConfig documentation).
+
+IMPORTED_TARGET was added in CMake 3.6.
+
+Fixes #490
+Closes #493
+---
+ CMakeLists.txt                     |  2 +-
+ cmake/Modules/FindPango.cmake      | 25 ++---------------------
+ cmake/Modules/FindPangoCairo.cmake | 32 ++++--------------------------
+ 3 files changed, 7 insertions(+), 52 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6e72942d..ca7ae4e92 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.6)
+ project(Performous CXX C)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+diff --git a/cmake/Modules/FindPango.cmake b/cmake/Modules/FindPango.cmake
+index bdddb9e03..42cb199cc 100644
+--- a/cmake/Modules/FindPango.cmake
++++ b/cmake/Modules/FindPango.cmake
+@@ -2,31 +2,10 @@
+ # Once done, this will define
+ #
+ #  Pango_FOUND - system has Pango
+-#  Pango_INCLUDE_DIRS - the Pango include directories
+ #  Pango_LIBRARIES - link these to use Pango
+ 
+ include(LibFindMacros)
+ 
+-# Dependencies
+-libfind_package(Pango Freetype)
+-libfind_package(Pango Glib)
+-libfind_package(Pango GObject)
+-
+-# Use pkg-config to get hints about paths
+-libfind_pkg_check_modules(Pango_PKGCONF pango)
+-
+-# Include dir
+-find_path(Pango_INCLUDE_DIR
+-  NAMES pango/pango.h
+-  HINTS ${Pango_PKGCONF_INCLUDE_DIRS}
+-  PATH_SUFFIXES pango-1.0
+-)
+-
+-# Finally the library itself
+-find_library(Pango_LIBRARY
+-  NAMES pango-1.0
+-  HINTS ${Pango_PKGCONF_LIBRARY_DIRS}
+-)
+-
++libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango)
++set(Pango_LIBRARY PkgConfig::Pango_PKGCONF)
+ libfind_process(Pango)
+-
+diff --git a/cmake/Modules/FindPangoCairo.cmake b/cmake/Modules/FindPangoCairo.cmake
+index a26f83bd0..1c1a9e843 100644
+--- a/cmake/Modules/FindPangoCairo.cmake
++++ b/cmake/Modules/FindPangoCairo.cmake
+@@ -1,35 +1,11 @@
+ # - Try to find PangoCairo
+ # Once done, this will define
+ #
+-#  PangoCairo_FOUND - system has Pango
+-#  PangoCairo_INCLUDE_DIRS - the Pango include directories
+-#  PangoCairo_LIBRARIES - link these to use Pango
++#  PangoCairo_FOUND - system has PangoCairo
++#  PangoCairo_LIBRARIES - link these to use PangoCairo
+ 
+ include(LibFindMacros)
+ 
+-# Dependencies
+-libfind_package(PangoCairo Pango)
+-libfind_package(PangoCairo Cairo)
+-
+-# Use pkg-config to get hints about paths
+-libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo)
+-
+-# Include dir
+-find_path(PangoCairo_INCLUDE_DIR
+-  NAMES pango/pangocairo.h
+-  HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS}
+-  PATH_SUFFIXES pango-1.0
+-)
+-
+-# Finally the library itself
+-find_library(PangoCairo_LIBRARY
+-  NAMES pangocairo-1.0
+-  HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS}
+-)
+-
+-# Set the include dir variables and the libraries and let libfind_process do the rest.
+-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+-set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR)
+-set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY)
++libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo)
++set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF)
+ libfind_process(PangoCairo)
+-
diff --git a/games-arcade/performous/performous-1.1-r2.ebuild b/games-arcade/performous/performous-1.1-r2.ebuild
index 5e1eeb5741dd..af1c5fefeb09 100644
--- a/games-arcade/performous/performous-1.1-r2.ebuild
+++ b/games-arcade/performous/performous-1.1-r2.ebuild
@@ -1,18 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext FindJpeg FindPng FindTiff FindZ"
-inherit cmake-utils desktop gnome2-utils
-
-MY_PN="Performous"
-MY_P="${MY_PN}-${PV}"
-SONGS_PN="ultrastar-songs"
+CMAKE_REMOVE_MODULES_LIST=( FindALSA FindBoost FindFreetype FindGettext FindJpeg FindPng FindTiff FindZ )
+inherit cmake desktop xdg-utils
 
 DESCRIPTION="SingStar GPL clone"
 HOMEPAGE="https://performous.org/"
+
+SONGS_PN="ultrastar-songs"
 SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.tar.gz
 	songs? (
 		mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
@@ -22,8 +19,7 @@ SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.t
 	)
 "
 
-LICENSE="GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )
-"
+LICENSE="GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="midi songs tools webcam"
@@ -52,7 +48,8 @@ RDEPEND="
 	midi? ( media-libs/portmidi )
 	webcam? ( media-libs/opencv )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/help2man
 	sys-devel/gettext
 	songs? ( app-arch/unzip )
@@ -66,10 +63,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-nomancompress.patch
 	"${FILESDIR}"/${P}-jpeg-9c.patch
 	"${FILESDIR}"/${P}-boost-1.70.patch
+	"${FILESDIR}"/${P}-boost-1.73.patch
+	"${FILESDIR}"/${P}-pango-use-pkgconfig.patch
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i \
 		-e "s:@GENTOO_BINDIR@:/usr/bin:" \
@@ -89,11 +88,11 @@ src_configure() {
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
 		-DSHARE_INSTALL="/usr/share/${PN}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	if use songs ; then
 		insinto "/usr/share/${PN}"
 		doins -r "${WORKDIR}/songs"
@@ -103,9 +102,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/games-arcade/savagewheels/Manifest b/games-arcade/savagewheels/Manifest
index 3ebd9eefc35c..76be9a7c2466 100644
--- a/games-arcade/savagewheels/Manifest
+++ b/games-arcade/savagewheels/Manifest
@@ -1,5 +1,5 @@
 AUX savagewheels.in 1488 BLAKE2B 5676996a1785b8653eaed1d2a606ac0a56fd55361e280517564d93c0aba1984bfbc603232a1225504c99a73bcb422659bf75121af8b7e2421a9b339550344024 SHA512 b13ff4b2739e3f5cb797c9364687c9077852863f9a3a1176fc03e3f9f030293366b177b1a494a8b12ee69ba6ee7aac8589475a5b2246135038ad3138990f2088
 DIST savagewheels-1.6.1.tar.gz 596480 BLAKE2B a1e236418e3e2af1634360c0a6c3e5debf0b429960f4dde0c3ed31a0450c9de73b0b67a833d66523004115ddd61dc32e156fcd64bd783c5cca8c3281e1684639 SHA512 0e535f5f86b1656fa20a2de3dbc9c107f9daacfd37308ca4e2e15df43b177161767a2834c0ed1b9cb93eed0b642092e4f840abf451d2de5082d3c4c721bedc0e
 DIST savagewheels-gamedata-1.4.0.tar.gz 13183072 BLAKE2B 1fdd20cd3bdd5589d17d131d13d1dbe56889f05972c162583a4b9b7cdb3eadea32b7d7a1130f2eb239ec87e1cb3dc6f02d6d15504463b399e12271348106702f SHA512 102214e18edb911b168e41999d239e3070255720f250e8ea640d365b3f7fc4c772cbf322f4558ba6c05fd56d904613c758918e25712e89eb2aca3e948c26fc65
-EBUILD savagewheels-1.6.1-r1.ebuild 1400 BLAKE2B ee2ddd5e6974a2b2389acaa5e1dcc104ba36062f44d085de51ac780909cca2217c558d7fc78f374237c667043c2a25fee2bc32366dfdd73b1335128913a3ca04 SHA512 2d7fbac6c6db683dee92c09087cabfd1603128095c55b985d47773b259c40317eb79bdbe9060a130e6379c007c327987e8b45dfdff0baefaeae3b7fa747e0e7e
-MISC metadata.xml 342 BLAKE2B 6f4cbacd74ec408ccba1de7cfbe4eb899ffaa4c30bb3ecc2a1500398c29f15795bde02fe21043ee3e671eeb50503931b23ac7ee95dbdf13770d0a365bfbada97 SHA512 5f3c0b7396ba31bef6d4dd9b936a2554b12aecf87cf95968c9b976709de808999598e3caa2be38c96d8a37be80850f95c67d0e71c0387a1b2bfe4982e3345d07
+EBUILD savagewheels-1.6.1-r2.ebuild 1306 BLAKE2B ad0c2c0ffb0e4020562a1a93a99bec154a7f1752e9a823115794185aff02815d569937c775b6c36606fe9e11ce543d61743aa4b200ad942b2efa5c03e52a1b56 SHA512 4acd276d60082eff5bc9cc3db011286bfb4886716fc88fdf70bca524de94e594621e9876d72baa5ee84034a5bd193226936edd6539ad71827a8981e3b6bab84f
+MISC metadata.xml 252 BLAKE2B 223ff4601d0d09afcd307faac70f114c680cf865903f5f20ab702e509fa35a142be0c48f05f7bf6cd5ca1465062a8c113b66ffc89c24eb027add8be8091e8d63 SHA512 a65e5e1581a3605a899d155fa4e6201c892a5b2f2502f08aa08a7db418e372b66be4cb2799440c8d69527ba6d4cff000c0c075af9e66650d80da24da48b240a3
diff --git a/games-arcade/savagewheels/metadata.xml b/games-arcade/savagewheels/metadata.xml
index 00392a14830e..9d75d2abfae2 100644
--- a/games-arcade/savagewheels/metadata.xml
+++ b/games-arcade/savagewheels/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="fmod">Enable the fmod music and sound effects library</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">petarov/savagewheels</remote-id>
 	</upstream>
diff --git a/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild b/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
index 7d06e4db88b4..d87adf05402a 100644
--- a/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild
+++ b/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="2D car crashing game similar to the old classic Destruction Derby."
+DESCRIPTION="2D car crashing game similar to the old classic Destruction Derby"
 HOMEPAGE="https://github.com/petarov/savagewheels"
 
 GAMEDATA="${PN}-gamedata-1.4.0"
@@ -18,20 +18,14 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-
-IUSE="fmod sound"
+IUSE="sound"
 
 RDEPEND="
-	media-libs/libsdl
-	sound? (
-		!fmod? ( media-libs/sdl-mixer[mod,modplug] )
-		fmod? ( >=media-libs/fmod-4.38.00 )
-	)"
-
+	media-libs/libsdl[joystick]
+	sound? ( media-libs/sdl-mixer[mod,modplug] )
+"
 DEPEND="${RDEPEND}"
 
-REQUIRED_USE="fmod? ( sound )"
-
 src_unpack() {
 	unpack ${P}.tar.gz
 
@@ -45,15 +39,15 @@ src_unpack() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_DATADIR=share/${PN}
-		-DCMAKE_INSTALL_LIBEXECDIR=libexec/${PN}
-		$(usex sound $(usex fmod '-DSOUND=FMOD -DFMOD_PATH=/opt/fmodex/api' '-DSOUND=YES') '-DSOUND=NO')
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
+		-DCMAKE_INSTALL_LIBEXECDIR="${EPREFIX}"/usr/libexec/${PN}
+		-DSOUND=$(usex sound YES NO) # yes, 'NO' is important here. bug 773439
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /usr/share/${PN}
 	doins -r "${WORKDIR}/${GAMEDATA}/."
diff --git a/games-arcade/tuxanci/Manifest b/games-arcade/tuxanci/Manifest
index 6a6d88bbe2d7..ee0ad66799a4 100644
--- a/games-arcade/tuxanci/Manifest
+++ b/games-arcade/tuxanci/Manifest
@@ -1,4 +1,4 @@
+AUX tuxanci-20110429-glu.patch 465 BLAKE2B bf6de17b99bde96779fa064969c95e351d58cbfa215611163aee449e551de9ca951939810c6e46fd5283cead74bd035ace5814e13e240af1b6688e31e7f95bd1 SHA512 9c26f868be5f1d42b14c3f5d1ee46345c75764e041d7172e3a657d21f34a3326503cfa8e7b90715d5011be9628527194fc47a52bf8bfc4a639f6d999f2db1c50
 DIST tuxanci-20110429.tar.xz 4283540 BLAKE2B c45aef1a6f89284dc1d41de1718342f0f7d3303d7281698291c74acf5aee262c8ed782d73f955ad3e22a88015adb077d8950e3ce69c7295a9fe97116518045e2 SHA512 72305be823981699e9ac38c090dda2baafd45bd36554eba65bd438646e0b0b8a3ab17a7516610db17e225292c39e0cdabb383193f8b07d2d31d638483feafeea
-EBUILD tuxanci-20110429-r1.ebuild 1458 BLAKE2B 3451b8082acaea6e518531a73c62ca215eaaedf633891b7a3bc9f8e289f90d6352b40830112e4c1cf5c699d9ffe5f8816da82d93f7ea59f2259ee646d5937162 SHA512 a91a03d4592eef0ffeaea42355c3494cbf29fd9fbf3e744d87663fffa22a71f40b7c89f3ee552fb7ec1e2981fedd95a1a79d427cd6bfdbe58293960eac20927d
-EBUILD tuxanci-99999999.ebuild 1458 BLAKE2B 3451b8082acaea6e518531a73c62ca215eaaedf633891b7a3bc9f8e289f90d6352b40830112e4c1cf5c699d9ffe5f8816da82d93f7ea59f2259ee646d5937162 SHA512 a91a03d4592eef0ffeaea42355c3494cbf29fd9fbf3e744d87663fffa22a71f40b7c89f3ee552fb7ec1e2981fedd95a1a79d427cd6bfdbe58293960eac20927d
+EBUILD tuxanci-20110429-r1.ebuild 1538 BLAKE2B aa64b3eb01b00ee0bcd5b4317e506f38864c60a911a1c3f41cd208fef9727101430c3f407154c6d0423bde14b64217f696767bcdbb5c2a6338596645ffc61195 SHA512 0cc51cb7825729309da40bc6fe81de2f7fdf8b0e28d403691cffd0ff922d51cfeaa1dad26d7b084b11c1ac00d2d7d135de26644ff1435ded7ebd41779169ed44
 MISC metadata.xml 391 BLAKE2B 9afeb2767b7924c11dc2b8407fd4f54beca1f223c2d1ebadb12a10b3a6a35e7576d63671a582197cd69e0969e676deaa924f68d381db9dc175c99dedc4b642c5 SHA512 f872f6da7bb29261230922b10e916705d073f4d780b868f25347081ffb89c96b514912b41898dc569c0b634551b925cbc18654707d40253d902ce5c74dd70414
diff --git a/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch b/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch
new file mode 100644
index 000000000000..4273114e41cc
--- /dev/null
+++ b/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2011-04-29 00:29:40.000000000 +0200
++++ b/CMakeLists.txt	2021-02-27 00:48:05.172582259 +0100
+@@ -187,7 +187,7 @@
+ 	pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
+ 	INCLUDE_DIRECTORIES ( ${FONTCONFIG_INCLUDE_DIRS} )
+ 	IF ( WITH_OPENGL )
+-		pkg_check_modules(OPENGL REQUIRED gl>=7.5)
++		pkg_check_modules(OPENGL REQUIRED glu>=7.5)
+ 		INCLUDE_DIRECTORIES ( ${OPENGL_INCLUDE_DIRS} )
+ 	ENDIF ( WITH_OPENGL )
+ 	pkg_check_modules(SDL REQUIRED sdl)
diff --git a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild b/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
index a03b0ba4176b..bbedae30502e 100644
--- a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
+++ b/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="Tuxanci is first tux shooter inspired by game Bulanci"
+DESCRIPTION="First Tux shooter multi-player network game inspired by Bulanci"
 HOMEPAGE="https://repo.or.cz/w/tuxanci.git"
 
 if [[ ${PV} = *9999 ]]; then
@@ -25,22 +25,24 @@ RDEPEND="
 	!dedicated? (
 		>=media-libs/fontconfig-2.7.0
 		media-libs/libsdl[X,opengl?]
-		media-libs/sdl-ttf[X]
 		>=media-libs/sdl-image-1.2.10[png]
-		sound? (
-			>=media-libs/sdl-mixer-1.2.11[vorbis]
-		)
+		media-libs/sdl-ttf[X]
+		sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] )
 	)
 	physfs? ( dev-games/physfs[zip] )
 	!physfs? ( >=dev-libs/libzip-0.9 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
+PATCHES=( "${FILESDIR}/${P}-glu.patch" ) # bug 715132
+
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_DEBUG=OFF
 		-DWITH_AUDIO=$(usex sound)
 		-DBUILD_SERVER=$(usex dedicated)
 		-DWITH_NLS=$(usex nls)
@@ -55,5 +57,5 @@ src_configure() {
 		-DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
 		-DCMAKE_CONF_PATH="${EPREFIX}"/etc
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/games-arcade/tuxanci/tuxanci-99999999.ebuild b/games-arcade/tuxanci/tuxanci-99999999.ebuild
deleted file mode 100644
index a03b0ba4176b..000000000000
--- a/games-arcade/tuxanci/tuxanci-99999999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tuxanci is first tux shooter inspired by game Bulanci"
-HOMEPAGE="https://repo.or.cz/w/tuxanci.git"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://repo.or.cz/tuxanci.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug dedicated +ipv6 nls opengl physfs +sound"
-
-# >=x11-libs/cairo-1.8.8[X,svg]
-RDEPEND="
-	!dedicated? (
-		>=media-libs/fontconfig-2.7.0
-		media-libs/libsdl[X,opengl?]
-		media-libs/sdl-ttf[X]
-		>=media-libs/sdl-image-1.2.10[png]
-		sound? (
-			>=media-libs/sdl-mixer-1.2.11[vorbis]
-		)
-	)
-	physfs? ( dev-games/physfs[zip] )
-	!physfs? ( >=dev-libs/libzip-0.9 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AUDIO=$(usex sound)
-		-DBUILD_SERVER=$(usex dedicated)
-		-DWITH_NLS=$(usex nls)
-		-DWITH_PHYSFS=$(usex physfs)
-		-DWITH_OPENGL=$(usex opengl)
-		-DENABLE_IPV6=$(usex ipv6)
-		-DDEVELOPER=$(usex debug)
-		-DCMAKE_INSTALL_ICONDIR="${EPREFIX}"/usr/pixmaps/
-		-DCMAKE_INSTALL_DESKTOPDIR="${EPREFIX}"/usr/applications/
-		-DCMAKE_DATA_PATH="${EPREFIX}"/usr/share/
-		-DCMAKE_LOCALE_PATH="${EPREFIX}"/usr/share/locale/
-		-DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-		-DCMAKE_CONF_PATH="${EPREFIX}"/etc
-	)
-	cmake-utils_src_configure
-}