gentoo resync : 12.07.2021

3 files changed, 71 insertions, 76 deletions

diff --git a/games-fps/turtlearena/Manifest b/games-fps/turtlearena/Manifest
index 4faeedd9fd50..0400b0d20a14 100644
--- a/games-fps/turtlearena/Manifest
+++ b/games-fps/turtlearena/Manifest
@@ -2,5 +2,5 @@ AUX turtlearena-0.6.1-build.patch 6401 BLAKE2B e69fda1f38253fcc4ae3a541624dbe365
 AUX turtlearena-0.6.1-freetype.patch 451 BLAKE2B 33c2f46261d75149e2151bfd38a4c4f895579c374924c08ee0ae64ef27a6cf5274a00dd4aad6a3ee4ed3885f63ee0e1475fb45226f33eb43f4b591d63564099a SHA512 cc16c0a69b77627956254b000a4b42e77f57f7d073488c0dde3c0b155e01288aaba958fc16d932550200add0b5429afb10f15c3e23a22d874fe31014ebe090a1
 DIST turtlearena-0.6.1-0-src.tar.bz2 33355448 BLAKE2B 492eafd29e60a2528d11c91a6c48d8cad4a47718d7aa52c7241590b4e758cc65b76c5eea08b92f16db2eb8feff83d8484c9bd9b02015c1af575309cd92635014 SHA512 aa11f66a9ec584226267d34ecd637245a068c3c13ffc49fe0ff1ca16699b3eebf6435255ad68b953fbf02f25c807833830eb76497d53bcff977814e87b804edf
 DIST turtlearena-0.6.1-0.zip 73713016 BLAKE2B 346222691553122814d92ea42bac3f21e39de499d019c92813d8769690540da5257c52b673ac17440f2fb6819ded6221e19fb0cba67c9d7ad9539dbfc4eeb7b8 SHA512 83c96e572687bbdc6183393d21435806b1032295156c1905d82b300bcb6e00a34cd247731f6958e65f085c4c022fc52195313bc0f44edc7a726f04367483a378
-EBUILD turtlearena-0.6.1-r1.ebuild 3148 BLAKE2B 18a0caf0de43d38dd25d5ed62f77183c168c17f79ebcc37fb0dcfda042decab92b2a77013e0c4798ddcbd9fa003974f3fbec6ab3042c46d2738a7aece62aefa9 SHA512 b535dcd923c9e7dc7f03626157284dec5b636429d460f5d1b9e9da5b04db14424eccb28591400e316f1131886bd7baae1710daa8d74254c28324afe837bff068
-MISC metadata.xml 448 BLAKE2B 0dd50368438ba4e015bdd06cca3f02104a43e9c9cee7dd28e610a9cd8b57dda4c34e27bd77082f30265ac6d7d0b0ab17b4e93d6e012f041778aba2e047ed5147 SHA512 633c20ebfe668a103133f8f4ca5bcefeffcde149c325973534ad1b362d72b4396c2e4c60681e027eb3f56c1a6ebbb073acc0078e22808627b7f39c0788f80069
+EBUILD turtlearena-0.6.1-r1.ebuild 2760 BLAKE2B c7af5d4118d1d8603447ecb056f41f05342985b7844f3c0c3c6c6769c2cccdbc880272c243d330d8b31e6f194894fceaa3f68591ec2539327038b71a98815c8b SHA512 1cd50c13715b7b303d73229bfae65f8113cb22c959b49f4a23d8ff67d822dc97e352dcc8506df945b2cb17ffc0eb45480f5c9266502deab70bdba027f758f48b
+MISC metadata.xml 543 BLAKE2B fa73176925358e9406548be841e19c5c8da9aae273d5ea77bc731a07cc3e62cb92f20a10435ac5a168784a7ed5500dd81998b6245d2e09193dc8301c268b560d SHA512 79e210d664fd96d05321b999af7a17667e5deb32df5a00665e1331a8f338e541cd45dfa6fbc997c50624264462c938fed8835683d8a33099f21e9d87dba0c15f
diff --git a/games-fps/turtlearena/metadata.xml b/games-fps/turtlearena/metadata.xml
index 76847d643c80..5ef91913b164 100644
--- a/games-fps/turtlearena/metadata.xml
+++ b/games-fps/turtlearena/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="server">Build server target</flag>
 		<flag name="voice">Adds VoIP support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Turtle-Arena/turtle-arena-code</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
index ee3525548a70..807e9f383934 100644
--- a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
+++ b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit eutils gnome2-utils
-
-MY_P=${PN/-/}-${PV}
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A turtle featuring free and open source third-person action game (ioq3 engine)"
-HOMEPAGE="http://ztm.x10host.com/ta/index.htm"
-SRC_URI="https://turtlearena.googlecode.com/files/${MY_P}-0-src.tar.bz2
-	https://turtlearena.googlecode.com/files/${MY_P}-0.zip"
+HOMEPAGE="https://clover.moe/turtlearena/"
+SRC_URI="
+	https://turtlearena.googlecode.com/files/${P}-0-src.tar.bz2
+	https://turtlearena.googlecode.com/files/${P}-0.zip"
+S+="-0-src"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 mplus-fonts lcc"
 SLOT="0"
@@ -18,11 +18,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+curl debug dedicated mumble openal server theora voice vorbis"
 
 RDEPEND="
-	sys-libs/zlib[minizip]
+	sys-libs/zlib:=[minizip]
 	!dedicated? (
 		media-libs/freetype:2
-		media-libs/libsdl[X,sound,joystick,opengl,video]
-		virtual/jpeg:0
+		media-libs/libsdl[X,joystick,opengl,sound,video]
+		virtual/jpeg
 		virtual/opengl
 		curl? ( net-misc/curl )
 		openal? ( media-libs/openal )
@@ -33,21 +33,21 @@ RDEPEND="
 		)
 		vorbis? ( media-libs/libvorbis )
 	)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/unzip
 	virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P}-0-src
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-freetype.patch
+)
 
 src_prepare() {
 	default
 
-	eapply "${FILESDIR}"/${P}-build.patch
-	eapply "${FILESDIR}"/${P}-freetype.patch
-
-	sed -i \
-		-e 's:JPEG_LIB_VERSION < 80:JPEG_LIB_VERSION < 62:' \
-		engine/code/renderer/tr_image_jpg.c || die #479822
+	sed -e 's|JPEG_LIB_VERSION < 80|JPEG_LIB_VERSION < 62|' \
+		-i engine/code/renderer/tr_image_jpg.c || die #479822
 
 	rm -r engine/code/{AL,libcurl,libogg,libspeex,libtheora,libvorbis,SDL12,zlib} \
 		engine/code/freetype* engine/code/jpeg-* \
@@ -55,68 +55,60 @@ src_prepare() {
 }
 
 src_compile() {
-	buildit() { use $1 && echo 1 || echo 0 ; }
-	nobuildit() { use $1 && echo 0 || echo 1 ; }
-
-	myarch=$(usex amd64 "x86_64" "x86")
-	emake -C engine \
-		Q="" \
-		ARCH=${myarch} \
-		CROSS_COMPILING=0 \
-		BUILD_GAME_QVM=0 \
-		BUILD_GAME_SO=0 \
-		BUILD_CLIENT=$(nobuildit dedicated) \
-		BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
-		DEFAULT_BASEDIR="/usr/share/${PN}" \
-		GENERATE_DEPENDENCIES=0 \
-		OPTIMIZEVM="" \
-		OPTIMIZE="" \
-		DEBUG_CFLAGS="" \
-		USE_MUMBLE=$(buildit mumble) \
-		USE_VOIP=$(buildit voice) \
-		USE_INTERNAL_SPEEX=0 \
-		USE_INTERNAL_OGG=0 \
-		USE_INTERNAL_ZLIB=0 \
-		USE_INTERNAL_JPEG=0 \
-		USE_INTERNAL_FREETYPE=0 \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_INTERNAL_VORBIS=0 \
-		USE_CODEC_THEORA=$(buildit theora) \
-		USE_OPENAL=$(buildit openal) \
-		USE_OPENAL_DLOPEN=0 \
-		USE_CURL=$(buildit curl) \
-		USE_CURL_DLOPEN=0 \
-		USE_LOCAL_HEADERS=0 \
-		$(usex debug "debug" "release")
+	tc-export CC
+
+	MY_ARCH=$(usex amd64 x86_64 x86)
+	MY_RELEASE=$(usex debug debug release)
+
+	local emakeargs=(
+		ARCH=${MY_ARCH}
+		BUILD_CLIENT=$(usex dedicated 0 1)
+		BUILD_SERVER=$(usex dedicated 1 $(usex server 1 0))
+		BUILD_GAME_QVM=0
+		BUILD_GAME_SO=0
+		CROSS_COMPILING=0
+		DEBUG_CFLAGS=
+		DEFAULT_BASEDIR="${EPREFIX}"/usr/share/${PN}
+		GENERATE_DEPENDENCIES=0
+		OPTIMIZE=
+		OPTIMIZEVM=
+		Q=
+		USE_CODEC_THEORA=$(usex theora 1 0)
+		USE_CODEC_VORBIS=$(usex vorbis 1 0)
+		USE_CURL=$(usex curl 1 0)
+		USE_CURL_DLOPEN=0
+		USE_INTERNAL_FREETYPE=0
+		USE_INTERNAL_JPEG=0
+		USE_INTERNAL_OGG=0
+		USE_INTERNAL_SPEEX=0
+		USE_INTERNAL_VORBIS=0
+		USE_INTERNAL_ZLIB=0
+		USE_LOCAL_HEADERS=0
+		USE_MUMBLE=$(usex mumble 1 0)
+		USE_OPENAL=$(usex openal 1 0)
+		USE_OPENAL_DLOPEN=0
+		USE_VOIP=$(usex voice 1 0)
+	)
+
+	emake -C engine "${emakeargs[@]}" ${MY_RELEASE}
 }
 
 src_install() {
-	dodoc engine/{ChangeLog,BUGS,TODO}
-	use voice && dodoc engine/voip-readme.txt
+	if ! use dedicated; then
+		newbin engine/build/${MY_RELEASE}-linux-${MY_ARCH}/turtlearena.${MY_ARCH} turtlearena
 
-	if ! use dedicated ; then
-		newbin engine/build/$(usex debug "debug" "release")-linux-${myarch}/turtlearena.${myarch} turtlearena
-		newicon -s scalable engine/misc/quake3-tango.svg ${PN}.svg
-		newicon -s 256 engine/misc/quake3-tango.png ${PN}.png
-		make_desktop_entry ${PN}
-	fi
+		use voice && dodoc engine/voip-readme.txt
 
-	if use dedicated || use server ; then
-		newbin engine/build/$(usex debug "debug" "release")-linux-${myarch}/turtlearena-server.${myarch} turtlearena-server
+		newicon engine/misc/quake3-tango.svg ${PN}.svg
+		make_desktop_entry ${PN} "Turtle Arena"
 	fi
 
-	insinto "/usr/share/${PN}"
-	doins -r "${WORKDIR}"/${MY_P}-0/base
-}
-
-pkg_preinst() {
-	use dedicated || gnome2_icon_savelist
-}
+	if use dedicated || use server; then
+		newbin engine/build/${MY_RELEASE}-linux-${MY_ARCH}/turtlearena-server.${MY_ARCH} turtlearena-server
+	fi
 
-pkg_postinst() {
-	use dedicated || gnome2_icon_cache_update
-}
+	insinto /usr/share/${PN}
+	doins -r ../${P}-0/base
 
-pkg_postrm() {
-	use dedicated || gnome2_icon_cache_update
+	dodoc engine/{ChangeLog,BUGS,TODO}
 }