USE flag split tcltk-> tcl & tk per bug #17808

Package-Manager: portage-2.1.1_pre4-r2

7 files changed, 61 insertions, 51 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index f611d2fbfc93..12a009b8f0d9 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.285 2006/07/31 23:30:07 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.286 2006/08/04 14:36:38 cardoe Exp $
+
+  04 Aug 2006; <dougg@gentoo.org> postgresql-7.3.11.ebuild,
+  postgresql-7.3.15-r1.ebuild, postgresql-7.4.13.ebuild,
+  postgresql-8.0.8.ebuild, postgresql-8.1.4.ebuild:
+  USE flag split tcltk-> tcl & tk per bug #17808
 
   31 Jul 2006; Luca Longinotti <chtekk@gentoo.org>
   -files/postgresql-7.3.15-cubeparse.patch,
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 8cbfd320343b..1cd1538c2d3d 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -99,30 +99,30 @@ DIST postgresql-opt-7.3.15.tar.bz2 341753 RMD160 8057276fff0ae87f49fb4853e6f3df6
 DIST postgresql-opt-7.4.13.tar.bz2 333860 RMD160 9fd1caacd6d842a473725450a0973173f68ae7b8 SHA1 79455e60f074a488ab3abafd10bfce4c63b33293 SHA256 8139a7161b2a55eba304b027896f0bfc81523dd41f7d1df222274b7a55e5aeab
 DIST postgresql-opt-8.0.8.tar.bz2 134600 RMD160 352f07aa25d0dcf1d2e3502f5cec7295c40bc3d5 SHA1 081d0b8d755a49395001b46ca0585c4e2b5ecf4f SHA256 427e82253b068b35e47235a1b78c521c89a9774b80dcc2433946f86220a34926
 DIST postgresql-opt-8.1.4.tar.bz2 144696 RMD160 8f25c6137a8cbd786a647cf4d8ef59c95573012d SHA1 ba8ed68da796e67858f7c100f6d64f1586540f05 SHA256 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
-EBUILD postgresql-7.3.11.ebuild 8401 RMD160 587943314f9b1af244247efab68029388eee9e09 SHA1 5cfd28d387a74bcb919d52fcbe76c4b553c0232e SHA256 f0d3f2d172a07d888455c358b525493bb15fe97577b604f258630a1d046742a1
-MD5 c540c692fbdd4385ccdd4e4aec09aae5 postgresql-7.3.11.ebuild 8401
-RMD160 587943314f9b1af244247efab68029388eee9e09 postgresql-7.3.11.ebuild 8401
-SHA256 f0d3f2d172a07d888455c358b525493bb15fe97577b604f258630a1d046742a1 postgresql-7.3.11.ebuild 8401
-EBUILD postgresql-7.3.15-r1.ebuild 8514 RMD160 930d79a86c600a23cbdd2d39c498a026a8cee102 SHA1 068084a34cd021502775bb7b291e8994b4794d36 SHA256 fe4b1a3ef975744b840bca7e30d821954c43fd3d673e0ba051fae03302ecfc17
-MD5 2a983db5d8b0808275c1f72c2de327c8 postgresql-7.3.15-r1.ebuild 8514
-RMD160 930d79a86c600a23cbdd2d39c498a026a8cee102 postgresql-7.3.15-r1.ebuild 8514
-SHA256 fe4b1a3ef975744b840bca7e30d821954c43fd3d673e0ba051fae03302ecfc17 postgresql-7.3.15-r1.ebuild 8514
-EBUILD postgresql-7.4.13.ebuild 10693 RMD160 f97311b69d04a1678d9841039c6231c35541b4fb SHA1 a7105807b9ccec595879591370c029bcdc144d80 SHA256 fc9c0d89fa011c688b04b8bffce912b050bbb2f9994af52fe9a0bc5b0bfe1ffa
-MD5 1d77d6d9067b80d60ebf43a47fb2b354 postgresql-7.4.13.ebuild 10693
-RMD160 f97311b69d04a1678d9841039c6231c35541b4fb postgresql-7.4.13.ebuild 10693
-SHA256 fc9c0d89fa011c688b04b8bffce912b050bbb2f9994af52fe9a0bc5b0bfe1ffa postgresql-7.4.13.ebuild 10693
-EBUILD postgresql-8.0.8.ebuild 7659 RMD160 a9b57522b7e7fefa2201edc7340af81d922c37c4 SHA1 f02faa1f213b51fb80867b5991ce5ee155c0b906 SHA256 8665d5aa48507508fb7df6c13698c6cfe37a01470747f1a1e5d1c2fad026af64
-MD5 2e5eba62bc3161b3b0f0b0557e90edf5 postgresql-8.0.8.ebuild 7659
-RMD160 a9b57522b7e7fefa2201edc7340af81d922c37c4 postgresql-8.0.8.ebuild 7659
-SHA256 8665d5aa48507508fb7df6c13698c6cfe37a01470747f1a1e5d1c2fad026af64 postgresql-8.0.8.ebuild 7659
-EBUILD postgresql-8.1.4.ebuild 7743 RMD160 ffc6909b4c6c681f3d738f629da59288ba520639 SHA1 8b354052abd8d44d03ccb47bb157d57adfb84627 SHA256 88c47cc67a82754ef64b414e59b26e391c21f7cbe4a73e78125da2fecda3af12
-MD5 d9cc36dfcaa0734dd891473f9514d063 postgresql-8.1.4.ebuild 7743
-RMD160 ffc6909b4c6c681f3d738f629da59288ba520639 postgresql-8.1.4.ebuild 7743
-SHA256 88c47cc67a82754ef64b414e59b26e391c21f7cbe4a73e78125da2fecda3af12 postgresql-8.1.4.ebuild 7743
-MISC ChangeLog 61510 RMD160 fdbc58af728433ecab87026fe345a25d89c42ace SHA1 ff7ff0778b218ba593e6ea9a69b5789f3111518c SHA256 f9491ce39f2199fb6336d71f31ed60eb443398ef0eb2dae89535afa606bcbee6
-MD5 1ff60ce5848e2cf211b5b6633a1d61fc ChangeLog 61510
-RMD160 fdbc58af728433ecab87026fe345a25d89c42ace ChangeLog 61510
-SHA256 f9491ce39f2199fb6336d71f31ed60eb443398ef0eb2dae89535afa606bcbee6 ChangeLog 61510
+EBUILD postgresql-7.3.11.ebuild 8405 RMD160 e3e4e72fd9b41b6c6c9c29e9ac01eacd665b0f74 SHA1 6c55c13f0882784ece835206dbb1ceb70d1379b4 SHA256 3e52d8e8d27798a1217188871711f0a3ecc3406c38dde981b020d50d899c0887
+MD5 dddf51b5f08883fd55944f9c1062a263 postgresql-7.3.11.ebuild 8405
+RMD160 e3e4e72fd9b41b6c6c9c29e9ac01eacd665b0f74 postgresql-7.3.11.ebuild 8405
+SHA256 3e52d8e8d27798a1217188871711f0a3ecc3406c38dde981b020d50d899c0887 postgresql-7.3.11.ebuild 8405
+EBUILD postgresql-7.3.15-r1.ebuild 8518 RMD160 3f862c6f4b6549dcdff086dc9f1785fab7f09cc5 SHA1 3ec43cf163bb737b8c8973474da8a17ea7273fa7 SHA256 97aaee8a7c6dba0be4d3fb1aca6397940df6b76c4d8f9e47d6e610787aa9a60a
+MD5 68ef24890abebda7bb4e86a525d01b67 postgresql-7.3.15-r1.ebuild 8518
+RMD160 3f862c6f4b6549dcdff086dc9f1785fab7f09cc5 postgresql-7.3.15-r1.ebuild 8518
+SHA256 97aaee8a7c6dba0be4d3fb1aca6397940df6b76c4d8f9e47d6e610787aa9a60a postgresql-7.3.15-r1.ebuild 8518
+EBUILD postgresql-7.4.13.ebuild 10697 RMD160 48a4d86db7baa79e5041195fcc5c9f567b4e6185 SHA1 988d25d48645dd1887169438ea0c00c3f65d9cc2 SHA256 0f3da83dee383fca39a466b3fc000d667754d62146e33751cead19b7d4eacc34
+MD5 85fa6d33135cc9b866ecd51843cccfb8 postgresql-7.4.13.ebuild 10697
+RMD160 48a4d86db7baa79e5041195fcc5c9f567b4e6185 postgresql-7.4.13.ebuild 10697
+SHA256 0f3da83dee383fca39a466b3fc000d667754d62146e33751cead19b7d4eacc34 postgresql-7.4.13.ebuild 10697
+EBUILD postgresql-8.0.8.ebuild 7663 RMD160 d49d1e4723fb33d3546e65ce7ac432bdb86e8d24 SHA1 e83a6e9a7a2a961b53ccb026acfd34640c0b1da2 SHA256 15506ee24cfe46cb1f2b4409ec4f8b564fd18d882e10201d1a2c7f075cafbc5b
+MD5 5d5b136988f1e394888e0e7d080f4148 postgresql-8.0.8.ebuild 7663
+RMD160 d49d1e4723fb33d3546e65ce7ac432bdb86e8d24 postgresql-8.0.8.ebuild 7663
+SHA256 15506ee24cfe46cb1f2b4409ec4f8b564fd18d882e10201d1a2c7f075cafbc5b postgresql-8.0.8.ebuild 7663
+EBUILD postgresql-8.1.4.ebuild 7748 RMD160 d5a7a5d4c0bddfce541d806fb896034f95ed10db SHA1 5213ea0bff14279d48e20197d8bb5c865a5c1c37 SHA256 6cb50b99210d7749a2e495579180dbc08e55d888926967190dbc9557d04226b3
+MD5 69a286cc31b5d364f746b58227acfb3e postgresql-8.1.4.ebuild 7748
+RMD160 d5a7a5d4c0bddfce541d806fb896034f95ed10db postgresql-8.1.4.ebuild 7748
+SHA256 6cb50b99210d7749a2e495579180dbc08e55d888926967190dbc9557d04226b3 postgresql-8.1.4.ebuild 7748
+MISC ChangeLog 61729 RMD160 7984bf31aa0cab8de6e0ca99a9ae69f8ce967172 SHA1 47a47e6c5f609a5bfca48d87883565c0bb112c37 SHA256 f0e7b75a1d9ecb8eeb85df23f9e2e938c3b1242d0c2a7f429bc8ae6a410d2897
+MD5 3830748baa0a82d5454336a2d9cf8982 ChangeLog 61729
+RMD160 7984bf31aa0cab8de6e0ca99a9ae69f8ce967172 ChangeLog 61729
+SHA256 f0e7b75a1d9ecb8eeb85df23f9e2e938c3b1242d0c2a7f429bc8ae6a410d2897 ChangeLog 61729
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
diff --git a/dev-db/postgresql/postgresql-7.3.11.ebuild b/dev-db/postgresql/postgresql-7.3.11.ebuild
index 1088b7e526d4..2698227552dc 100644
--- a/dev-db/postgresql/postgresql-7.3.11.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.11.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-db/postgresql/postgresql-7.3.11.ebuild,v 1.11 2006/07/31 23:30:07 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.11.ebuild,v 1.12 2006/08/04 14:36:38 cardoe Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86"
-IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux"
+IUSE="doc java libg++ nls pam perl python readline ssl tcl tk zlib threads selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.3.11*
@@ -22,7 +22,8 @@ DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	tcl? ( >=dev-lang/tcl-8 )
+	tk? ( >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3
@@ -34,7 +35,7 @@ DEPEND="virtual/libc
 RDEPEND="virtual/libc
 	=dev-db/libpq-7.3.11*
 	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
+	tcl? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
 	java? ( >=virtual/jdk-1.3 )
@@ -86,7 +87,7 @@ src_compile() {
 	fi
 
 	local myconf
-	use tcltk && myconf="--with-tcl"
+	use tcl && myconf="--with-tcl"
 	use python && myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
 	use java && myconf="$myconf --with-java"
diff --git a/dev-db/postgresql/postgresql-7.3.15-r1.ebuild b/dev-db/postgresql/postgresql-7.3.15-r1.ebuild
index 441ae0fa6614..6473cdcbb4b5 100644
--- a/dev-db/postgresql/postgresql-7.3.15-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.15-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-db/postgresql/postgresql-7.3.15-r1.ebuild,v 1.4 2006/07/31 23:30:08 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.15-r1.ebuild,v 1.5 2006/08/04 14:36:38 cardoe Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ppc ~s390 ~sh ~sparc ~x86"
-IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux"
+IUSE="doc java libg++ nls pam perl python readline ssl tcl tk zlib threads selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.3.15*
@@ -22,7 +22,8 @@ DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	tcl? ( >=dev-lang/tcl-8 )
+	tk? ( >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3
@@ -34,7 +35,7 @@ DEPEND="virtual/libc
 RDEPEND="virtual/libc
 	=dev-db/libpq-7.3.15*
 	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
+	tcl? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
 	java? ( >=virtual/jdk-1.3 )
@@ -86,7 +87,7 @@ src_compile() {
 	fi
 
 	local myconf
-	use tcltk && myconf="--with-tcl"
+	use tcl && myconf="--with-tcl"
 	use python && myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
 	use java && myconf="$myconf --with-java"
diff --git a/dev-db/postgresql/postgresql-7.4.13.ebuild b/dev-db/postgresql/postgresql-7.4.13.ebuild
index 4acb5307cf6b..162efc4dbcea 100644
--- a/dev-db/postgresql/postgresql-7.4.13.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.13.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-db/postgresql/postgresql-7.4.13.ebuild,v 1.11 2006/07/30 22:30:54 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.12 2006/08/04 14:36:38 cardoe Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
+IUSE="ssl nls java python tcl tk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.13*
@@ -24,7 +24,8 @@ DEPEND="virtual/libc
 	>=sys-devel/bison-1.875
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	tcl? ( >=dev-lang/tcl-8 )
+	tk? ( >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3
@@ -37,7 +38,7 @@ DEPEND="virtual/libc
 RDEPEND="virtual/libc
 	=dev-db/libpq-7.4.13*
 	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
+	tcl? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
 	java? ( >=virtual/jdk-1.3 )
@@ -103,7 +104,7 @@ src_compile() {
 	fi
 
 	local myconf
-	use tcltk && myconf="--with-tcl"
+	use tcl && myconf="--with-tcl"
 	use python && myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
 	use java && myconf="$myconf --with-java"
diff --git a/dev-db/postgresql/postgresql-8.0.8.ebuild b/dev-db/postgresql/postgresql-8.0.8.ebuild
index 2f021462111d..00a5abc87c37 100644
--- a/dev-db/postgresql/postgresql-8.0.8.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.8.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-db/postgresql/postgresql-8.0.8.ebuild,v 1.11 2006/07/30 22:30:54 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.8.ebuild,v 1.12 2006/08/04 14:36:38 cardoe Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcl tk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -27,7 +27,8 @@ DEPEND="virtual/libc
 	>=sys-devel/bison-1.875
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	tcl? ( >=dev-lang/tcl-8 )
+	tk? ( >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
@@ -37,7 +38,7 @@ DEPEND="virtual/libc
 RDEPEND="virtual/libc
 	=dev-db/libpq-8.0.8*
 	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
+	tcl? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
@@ -79,7 +80,7 @@ src_compile() {
 	filter-flags -ffast-math -feliminate-dwarf2-dups
 
 	local myconf
-	use tcltk && myconf="--with-tcl"
+	use tcl && myconf="--with-tcl"
 	use python && myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
 	use ssl && myconf="$myconf --with-openssl"
diff --git a/dev-db/postgresql/postgresql-8.1.4.ebuild b/dev-db/postgresql/postgresql-8.1.4.ebuild
index 913afa5a336c..b10480d61ea5 100644
--- a/dev-db/postgresql/postgresql-8.1.4.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.4.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-db/postgresql/postgresql-8.1.4.ebuild,v 1.3 2006/07/30 22:30:54 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.4.ebuild,v 1.4 2006/08/04 14:36:38 cardoe Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime threads"
+#IUSE="ssl nls python tcl tk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcl tk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime threads"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-8.1.4*
@@ -25,7 +25,8 @@ DEPEND="virtual/libc
 	>=sys-devel/bison-1.875
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	tcl? ( >=dev-lang/tcl-8 )
+	tk? ( >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
@@ -35,7 +36,7 @@ DEPEND="virtual/libc
 RDEPEND="virtual/libc
 	=dev-db/libpq-8.1.4*
 	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
+	tcl? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
@@ -75,7 +76,7 @@ src_compile() {
 	filter-flags -ffast-math -feliminate-dwarf2-dups
 
 	local myconf
-	use tcltk && myconf="--with-tcl"
+	use tcl && myconf="--with-tcl"
 	use python && myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
 	use ssl && myconf="$myconf --with-openssl"