gentoo resync : 28.04.2021

2 files changed, 29 insertions, 28 deletions

diff --git a/games-action/heretic2/Manifest b/games-action/heretic2/Manifest
index 7ca9cfc6b8a4..a44d8c78f7db 100644
--- a/games-action/heretic2/Manifest
+++ b/games-action/heretic2/Manifest
@@ -1,5 +1,5 @@
 DIST heretic2-1.06b-unified-x86.run 4718161 BLAKE2B 880b8c9468bf98a95cc0e31e9d1853de6f0f7e9d205518043ab243f81f760e588655b85bf7a2e1983ff738072adaa731a9488e00d342ec86be41f1b5aa32087f SHA512 7dcd4f8f87d526db7ea9fd647e4807d4e1a404a612460f8dcc0d0360964ef0d4c721e9c62b58cd1764c1e2c71ad1539c6aac5083fadc7a85ec4c12c8aa7b338f
 DIST heretic2-1.06c-unified-x86.run 3667873 BLAKE2B f492aec1d290ccf32a63d5a4ff017168ba89435db63124ce9de93ebe9c5284cf6dbabe0355fbad6a52f20d646194a9fd5014c1030abc1946961f922ae57e810f SHA512 e855c573d6e215e18d80143d1850e890349f941462a5d2d59c57a02f11a39967fd633efdfe46199d588e97cc99322d539ac50fc7bc7fa6d7e116e99f5a532de4
 DIST heretic2-maps-1.0.run 6257076 BLAKE2B 15151d80027f4912fab919526e4b91cacb87adeee7cb97e50b1ad5cfa905059c169705fd40ec3330b58996fac167822bc93af49c01fbbb61e4ace73309932cc2 SHA512 ba570caeae6bbe4a97bfe937353014dc9ddcc5a007b0fd1911ab1494667d2dae263d727190e7172d35639511a6383ff35eea5622cdc2e124e3793daef3c8e607
-EBUILD heretic2-1.06c-r1.ebuild 1802 BLAKE2B fe462943c6a872273ae068c80257c358b9e622ad4bd93637510b91ceab35fca37f7c10a2270944a0fd3be6d91b9f8a6eb797d18a51d29f352e270f6ed1b929bb SHA512 c161a23edd7b0d3589f3a6c0b5fa05643deec40f9e2562185ae860b1b2524b1390def80275a36f2663b186d1e9cc805264fbd0ba5bd6a1ddda9137b30afc8003
+EBUILD heretic2-1.06c-r2.ebuild 1804 BLAKE2B 630c04d8f8d62d315424aea048c7413177a52785909f5ae5e3cbadcd328e6e789c69f3721e534d18e3a9fdaab1bbc0c5f11ab9f8168248bde95e4312ec07b75b SHA512 4353140eff9bd2fa602a6513c0213b35199a5582a80bd3184c3bb9f71435823de26e8e6ea8d8da7d1201af2d7ff7fabb437f9b5df87b0270938fd8aaa2a6d30b
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-action/heretic2/heretic2-1.06c-r1.ebuild b/games-action/heretic2/heretic2-1.06c-r2.ebuild
index 60d2b16cafed..378a37e5873d 100644
--- a/games-action/heretic2/heretic2-1.06c-r1.ebuild
+++ b/games-action/heretic2/heretic2-1.06c-r2.ebuild
@@ -1,8 +1,9 @@
-# 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 multilib unpacker wrapper
 
 DESCRIPTION="Third-person classic magical action-adventure game"
 HOMEPAGE="http://lokigames.com/products/heretic2/
@@ -10,16 +11,17 @@ HOMEPAGE="http://lokigames.com/products/heretic2/
 SRC_URI="mirror://lokigames/${PN}/${P/%?/b}-unified-x86.run
 	mirror://lokigames/${PN}/${P}-unified-x86.run
 	mirror://lokigames/${PN}/${PN}-maps-1.0.run"
+S="${WORKDIR}"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="strip mirror bindist"
-QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/${PN}/base/*.so"
 
-DEPEND="games-util/loki_patch"
-RDEPEND="virtual/opengl
+QA_TEXTRELS="opt/${PN}/base/*.so"
+
+RDEPEND="
+	virtual/opengl
 	amd64? (
 		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
@@ -28,17 +30,17 @@ RDEPEND="virtual/opengl
 	x86? (
 		x11-libs/libX11
 		x11-libs/libXext
-	)"
-
-S=${WORKDIR}
+	)
+"
+BDEPEND="games-util/loki_patch"
 
 src_unpack() {
 	cdrom_get_cds bin/x86/glibc-2.1/${PN}
-	mkdir ${A}
+	mkdir ${A} || die
 
 	local f
 	for f in * ; do
-		cd "${S}"/${f}
+		cd "${S}"/${f} || die
 		unpack_makeself ${f}
 	done
 }
@@ -46,39 +48,38 @@ src_unpack() {
 src_install() {
 	has_multilib_profile && ABI=x86
 
-	local dir=${GAMES_PREFIX_OPT}/${PN}
+	local dir=/opt/${PN}
 
-	cd "${CDROM_ROOT}"
+	cd "${CDROM_ROOT}" || die
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r base help Manual.html README README.more
 
-	exeinto "${dir}"
+	exeinto ${dir}
 	doexe bin/x86/glibc-2.1/${PN}
 
-	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+	make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
 	sed -i \
 		-e 's/^exec /__GL_ExtensionStringVersion=17700 exec /' \
-		"${D}/${GAMES_BINDIR}/${PN}" || die
+		"${ED}/usr/bin/${PN}" || die
 	newicon icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Heretic II"
 
-	cd "${D}/${dir}"
-	ln -s "${CDROM_ROOT}"/*.gz .
+	cd "${ED}/${dir}" || die
+	ln -s "${CDROM_ROOT}"/*.gz . || die
 	unpack ./*.gz
-	rm -f *.gz
+	rm -f *.gz || die
 
 	local d
 	for d in "${S}"/* ; do
-		pushd "${d}" > /dev/null
-		loki_patch patch.dat "${D}/${dir}" || die
-		popd > /dev/null
+		pushd "${d}" > /dev/null || die
+		loki_patch patch.dat "${ED}/${dir}" || die
+		popd > /dev/null || die
 	done
 
-	rmdir gl_drivers
+	rmdir gl_drivers || die
+
 	sed -i \
 		"128i set gl_driver \"/usr/$(get_libdir)/libGL.so\"" \
 		base/default.cfg || die
-
-	prepgamesdirs
 }