gentoo auto-resync : 28:01:2023 - 08:51:03

9 files changed, 16 insertions, 50 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index f97230b83f6e..5f841a3d66c5 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/spacearyarya-kxl/Manifest b/games-action/spacearyarya-kxl/Manifest
index 2ea01a352acd..bdf30e143490 100644
--- a/games-action/spacearyarya-kxl/Manifest
+++ b/games-action/spacearyarya-kxl/Manifest
@@ -1,6 +1,4 @@
-AUX spacearyarya-kxl-1.0.2-cflags.patch 221 BLAKE2B 3b92bcc7ce4a11d53da26ec3b8031b7e2b01d29957866cd4eb2d1cb29ba69382ea3b061faa365ce3865363e30a8e9cc5e3adfd0ec876a75811f476847088394f SHA512 e7e62ae45a406dde281efcc98020b2994a87c26b4227d6bce768072702565aab1799a96659af80e3bd088cf05dd4137f470ba19a3d2f2b402e7b6ceb8ff05b4f
-AUX spacearyarya-kxl-1.0.2-clang.patch 435 BLAKE2B 8e28a600f8a19aebfc9a7e8349ff985c35dccdf0edb3d75bd51c296dc1c9ef520b0083e960a6db8be5c663749b8583997b526af2f4239c9d7dd9d256270f4a5a SHA512 461213b469ad6d68980143821e8d4dedc3e13bfb8e28bc645430f65fbe6d849d16b30ad8dcdca63145f462c8f52befc987c712f6c8a989ce0c4096ce1fe8a1e8
-DIST SpaceAryarya-KXL-1.0.2.tar.gz 279894 BLAKE2B 1e7d24107d21396d4463924c7e5665271c14c6ba84f600f126128195ac9d6a08bd112cb6730b1931cf113700d7cae18367359639c8c8a10073a2395bcdc87948 SHA512 1109606741bab6c290395cdfd8d19cf12e68cfef41f50164586c316fc425a32232e0f8dd822207d969c27c3f7a8478d1a65f36fe5468f3cfa8932c99ab3cb125
+DIST space-aryarya-1.0.3.tar.bz2 267139 BLAKE2B 9893d9ca6b02533231bc6d391726048089be901ad879be58cdc90c910d9c9b973592b2e37af27b1498b1931bb9947eb601e7bf409b20158f7e6c76bc7f3e433f SHA512 327f1821e1457424d8fce15b33940328b191f1e2f849284e1709bcafa6a33279d4cf7639fba235dd3c7107d5b1c4dcae0425b34c013b87c2c7dc3c00bb9d2bac
 DIST spacearyarya-kxl.png 4853 BLAKE2B e8dcaf2e75f18900d67c68f75939ba030dc8207d4a2df1b465ce516527d846c4b44d105f85afcb0750dbfc6b33c9030da34c863b6e8f09f120d855d7361cce67 SHA512 f47c497f28c4cb22a518c8bc593a443aa0f52a600db04b6a3d33006b40aa57c11bdedd97a272587d6751bee04a593965c4f348ad5e7dff4deb276b7d89243e2e
-EBUILD spacearyarya-kxl-1.0.2-r3.ebuild 1158 BLAKE2B d7e0ae42d347199749b4e433134dd093a5f30365e2484dd0a0a6c2ff360f3c81cc629289d16cdcdc8e865fd721e59f236655c68f16a3b5334a5544abfdd1dae2 SHA512 9ae7e2d439d26ae11dac867667b2918b1b7940ac10505f0227a12f311d299333af8420bfb17d596aaad8f65e0636b507366671bbe208e59c1c5a2d8932ba188f
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+EBUILD spacearyarya-kxl-1.0.3.ebuild 1136 BLAKE2B 6155820f327f6be0b17addecfb0315e7b40ff9506b16c262c95be23b69593df0617e495bf62dd852d66cfc2692a81fedcd8d072636ffb60890368b80b7e35c6d SHA512 e95f64d8851f5452d976b715b6549bdf00d909d9f3f27ea0d6646a8450f3d6577ca2496afa4d8be67abec826094783fbf1b79dcccbb0e13b8281b415da7846c9
+MISC metadata.xml 354 BLAKE2B cb7ed1870d242a2dd7f1581f519ffa4d0a4deb6d6646cbb1c20d6d1922f0b8f58df58b55a7165ba22786876e0ba414f993ddb20ffa450b3dd80758ff542c63b7 SHA512 132575d4c41ae8df77762037cf8a51314f2b9dfd063ae6786cd8fd650f839cb59d8f4fb17e07939cb0d75ee1c5fe1557057d53ef503e72b22ad7eac07da5b069
diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch
deleted file mode 100644
index 66cd0b7fe1bc..000000000000
--- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-https://bugs.gentoo.org/429422
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,4 +6,4 @@
- 		boss.c boss.h
- 
--CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
-+AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
- LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL
diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
deleted file mode 100644
index 7115b4a2382f..000000000000
--- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Use void so that clang does not complain about missing (unused)
-return value, and also add missing string.h.
---- a/src/ranking.c
-+++ b/src/ranking.c
-@@ -1,2 +1,3 @@
- #include <pwd.h>

-+#include <string.h>

- #include "geki4.h"

-@@ -7,3 +8,3 @@
-  **********************/

--int ScoreRanking(void)

-+void ScoreRanking(void)

- {

---- a/src/ranking.h
-+++ b/src/ranking.h
-@@ -3,2 +3,3 @@
- 
-+void ScoreRanking(void);
- void RankingScore(void);
diff --git a/games-action/spacearyarya-kxl/metadata.xml b/games-action/spacearyarya-kxl/metadata.xml
index 1c3ba213c494..361e5395db04 100644
--- a/games-action/spacearyarya-kxl/metadata.xml
+++ b/games-action/spacearyarya-kxl/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="gitlab">oss-abandonware/games-action/space-aryarya</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.3.ebuild
index 935cf953f9f6..5e7537d754e6 100644
--- a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild
+++ b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.3.ebuild
@@ -5,14 +5,12 @@ EAPI=8
 
 inherit autotools desktop
 
-MY_P="SpaceAryarya-KXL-${PV}"
-
 DESCRIPTION="2D/3D shooting game"
 HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
 SRC_URI="
-	mirror://gentoo/${MY_P}.tar.gz
+	https://gitlab.com/oss-abandonware/games-action/space-aryarya/-/archive/${PV}/space-aryarya-${PV}.tar.bz2
 	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/space-aryarya-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,11 +24,6 @@ RDEPEND="
 	media-fonts/font-adobe-100dpi
 	media-fonts/font-bitstream-100dpi"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
 src_prepare() {
 	default
 
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 09228d3e928f..944d22507f35 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -5,5 +5,5 @@ DIST SuperTuxKart-1.3-src.tar.xz 627753500 BLAKE2B 3ffc86edf80adb27cd17a6ba796fb
 DIST SuperTuxKart-1.4-src.tar.xz 650010456 BLAKE2B dc85c77cdf8b8f7377b5771eb3b3edbe20f6949c99f710ca70506c09152e7a846b3d3239f185d23c9fdf0477da417bacc644793b3407aed1e68fc41ced41a71e SHA512 e88f3fb5ccdb38d0ef75e92d73b43c5cc7a1f6c76ac9502033df099a00d6dc3e86b2c5442b806237d2420c44ada7dd23a2c90ecf94785a44d2348c933770a5ab
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
 EBUILD supertuxkart-1.3.ebuild 2175 BLAKE2B 71eed85edb65a6d9b3b801d471d818b8c773c0e079b38937a31581c1f2da1d3fd91f6aad2780f6c9befe1e6e8ceaca8a2234cb42c2cebb3ef0ead96b95426283 SHA512 6a6283615eae76489e18a37e36d1cbcfad907f7005e44c4bfb20fcb9b2a2ba3a55af9a48eed66013d3ebeec33bb59eba9a849adeaa08a9086b3a874b759012c9
-EBUILD supertuxkart-1.4.ebuild 2110 BLAKE2B 37b9972b98cd7e16fd8d6211f0bedc4f1b2f19d5a3544280bb65aae9e9b322b97ba6624ee667c2867ca045ee14ef418e17b5043e0585f6d31a5cf8b4a365ba4f SHA512 08cf67cf06ace8a7bfb2d05ce1927fc997900385491e8d7b53284e902fa565f197c93f41dbc156c91edff0e2486e6b72083171bef35b4a9412ca9abdcc1b697c
-MISC metadata.xml 800 BLAKE2B 3c8e8faf65549ebc5ed553ed34e07c89480414858c1a90a0355fc4dbd758dba9feb6ffde9d799322957677e1cb3f740f008bc7dccf0986d659a5d2b6a1733a94 SHA512 e1cb946bd8bba015c85c994346ac18ecd13e570d49b9a293637e59539d787c53571285cb00d88dc3d234166029459d9bdde255baae9331cda830fd99cb04e3fd
+EBUILD supertuxkart-1.4-r1.ebuild 2146 BLAKE2B cfaca400a4ad23554daba7e20b27051c914e4d7fa9beb73bed66cd82d808fd92c8e99699d4029ce540a79ed2d2a8293d6a7e2d463a34ec42ca7e2a6b8d280896 SHA512 1a9245fab7be7d45831ce8f3c6a5802050dd540b59c85dc751136c6e26e97f753fac8f027057474efd30f94abe34602aa81d0c8c7a84805865640f61bb9b60ce
+MISC metadata.xml 745 BLAKE2B 6064e59ccfa2826a6cd00a72834b768e2a4de4882e341c4acc9fbb2f5b92e316a97ceee1b836c79c1cebb269add19a0d835048484a4f0d72bf9a7358c3cbae91 SHA512 66ead957f3f61f4796471cc2dd091b35caa601568ef86431658212228671a98ba515026dd576226ce18c25b49d46bc5e4a214a0a4c79533acf08709f72a61b1b
diff --git a/games-action/supertuxkart/metadata.xml b/games-action/supertuxkart/metadata.xml
index 2e74607fa408..28d5e6b38a19 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
 		<flag name="recorder">Enable recording with <pkg>media-libs/libopenglrecorder</pkg></flag>
 		<flag name="sqlite">Record IP bans, statistics in server mode with <pkg>dev-db/sqlite</pkg></flag>
-		<flag name="vulkan">Enable support for Vulkan</flag>
 		<flag name="wiimote">Support for wiimote input devices</flag>
 	</use>
 	<upstream>
diff --git a/games-action/supertuxkart/supertuxkart-1.4.ebuild b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
index 495e18a9ae69..8cf641688c37 100644
--- a/games-action/supertuxkart/supertuxkart-1.4.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
@@ -15,12 +15,14 @@ SRC_URI="
 
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="debug nettle recorder sqlite vulkan wiimote"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug nettle recorder sqlite wiimote"
 
-# Don't unbundle irrlicht and bullet
+# - Don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game
 # https://sourceforge.net/p/irrlicht/feature-requests/138/
+# - For >1.4, restore USE=vulkan and make shaderc dep optional,
+# and pass -DNO_SHADERC to cmake.
 RDEPEND="
 	dev-cpp/libmcpp
 	dev-libs/angelscript:=
@@ -31,6 +33,7 @@ RDEPEND="
 	media-libs/libsdl2[opengl,video]
 	media-libs/libvorbis
 	media-libs/openal
+	media-libs/shaderc
 	net-libs/enet:1.3=
 	net-misc/curl
 	sys-libs/zlib
@@ -39,7 +42,6 @@ RDEPEND="
 	!nettle? ( >=dev-libs/openssl-1.0.1d:= )
 	recorder? ( media-libs/libopenglrecorder )
 	sqlite? ( dev-db/sqlite:3 )
-	vulkan? ( media-libs/shaderc )
 	wiimote? ( net-wireless/bluez )
 "
 DEPEND="${RDEPEND}"
@@ -67,7 +69,6 @@ src_configure() {
 		-DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
 		-DBUILD_RECORDER=$(usex recorder)
 		-DUSE_WIIUSE=$(usex wiimote)
-		-DNO_SHADERC=$(usex !vulkan)
 		-DSTK_INSTALL_BINARY_DIR=bin
 		-DSTK_INSTALL_DATA_DIR=share/${PN}
 		-DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library