[gentoo-commits] repo/gentoo:master commit in: games-action/heretic2-demo/

[gentoo-commits] repo/gentoo:master commit in: games-action/heretic2-demo/

[Ulrich Müller]

commit:     e19daea57132b64c3b7828639803a1a38c4a9d05
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 07:46:34 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri May 31 08:24:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19daea5

games-action/heretic2-demo: Add mirror and bindist restrictions.

Bug: https://bugs.gentoo.org/665108
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 games-action/heretic2-demo/heretic2-demo-1.06a.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
index 0db2fab5233..13ff487e694 100644
--- a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
+++ b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
 
 DEPEND="games-util/loki_patch"

[gentoo-commits] repo/gentoo:master commit in: games-action/heretic2-demo/

[Sam James]

commit:     1d61eeb42ec76a3bce0d0617b3af91642506e4fe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 23:06:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 23:06:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d61eeb4

games-action/heretic2-demo: port to EAPI 7, games.eclass--

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...-1.06a.ebuild => heretic2-demo-1.06a-r1.ebuild} | 32 ++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild
similarity index 69%
rename from games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
rename to games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild
index 13ff487e694..8d869e898f2 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
 }

[gentoo-commits] repo/gentoo:master commit in: games-action/heretic2-demo/

[Sam James]

commit:     f1cf77ce768aa5487d606ec27a0e9a16c1c4177f
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Apr 29 17:23:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  4 22:17:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1cf77ce

games-action/heretic2-demo: Fix QA_PREBUILT variable

Closes: https://bugs.gentoo.org/780723
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild
index 8d869e898f2..7afa4b008c9 100644
--- a/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild
+++ b/games-action/heretic2-demo/heretic2-demo-1.06a-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop multilib unpacker wrapper
+inherit desktop unpacker wrapper
 
 DESCRIPTION="Third-person classic magical action-adventure game"
 HOMEPAGE="http://www.lokigames.com/products/heretic2/
@@ -24,7 +24,7 @@ RDEPEND="
 BDEPEND="games-util/loki_patch"
 
 dir=opt/${PN}
-QA_PREBUILT="${dir:1}/*"
+QA_PREBUILT="${dir}/*"
 QA_TEXTRELS="opt/heretic2-demo/ref_glx.so"
 
 src_install() {