added X useflag for greater tcltk seperation. now needs both X and tcltk USE flags to enable tkinter support

3 files changed, 21 insertions, 15 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 07ebe44c3253..7216ecb8a4e7 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.86 2004/03/03 22:15:34 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.87 2004/03/05 04:10:16 liquidx Exp $
+
+  05 Mar 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild:
+  added X useflag for greater tcltk seperation. now needs both X and tcltk USE
+  flags to enable tkinter support
 
   03 Mar 2004; David Holm <dholm@gentoo.org> python-2.1.3-r1.ebuild:
   Added to ~ppc.
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 9e5656bd7e81..4412cd76003a 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,28 +1,29 @@
-MD5 0a564fe50ba2464a6b1767bc7204e3dd ChangeLog 15432
+MD5 3881ea9a550549ec6a5249b99516906d ChangeLog 15618
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 a9096f479423e2fb5da2afac23238751 python-2.1.3-r1.ebuild 2335
 MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912
 MD5 a6b6753a28a9907d0743671073022f95 python-2.2.2.ebuild 3023
-MD5 8c0ad1999e7d8a0883cfcfe9579f6628 python-2.3.3.ebuild 5311
 MD5 93b7662124de176bfe45c4086578e583 python-2.2.3-r5.ebuild 4343
+MD5 b8694da06a7bb5c92806de7588e521fa python-2.3.3.ebuild 5377
+MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
 MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62
 MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
-MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015
+MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3 66
 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
 MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
 MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
-MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
 MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
 MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
 MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
 MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
+MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015
 MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
-MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
-MD5 85f269cd745feae3953f7e35215e242d files/python-updater 8138
 MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
 MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
+MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
+MD5 85f269cd745feae3953f7e35215e242d files/python-updater 8138
diff --git a/dev-lang/python/python-2.3.3.ebuild b/dev-lang/python/python-2.3.3.ebuild
index ad336448f129..0732e8fb7d65 100644
--- a/dev-lang/python/python-2.3.3.ebuild
+++ b/dev-lang/python/python-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3.ebuild,v 1.20 2004/03/02 16:39:07 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3.ebuild,v 1.21 2004/03/05 04:10:16 liquidx Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage 
@@ -19,7 +19,7 @@ DESCRIPTION="A really great language"
 SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${MY_PV}.tar.bz2"
 HOMEPAGE="http://www.python.org"
 
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc"
+IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
 LICENSE="PSF-2.2"
 SLOT="2.3"
 
@@ -28,7 +28,7 @@ KEYWORDS="x86 ppc sparc hppa amd64 s390"
 
 DEPEND="virtual/glibc
 	>=sys-libs/zlib-1.1.3
-	!build? ( 	tcltk? ( >=dev-lang/tk-8.0 )
+	!build? ( 	X? ( tcltk? ( >=dev-lang/tk-8.0 ) )
 				ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
 				berkdb? ( >=sys-libs/db-3.1 )
 				gdbm? ( sys-libs/gdbm )
@@ -69,13 +69,14 @@ src_configure() {
 			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb"
 		use readline \
 			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline"
-		use tcltk \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter"
+		[ -z "use X" -o -z "use tcltk" ] \
+			&& PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter"
 		use ncurses \
 			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel"
 		use ssl \
 			|| export PYTHON_DISABLE_SSL=1
 		export PYTHON_DISABLE_MODULES
+		echo $PYTHON_DISABLE_MODULES
 	fi
 }