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

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 46 insertions, 44 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/Manifest b/games-roguelike/zangband/Manifest
index 8dfbff0e518a..20abc2d61631 100644
--- a/games-roguelike/zangband/Manifest
+++ b/games-roguelike/zangband/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST zangband-2.7.4b.tar.gz 2765148 RMD160 e3443a8eecaa616d2329114aa7f3f08351e36b6f SHA256 64e99e4a1aa3881909b8b02d6942fe408c278902a5e8c75b59713e515388fea0
 DIST zangband-2.7.4c.tar.gz 2821355 RMD160 50d2f0d6cf7f71302b0f7efcc819ddb4da86cd30 SHA1 476c6cd7555b76626a4a1e05e979ff7976f92875 SHA256 3033fc52d0daab6098394a8caaa6572ba64585d7b9deb62800328ca7ba592cdc
-EBUILD zangband-2.7.4b.ebuild 1848 RMD160 d4d587e8285ee6b1afb922b3a14ef960a89a36ec SHA1 3693c4c40166805f27408036211446a9a036c072 SHA256 26f7e12ea7def43c4b9b07c3bd55ee8099fc8cd1f628c58a95bdbcb8c3f59c41
-MD5 35c70fb609c4aa7fbfcd86e1e5cd6f6a zangband-2.7.4b.ebuild 1848
-RMD160 d4d587e8285ee6b1afb922b3a14ef960a89a36ec zangband-2.7.4b.ebuild 1848
-SHA256 26f7e12ea7def43c4b9b07c3bd55ee8099fc8cd1f628c58a95bdbcb8c3f59c41 zangband-2.7.4b.ebuild 1848
-EBUILD zangband-2.7.4c.ebuild 1863 RMD160 5ef7b6fbdbe71a967350e0a01679351dca8ea5db SHA1 6cf84001c1e4f57dd05f6ec9d46a25bda49d74cc SHA256 6186076eb3096581bc32ba4319f6575f8db4b457222fbd92e972ac6d10ff8989
-MD5 b0c3c07eaecf7a33c6babb21146d5066 zangband-2.7.4c.ebuild 1863
-RMD160 5ef7b6fbdbe71a967350e0a01679351dca8ea5db zangband-2.7.4c.ebuild 1863
-SHA256 6186076eb3096581bc32ba4319f6575f8db4b457222fbd92e972ac6d10ff8989 zangband-2.7.4c.ebuild 1863
-MISC ChangeLog 1919 RMD160 55a5965467fc10c88881c7a66a31aca809d562e5 SHA1 da2aa27a9af911996bc747eae72c702a67a18781 SHA256 cdd053ba114b916dadb1210fdcf0985e7dc79b70366857f34064fcb2692214db
-MD5 42f019ad3d5f3aa3e80696d28f3562d7 ChangeLog 1919
-RMD160 55a5965467fc10c88881c7a66a31aca809d562e5 ChangeLog 1919
-SHA256 cdd053ba114b916dadb1210fdcf0985e7dc79b70366857f34064fcb2692214db ChangeLog 1919
+EBUILD zangband-2.7.4b.ebuild 1843 RMD160 c4542a6420ca593a8703498239fd55387074e460 SHA1 e941f02c41875ff88d834a6a907a283947d46387 SHA256 b7f9a4701369606f09aa7386a842045b2902570e86841622a40db66d317eacbc
+MD5 90cce28b77ee52910fb6ae385c4c4ffd zangband-2.7.4b.ebuild 1843
+RMD160 c4542a6420ca593a8703498239fd55387074e460 zangband-2.7.4b.ebuild 1843
+SHA256 b7f9a4701369606f09aa7386a842045b2902570e86841622a40db66d317eacbc zangband-2.7.4b.ebuild 1843
+EBUILD zangband-2.7.4c.ebuild 1742 RMD160 bf0adcefbb4b5574e8f53b8de40478aec8769e68 SHA1 068478a6b3b5907812bb0e48ce95af9056f9fc89 SHA256 e9d9d9dfe46f310c160f1daddfafd5856a58b91e29c2045ada081d03ae8fedde
+MD5 ca5b29072ed2136bf63e6a1b600f8a9b zangband-2.7.4c.ebuild 1742
+RMD160 bf0adcefbb4b5574e8f53b8de40478aec8769e68 zangband-2.7.4c.ebuild 1742
+SHA256 e9d9d9dfe46f310c160f1daddfafd5856a58b91e29c2045ada081d03ae8fedde zangband-2.7.4c.ebuild 1742
+MISC ChangeLog 2060 RMD160 2677301989ac4c51bd90675c7da3cd9e83b1ff0d SHA1 6ede8267339c32e8ef3194fdeeab95d138754462 SHA256 6ecd0fc5c77aac909599935e4f78755455a486ac0a814646540adbe8b7b16320
+MD5 5438833ba21e4b5e5cdef6931c28451d ChangeLog 2060
+RMD160 2677301989ac4c51bd90675c7da3cd9e83b1ff0d ChangeLog 2060
+SHA256 6ecd0fc5c77aac909599935e4f78755455a486ac0a814646540adbe8b7b16320 ChangeLog 2060
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,9 +26,9 @@ MD5 142e422bf8923fcb8e5bc71686dacb0d files/digest-zangband-2.7.4c 250
 RMD160 48f2ab84903a8d466240cc5d3c7bf2bf6665def2 files/digest-zangband-2.7.4c 250
 SHA256 a3eaf2f1501202db966d617e7e948757ce5bd5fde7476db3e1130e1e468a3fc3 files/digest-zangband-2.7.4c 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEvHCkAiZjviIA2XgRAuI4AJ42hy/NgdkmWs2tWX3YcPi3y4XA5ACg1i7B
-gmdRc6tK/o7aDHLj3RNFgfs=
-=bWxm
+iD8DBQFFTT7xdz7hIScOURERAsjfAJ49CMNMu5ico3AyHsX6tPWUlldJ0QCeIIVh
+c9dAzctX0PCCnZPPqKhST7A=
+=NWj9
 -----END PGP SIGNATURE-----
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}
 }