gentoo resync : 28.04.2021

2 files changed, 24 insertions, 20 deletions

diff --git a/games-fps/etqw-demo/Manifest b/games-fps/etqw-demo/Manifest
index 939904a8f7e9..736070d5c7bb 100644
--- a/games-fps/etqw-demo/Manifest
+++ b/games-fps/etqw-demo/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-demo2-client-full.r1.x86.run 691248874 BLAKE2B 42692da7b2f7f35730dea9557c26bb189ac555eccdaf2873d3b5e91bff640b1cd121022aa671c990f92164a97874e9f46f47c76ad01f2ff2973ad3edea6898db SHA512 41332208626449da74bea71a9926258f50986f0af85045d470d4405d27e497085ba318337181802be58eb50c724ab91df6b9c810e5fcc5f8dc131486d6529f38
-EBUILD etqw-demo-2.0_p1-r2.ebuild 1578 BLAKE2B f63007ba05b07abb5b8136e6252193ceb4b13150f2f8b96a116a35a307125893ead3efaef15c423af8753e32d16e3d378b5db1246624f83a3378d0cb0befd99f SHA512 66a14e35580349f64aba9416b29f0cb0894da6b19939d7c7111421e45c9341cbd513f46040caafc752ed289eac1cdc0cc8029f20c9538ca67b51d1d34ab5a97f
+EBUILD etqw-demo-2.0_p1-r3.ebuild 1548 BLAKE2B 4f04f7f452d00d6a26838adf7064c088d930225bd34d61223ab226adf3f695707bc7797f30790a9935b502c3a497cf53b645d9f5582c48a418f3d2581e0eae57 SHA512 8474b43175dfbda40773ffab928abafd49eebabbf16a0810cfe95159e23330f125bce44b30ea668444d59945e3e57e558f22224b50fa4093db8bd8a290b63027
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild
index 862cea3fb0da..244db5ad24ee 100644
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild
+++ b/games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild
@@ -1,37 +1,43 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils versionator games
+EAPI=7
 
-MY_MAJOR=$(get_major_version)
-MY_REV=$(get_version_component_range 3)
+inherit desktop unpacker wrapper
+
+MY_MAJOR=$(ver_cut 1)
+MY_REV=$(ver_cut 3-)
 MY_BODY="ETQW-demo${MY_MAJOR}-client-full.r${MY_REV/p/}.x86"
 
 DESCRIPTION="Enemy Territory: Quake Wars demo"
 HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
 SRC_URI="mirror://idsoftware/etqw/${MY_BODY}.run"
+S="${WORKDIR}"
 
 # See copyrights.txt
 LICENSE="ETQW"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="bindist strip mirror"
 
-DEPEND="app-arch/unzip"
-RDEPEND=">=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(-)]
+	sys-libs/ncurses-compat[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	virtual/jpeg-compat:62[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+"
 
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
+BDEPEND="app-arch/unzip"
 
-QA_PREBUILT="${dir:1}/guis/libmojosetupgui_ncurses.so
+dir=opt/${PN}
+
+QA_PREBUILT="
+	${dir:1}/guis/libmojosetupgui_ncurses.so
 	${dir:1}/data/*
-	${dir:1}/data/pb/*.so"
+	${dir:1}/data/pb/*.so
+"
 
 src_unpack() {
 	# exit status of 1 should just be warnings, not corrupt archive
@@ -42,7 +48,7 @@ src_install() {
 	insinto "${dir}"
 	doins -r guis scripts
 
-	cd data
+	cd data || die
 	insinto "${dir}"/data
 	doins -r base pb etqw_icon.png
 	dodoc README.txt EULA.txt copyrights.txt etqwtv.txt
@@ -50,11 +56,9 @@ src_install() {
 	exeinto "${dir}"/data
 	doexe etqw *\.x86 etqw-* libCgx86* libSDL* *.sh
 
-	games_make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
+	make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
 	# Matches with desktop entry for enemy-territory-truecombat
 	make_desktop_entry ${PN} "Enemy Territory - Quake Wars (Demo)"
 
-	games_make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
-
-	prepgamesdirs
+	make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
 }