gentoo resync : 28.04.2021

2 files changed, 24 insertions, 24 deletions

diff --git a/games-fps/ut2003-demo/Manifest b/games-fps/ut2003-demo/Manifest
index f80f7aed52d2..f15527da65a2 100644
--- a/games-fps/ut2003-demo/Manifest
+++ b/games-fps/ut2003-demo/Manifest
@@ -4,5 +4,5 @@ AUX ut2003-demo 692 BLAKE2B c9eef6a5ee06c4c9619ca29c7cdafab5763a3cb63a8b060ac4c2
 DIST UT2003CrashFix.zip 2764 BLAKE2B 697c35a02f447d0d436fc32bebdeafbca55ef644d951e92085c33f7597108625770b76e027f31287cd2ac66607692ff8c908f6971f936a134d58d0effc2586fc SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444
 DIST ut2003-demo-misc.tar.bz2 31851 BLAKE2B 585fe83e142fecdce330ae6116d2c3ef94c870e9bfadb8d7e32185bf0880464bf162330da1f0960feef0d6f3eda7ba591565291d7b25f70f9834d4fbb5a41c58 SHA512 9a1e154aac7a8ccd043135e2a617a19203f6942e8e152d06ec8ed1e6877118cfb3ddbeab7ec2617670e26f13c0e394b8b8dbc747688b8b0b244a8c404f33d7f0
 DIST ut2003demo-lnx-2206.sh.bin 137253079 BLAKE2B 9048a6f82e6302c84481989c4ce176fb969eb5c7a86e9d5a8b28060b0e2d139de786b8edbd5080cbf5d49ca9c6114d3f750ed8ad9bcdff6e69841933830538ea SHA512 8018d58999010c17198185838e42f7cbda0f55476f1e6065b4b2957db3652fe9c1af39ba65451565f54d41507413f4e0b1edf2678c9cc7c221f2ca278ec655be
-EBUILD ut2003-demo-2206-r4.ebuild 3552 BLAKE2B 9a7655140e511bc436a0b6d835a58b73079b7594a2cbdf4768c8ce4065b73dbd08aa5b3c1edaeb27deabbf44b0e11c7c4d2f6884afc2d39e44ca537b0d9f61cb SHA512 2a434fcc938c10135de612a3126e4c9d3e4b8665a7e4bb9d8fac8b16616eab573b02e10b7a656e22264849d44f4536dcd8136b858e6ebc25785c111952a517e2
+EBUILD ut2003-demo-2206-r5.ebuild 3504 BLAKE2B 1792b997e8a4c85b9445fbbe487ee45a3b101f41f07a9b40d7a68a1b8f4830a47c59e9ef60a608874f0c70736004022089b783731c89ede268008a52d11f7cda SHA512 9ac270b102ffb42b0b6632f73843010bd850d190e4ec70c93d47a76b739d421a6295533a7445f1ecabd7310f63a7d2333b19524eec0b538e8e74137bf7d164c1
 MISC metadata.xml 602 BLAKE2B 860e51d942ba4cb4200404571230e2f9b7962a050c57e3c7ae336fa909e183a248c191f4dd0718a564945f5cb02592d578f774e1c50db208639ac02470980799 SHA512 2c956bf66965f83b68bb0c04d79d479ae76af9b7781bca93a1ff7898f02838ee0c1cc72290943be9902dee38096f2b119f95f21e5bed781e8c04f331a60adac2
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r4.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r5.ebuild
index 2f1817e72c8e..2ff0e02a1bcc 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r4.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r5.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils unpacker games
+inherit desktop unpacker
 
 DESCRIPTION="Demo for the sequel to the 1999 multi-player first-person shooter"
 HOMEPAGE="http://www.ut2003.com/"
 SRC_URI="http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-${PV}.sh.bin
 	http://download.factoryunreal.com/mirror/UT2003CrashFix.zip
 	https://dev.gentoo.org/~wolf31o2/sources/${PN}/${PN}-misc.tar.bz2"
+S="${WORKDIR}"
 
 LICENSE="ut2003-demo"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
+RESTRICT="bindist mirror strip"
 
-DEPEND="app-arch/unzip"
 RDEPEND="
 	sys-devel/bc
 	sys-libs/libstdc++-v3:5
@@ -25,18 +24,18 @@ RDEPEND="
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 "
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
+dir=opt/${PN}
+Ddir="${ED}"/${dir}
 
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-QA_PREBUILT="${dir:1}/*.so ${dir:1}/*-bin ${dir:1}/System/libSDL-1.2.so.0"
+QA_PREBUILT="${dir}/*.so ${dir}/*-bin ${dir}/System/libSDL-1.2.so.0"
 
 src_unpack() {
 	unpack_makeself "${DISTDIR}"/ut2003demo-lnx-${PV}.sh.bin || die
 	unzip "${DISTDIR}"/UT2003CrashFix.zip || die
-	cd "${S}"
+
+	cd "${S}" || die
 	unpack ./setupstuff.tar.gz || die
 	unpack ./ut2003lnx_demo.tar.bz2 || die
 	unpack ${PN}-misc.tar.bz2 || die
@@ -48,16 +47,14 @@ src_install() {
 
 	local i
 	for i in Animations Benchmark Help KarmaData Maps Music Sounds \
-	StaticMeshes System Textures Web extras
-	do
+			StaticMeshes System Textures Web extras ; do
 		dodir "${dir}"/${i}
-		cp -pPR "${S}"/${i}/* "${Ddir}"/${i}
+		cp -pPR "${S}"/${i}/* "${Ddir}"/${i} || die
 	done
 
 	# Fix the benchmark configurations to use SDL rather than the Windows driver
 	local f
-	for f in MaxDetail.ini MinDetail.ini
-	do
+	for f in MaxDetail.ini MinDetail.ini ; do
 		sed -i \
 			-e 's/RenderDevice=D3DDrv.D3DRenderDevice/\;RenderDevice=D3DDrv.D3DRenderDevice/' \
 			-e 's/ViewportManager=WinDrv.WindowsClient/\;ViewportManager=WinDrv.WindowsClient/' \
@@ -74,11 +71,13 @@ src_install() {
 	done
 
 	# Wrapper and benchmark-scripts
-	dogamesbin "${FILESDIR}"/ut2003-demo
+	dobin "${FILESDIR}"/ut2003-demo
 	exeinto "${dir}"/Benchmark
 	doexe "${FILESDIR}/"{benchmark,results.sh}
-	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
-		"${ED}/${GAMES_BINDIR}/${PN}" "${ED}/${dir}"/Benchmark/benchmark || die
+	sed -i \
+		-e "s:GAMES_PREFIX_OPT:/opt:" \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/${dir}"/Benchmark/benchmark || die
 
 	# Here we apply DrSiN's crash patch
 	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System || die
@@ -99,25 +98,26 @@ EOT
 	doexe ucc ut2003_demo
 	newicon Unreal.xpm ut2003-demo.xpm
 	make_desktop_entry ut2003-demo "Unreal Tournament 2003 (Demo)" ${PN}
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "You can run benchmarks by typing 'ut2003-demo --bench' (MinDetail seems"
 	elog "to not be working for some unknown reason :/)"
+
 	echo
 	elog "Read ${dir}/README.linux for instructions on how to run a"
 	elog "dedicated server."
+
 	echo
 	ewarn "If you are not installing for the first time and you plan on running"
 	ewarn "a server, you will probably need to edit your"
 	ewarn "~/.ut2003demo/System/UT2003.ini file and add a line that says"
 	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
 	ewarn "[Engine.GameInfo] section to close a security issue."
+
 	echo
 	elog "To play the demo run:"
 	elog " ut2003-demo"
+
 	echo
 }