gentoo resync : 28.04.2021

2 files changed, 27 insertions, 25 deletions

diff --git a/games-fps/etqw-bin/Manifest b/games-fps/etqw-bin/Manifest
index 67ec0369f8db..599da90caef1 100644
--- a/games-fps/etqw-bin/Manifest
+++ b/games-fps/etqw-bin/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-client-1.5-full.x86.run 556383725 BLAKE2B 8fcaa8518c7c452a4fe593a00beea0f5a6d5849c72b03d4a443fffde8540ea53b7bf0376d90b2f2ed4e3a736628f8871e009a49b938344516b2db0495cf1e826 SHA512 32bb3d7ef47790ac6b790a5a5d61592c3504d034372254102985e58dee25b5d200e507330226bf8458c628154c246b2abcb08bf550fa044189c4c8de813af0c2
-EBUILD etqw-bin-1.5-r2.ebuild 2005 BLAKE2B 8a37d8c1220bf9b3a04f76387749ca2a44783ea5e3450a3951ca3b6c64ba8f97af8f5e8cbaef37fb63c1dd8b3c265690ddc902e7b356110e635ca18294861703 SHA512 e0c8d2cd41d2cd40adbe8e8d901271a0c6349cec4eb26de856a69412f1c477f9504535bb319ca63579eacbd35feadbd22a768372125bd5b5083fc6349eefe7d0
+EBUILD etqw-bin-1.5-r3.ebuild 1987 BLAKE2B d776bba9c2a5701aa4865b530a0ea79c5ce9d54ad7e3bea5f8d1be2d15f863c69a15b57d2671e6eae032426d279d93dd35bccf22199765a83d5f0981da4cd90e SHA512 07525bc07821008889c86f17c051e1c4b23046cf4bb72bddf06fe9e7fb3d895e7eeda41f4e3e336b93ea3cefdb21c6f02961ebf14b4a785e2839a8943b7643d4
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r3.ebuild
index 75458580db7e..180c6f86e698 100644
--- a/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r3.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="Enemy Territory: Quake Wars"
 HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/"
 SRC_URI="http://ftp.jeuxlinux.fr/files/ETQW-client-${PV}-full.x86.run"
+S="${WORKDIR}"/data
 
 LICENSE="ETQW"
 SLOT="0"
@@ -14,57 +16,57 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall"
 RESTRICT="bindist mirror strip"
 
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	virtual/jpeg-compat:62[abi_x86_32(-)]
+RDEPEND="
 	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
 	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+	sys-libs/glibc
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	cdinstall? ( games-fps/etqw-data )"
+	virtual/jpeg-compat:62[abi_x86_32(-)]
+	amd64? ( sys-libs/glibc[multilib] )
+	cdinstall? ( games-fps/etqw-data )
+"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/data
-dir=${GAMES_PREFIX_OPT}/etqw
+MY_DIR=opt/etqw
 
-QA_PREBUILT="${dir:1}/*.x86
-	${dir:1}/*.so*"
+QA_PREBUILT="
+	${MY_DIR:1}/*.x86
+	${MY_DIR:1}/*.so*
+"
 
 src_unpack() {
 	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
 	unpack ./${A}.zip
-	rm -f ${A}.zip
+	rm -f ${A}.zip || die
 }
 
 src_install() {
-	insinto "${dir}"
+	insinto ${MY_DIR}
 	doins -r base pb *.png
 	dodoc *.txt
 
-	exeinto "${dir}"
+	exeinto ${MY_DIR}
 	doexe etqw{,ded,-rthread}.x86 openurl.sh libCgx86.so libSDL*.id.so*
 
 	newicon etqw_icon.png etqw.png
-	games_make_wrapper etqw ./etqw.x86 "${dir}" "${dir}"
+	make_wrapper etqw ./etqw.x86 "${MY_DIR}" "${MY_DIR}"
 	make_desktop_entry etqw "Enemy Territory: Quake Wars" etqw
 
-	games_make_wrapper etqw-dedicated ./etqwded.x86 "${dir}" "${dir}"
+	make_wrapper etqw-dedicated ./etqwded.x86 "${MY_DIR}" "${MY_DIR}"
 	make_desktop_entry etqw-dedicated "Enemy Territory: Quake Wars (dedicated server)" etqw
 
-	games_make_wrapper etqw-rthread ./etqw-rthread.x86 "${dir}" "${dir}"
+	make_wrapper etqw-rthread ./etqw-rthread.x86 "${MY_DIR}" "${MY_DIR}"
 	make_desktop_entry etqw-rthread "Enemy Territory: Quake Wars (SMP)" etqw
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	if ! use cdinstall ; then
 		elog "You need to copy pak00*.pk4, zpak_*.pk4 and the megatextures"
-		elog "directory to ${dir}/base before running the game."
+		elog "directory to ${MY_DIR}/base before running the game."
 	fi
+
 	elog "To change the game language from English, add"
 	elog "seta sys_lang \"your_language\" to your autoexec.cfg file."
 	elog "Menu fonts may not show up until you do so."