gentoo resync : 28.04.2021

2 files changed, 20 insertions, 18 deletions

diff --git a/games-action/descent3/Manifest b/games-action/descent3/Manifest
index 958be74c77f7..d76687035c85 100644
--- a/games-action/descent3/Manifest
+++ b/games-action/descent3/Manifest
@@ -1,4 +1,4 @@
 DIST descent3-1.4.0a-x86.run 2736956 BLAKE2B 23ea2042404308ff6d9b1b3fca688b1b59c9a774017ed0ca0a1e95166c698a41f7453addf6af043bb5faed8866ce590692dc8c708de01fb5464b0c456863c50e SHA512 e6c5d6a678c46374c5d5d40589d40906378fd17ebb658778a2d052a71cd069877a43eb83b344b41473fe443e886c3b07283ea9de908df4ab8584638670114ecc
 DIST descent3-1.4.0b-x86.run 4504631 BLAKE2B e6e807b8e1bc511a612a7b217ec9b86bb75cebfee3b30f636f7b668a651c09e61b13679d332e92708e8adc926033c4abe9b270e0357673d4026f934f31287de2 SHA512 912afcf51a2f4f8cacb231e318d4837c64b2f762109244c083760b5e580298d4166fea0878ee2d344b841c788d673896a09d0052ebea59dead637d834e826db3
-EBUILD descent3-1.4.0b-r2.ebuild 2660 BLAKE2B f2fb0f3d955a9d867747892d9897e757f066c400230c1fc4f7d437f401ce890052196809ebd0426ae61b588962fba92a940a0e39fcb2eaa045bc58cf80dcf1ae SHA512 874f2c6a6009302badfc428a3a4f8909a513bab9a798e2ccf178ef97c0c1cb6001d2913de6b23deccabe25eefbc481ae932a46d3cd1d467396966a7c68ad2b7c
+EBUILD descent3-1.4.0b-r3.ebuild 2594 BLAKE2B 60afc4a5195afb3b9d5674be56c58e365de7dce0eea8fea1c52b67e62c11c1adb8b778836fd6ab0e30a77845944730f4bd7ee4b99c8838a99693aa69362ea5ad SHA512 d2b04034cf823e13656b5c44cc5fbe2d8f2ca11bd77a47a27046b3a0141bc2110229f5b26a3695d977a3f2c51d0d1bbd4065f31483b1736ef76f5797aafdea8d
 MISC metadata.xml 625 BLAKE2B 5fd68ba049724b77f21760b68d7a2a755dbf7b8caa159d629cd19bac4c7500b02a867bd999d87cafa96f2895ab068c1ae37890021f2de1be52a377dde4f4ac20 SHA512 a72428b67ed26503112a398643a53230dd80f0b48a0ffa53a4ade00647302147aa042acc91cc6b49fef0d23efeafef2e33d4caea4bb845de7f6d08e8c943d71c
diff --git a/games-action/descent3/descent3-1.4.0b-r2.ebuild b/games-action/descent3/descent3-1.4.0b-r3.ebuild
index 44a13d1b0af9..0756a6d15fc4 100644
--- a/games-action/descent3/descent3-1.4.0b-r2.ebuild
+++ b/games-action/descent3/descent3-1.4.0b-r3.ebuild
@@ -1,10 +1,10 @@
-# 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 unpacker cdrom multilib games
+EAPI=7
+
+inherit cdrom desktop unpacker wrapper
 
-IUSE="nocd videos"
 DESCRIPTION="Descent 3 - 3-Dimensional indoor/outdoor spaceship combat"
 HOMEPAGE="http://www.lokigames.com/products/descent3/"
 SRC_URI="mirror://lokigames/${PN}/${PN}-1.4.0a-x86.run
@@ -13,20 +13,23 @@ SRC_URI="mirror://lokigames/${PN}/${PN}-1.4.0a-x86.run
 LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="nocd videos"
+
 RESTRICT="strip mirror bindist"
 
-RDEPEND="sys-libs/glibc
+RDEPEND="
 	media-libs/libsdl[abi_x86_32(-)]
 	media-libs/smpeg[abi_x86_32(-)]
+	sys-libs/glibc
 	virtual/opengl[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]"
+	x11-libs/libXext[abi_x86_32(-)]
+"
 
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
+dir=opt/${PN}
+Ddir="${ED}"/${dir}
 
 pkg_setup() {
-	games_pkg_setup
 	if use videos ; then
 		ewarn "The installed game takes about 1.2GB of space!"
 	elif use nocd ; then
@@ -42,6 +45,7 @@ src_unpack() {
 	else
 		cdrom_get_cds missions/d3.mn3
 	fi
+
 	mkdir -p "${S}"/{a,b} || die
 	cd "${S}"/a || die
 	unpack_makeself ${PN}-1.4.0a-x86.run
@@ -51,9 +55,9 @@ src_unpack() {
 
 src_install() {
 	einfo "Copying files... this may take a while..."
-	exeinto "${dir}"
+	exeinto ${dir}
 	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/{${PN},nettest}
-	insinto "${dir}"
+	insinto ${dir}
 	doins ${CDROM_ROOT}/{FAQ.txt,README{,.mercenary},d3.hog,icon.{bmp,xpm}}
 
 	cd "${Ddir}" || die
@@ -73,6 +77,7 @@ src_install() {
 	cd "${S}"/a || die
 	bin/Linux/x86/loki_patch --verify patch.dat || die
 	bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die
+
 	cd "${S}"/b || die
 	bin/Linux/x86/loki_patch --verify patch.dat || die
 	bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die
@@ -80,22 +85,19 @@ src_install() {
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find "${Ddir}" -exec touch '{}' +
+	find "${Ddir}" -exec touch '{}' + || die
 
-	games_make_wrapper descent3 ./descent3.dynamic "${dir}" "${dir}"
+	make_wrapper descent3 ./descent3.dynamic "${dir}" "${dir}"
 	newicon ${CDROM_ROOT}/icon.xpm ${PN}.xpm
 
 	# Fix for 2.6 kernel crash
 	cd "${Ddir}" || die
-	ln -sf ppics.hog PPics.Hog
+	ln -sf ppics.hog PPics.Hog || die
 
-	prepgamesdirs
 	make_desktop_entry ${PN} "Descent 3" ${PN}
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "To play the game run:"
 	elog " descent3"
-	echo
 }