Change "tcltk" USE flag to "tk", bug #17808

(Portage version: 2.1.2_rc1-r3)

3 files changed, 30 insertions, 28 deletions

diff --git a/games-roguelike/zangband/ChangeLog b/games-roguelike/zangband/ChangeLog
index ecaa93549c8c..054e07209e31 100644
--- a/games-roguelike/zangband/ChangeLog
+++ b/games-roguelike/zangband/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/zangband
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.9 2006/07/18 05:24:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.10 2006/11/05 01:31:22 nyhm Exp $
+
+  05 Nov 2006; Tristan Heaven <nyhm@gentoo.org> zangband-2.7.4b.ebuild,
+  zangband-2.7.4c.ebuild:
+  Change "tcltk" USE flag to "tk", bug #17808
 
   18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> zangband-2.7.4c.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/games-roguelike/zangband/zangband-2.7.4b.ebuild b/games-roguelike/zangband/zangband-2.7.4b.ebuild
index b36680da36b6..0767ddad2e07 100644
--- a/games-roguelike/zangband/zangband-2.7.4b.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4b.ebuild,v 1.3 2006/02/21 23:29:09 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4b.ebuild,v 1.4 2006/11/05 01:31:22 nyhm Exp $
 
 inherit games
 
@@ -11,14 +11,14 @@ SRC_URI="ftp://clockwork.dementia.org/angband/Variant/ZAngband/${P}.tar.gz"
 LICENSE="Moria"
 SLOT="0"
 KEYWORDS="x86 ppc"
-IUSE="gtk tcltk"
+IUSE="gtk tk"
 
 # Dropping X use keyword: 
 #  it had to be $(use_with X x11)
 #  but ebuild fails to link without-x11
 RDEPEND=">=sys-libs/ncurses-5
 	sys-libs/zlib
-	tcltk? (
+	tk? (
 		dev-lang/tcl
 		dev-lang/tk
 	)
@@ -34,7 +34,7 @@ src_compile() {
 		--datadir="${GAMES_DATADIR_BASE}" \
 		"--with-setgid=${GAMES_GROUP}" \
 		`use_with gtk` \
-		`use_with tcltk` \
+		`use_with tk tcltk` \
 		|| die "configure failed"
 	emake || die "emake failed"
 }
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index f3b23cdac374..374ed4d0da0e 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.2 2006/07/18 05:24:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.3 2006/11/05 01:31:22 nyhm Exp $
 
 inherit games
 
@@ -11,51 +11,49 @@ SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz"
 LICENSE="Moria"
 SLOT="0"
 KEYWORDS="~ppc ~x86 ~x86-fbsd"
-IUSE="gtk tcltk"
+IUSE="gtk tk"
 
 # Dropping X use keyword: 
 #  it had to be $(use_with X x11)
 #  but ebuild fails to link without-x11
-RDEPEND=">=sys-libs/ncurses-5
-	sys-libs/zlib
-	tcltk? (
+RDEPEND="tk? (
 		dev-lang/tcl
-		dev-lang/tk
-	)
+		dev-lang/tk )
 	gtk? ( =x11-libs/gtk+-1* )
-	|| ( x11-libs/libXaw virtual/x11 )"
+	x11-libs/libXaw"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	egamesconf \
 		--datadir="${GAMES_DATADIR_BASE}" \
-		"--with-setgid=${GAMES_GROUP}" \
-		`use_with gtk` \
-		`use_with tcltk` \
-		|| die "configure failed"
+		--with-setgid="${GAMES_GROUP}" \
+		$(use_with gtk) \
+		$(use_with tk tcltk) \
+		|| die
 	emake || die "emake failed"
 }
 
 src_install() {
 	# Keep some important dirs we want to chmod later
-	keepdir ${GAMES_DATADIR}/zangband/lib/apex \
-		${GAMES_DATADIR}/zangband/lib/user \
-		${GAMES_DATADIR}/zangband/lib/save
+	keepdir "${GAMES_DATADIR}"/${PN}/lib/apex \
+		"${GAMES_DATADIR}"/${PN}/lib/user \
+		"${GAMES_DATADIR}"/${PN}/lib/save
 
 	# Install the basic files but remove unneeded crap
-	make DESTDIR=${D}/${GAMES_DATADIR}/zangband/ installbase || \
-		die "make installbase failed"
-	rm ${D}${GAMES_DATADIR}/zangband/{angdos.cfg,readme,z_faq.txt,z_update.txt}
+	emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase \
+		|| die "emake installbase failed"
+	rm "${D}${GAMES_DATADIR}"/${PN}/{angdos.cfg,readme,z_faq.txt,z_update.txt}
 
 	# Install everything else and fix the permissions
-	dogamesbin zangband                 || die "dogamesbin failed"
+	dogamesbin zangband || die "dogamesbin failed"
 	dodoc readme z_faq.txt z_update.txt || die "dodoc failed"
 	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
-	chmod -R g+w ${D}/${GAMES_DATADIR}/zangband/lib/{apex,save,user}
+	# All users in the games group need write permissions to
+	# some important dirs
+	fperms -R g+w "${GAMES_DATADIR}"/zangband/lib/{apex,save,user}
 }