fix LICENSE #36958

4 files changed, 6 insertions, 63 deletions

diff --git a/games-roguelike/hengband/hengband-1.5.4.ebuild b/games-roguelike/hengband/hengband-1.5.4.ebuild
index 207529dae2b3..14fb260304b5 100644
--- a/games-roguelike/hengband/hengband-1.5.4.ebuild
+++ b/games-roguelike/hengband/hengband-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/hengband/hengband-1.5.4.ebuild,v 1.1 2003/12/27 07:43:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/hengband/hengband-1.5.4.ebuild,v 1.2 2004/01/01 23:58:24 vapier Exp $
 
 inherit games
 
@@ -8,7 +8,7 @@ DESCRIPTION="An Angband variant, with a Japanese/fantasy theme"
 HOMEPAGE="http://hengband.sourceforge.jp/en/"
 SRC_URI="ftp://clockwork.dementia.org/angband/Variant/Hengband/${P}.tar.gz"
 
-LICENSE="Moria | GPL-2"
+LICENSE="Moria"
 SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE="cjk X"
diff --git a/games-roguelike/zangband/files/digest-zangband-2.7.3 b/games-roguelike/zangband/files/digest-zangband-2.7.3
deleted file mode 100644
index 348f1d6af640..000000000000
--- a/games-roguelike/zangband/files/digest-zangband-2.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f3d7f74aec7d04412ea8442603458815 zangband-2.7.3.tar.gz 2723509
diff --git a/games-roguelike/zangband/zangband-2.7.3.ebuild b/games-roguelike/zangband/zangband-2.7.3.ebuild
deleted file mode 100644
index c9fe82072770..000000000000
--- a/games-roguelike/zangband/zangband-2.7.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.3.ebuild,v 1.1 2003/09/10 04:59:58 vapier Exp $
-
-inherit games
-
-DESCRIPTION="An enhanced version of the Roguelike game Angband"
-HOMEPAGE="http://www.zangband.org/"
-SRC_URI="ftp://clockwork.dementia.org/angband/Variant/ZAngband/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Moria GPL-2"
-KEYWORDS="x86 ppc"
-IUSE="X"
-
-DEPEND=">=sys-libs/ncurses-5
-	>=sys-apps/sed-4
-	X? ( >=x11-base/xfree-4.0 )"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	# Version 2.7.3 won't configure without this
-	export WANT_AUTOCONF_2_5=1
-
-	local myconf="--with-setgid=${GAMES_GROUP}"
-	use X || myconf="${myconf} --without-x"
-
-	# Bootstrap and configure Zangband
-	./bootstrap || die "bootstrapping failed"
-	egamesconf ${myconf} || die
-
-	# This fixes the games/games bug
-	sed -i "s:${GAMES_DATADIR}:/usr/share:" makefile
-	emake || die
-}
-
-src_install() {
-	# Keep some important dirs we want to chmod later
-	keepdir ${GAMES_DATADIR}/zangband/lib/apex
-	keepdir ${GAMES_DATADIR}/zangband/lib/user
-	keepdir ${GAMES_DATADIR}/zangband/lib/save
-
-	# Install the basic files but remove unneeded crap
-	make DESTDIR=${D}/${GAMES_DATADIR}/zangband/ installbase || die
-	rm ${D}/${GAMES_DATADIR}/zangband/{angdos.cfg,readme,z_faq.txt,z_update.txt}
-
-	# Install everything else and fix the permissions
-	exeinto /usr/games/bin
-	doexe zangband
-	dodoc readme z_faq.txt z_update.txt
-
-	prepgamesdirs
-	# All users in the games group need write permissions to some important dirs
-	chmod -R g+w ${D}/${GAMES_DATADIR}/zangband/lib/{apex,save,user}
-}
diff --git a/games-roguelike/zangband/zangband-2.7.4.ebuild b/games-roguelike/zangband/zangband-2.7.4.ebuild
index a9667ecfed1a..ff4c88ca959a 100644
--- a/games-roguelike/zangband/zangband-2.7.4.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4.ebuild,v 1.1 2003/11/25 10:57:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4.ebuild,v 1.2 2004/01/01 23:58:05 vapier Exp $
 
 inherit games
 
@@ -8,9 +8,9 @@ DESCRIPTION="An enhanced version of the Roguelike game Angband"
 HOMEPAGE="http://www.zangband.org/"
 SRC_URI="ftp://clockwork.dementia.org/angband/Variant/ZAngband/${P}.tar.gz"
 
-KEYWORDS="x86 ppc"
-LICENSE="Moria GPL-2"
+LICENSE="Moria"
 SLOT="0"
+KEYWORDS="x86 ppc"
 IUSE="X"
 
 DEPEND=">=sys-libs/ncurses-5
@@ -20,7 +20,7 @@ DEPEND=">=sys-libs/ncurses-5
 	gtk? ( =x11-libs/gtk+-1* )
 	X? ( virtual/x11 )"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	egamesconf \