public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/zangband/
@ 2021-04-05 17:45 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-04-05 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     edd77013ce25f30a45bbc733ccee6ffd0c56ed56
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 17:45:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 17:45:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd77013

games-roguelike/zangband: fix DESTDIR

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

 games-roguelike/zangband/zangband-2.7.4c.ebuild | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index 39b08af052a..211bb818327 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-inherit autotools multilib
+inherit autotools
 
 DESCRIPTION="An enhanced version of the Roguelike game Angband"
 HOMEPAGE="http://www.zangband.org/"
 SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="Moria"
 SLOT="0"
@@ -20,16 +21,20 @@ RDEPEND="
 		dev-lang/tk:0=
 		)
 	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
 
-S=${WORKDIR}/${PN}
+DOCS=( readme z_faq.txt z_update.txt )
 
-PATCHES=( "${FILESDIR}"/${P}-tk85.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-tk85.patch
 	"${FILESDIR}"/${P}-rng.patch
 	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-makefile.patch )
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
 src_prepare() {
 	default
@@ -49,14 +54,10 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
-DOCS=( readme
-	z_faq.txt
-	z_update.txt )
-
 src_install() {
 	# Install the basic files but remove unneeded crap
-	emake DESTDIR="${D}/" installbase
-	rm "${D}"/{angdos.cfg,readme,z_faq.txt,z_update.txt}
+	emake DESTDIR="${D}/usr/" installbase
+	rm "${ED}"/usr/{angdos.cfg,readme,z_faq.txt,z_update.txt} || die
 
 	# Install everything else and fix the permissions
 	dobin zangband


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

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/zangband/
@ 2021-04-05 17:45 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-04-05 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     104ca58ef4e5af8d7978dd78327c102e32d9c4c3
Author:     Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail <DOT> com>
AuthorDate: Tue Mar  9 03:18:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 17:45:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104ca58e

games-roguelike/zangband: remove games.eclass, update to EAPI 7

TODO: figure out why DESTDIR is not respected
Signed-off-by: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-roguelike/zangband/zangband-2.7.4c.ebuild | 52 +++++++++++++------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index 23fcdc425c0..39b08af052a 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -1,9 +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
+EAPI=7
 
-inherit autotools eutils games
+inherit autotools multilib
 
 DESCRIPTION="An enhanced version of the Roguelike game Angband"
 HOMEPAGE="http://www.zangband.org/"
@@ -25,39 +25,41 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}
 
+PATCHES=( "${FILESDIR}"/${P}-tk85.patch
+	"${FILESDIR}"/${P}-rng.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-makefile.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-tk85.patch \
-		"${FILESDIR}"/${P}-rng.patch \
-		"${FILESDIR}"/${P}-tinfo.patch \
-		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-makefile.patch
+	default
+
 	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf \
-		--datadir="${GAMES_DATADIR_BASE}" \
-		--with-setgid="${GAMES_GROUP}" \
-		--without-gtk \
+	local myconf=(
+		--libdir="${EPREFIX}"/$(get_libdir)/${PN}
+		--with-setgid="nobody"
+		--without-gtk
 		$(use_with tk tcltk)
+	)
+
+	econf "${myconf[@]}"
 }
 
-src_install() {
-	# Keep some important dirs we want to chmod later
-	keepdir "${GAMES_DATADIR}"/${PN}/lib/{apex,user,save,bone,info,xtra/help,xtra/music}
+DOCS=( readme
+	z_faq.txt
+	z_update.txt )
 
+src_install() {
 	# Install the basic files but remove unneeded crap
-	emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase
-	rm "${D}${GAMES_DATADIR}"/${PN}/{angdos.cfg,readme,z_faq.txt,z_update.txt}
+	emake DESTDIR="${D}/" installbase
+	rm "${D}"/{angdos.cfg,readme,z_faq.txt,z_update.txt}
 
 	# Install everything else and fix the permissions
-	dogamesbin zangband
-	dodoc readme z_faq.txt z_update.txt
-	find "${D}${GAMES_DATADIR}/zangband/lib" -type f -exec chmod a-x \{\} +
-
-	prepgamesdirs
-	# All users in the games group need write permissions to
-	# some important dirs
-	fperms -R g+w "${GAMES_DATADIR}"/zangband/lib/{apex,data,save,user}
+	dobin zangband
+
+	einstalldocs
 }


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

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/zangband/
@ 2022-07-26  9:45 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-07-26  9:45 UTC (permalink / raw
  To: gentoo-commits

commit:     83a81ccad1ae3e8c76ad759ef0978d35b71e4839
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 09:43:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 09:43:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a81cca

games-roguelike/zangband: fix games.eclass migration

- Add missing deps

- Use /var/games to fix games.eclass migration.

  Bit cheesy but I don't see an alternative here.

  Unlike the actively developed(!) games-roguelike/angband, the build
  system (and code) is pretty brittle and it hardcodes in one
  hierarchy and doesn't allow easy splitting.

  Startup & saving games should work now.

I should've noticed when merging the PR but apparently
I didn't try running. Oh well.

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

 games-roguelike/zangband/zangband-2.7.4c-r1.ebuild | 82 ++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/games-roguelike/zangband/zangband-2.7.4c-r1.ebuild b/games-roguelike/zangband/zangband-2.7.4c-r1.ebuild
new file mode 100644
index 000000000000..d1fb2671077c
--- /dev/null
+++ b/games-roguelike/zangband/zangband-2.7.4c-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="An enhanced version of the Roguelike game Angband"
+HOMEPAGE="http://www.zangband.org/"
+SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
+
+LICENSE="Moria"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tk"
+
+RDEPEND="
+	acct-group/gamestat
+	sys-libs/ncurses:=
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt
+	tk? (
+		dev-lang/tcl:=
+		dev-lang/tk:=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="acct-group/gamestat"
+
+DOCS=( readme z_faq.txt z_update.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tk85.patch
+	"${FILESDIR}"/${P}-rng.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--datadir="${EPREFIX}"/var
+		--with-setgid=gamestat
+		--without-gtk
+		$(use_with tk tcltk)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	dodir /var/games/${PN}
+
+	# Install the basic files but remove unneeded bits to install ourselves
+	emake DESTDIR="${ED}"/var/games/${PN}/ installbase
+	# Covered via DOCS
+	rm "${ED}"/var/games/${PN}/{angdos.cfg,readme,z_faq.txt,z_update.txt} || die
+
+	# Install everything else and fix the permissions
+	dobin zangband
+
+	keepdir /var/games/zangband/lib/{bone,info,user,save,xtra/{,help,music}}
+
+	# All users in the games group need write permissions to
+	# some important dirs
+	fowners -R :gamestat /var/games/${PN}/lib/{apex,data,save,user}
+	fperms -R g+w /var/games/${PN}/lib/{apex,data,save,user}
+
+	einstalldocs
+}


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

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/zangband/
@ 2022-08-11  7:37 Ionen Wolkens
  0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2022-08-11  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     29dd25e6d75e041c8ca25d3300928b92263ccd08
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 06:12:19 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 07:37:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dd25e6

games-roguelike/zangband: drop 2.7.4c-r0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-roguelike/zangband/zangband-2.7.4c.ebuild | 66 -------------------------
 1 file changed, 66 deletions(-)

diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
deleted file mode 100644
index 211bb818327b..000000000000
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="An enhanced version of the Roguelike game Angband"
-HOMEPAGE="http://www.zangband.org/"
-SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz"
-S="${WORKDIR}"/${PN}
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-RDEPEND="
-	tk? (
-		dev-lang/tcl:0=
-		dev-lang/tk:0=
-		)
-	x11-libs/libXaw"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-DOCS=( readme z_faq.txt z_update.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tk85.patch
-	"${FILESDIR}"/${P}-rng.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-makefile.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}"/$(get_libdir)/${PN}
-		--with-setgid="nobody"
-		--without-gtk
-		$(use_with tk tcltk)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# Install the basic files but remove unneeded crap
-	emake DESTDIR="${D}/usr/" installbase
-	rm "${ED}"/usr/{angdos.cfg,readme,z_faq.txt,z_update.txt} || die
-
-	# Install everything else and fix the permissions
-	dobin zangband
-
-	einstalldocs
-}


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

* [gentoo-commits] repo/gentoo:master commit in: games-roguelike/zangband/
@ 2024-05-06  1:46 Ionen Wolkens
  0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2024-05-06  1:46 UTC (permalink / raw
  To: gentoo-commits

commit:     6f7ed9311da82ff301c8ff9807ff264212e2c4da
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 01:44:43 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May  6 01:44:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f7ed931

games-roguelike/zangband: remove HOMEPAGE

Don't know if it can be found somewhere else but the current
HOMEPAGE redirects to an unrelated gambling website so let's
not leave it like that.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-roguelike/zangband/zangband-2.7.4c-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/zangband/zangband-2.7.4c-r1.ebuild b/games-roguelike/zangband/zangband-2.7.4c-r1.ebuild
index d1fb2671077c..900c08ca15d6 100644
--- a/games-roguelike/zangband/zangband-2.7.4c-r1.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools
 
 DESCRIPTION="An enhanced version of the Roguelike game Angband"
-HOMEPAGE="http://www.zangband.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz"
 S="${WORKDIR}"/${PN}
 


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

end of thread, other threads:[~2024-05-06  1:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-05 17:45 [gentoo-commits] repo/gentoo:master commit in: games-roguelike/zangband/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-05-06  1:46 Ionen Wolkens
2022-08-11  7:37 Ionen Wolkens
2022-07-26  9:45 Sam James
2021-04-05 17:45 Sam James

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