gentoo resync : 28.04.2021

2 files changed, 16 insertions, 18 deletions

diff --git a/games-action/heretic2-demo/Manifest b/games-action/heretic2-demo/Manifest
index 8ff3dfbf218b..352946991d85 100644
--- a/games-action/heretic2-demo/Manifest
+++ b/games-action/heretic2-demo/Manifest
@@ -1,3 +1,3 @@
 DIST heretic2-demo.run 55065564 BLAKE2B d4d2e3383a14633d215f4cc7c979dc737e56a743998f10b36d0b9cbc3787df86cc0943802ce700e2123791f9d44cea9fd37d891b7c0562dbca1a4264e3eb48cc SHA512 62aba7b4569b76bf9a01864652da7be8e268ad3cad4eb5b986b7e84adbd88e826799d021b141f9a7a1135520e440de4ce2e57c5be6ceaa85dc08295d5e3ad30e
-EBUILD heretic2-demo-1.06a.ebuild 1364 BLAKE2B 43b9ce781e8061f23dfc100f5f797d503626ecba192fd122e3bac15ed5d0ccfa140ee5600e8aad2a991141f6350a487bea045fcf2ddab72eba2649164ffbf932 SHA512 365da399424fc1b05ed7960e2cbf8179092f6441a2095960b68250fe3111bc78bedfe8867a0e93597871a54613134b85b184dff92d92d8757b806fe39ff568fc
+EBUILD heretic2-demo-1.06a-r1.ebuild 1294 BLAKE2B 9386d5e65bdd3ee69c23af66e6d31fe2a027e2110c81daf1d2de4e878363bd1d7fbfaaa775bd7b12a13998f288145f71e714e6ed8a7026c03a17240166b68bb3 SHA512 eb23e3fef0d814b5e23a42a3d7590b1feaf8b4df1a3caca787d365ef45108c1d53d5681cc0ab73bd75fffd09da66cd0a066e24c31e8ce6f797a37aae8fc66b77
 MISC metadata.xml 710 BLAKE2B 2b9f13c1ebed41739b7700016440fbc43cb798906a68cd6c6c105218db4681863ebf1d711534967abed200c4e6ff2c5f42963b01fb33b63a6a1e6311e9f76c4a SHA512 3d5b818e953410bd3b51926173604c85ea1d74d6433e5ea52866153fa9da7d4627cd18adc844e10fa54cba1d156b505dca9364b22f6fe7d2d792127fa65b4586
diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild
index 13ff487e694d..8d869e898f2b 100644
--- a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
+++ b/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild
@@ -1,31 +1,31 @@
-# 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 multilib games
+EAPI=7
+
+inherit desktop multilib unpacker wrapper
 
 DESCRIPTION="Third-person classic magical action-adventure game"
 HOMEPAGE="http://www.lokigames.com/products/heretic2/
 	http://www.hereticii.com/"
 SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
+S="${WORKDIR}"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
 RESTRICT="strip mirror bindist"
-QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
 
-DEPEND="games-util/loki_patch"
 RDEPEND="
 	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]"
+	x11-libs/libXext[abi_x86_32(-)]
+"
+BDEPEND="games-util/loki_patch"
 
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
+dir=opt/${PN}
 QA_PREBUILT="${dir:1}/*"
+QA_TEXTRELS="opt/heretic2-demo/ref_glx.so"
 
 src_install() {
 	ABI=x86
@@ -36,7 +36,7 @@ src_install() {
 	loki_patch patch.dat data/ || die
 
 	# Remove bad opengl library
-	rm -r "${demo}/gl_drivers/"
+	rm -r "${demo}/gl_drivers/" || die
 
 	# Change to safe default of 800x600 and option of normal opengl driver
 	sed -i \
@@ -44,14 +44,12 @@ src_install() {
 		-e "s:libGL:/usr/$(get_libdir)/libGL:" \
 		"${demo}"/base/default.cfg || die
 
-	insinto "${dir}"
-	exeinto "${dir}"
+	insinto ${dir}
+	exeinto ${dir}
 	doins -r "${demo}"/*
 	doexe "${demo}/${exe}"
 
-	games_make_wrapper ${PN} "./${exe}" "${dir}" "${dir}"
+	make_wrapper ${PN} "./${exe}" "${dir}" "${dir}"
 	newicon "${demo}"/icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Heretic 2 (Demo)" ${PN}
-
-	prepgamesdirs
 }