public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-action/heretic2/
@ 2016-08-19 13:21 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2016-08-19 13:21 UTC (permalink / raw
  To: gentoo-commits

commit:     91a458899fbf8e46262a1d8cf333ccb767cd8e5d
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 13:18:21 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 13:20:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a45889

games-action/heretic2: Cleanup due to bug #143241

Package-Manager: portage-2.3.0

 games-action/heretic2/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/games-action/heretic2/metadata.xml b/games-action/heretic2/metadata.xml
index 268a234..3c18668 100644
--- a/games-action/heretic2/metadata.xml
+++ b/games-action/heretic2/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tristan@gentoo.org</email>
-		<name>Tristan Heaven</name>
-	</maintainer>
 <maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/heretic2/
@ 2019-05-31  8:24 Ulrich Müller
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2019-05-31  8:24 UTC (permalink / raw
  To: gentoo-commits

commit:     184627f76e695eee533dc764649ca78b74faf783
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 07:45:02 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri May 31 08:24:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=184627f7

games-action/heretic2: 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/heretic2-1.06c-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-action/heretic2/heretic2-1.06c-r1.ebuild b/games-action/heretic2/heretic2-1.06c-r1.ebuild
index dc1322e8935..60d2b16cafe 100644
--- a/games-action/heretic2/heretic2-1.06c-r1.ebuild
+++ b/games-action/heretic2/heretic2-1.06c-r1.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
@@ -15,7 +15,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="strip mirror bindist"
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/${PN}/base/*.so"
 
 DEPEND="games-util/loki_patch"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/heretic2/
@ 2021-04-06 22:54 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-04-06 22:54 UTC (permalink / raw
  To: gentoo-commits

commit:     da612df6fcc898e6757045a9cbe50f041c9dcb07
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 22:53:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 22:54:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da612df6

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

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

 ...c2-1.06c-r1.ebuild => heretic2-1.06c-r2.ebuild} | 55 +++++++++++-----------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/games-action/heretic2/heretic2-1.06c-r1.ebuild b/games-action/heretic2/heretic2-1.06c-r2.ebuild
similarity index 65%
rename from games-action/heretic2/heretic2-1.06c-r1.ebuild
rename to games-action/heretic2/heretic2-1.06c-r2.ebuild
index 60d2b16cafe..aeb604f80b7 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 multilib unpacker wrapper
 
 DESCRIPTION="Third-person classic magical action-adventure game"
 HOMEPAGE="http://lokigames.com/products/heretic2/
@@ -10,16 +11,18 @@ 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"
+
+BDEPEND="games-util/loki_patch"
+RDEPEND="
+	virtual/opengl
 	amd64? (
 		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
@@ -28,17 +31,16 @@ RDEPEND="virtual/opengl
 	x86? (
 		x11-libs/libX11
 		x11-libs/libXext
-	)"
-
-S=${WORKDIR}
+	)
+"
 
 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
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/heretic2/
@ 2021-04-06 22:56 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-04-06 22:56 UTC (permalink / raw
  To: gentoo-commits

commit:     24117ef594609c8f54f66369484edad7fe30e964
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 22:55:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 22:55:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24117ef5

games-action/heretic2: add desktop inherit

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

 games-action/heretic2/heretic2-1.06c-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/heretic2/heretic2-1.06c-r2.ebuild b/games-action/heretic2/heretic2-1.06c-r2.ebuild
index aeb604f80b7..6a98959420b 100644
--- a/games-action/heretic2/heretic2-1.06c-r2.ebuild
+++ b/games-action/heretic2/heretic2-1.06c-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cdrom multilib unpacker wrapper
+inherit cdrom desktop multilib unpacker wrapper
 
 DESCRIPTION="Third-person classic magical action-adventure game"
 HOMEPAGE="http://lokigames.com/products/heretic2/


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/heretic2/
@ 2021-04-06 23:14 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-04-06 23:14 UTC (permalink / raw
  To: gentoo-commits

commit:     69d7ac851f9bb304a7b9def5146a133effcfba31
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 23:14:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 23:14:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d7ac85

games-action/heretic2: move BDEPEND

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

 games-action/heretic2/heretic2-1.06c-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/heretic2/heretic2-1.06c-r2.ebuild b/games-action/heretic2/heretic2-1.06c-r2.ebuild
index 6a98959420b..729e2999cb0 100644
--- a/games-action/heretic2/heretic2-1.06c-r2.ebuild
+++ b/games-action/heretic2/heretic2-1.06c-r2.ebuild
@@ -20,7 +20,6 @@ RESTRICT="strip mirror bindist"
 
 QA_TEXTRELS="opt/${PN}/base/*.so"
 
-BDEPEND="games-util/loki_patch"
 RDEPEND="
 	virtual/opengl
 	amd64? (
@@ -33,6 +32,7 @@ RDEPEND="
 		x11-libs/libXext
 	)
 "
+BDEPEND="games-util/loki_patch"
 
 src_unpack() {
 	cdrom_get_cds bin/x86/glibc-2.1/${PN}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/heretic2/
@ 2021-04-10  6:31 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-04-10  6:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f33028d1cc03363199349c9d4653001f96054c70
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 06:28:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 06:31:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33028d1

games-action/heretic2: fix install dir

Don't shout! I don't own this game, so testing only got as
far as pkg_nofetch, unfortunately. Luckily, changes were
only to do with EAPI + games.eclass, so *should* be okay.

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

 games-action/heretic2/heretic2-1.06c-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-action/heretic2/heretic2-1.06c-r2.ebuild b/games-action/heretic2/heretic2-1.06c-r2.ebuild
index 729e2999cb0..378a37e5873 100644
--- a/games-action/heretic2/heretic2-1.06c-r2.ebuild
+++ b/games-action/heretic2/heretic2-1.06c-r2.ebuild
@@ -48,7 +48,7 @@ src_unpack() {
 src_install() {
 	has_multilib_profile && ABI=x86
 
-	local dir=opt/${PN}
+	local dir=/opt/${PN}
 
 	cd "${CDROM_ROOT}" || die
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-04-10  6:31 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-31  8:24 [gentoo-commits] repo/gentoo:master commit in: games-action/heretic2/ Ulrich Müller
  -- strict thread matches above, loose matches on Subject: below --
2021-04-10  6:31 Sam James
2021-04-06 23:14 Sam James
2021-04-06 22:56 Sam James
2021-04-06 22:54 Sam James
2016-08-19 13:21 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox