gentoo resync : 28.04.2021

5 files changed, 41 insertions, 38 deletions

diff --git a/games-roguelike/zangband/Manifest b/games-roguelike/zangband/Manifest
index 8f05a411362f..890d843c7009 100644
--- a/games-roguelike/zangband/Manifest
+++ b/games-roguelike/zangband/Manifest
@@ -1,8 +1,8 @@
-AUX zangband-2.7.4c-configure.patch 1506 BLAKE2B a1fe4d0c0f1ce58e9487b282d9a0b5e363016c8df93141c6ef3fd63636693e696ad08d2e57242e2b62670257a395f623c795983dc646981f9bec0df99c244a26 SHA512 a5f0e8265aa05da7881b0e194bd4b1cc07d1376ad14d20bb4707d08ba1042a919d57f5ec7a8c990fd1d7f13d9dd8e5f147c1816eb99f2589dfdf0d399161c3ea
-AUX zangband-2.7.4c-makefile.patch 631 BLAKE2B 0266dbb4b40ef515ac6ab0c1f807fe56ea7f5254f43803900330dfe4e573283b484c88c1e3d953a6e11beec2e12b4ddf7c87495bf8e11a996ed3f2ffe4ab4620 SHA512 c6453d867336a7974757b1240a28715fd0e801d59f61fed23d053be86c7cdf6ea07bc874415b860076a4e5fd08537eff17793f0caa52a2bdb219514a7b8d1fd8
+AUX zangband-2.7.4c-configure.patch 1505 BLAKE2B e945c8aa0408250be05d10a98688ff32b5c752239b576e63355f05119f4272b543659441b950835fcb354c10c0581bf285abe9cfdf169a58058bd019e67e1dec SHA512 3d7a6b4f95b570b8fcedb5926f4bfa68af12925fe5742d935776ba655cf989bbbccbc0c6d1f358d385ff6dc0daf8ab79dde31905715a784386a3512a31fd5d0d
+AUX zangband-2.7.4c-makefile.patch 630 BLAKE2B ac98faa95612ff3d04103ddbab5596e50088911dd45668b0a61b00680de24af5263a6602439106da6684bdfc1121bc998aaa4e5ffb6990c4dd3867b068d7e2ad SHA512 00b6e85933a9128d0b4d6810b94edecc7add9050fa22e14fa1a6817227956952c15f8d35e9e75a8210c85fad33fca63f5144ffc3aaa894f8abe443e4cb6b700c
 AUX zangband-2.7.4c-rng.patch 285 BLAKE2B fa32ebcf9ce2e2da9f004d6973c19355e9ba813d870a5e309084f008ea014452f0d1597d6f92a370f46b29a2571b2914d6519c31b4af506daf6c5ef27271c31c SHA512 ff6e63d15c8d6243b24fc580c8e21c556edf578b5c31b6c0af62db8f096e4e47ebe50d201811d834ba32af678e5c6775b4d4426295dd3d87dbd8ce798d13528c
 AUX zangband-2.7.4c-tinfo.patch 513 BLAKE2B e095db92aa2d350850032d337dbfa7daf345b2ed01870a51ce864b6c01285335f412f79104d966468698bbf8839f9bc6dab494114d5e4979a70ec206d6e41373 SHA512 e0ec33b61f4aff5a6180ff861296a6fd1bf7ee9acb54b7b4dd4b35ccbfaf70e2e36c2dc0da2dbbfbd1d42857c9fec11e5bd7c1d8f2bf7f43acee5b41ba844629
-AUX zangband-2.7.4c-tk85.patch 1405 BLAKE2B 082065c1549874160c348d534167a440ef57ee1d74a4f1fc3f290360216ab58a19e2717d4e8f387d925dc8e67dffd7245ea1309d55d2b4888e6f37d16356f182 SHA512 358edb61b0703dabbe780a2fdca284b80c1fd68dba16e1b70de42b96c7407e5eaf6d9304789c2a37098c1ed2c10690731c9ad10002995f82c6289c1657d2e2c3
+AUX zangband-2.7.4c-tk85.patch 1404 BLAKE2B 88c346359d06439763baa39312e9f65da0acb934427e82754e14781cf8b599afb857689061aff6db4855898573a3bf7436322173242d3a76723316aa9415732c SHA512 41c71ebd62fe0eba51b0a07352729dda67ada6c7ff38a05adc6d66b71128962c324c4e51c7ed20db30fa4438e32704d1c5c32d567d1e115d2b41b1816fcd21f7
 DIST zangband-2.7.4c.tar.gz 2821355 BLAKE2B 5d541ad0e24d61000194beb6d5139b3ff5236de3e48ace9861716c953303f5b37c855c933e7aaab711ff7389a7f81e644654535f88f83cd999484d3e4254f4ad SHA512 491dfeb72b6eb34f7feaa45d5360014da8eaeccd173dd75b3f7a1c2034e4fb634817493957b75babc0d9600077a80d88529cf2e86769948fc86d05e59958356e
-EBUILD zangband-2.7.4c.ebuild 1609 BLAKE2B 0d249d0788841ae1b4a4bce6283e5cd9c0214d24311a268109bd2154acb80686d4ba003792a4abef621e5e19c4b907495c0179feca7f39626661900e41e8e3b8 SHA512 6c4307dcaf5b63d645ba67971fef0a26236306a8556a01c5e476dcdc41ab76e35c418523d924c1a479ef9caa7a68fcaecfbd8d02b1e91e4370f5056de6c80cc3
+EBUILD zangband-2.7.4c.ebuild 1233 BLAKE2B cda232b9f7a6bb0ce7198485aeae4c45730f32fb51a50b213169d1c44a6e36d6e140cc2d3c59d8b9bcee775cfa18303ca59ae73b64d890f399efb3b4545cd4a1 SHA512 714107a5740ea7a25f994e1793ec22438a6091c2636b36a3c6ae009b2c79045e64280248ea387eef2ccef3ab620be56eb87152acb5f41bee6cda53716692da56
 MISC metadata.xml 376 BLAKE2B c9d07a6b1cc2ad8e07c045d37d89534c2df89ac24fef88a632a7b8ecefbf38f4e409d00f0b832935d123cd51570ea360fefff021c399994880c42beaaaaa70ec SHA512 b6f1ab669041ee08a2aceec376775c41dc95e7bbdccff4c51fc930086c82c508d3bf2d92e4bf55f0888d157fec0aec6f7faaad1fc8dbdfacdb6b62c109dc8b19
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
index 756ea757845c..b56fed37cfdb 100644
--- a/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
@@ -1,5 +1,5 @@
---- configure.in.orig
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -236,48 +236,5 @@
  AC_CHECK_FUNCS([Tk_SetClassProcs TkpSync])
  AC_CHECK_FUNCS([mkstemp usleep getpwuid getpwnam shmget])
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
index bae74904cf02..0fb2821ecfad 100644
--- a/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
@@ -1,5 +1,5 @@
---- makefile.in.orig
-+++ makefile.in
+--- a/makefile.in
++++ b/makefile.in
 @@ -111,17 +111,6 @@
  %.o: %.c
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $< -c -o $@ $(DEFS)
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch b/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
index 73ea2ab5f9dc..6b4eff9d30da 100644
--- a/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
@@ -1,5 +1,5 @@
---- configure.in.orig
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -141,12 +141,12 @@
  ])
  
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index 23fcdc425c07..211bb818327b 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -1,13 +1,14 @@
-# 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
 
 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,44 +21,46 @@ 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
+	"${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}
-
 	# 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}/usr/" installbase
+	rm "${ED}"/usr/{angdos.cfg,readme,z_faq.txt,z_update.txt} || die
 
 	# 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
 }