tcltk -> tk USE flag change as per bug #17808

(Portage version: 2.1.2_pre1)

9 files changed, 43 insertions, 23 deletions

diff --git a/sys-fs/hfsutils/ChangeLog b/sys-fs/hfsutils/ChangeLog
index 3bbf7480ad29..6f32bb897ff1 100644
--- a/sys-fs/hfsutils/ChangeLog
+++ b/sys-fs/hfsutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/hfsutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/ChangeLog,v 1.14 2006/03/27 09:28:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/ChangeLog,v 1.15 2006/09/19 02:11:06 cardoe Exp $
+
+  19 Sep 2006; Doug Goldstein <cardoe@gentoo.org> hfsutils-3.2.6-r1.ebuild,
+  hfsutils-3.2.6-r2.ebuild, hfsutils-3.2.6-r3.ebuild,
+  hfsutils-3.2.6-r5.ebuild:
+  tcltk -> tk USE flag change as per bug #17808
 
 *hfsutils-3.2.6-r5 (27 Mar 2006)
 
diff --git a/sys-fs/hfsutils/files/digest-hfsutils-3.2.6 b/sys-fs/hfsutils/files/digest-hfsutils-3.2.6
index 7cdf8f29675b..871a0bd31a2c 100644
--- a/sys-fs/hfsutils/files/digest-hfsutils-3.2.6
+++ b/sys-fs/hfsutils/files/digest-hfsutils-3.2.6
@@ -1 +1,3 @@
 MD5 fa572afd6da969e25c1455f728750ec4 hfsutils-3.2.6.tar.gz 207697
+RMD160 a8b8c0c6556f3be2b701baab80b933dc6691a6ea hfsutils-3.2.6.tar.gz 207697
+SHA256 bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840 hfsutils-3.2.6.tar.gz 207697
diff --git a/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r1 b/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r1
index 7cdf8f29675b..871a0bd31a2c 100644
--- a/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r1
+++ b/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r1
@@ -1 +1,3 @@
 MD5 fa572afd6da969e25c1455f728750ec4 hfsutils-3.2.6.tar.gz 207697
+RMD160 a8b8c0c6556f3be2b701baab80b933dc6691a6ea hfsutils-3.2.6.tar.gz 207697
+SHA256 bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840 hfsutils-3.2.6.tar.gz 207697
diff --git a/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r2 b/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r2
index 7cdf8f29675b..871a0bd31a2c 100644
--- a/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r2
+++ b/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r2
@@ -1 +1,3 @@
 MD5 fa572afd6da969e25c1455f728750ec4 hfsutils-3.2.6.tar.gz 207697
+RMD160 a8b8c0c6556f3be2b701baab80b933dc6691a6ea hfsutils-3.2.6.tar.gz 207697
+SHA256 bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840 hfsutils-3.2.6.tar.gz 207697
diff --git a/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r3 b/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r3
index 7cdf8f29675b..871a0bd31a2c 100644
--- a/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r3
+++ b/sys-fs/hfsutils/files/digest-hfsutils-3.2.6-r3
@@ -1 +1,3 @@
 MD5 fa572afd6da969e25c1455f728750ec4 hfsutils-3.2.6.tar.gz 207697
+RMD160 a8b8c0c6556f3be2b701baab80b933dc6691a6ea hfsutils-3.2.6.tar.gz 207697
+SHA256 bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840 hfsutils-3.2.6.tar.gz 207697
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild
index ab93209cdd85..63208a8690bc 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild,v 1.5 2005/02/05 21:20:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild,v 1.6 2006/09/19 02:11:06 cardoe Exp $
 
 DESCRIPTION="HFS FS Access utils"
 HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
@@ -9,15 +9,17 @@ SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ppc"
-IUSE="tcltk"
+IUSE="tcl tk"
 
 DEPEND="virtual/libc
-	tcltk? ( dev-lang/tcl dev-lang/tk )"
+	tcl? ( dev-lang/tcl )
+	tk? ( dev-lang/tk )"
 RDEPEND=""
 
 src_compile() {
 	local myconf
-	use tcltk && myconf="--with-tcl --with-tk"
+	use tcl && myconf="--with-tcl"
+	use tk && myconf="--with-tk"
 
 	econf ${myconf} || die
 	emake PREFIX=/usr MANDIR=/usr/share/man || die
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild
index 34fe0133c2fc..4d05b6451250 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild,v 1.6 2005/02/05 21:20:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild,v 1.7 2006/09/19 02:11:06 cardoe Exp $
 
 inherit eutils
 
@@ -11,10 +11,11 @@ SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc ~x86"
-IUSE="tcltk"
+IUSE="tcl tk"
 
 DEPEND="virtual/libc
-	tcltk? ( dev-lang/tcl dev-lang/tk )"
+	tcl? ( dev-lang/tcl )
+	tk? ( dev-lang/tk )"
 RDEPEND=""
 
 src_unpack() {
@@ -25,7 +26,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use tcltk && myconf="--with-tcl --with-tk"
+	use tcl && myconf="--with-tcl"
+	use tk && myconf="--with-tk"
 
 	econf ${myconf} || die
 	emake PREFIX=/usr MANDIR=/usr/share/man || die
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild
index 6244f145ce73..f5a7b408bc7b 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild,v 1.8 2005/02/05 21:20:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild,v 1.9 2006/09/19 02:11:06 cardoe Exp $
 
 inherit eutils
 
@@ -11,11 +11,12 @@ SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ppc ~sparc ppc64"
-IUSE="tcltk"
+IUSE="tcl tk"
 
 DEPEND="virtual/libc
-	tcltk? ( dev-lang/tcl dev-lang/tk )"
-RDEPEND=""
+	tcl? ( dev-lang/tcl )
+	tk? ( dev-lang/tk )"
+RDEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -25,7 +26,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use tcltk && myconf="--with-tcl --with-tk"
+	use tcl && myconf="--with-tcl"
+	use tk && myconf="--with-tk"
 
 	econf ${myconf} || die
 	emake PREFIX=/usr MANDIR=/usr/share/man || die
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
index 20b84978d12a..9faa500fd47b 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r5.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/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild,v 1.1 2006/03/27 09:28:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild,v 1.2 2006/09/19 02:11:06 cardoe Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,10 +11,11 @@ SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="tcltk"
+IUSE="tcl tk"
 
-DEPEND="tcltk? ( dev-lang/tcl dev-lang/tk )"
-RDEPEND=""
+DEPEND="tcl? ( dev-lang/tcl )
+		tk? ( dev-lang/tk )"
+RDEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -26,8 +27,8 @@ src_unpack() {
 src_compile() {
 	tc-export CC CPP LD RANLIB
 	econf \
-		$(use_with tcltk tcl) \
-		$(use_with tcltk tk) \
+		$(use_with tcl) \
+		$(use_with tk) \
 		|| die
 	emake PREFIX=/usr MANDIR=/usr/share/man || die
 	emake -C hfsck PREFIX=/usr MANDIR=/usr/share/man || die