[gentoo-commits] repo/gentoo:master commit in: games-roguelike/zangband/

["Sam James" <sam@gentoo.org>]

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