fixing tcltk USE flag as per bug #17808

(Portage version: 2.1.1_pre5-r1)

5 files changed, 21 insertions, 17 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index d79466d2fef6..a79cd7f976ef 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.115 2006/08/13 18:00:47 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.116 2006/08/14 14:33:45 cardoe Exp $
+
+  14 Aug 2006; <dougg@gentoo.org> git-1.1.6.ebuild, git-1.4.0-r1.ebuild,
+  git-1.4.1.1.ebuild, git-1.4.2.ebuild:
+  fixing tcltk USE flag as per bug #17808
 
   13 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild:
   app-editors/emacs -> virtual/emacs
diff --git a/dev-util/git/git-1.1.6.ebuild b/dev-util/git/git-1.1.6.ebuild
index 7a35f9dee5ae..c316111a746a 100644
--- a/dev-util/git/git-1.1.6.ebuild
+++ b/dev-util/git/git-1.1.6.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/dev-util/git/git-1.1.6.ebuild,v 1.8 2006/02/18 12:18:02 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.1.6.ebuild,v 1.9 2006/08/14 14:33:45 cardoe Exp $
 
 inherit python toolchain-funcs eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/software/scm/git/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86"
-IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail webdav"
+IUSE="mozsha1 ppcsha1 doc curl tk gitsendemail webdav"
 
 DEPEND="dev-libs/openssl
 		sys-libs/zlib
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}
 		dev-lang/perl
 		>=dev-lang/python-2.3
 		app-text/rcs
-		tcltk? ( dev-lang/tk )
+		tk? ( dev-lang/tk )
 		dev-perl/String-ShellQuote
 		gitsendemail? ( dev-perl/Mail-Sendmail dev-perl/Email-Valid )"
 
@@ -78,7 +78,7 @@ src_compile() {
 src_install() {
 	make ${MY_MAKEOPTS} DESTDIR=${D} prefix=/usr install || die "make install failed"
 
-	use tcltk || rm ${D}/usr/bin/gitk
+	use tk || rm ${D}/usr/bin/gitk
 
 	doman ${WORKDIR}/${PN}-man-${DOC_VER}/man?/*
 
diff --git a/dev-util/git/git-1.4.0-r1.ebuild b/dev-util/git/git-1.4.0-r1.ebuild
index 8aa00f4dff14..1eb5f9723acb 100644
--- a/dev-util/git/git-1.4.0-r1.ebuild
+++ b/dev-util/git/git-1.4.0-r1.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/dev-util/git/git-1.4.0-r1.ebuild,v 1.3 2006/07/11 14:15:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.4.0-r1.ebuild,v 1.4 2006/08/14 14:33:45 cardoe Exp $
 
 inherit python toolchain-funcs eutils elisp-common
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/software/scm/git/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="curl doc emacs gtk mozsha1 ppcsha1 webdav X"
+IUSE="curl doc emacs gtk mozsha1 ppcsha1 tk webdav"
 
 DEPEND="dev-libs/openssl
 		sys-libs/zlib
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}
 		dev-lang/perl
 		>=dev-lang/python-2.3
 		app-text/rcs
-		X? ( dev-lang/tk )
+		tk? ( dev-lang/tk )
 		gtk? ( >=dev-python/pygtk-2.6 )"
 
 # This is needed because for some obscure reasons future calls to make don't
@@ -84,7 +84,7 @@ src_compile() {
 src_install() {
 	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
 
-	use X || rm "${D}"/usr/bin/gitk
+	use tk || rm "${D}"/usr/bin/gitk
 
 	doman "${WORKDIR}"/man?/*
 
diff --git a/dev-util/git/git-1.4.1.1.ebuild b/dev-util/git/git-1.4.1.1.ebuild
index af085dbe343f..df1b16020aba 100644
--- a/dev-util/git/git-1.4.1.1.ebuild
+++ b/dev-util/git/git-1.4.1.1.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/dev-util/git/git-1.4.1.1.ebuild,v 1.10 2006/08/12 20:41:43 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.4.1.1.ebuild,v 1.11 2006/08/14 14:33:45 cardoe Exp $
 
 inherit python toolchain-funcs eutils elisp-common
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/software/scm/git/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~ia64 ppc ~ppc-macos ppc64 sparc x86 ~x86-fbsd"
-IUSE="curl doc emacs gtk mozsha1 ppcsha1 webdav X"
+IUSE="curl doc emacs gtk mozsha1 ppcsha1 tk webdav"
 
 DEPEND="dev-libs/openssl
 		sys-libs/zlib
@@ -27,7 +27,7 @@ RDEPEND="${DEPEND}
 		dev-lang/perl
 		>=dev-lang/python-2.3
 		app-text/rcs
-		X? ( dev-lang/tk )
+		tk? ( dev-lang/tk )
 		gtk? ( >=dev-python/pygtk-2.6 )"
 
 # This is needed because for some obscure reasons future calls to make don't
@@ -85,7 +85,7 @@ src_compile() {
 src_install() {
 	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
 
-	use X || rm "${D}"/usr/bin/gitk
+	use tk || rm "${D}"/usr/bin/gitk
 
 	doman "${WORKDIR}"/man?/*
 
diff --git a/dev-util/git/git-1.4.2.ebuild b/dev-util/git/git-1.4.2.ebuild
index 8ec8d27b9e06..6f9e768d3194 100644
--- a/dev-util/git/git-1.4.2.ebuild
+++ b/dev-util/git/git-1.4.2.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/dev-util/git/git-1.4.2.ebuild,v 1.2 2006/08/13 18:00:47 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.4.2.ebuild,v 1.3 2006/08/14 14:33:45 cardoe Exp $
 
 inherit python toolchain-funcs eutils elisp-common
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/software/scm/git/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="curl doc emacs gtk mozsha1 ppcsha1 webdav X"
+IUSE="curl doc emacs gtk mozsha1 ppcsha1 tk webdav"
 
 DEPEND="dev-libs/openssl
 		sys-libs/zlib
@@ -27,7 +27,7 @@ RDEPEND="${DEPEND}
 		dev-lang/perl
 		>=dev-lang/python-2.3
 		app-text/rcs
-		X? ( dev-lang/tk )
+		tk? ( dev-lang/tk )
 		gtk? ( >=dev-python/pygtk-2.6 )"
 
 # This is needed because for some obscure reasons future calls to make don't
@@ -84,7 +84,7 @@ src_compile() {
 src_install() {
 	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
 
-	use X || rm "${D}"/usr/bin/gitk
+	use tk || rm "${D}"/usr/bin/gitk
 
 	doman "${WORKDIR}"/man?/*