gentoo resync : 29.12.2022

17 files changed, 110 insertions, 75 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index e1909b4deb08..3e8bac0160e5 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest
index 895efc6f1cf1..eb64536ba275 100644
--- a/games-arcade/cdogs-sdl/Manifest
+++ b/games-arcade/cdogs-sdl/Manifest
@@ -1,6 +1,4 @@
 AUX cdogs-sdl-1.1.1-cmake.patch 410 BLAKE2B b2a36bf3644e885dcf05147f63c4c72e5936acc7727fc37daf9f1732ab3edd699d7a990f63f1977e9e2e9e775b8102429fbba6ffdaf77834a9e7acd3e1933023 SHA512 dd2ffe17f21640d50dec2021fa133baed11f93eba53686792116f15d21d37aed144cc03708baf633d0e0b1c74999202fe58a92eae9f15b81f61bb1b215d39ac4
-DIST cdogs-sdl-1.2.0.tar.gz 35018104 BLAKE2B 1a87f0c6e4af0fda69c0dd98249b319b58411a5b0b7377c21ebef51939f2b6e76959a00bf7fd5602b07bebb9eaab22c840699ae1c54e5d4dcb1aa26852fb8ba0 SHA512 70a5a4bb8e48cf53a4497807b14d8a70e26ad6b74f0c4675b3d98667c867d499d372f323e7abb669ebef08b1d6b5ac9c840ab14eada38e7b868d3099ed6b3e35
-DIST cdogs-sdl-1.3.0.tar.gz 35201522 BLAKE2B bdfeab22edc0e5bfe46d23862bb0e8a829eb8c782519f473340a73d6823fcf6236d61892dff5f6be52e985a8560ce2175b5aab50fb899359d47d3acdf937fe5d SHA512 913ee8a70ab2190259a88891e4f3e30034b7a88dac5fa1a79fcc9452a42fe9fa6679e24104848fab63c7aace8dac311d2166fa01c7175f14243d8658f25aee69
-EBUILD cdogs-sdl-1.2.0.ebuild 1024 BLAKE2B 3519b9c3f554a654e70ca2c68172eb7debd13d11b272bf0c8b7b3b8e640157b3b66c812d5af487a4e029b03cd1b5390eaea1005dba706fbe759e5e0d83452134 SHA512 ead8c69d596c43166e145a688b5c32c8453111c23e37dd38c7207e7fc74b56d88fdb55fb139b80fba48bb453e8404e4fe8c190497924f55eb9e46b8d7f5e93eb
-EBUILD cdogs-sdl-1.3.0.ebuild 1000 BLAKE2B b3cf3c37eef6678721c351290556dbf29fa6fe8a387995de55653d902d5c63f06657c59aa80fb580ceac99acc21fb9d3ca86da3faa5cee19de04c4badab6b53e SHA512 ac53d6208a4137e808fc4f2bc1b00336be1eb53fa1be09cb3cbbb85edd908cfd56788f3b665d312960eed608343ba15f88505ecce1c1d8540f24ef8ff72813b7
+DIST cdogs-sdl-1.3.1.tar.gz 35202950 BLAKE2B 0f1da8a8475fec784042dc31d329361cc11266816a03e64a156362064e19a057908abf6d97cc5c7903307dae039713eeab27b87bba0764cf770cf49eaae806a1 SHA512 504736eddb6aa314072059ca76b65dcbc56c622dc217f78ca12a55a0fdf5e05b5c4cf49408d6af52d00d9cf8b7d3c2e246d7f44c98486520f31e94879e855e3e
+EBUILD cdogs-sdl-1.3.1.ebuild 1000 BLAKE2B b3cf3c37eef6678721c351290556dbf29fa6fe8a387995de55653d902d5c63f06657c59aa80fb580ceac99acc21fb9d3ca86da3faa5cee19de04c4badab6b53e SHA512 ac53d6208a4137e808fc4f2bc1b00336be1eb53fa1be09cb3cbbb85edd908cfd56788f3b665d312960eed608343ba15f88505ecce1c1d8540f24ef8ff72813b7
 MISC metadata.xml 738 BLAKE2B d88ddca3d0f022c5dc03aa79cd3e64bc11e3328c53e75ec0ce719edb389ee4d119e044ded0c1c3fa7de058c62a6614459f2d3927d745cb3cb3a3e55e32ddac39 SHA512 49e02eb89ad38a8b2e8375940a9e30e2368d970c01a88095dd679e828ba91a6054c9db264a0af038648cf42f8da99800f682a6394db77c0278d98a87dc6648cb
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild
deleted file mode 100644
index 9f3981f80c07..000000000000
--- a/games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Classic overhead run-and-gun game"
-HOMEPAGE="https://cxong.github.io/cdogs-sdl/"
-SRC_URI="https://github.com/cxong/cdogs-sdl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ BSD-2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 XMAME"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	media-libs/libsdl2[haptic,opengl]
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-mixer[vorbis,wav]
-	net-libs/enet:1.3="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1-cmake.patch
-)
-
-CMAKE_IN_SOURCE_BUILD=1 # msg.pb.c not found
-
-src_configure() {
-	local mycmakeargs=(
-		-DCDOGS_DATA_DIR="${EPREFIX}"/usr/share/${PN}/
-		-DBUILD_EDITOR=OFF
-		-DUSE_SHARED_ENET=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc doc/{AUTHORS,original_readme.txt}
-
-	# CREDITS is used at runtime, rest is licenses or duplicates
-	find "${ED}"/usr/share/${PN}/doc -type f ! -name CREDITS -delete || die
-}
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-1.3.0.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-1.3.1.ebuild
index 70ed391a2e22..70ed391a2e22 100644
--- a/games-arcade/cdogs-sdl/cdogs-sdl-1.3.0.ebuild
+++ b/games-arcade/cdogs-sdl/cdogs-sdl-1.3.1.ebuild
diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest
index eddc88b8ceb5..419273ab11b9 100644
--- a/games-arcade/oshu/Manifest
+++ b/games-arcade/oshu/Manifest
@@ -1,6 +1,9 @@
 AUX oshu-2.0.0-use_unpacked_osu-skin.patch 1233 BLAKE2B fb8a41b0fc8c8891e3d1dbe1cca6da320049c30a24b146612e2dcbf5490458b8c5db1ed410e9378552f4f048148b2770caf1f87ca60431b92f5d9f9b12885761 SHA512 4e5a0cfb995710c16f6acba7a02e4f0c25de9fc83b28de8c42279fe8e3dea01c33a2e22e9b43e05ab9996534710199315f36e836e24a41ea212e17b08c30e461
+AUX oshu-2.0.2-ffmpeg4-compat.patch 447 BLAKE2B 6c48bb4a0abd443db907ecc869ac51f27ae90cb536f78e5e7c7af3e39355686dd7b0d68a405c3c6f6ee79d965d9c8041913a23df2cf5cc4e6d64ae5203520c4f SHA512 d166690da71bbed8f48989fe3f7ce5d8dcb3bafb7677d79ff0ecd837ad40b41692937cfb492f0ebd1367c3a5de8bfb9e6a6b2bdde49fab975ed13f8d962d10a9
 DIST oshu-2.0.1.tar.gz 144900 BLAKE2B 47f1d0a11255459ae357142499aeffcf07fbcad961cb34ba98e9efa7cb4229cf8d61ec836a4c899f2ea0883f1252395bc0c6ff34c5d670d67091cf6483d135ff SHA512 65768b3d8e7733464f05a19bbee594c0be728267bbd0667bc0f34e0d01a39e52d4ecce89a9223f7c454d73b21bc735401e9d83eea8b0a2eaf1c7825a3bd6b1cf
+DIST oshu-2.0.2.tar.gz 146109 BLAKE2B 98dd49f972f1f1f820f654a2d358ceffdd2c54cd2daa0594914e6a1e29f1d1e757fe46d021afc75a33f4ef94bbb370213f20229843c173d7c55d876fe3db7e12 SHA512 e881e9429cebaf74337e55e7fa5445d992627d7616088f15abfafa2c125e1ff057a5b0f39ee4a1d1728c310728a8590e65286b9a0f81dca1f8963b2943fba596
 DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618
 EBUILD oshu-2.0.1.ebuild 1190 BLAKE2B ec734d13c35b0016b091910d722f7e08bce57700ed160eec78e4854553422995e2c1b4aba8cb202ae9a5d6e06df428dcc8e6b5064b76faaf82877baade5b730c SHA512 6028ae2e6463f87f9b5a7eae829e958cf6c1f9052d773b2714865dbc8bfde4fa17f783f2052bb66fccf80d5b9722e9352d523ff1245217f2ebca24c14345afbd
-EBUILD oshu-9999.ebuild 1190 BLAKE2B ec734d13c35b0016b091910d722f7e08bce57700ed160eec78e4854553422995e2c1b4aba8cb202ae9a5d6e06df428dcc8e6b5064b76faaf82877baade5b730c SHA512 6028ae2e6463f87f9b5a7eae829e958cf6c1f9052d773b2714865dbc8bfde4fa17f783f2052bb66fccf80d5b9722e9352d523ff1245217f2ebca24c14345afbd
+EBUILD oshu-2.0.2.ebuild 1320 BLAKE2B dc2031317c9191ca7f062fffb87eb37dceb85c79c2792727a8a62a240cb7004239ccfbfe747d3a1f00beee50557052d69d51bbc7cd190d04ed97d1359072c12b SHA512 bf52ed5ae27aeaa1bd976aaef7740b92c3a2663e5c53bc3af25c0c4ebd8457270c79f3d33d620f36f08802da9dcbf9b6c620862cb4993718ccf981fbfe9daafd
+EBUILD oshu-9999.ebuild 1264 BLAKE2B 60501c1543ef68331c5adbd31decec2c658026b5c9c62fbf688b0eff3c1dbe06e7d66976a25acc5239efdd3fd111eb15f914f4134b6f03b1c35188bd103da883 SHA512 158bae63f670a5cb2c93ef5ba93f4f150e8190b710cf3957c3119a5bf00c0f4461118d94702f0e44aa49a42916eb88893328347ec6f4a64c3f11ee2c745ae3d1
 MISC metadata.xml 454 BLAKE2B 0111215168ba84d5af192487499db1f201c103db7ae7d60f49af27b695701074324c367ba82bcdd5a8d3749f54a93712eb519ba7ee8af2d1b9e487d9742065dd SHA512 01e8aea4d15317ae5edc3cd1c658cc9bc26727c7cfaaa737b8d54286745b8edd0813c746e9c936282b17afab67582cbf7a5d5c72a0eed6d78dde5f9d761680dc
diff --git a/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch b/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch
new file mode 100644
index 000000000000..c16e61ce1288
--- /dev/null
+++ b/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch
@@ -0,0 +1,16 @@
+diff --git a/./lib/audio/stream.cc.old b/./lib/audio/stream.cc
+index 808851f..09eb4fb 100644
+--- a/./lib/audio/stream.cc.old
++++ b/./lib/audio/stream.cc
+@@ -193,7 +193,11 @@ static int open_demuxer(const char *url, oshu::stream *stream)
+ 		stream->demuxer,
+ 		AVMEDIA_TYPE_AUDIO,
+ 		-1, -1,
++#if LIBAVCODEC_VERSION_MAJOR < 59
++		&stream->codec,
++#else
+ 		(const AVCodec**)&stream->codec,
++#endif
+ 		0
+ 	);
+ 	if (rc < 0 || stream->codec == NULL) {
diff --git a/games-arcade/oshu/oshu-2.0.2.ebuild b/games-arcade/oshu/oshu-2.0.2.ebuild
new file mode 100644
index 000000000000..c1d02ab63c76
--- /dev/null
+++ b/games-arcade/oshu/oshu-2.0.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Lightweight osu! port"
+HOMEPAGE="https://github.com/fmang/oshu"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fmang/oshu.git"
+	SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+else
+	SRC_URI="https://github.com/fmang/oshu/archive/${PV}.tar.gz -> oshu-${PV}.tar.gz
+		osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3 CC-BY-NC-4.0"
+SLOT="0"
+IUSE="osu-skin"
+
+RDEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-image
+	x11-libs/cairo
+	x11-libs/pango
+	media-video/ffmpeg:=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/oshu-2.0.2-ffmpeg4-compat.patch" )
+
+src_unpack() {
+	default
+
+	if [[ ${PV} = *9999 ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	if use osu-skin; then
+		eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
+		mv "${WORKDIR}/osu" share/skins/ || die "Failed to move osu-skin"
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOSHU_DEFAULT_SKIN=$(usex osu-skin osu minimal)
+		-DOSHU_SKINS=minimal$(usev osu-skin ';osu')
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/games-arcade/oshu/oshu-9999.ebuild b/games-arcade/oshu/oshu-9999.ebuild
index 5ebae7bfdcd6..cf543ede25bd 100644
--- a/games-arcade/oshu/oshu-9999.ebuild
+++ b/games-arcade/oshu/oshu-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
@@ -27,11 +27,19 @@ RDEPEND="
 	media-libs/sdl2-image
 	x11-libs/cairo
 	x11-libs/pango
-	media-video/ffmpeg:=
+	>media-video/ffmpeg-5:=
 "
 
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	default
+
+	if [[ ${PV} = *9999 ]]; then
+		git-r3_src_unpack
+	fi
+}
+
 src_prepare() {
 	if use osu-skin; then
 		eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
@@ -43,8 +51,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		'-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal')
-		'-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '')
+		-DOSHU_DEFAULT_SKIN=$(usex osu-skin osu minimal)
+		-DOSHU_SKINS=minimal$(usev osu-skin ';osu')
 	)
 
 	cmake_src_configure
diff --git a/games-arcade/pengupop/Manifest b/games-arcade/pengupop/Manifest
index f0f700f442ef..80171ba5366a 100644
--- a/games-arcade/pengupop/Manifest
+++ b/games-arcade/pengupop/Manifest
@@ -1,3 +1,3 @@
 DIST pengupop-2.2.5.tar.gz 1676224 BLAKE2B 5527d956a9ae0d3a2c4a31e2bb5f4059bd79c8c6ab2ccc81b2ec35c698f8e40bbdf7a68b6799bd202f39b2e5d39e690de6e71aa97c6ff307d03679f8aae8f755 SHA512 1886898288cb9b2be949a031bf2baae80332c5ca93bead91ed8c50d0aaea81715cf0eaeb09a63af298e82e1409f9f39527742707839526283e57809484be4abf
 EBUILD pengupop-2.2.5-r1.ebuild 521 BLAKE2B 27986dfe2574a8bd6da2111111464fe7dbfaa32dabbe2c7f144e8debf6dfcb9a323e1c17395bc5dafe620490651bf3a7f0a4d7f99f3acd944e65ed130e6de6df SHA512 a43a599e248334631b23531ea6b8a952b067659fe26d345adce9834eb897a855fce78486614d8a65882692c958e8db5b6e1a443b4c9a25dc84271bcd5f9e42f9
-MISC metadata.xml 330 BLAKE2B 1fc19608c03e50c1dddaefec3d90d95ba74d3e673449b8881e1e833ff3bca0c7c02c15ab70f94c91571d957607035b73ad3aab7c96e8732b036a9d5dee088d6e SHA512 a9e357c484135682736c2a5aea678e1ad5caaa5a5928553ac0e83b5205c8710ecccdc535c9960de49e79314c4c2b72d295877cb0d6aed06b31029807bea1fe16
+MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-arcade/pengupop/metadata.xml b/games-arcade/pengupop/metadata.xml
index c0074924de44..7c730d47817a 100644
--- a/games-arcade/pengupop/metadata.xml
+++ b/games-arcade/pengupop/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">pengupop</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/savagewheels/Manifest b/games-arcade/savagewheels/Manifest
index 6ea0385a9f5f..88d2e5307d12 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-r2.ebuild 1306 BLAKE2B ad0c2c0ffb0e4020562a1a93a99bec154a7f1752e9a823115794185aff02815d569937c775b6c36606fe9e11ce543d61743aa4b200ad942b2efa5c03e52a1b56 SHA512 4acd276d60082eff5bc9cc3db011286bfb4886716fc88fdf70bca524de94e594621e9876d72baa5ee84034a5bd193226936edd6539ad71827a8981e3b6bab84f
-MISC metadata.xml 253 BLAKE2B 17fe1d2424dd150d063ddce2a141bc1738fcda2a13aeb66108fed4dc1f23feea034deac57a4ad5fa035b322b304f000af765e11d5a148a1c9f86e9c7b7f502d4 SHA512 ba63e0faca0953e950fef238cd708afcb31c50a0e6214130dc2ab0a5ae3b3e8d80939b996621eae8694f8559378b4ccb393c46da0426e73fdd32a24f9b452123
+EBUILD savagewheels-1.6.1-r2.ebuild 1309 BLAKE2B a0755aee30bfb5c617c2971c20ff570111d8e53f48ebb797c553621acb8fc6c5e8f92194c5b6b28043bdf535b93025705d60288bf1ba20385bb9e94a6d7324cf SHA512 7efbe46c7fc3fa71bbaed74597eeb2f9da66a775c222aa72e195b6932fea79cb086b17d8a6f17874e37cabe85d83829a44ae3760f5326230e393efd8fa95a391
+MISC metadata.xml 254 BLAKE2B 93ee116a700e6d2a07542ba2190797ccab03d2005e014766ab74782515fc36eb346c1accd703c994110856ab12ca24382629ecbcb5424ba4c9891ec6adc469b8 SHA512 877f0bb036bb1e3a087cf7d4f026589b67af9c3751499dd94e002f0272b38e943df537f120b985dda90439077773fa56cf9f2bf68c0d5e4a51dff54525d251d8
diff --git a/games-arcade/savagewheels/metadata.xml b/games-arcade/savagewheels/metadata.xml
index e0c3da06887f..6cffb58dceda 100644
--- a/games-arcade/savagewheels/metadata.xml
+++ b/games-arcade/savagewheels/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="github">petarov/savagewheels</remote-id>
+		<remote-id type="github">kenamick/savagewheels</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild b/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
index d87adf05402a..b52e1e1467e6 100644
--- a/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
+++ b/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,13 +6,13 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="2D car crashing game similar to the old classic Destruction Derby"
-HOMEPAGE="https://github.com/petarov/savagewheels"
+HOMEPAGE="https://github.com/kenamick/savagewheels"
 
 GAMEDATA="${PN}-gamedata-1.4.0"
 
 SRC_URI="
-	https://github.com/petarov/savagewheels/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/petarov/savagewheels/releases/download/v1.4/${PN}-gamedata.tar.gz -> ${GAMEDATA}.tar.gz
+	https://github.com/kenamick/savagewheels/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/kenamick/savagewheels/releases/download/v1.4/${PN}-gamedata.tar.gz -> ${GAMEDATA}.tar.gz
 "
 
 LICENSE="MIT"
diff --git a/games-arcade/spout/Manifest b/games-arcade/spout/Manifest
index 6916b20ad04c..5d36aa841f41 100644
--- a/games-arcade/spout/Manifest
+++ b/games-arcade/spout/Manifest
@@ -1,4 +1,4 @@
 AUX spout-1.3-fno-common.patch 279 BLAKE2B 173f83694ef3c55590436ba144efc56a9f1082dce69efaf3d53d3243d485f8fa993af9c9c1b7fc50bb75e44cbf51f6c0018bdc4727390e4a99e1b7b572d726d1 SHA512 cccdc26be30bf00f9539841db74e809edf088dad6130731ba1323975d5926bb3e392ad10dc830f13c9ffc5ce2a4a086e0f00955f5f44a2c234f5846e71f781ce
 DIST spout-unix-1.3.tar.bz2 92144 BLAKE2B 4512a3f47fddfbed7471fe81f8a7fa296f44aa12b3e3b69c0d665a4f95c82508460ab007a798c098ccbea68f1ccc827699f8428203e1217ea7a493e96810771c SHA512 46ed12a617a4084e8a5d1da56799fe7784ed288a254385b109ced6138ce904e658a44af445c1577112a3701a0b108fc886e3d06df41743b0d82b028eb8a846d6
 EBUILD spout-1.3-r1.ebuild 976 BLAKE2B 7075eb905cab36076e0f252d91dd00259a236099e630810ca67dd5d126b2ae9c3da152a53eb9ca4eaadcb5690dde12096a97afdf07202f0ece5153bacc6828ae SHA512 978ea480a2a342cb96f6e232c6f536364852cb12b949e97ea52aa445179e535cc72b61e8b7e92028d80b1447b19d63a7a2aa4c47e49d27ca4b38f456a92357f6
-MISC metadata.xml 327 BLAKE2B de9f06812151905af8fb3e6aa62d45ed41e0758f1731169f8c43ccc4398522a3a5bc51c6501ddcbe0bb42cf2bf551dfcee9d5dea190dd80ca0dd01e6042661cd SHA512 d4c80573119329c147e88d354869996cf51a56b71efae285bf962779ec1abe1b1336d39963c8230f85df21f7f26f866f1763863c542e0f9e2bffea03607484db
+MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-arcade/spout/metadata.xml b/games-arcade/spout/metadata.xml
index 91325b3c4eff..7c730d47817a 100644
--- a/games-arcade/spout/metadata.xml
+++ b/games-arcade/spout/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">spout</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/yarsrevenge/Manifest b/games-arcade/yarsrevenge/Manifest
index 39522c328d56..b2cc57a3c290 100644
--- a/games-arcade/yarsrevenge/Manifest
+++ b/games-arcade/yarsrevenge/Manifest
@@ -3,4 +3,4 @@ AUX yarsrevenge-0.99-gcc43.patch 219 BLAKE2B 23b1aa4f4e15abb04b1391ac65b0258bc65
 AUX yarsrevenge-0.99-gcc44.patch 258 BLAKE2B 71defcf5d287e3611b54850c50ebbceff81fbd0b84420dfac44c618cce1bb4db9014f532e6daced744b846fe634e8ccf040395192195b589d16f85909b9b8eef SHA512 dc3fbec65cd49950141bbd64b7b4a711217b0ac267166c71a9d175f1ba20fcedad97c1b89476d5c6f3a1630c5eae68d0f44738dba4383bb576edd059acd060e8
 DIST yar-0.99.tar.gz 535043 BLAKE2B 8760a039b987d701cfbeccf7612b14d60a1867b737999afb94383d9123cd82fe385dc12d410d333dceb07f580c75b7a515131f4b1ce2be25ee1725e6961150be SHA512 c520b9c6c7ff2c60c2e7e18e6c0d2ff376334706fb190ce0d015acba21815680029a30d7a573d0b4c41da2d9f932108417804141bf4557bc99550e30f699e8bb
 EBUILD yarsrevenge-0.99-r1.ebuild 644 BLAKE2B 75ab662511684ebd400a17f1351802eba566c9fd376d3c4d4e4a2d99d4cf24e38ef8230aa6f0f705ff65ced82066804fc7ceae30ce2979d621ae9996fa4a2d8a SHA512 d1f4613313c954a0c4f318201005f99590ab1986ad4204bdc5173f8e4362a0f1712d494e86a290e9bb6d60105549523d0d53927f8c14d4dea7d028ed91b82bb8
-MISC metadata.xml 502 BLAKE2B f4b49b7a3b6d1a8ef18d571641069e18a835007da3e899229c4c237f5865636f6448a473e84a793ca5cb7af821971abf5ec531dd47854e99ca3e771208ef0d57 SHA512 bd3cd4482292fd9b47348ebd90f49168a1be08f2346347aa1d0ab18ef1f97aed3a94be3f3720a5fbd7913c4a9a600e7d513eabdc778a04a183932eb9142f757d
+MISC metadata.xml 423 BLAKE2B 8cf992bb869a8849a5c33b4ffedc31811dbfef15ed232a5dce9f6772662fee755160aec79c6f5a7db4c53842a4cf53bc4fb3ddf05f6cb1f7ec2e1abb7bc4c746 SHA512 1c91fe45a294ac0ea789905a8e8284da6b858cde2bed27c27dfce22f90b2c0507127fb1776afea6f89b440f6e1be611a674743d7c3b172663be6ae71a969ef20
diff --git a/games-arcade/yarsrevenge/metadata.xml b/games-arcade/yarsrevenge/metadata.xml
index c6adac0a3600..40ca8a9757f8 100644
--- a/games-arcade/yarsrevenge/metadata.xml
+++ b/games-arcade/yarsrevenge/metadata.xml
@@ -9,7 +9,4 @@
 A rather weird shoot-em-up game that originated on the Atari 2600. It's more
 fun than it looks. Just released so might be tweaked.
 </longdescription>
-	<upstream>
-		<remote-id type="freshmeat">yarsrevenge</remote-id>
-	</upstream>
 </pkgmetadata>