safety locks on python-2.3, plus bonus ucs2 useflag for those who know about unicode

3 files changed, 36 insertions, 17 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index d482d5987013..a54846be16bd 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.52 2003/11/22 15:13:12 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.53 2003/11/23 11:39:56 liquidx Exp $
+
+  23 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild:
+  add pkg_setup() to 2.3 as a temporary measure to stop people messing up their
+  own system. Also added a ucs2 local useflag just in case someone complains
+  loudly and knows what they're doing
 
 *python-2.3.2-r2 (22 Nov 2003)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 50af90caf9c8..7a549a735b13 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,33 +1,33 @@
-MD5 bf0cd5a39f61e644ff58adecbb9652f6 ChangeLog 10529
+MD5 a79d423b1a09ffb409141c2050704e41 ChangeLog 10798
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 58b06d58bccd371fcbf1b781164c75a9 python-2.1.3-r1.ebuild 2345
 MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912
 MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027
 MD5 58ed89f3cc48f16f8bc96b76490e5b6a python-2.2.3-r1.ebuild 3293
+MD5 77b761a177b5943e0a0893fcbd8b0e3a python-2.2.3-r5.ebuild 4472
 MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999
-MD5 68490db953f1660989712ea4715be83b python-2.3.2-r2.ebuild 4724
 MD5 cca542f96b13c06fa4f7cd6626182a6c python-2.3.2-r1.ebuild 4817
-MD5 77b761a177b5943e0a0893fcbd8b0e3a python-2.2.3-r5.ebuild 4472
+MD5 c4daff95a8ff22a0d7f6f9012dcc0dbe python-2.3.2-r2.ebuild 5279
+MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947
 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 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r1 62
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
+MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r1 62
+MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r2 62
 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 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 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
+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 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r2 62
-MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
 MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
 MD5 85f269cd745feae3953f7e35215e242d files/python-updater 8138
-MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r1 62
-MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
-MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947
-MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
-MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
-MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
diff --git a/dev-lang/python/python-2.3.2-r2.ebuild b/dev-lang/python/python-2.3.2-r2.ebuild
index 139cd5c5074c..e8e754d7d5ac 100644
--- a/dev-lang/python/python-2.3.2-r2.ebuild
+++ b/dev-lang/python/python-2.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.2-r2.ebuild,v 1.2 2003/11/23 01:43:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.2-r2.ebuild,v 1.3 2003/11/23 11:39:56 liquidx Exp $
 
 inherit flag-o-matic python
 
@@ -14,7 +14,7 @@ DESCRIPTION="A really great language"
 SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${MY_PV}.tgz"
 HOMEPAGE="http://www.python.org"
 
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build"
+IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2"
 LICENSE="PSF-2.2"
 SLOT="2.3"
 
@@ -39,6 +39,14 @@ RDEPEND="${DEPEND} dev-python/python-fchksum"
 
 PROVIDE="virtual/python"
 
+# this is to stop people shooting themselves in the foot. we can't
+# add portage to DEPENDS otherwise it'll create a circular dependency
+pkg_setup() {
+	if ! has_version ">=sys-apps/portage-2.0.49-r16"; then
+		eerror "Dependency Failed! Requires >=sys-apps/portage-2.0.49-r16"
+		die "Requires >=sys-apps/portage-2.0.49-r16"
+	fi
+}
 
 src_unpack() {
 	unpack ${A}
@@ -87,11 +95,17 @@ src_compile() {
 		myconf="--with-cxx=no"
 	fi
 
+	# super-secret switch. don't use this unless you know what you're
+	# doing. enabling UCS2 support will break your existing python
+	# modules
+	use ucs2 \
+		&& myconf="${myconf} --enable-unicode=ucs2" \
+		|| myconf="${myconf} --enable-unicode=ucs4"
+
 	src_configure
 
 	econf --with-fpectl \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 		`use_enable ipv6` \
 		--infodir='${prefix}'/share/info \
 		--mandir='${prefix}'/share/man \