Forward part from 2.3.3-r1 the removal of directories in /usr/lib/python based upon USE flags.

4 files changed, 35 insertions, 12 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 39ea501fa04c..ac057157353a 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.113 2004/10/17 22:54:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.114 2004/10/18 20:22:02 vapier Exp $
+
+  18 Oct 2004; Mike Frysinger <vapier@gentoo.org> python-2.3.3-r1.ebuild,
+  python-2.3.4.ebuild:
+  Forward part from 2.3.3-r1 the removal of directories in /usr/lib/python
+  based upon USE flags.
 
   17 Oct 2004; Jason Wever <weeve@gentoo.org> python-2.3.4.ebuild:
   Stable on sparc.
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 4a125941badb..32c1b6641390 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,14 +1,19 @@
-MD5 649a31ea592a4b8c82f228de83ad3b9f ChangeLog 19515
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4baba230649247692d479172a7ae91eb ChangeLog 19713
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 0499eca9ccd343cf1c183ce21902e286 python-2.1.3-r1.ebuild 2324
+MD5 3296993efe6a80471c0becf92c363c7d python-2.3.3-r1.ebuild 7015
 MD5 6dd864fb6beb993ede8802350e83602c python-2.2.3-r5.ebuild 4309
+MD5 e74fcbfa785ce1ddde70f82d658b8805 python-2.3.4.ebuild 7016
 MD5 add5816d1a35b2e9311e5b9f6d2e2f90 python-2.3.3.ebuild 5568
-MD5 f8f0af23d95eede816954b5269f57ef7 python-2.3.3-r1.ebuild 7015
-MD5 250a8d0ca51c35f4368c6b3cd24d05ae python-2.3.4.ebuild 6727
 MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
+MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3-r1 66
+MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
-MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3 66
+MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015
 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
@@ -16,16 +21,21 @@ MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.
 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 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
-MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
+MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3 66
 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 69dfdde8a2e880656ba066253dee80ee files/python-updater 8087
-MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3-r1 66
+MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
 MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614
 MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4 66
 MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBdCX8HTu7gpaalycRAoTjAKC5FUdN+tmXHKLrB+QJLoh0BdH/sgCgifPu
+ovwF0xVELwoBE+6i6GxsWVg=
+=l8dC
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.3.3-r1.ebuild b/dev-lang/python/python-2.3.3-r1.ebuild
index 3b39da7d21cb..58596ba028e4 100644
--- a/dev-lang/python/python-2.3.3-r1.ebuild
+++ b/dev-lang/python/python-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3-r1.ebuild,v 1.22 2004/09/24 10:47:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3-r1.ebuild,v 1.23 2004/10/18 20:22:02 vapier Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage 
@@ -154,7 +154,7 @@ src_install() {
 	if [ "${CONF_LIBDIR}" == "lib64" ] ;then
 		dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib64/python${PYVER}/config/Makefile
 	else
-	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile
+		dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile
 	fi
 
 	# install python-updater in /usr/sbin
diff --git a/dev-lang/python/python-2.3.4.ebuild b/dev-lang/python/python-2.3.4.ebuild
index f56fd01d76ed..719e1669a6db 100644
--- a/dev-lang/python/python-2.3.4.ebuild
+++ b/dev-lang/python/python-2.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4.ebuild,v 1.14 2004/10/17 22:54:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4.ebuild,v 1.15 2004/10/18 20:22:02 vapier Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage 
@@ -157,6 +157,14 @@ src_install() {
 
 	# install python-updater in /usr/sbin
 	dosbin ${FILESDIR}/python-updater
+
+	if use build ; then
+		rm -rf ${D}/usr/lib/python2.3/{test,encodings,email,lib-tk,bsddb/test}
+	else
+		use uclibc && rm -rf ${D}/usr/lib/python2.3/{test,bsddb/test}
+		use berkdb || rm -rf ${D}/usr/lib/python2.3/bsddb
+		( use !X || use !tcltk ) || rm -rf ${D}/usr/lib/python2.3/lib-tk
+	fi
 }
 
 pkg_postrm() {