[gentoo-commits] repo/proj/guru:dev commit in: games-fps/etlegacy/

["Florian Schmaus" <flow@gentoo.org>]

commit:     f533cbb85bf1f0e905882c8cf824b46169a2c8ba
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 20:36:57 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 20:37:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f533cbb8

games-fps/etlegacy: add 2.81.0, drop 2.80.2

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 games-fps/etlegacy/Manifest                             |  2 +-
 .../{etlegacy-2.80.2.ebuild => etlegacy-2.81.0.ebuild}  | 17 ++++++++---------
 games-fps/etlegacy/metadata.xml                         |  3 +++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/games-fps/etlegacy/Manifest b/games-fps/etlegacy/Manifest
index 223eeff92..371f89a66 100644
--- a/games-fps/etlegacy/Manifest
+++ b/games-fps/etlegacy/Manifest
@@ -1,2 +1,2 @@
 DIST et260b.x86_full.zip 275647724 BLAKE2B ea52d1859e78c6da5a16bd3598c2b649e9f79596be93fe35858a1174b0d63ef94eaecdb24b8f749d7dc39b1a70dd38557d455238cbc4b857ed7083369fe47262 SHA512 7a9639c7a67c6c058ae1c85ca1e04e74526194a8a676eaccffa1984869251cc058f0cb79b96604ec087492003d14f7f3e96c8ebe7e527959ae47d4d25645d3e1
-DIST etlegacy-2.80.2.tar.gz 15332562 BLAKE2B 8e32c6a054b02a3a08ce9f5f16df7dcd8f8a819ba2abf4cbcdfc712f2f1475f9d1a226ed5ef7d33d5b8288a38d135613c55ab08caa36a2d6ec78b5d4a4cb9d3d SHA512 b9dd87388bfaeea1ec0805518ae988d91bde2e7ee3a1909581c63d6b3d2412c0d2079aca3fb3ab4420f24cb0d480a6d153179451b88ad22a43d68a4ad4e27a04
+DIST etlegacy-2.81.0.tar.gz 15515335 BLAKE2B f66b4f6136b4651695d478547f7d535cb80d1309f44e9640113e5416b977e59cee1c59a531c8dbd56cb9587e218f9e8230a3bd0470ac3540967e5aa53f6f79f5 SHA512 c37f6c6740c0da67dccdb1bdd3b72641f2fbfeb3aac7c018e1cba5fdb2052039d7b56c60119ad92df47f8ff4046b10e9bb770a5614d50a4ca3e308e1df058a03

diff --git a/games-fps/etlegacy/etlegacy-2.80.2.ebuild b/games-fps/etlegacy/etlegacy-2.81.0.ebuild
similarity index 91%
rename from games-fps/etlegacy/etlegacy-2.80.2.ebuild
rename to games-fps/etlegacy/etlegacy-2.81.0.ebuild
index 1722ef99c..c45ba5c5b 100644
--- a/games-fps/etlegacy/etlegacy-2.80.2.ebuild
+++ b/games-fps/etlegacy/etlegacy-2.81.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake unpacker xdg
 
@@ -22,18 +22,14 @@ fi
 
 LICENSE="GPL-3 RTCW-ETEULA"
 SLOT="0"
-IUSE="autoupdate +curl dedicated +freetype +gettext ipv6 irc lua omnibot +openal +opengl +png renderer2 renderer-gles +ssl +theora +vorbis"
+IUSE="autoupdate +curl dedicated +freetype +gettext ipv6 irc +lua omnibot +openal +opengl +png renderer2 renderer-gles +ssl +theora +vorbis"
 #REQUIRED_USE="omnibot? ( x86 )"
 
 RESTRICT="bindist mirror"
 
 # TODO add debug use for CMAKE_BUILD_TYPE=debug
 
-if [[ ${PV} == "9999" ]]; then
-	LUADEPEND="lua? ( dev-lang/lua:5.2 )"
-else
-	LUADEPEND="lua? ( >=dev-lang/lua-5.1:* )"
-fi
+LUADEPEND="lua? ( >=dev-lang/lua-5.4:* )"
 
 # * media-libs/glew     | media-libs/glew:=
 # * media-libs/libpng:= <
@@ -61,6 +57,7 @@ UIDEPEND="
 
 DEPEND="
 	dev-db/sqlite:3
+	dev-libs/cJSON
 	opengl? ( ${UIDEPEND} )
 "
 
@@ -148,8 +145,10 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
+	local arch=$(uname -m || die "Failed to detect architecture")
+
 	insinto /usr/share/etlegacy/legacy
-	doins "${BUILD_DIR}"/legacy/ui.mp.$(uname -m).so
+	doins "${BUILD_DIR}"/legacy/ui.mp.${arch}.so
 
 	# Install the game files
 	insinto /usr/share/etlegacy/etmain

diff --git a/games-fps/etlegacy/metadata.xml b/games-fps/etlegacy/metadata.xml
index cc882c885..f45cad976 100644
--- a/games-fps/etlegacy/metadata.xml
+++ b/games-fps/etlegacy/metadata.xml
@@ -14,4 +14,7 @@
 		<flag name="renderer2">Enable renderer2</flag>
 		<flag name="renderer-gles">Enable renderer-gles</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">etlegacy/etlegacy</remote-id>
+	</upstream>
 </pkgmetadata>