diff options
| -rw-r--r-- | dev-lang/python/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/python/Manifest | 39 | ||||
| -rw-r--r-- | dev-lang/python/files/python-2.3.2-disable_modules_and_ssl.patch | 36 | ||||
| -rw-r--r-- | dev-lang/python/python-2.3.2-r2.ebuild | 3 |
4 files changed, 27 insertions, 59 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 53562fc896b9..ac543a6395ee 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,12 @@ # 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.61 2003/12/14 03:47:18 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.62 2003/12/24 04:24:20 bazik Exp $ + + 24 Dec 2003; Sven Blumenstein <bazik@gentoo.org> python-2.3.2-r2.ebuild, + files/python-2.3.2-disable_modules_and_ssl.patch: + Removed python-2.3.2-disable_modules_and_ssl.patch as + it broke python and caused 'ImportError: No module named _socket'. + More info: http://article.gmane.org/gmane.linux.gentoo.devel/14621 14 Dec 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.3-r5.ebuild: Marked stable on hppa. diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 886bb6421f32..66706a28793c 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,31 +1,30 @@ -MD5 e53ed65bbc7dfce734a83af878671015 ChangeLog 11576 -MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221 +MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999 +MD5 ed960a89f5695e18cabb230d8b5aa005 python-2.2.3-r5.ebuild 4353 +MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027 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 0eaebb69b77638be1c5ad141bed6f5c2 python-2.2.3-r5.ebuild 4344 -MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999 -MD5 c44c8d547942827698ddc51cf5fcab76 python-2.3.2-r2.ebuild 5432 -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 5471799af896b6ee8637966f82ece263 ChangeLog 11897 +MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221 +MD5 452d67efc9c1bbd9e892cdf3c2719e47 python-2.3.2-r2.ebuild 5346 +MD5 85f269cd745feae3953f7e35215e242d files/python-updater 8138 +MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152 MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62 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-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 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732 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 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178 +MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478 +MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607 +MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212 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 +MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 +MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 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-r2 62 +MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947 diff --git a/dev-lang/python/files/python-2.3.2-disable_modules_and_ssl.patch b/dev-lang/python/files/python-2.3.2-disable_modules_and_ssl.patch deleted file mode 100644 index 808d7cb82e7b..000000000000 --- a/dev-lang/python/files/python-2.3.2-disable_modules_and_ssl.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- setup.py.old 2003-11-01 19:23:48.495647848 +0000 -+++ setup.py 2003-11-01 19:24:16.044459792 +0000 -@@ -15,7 +15,14 @@ - from distutils.command.install_lib import install_lib - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+try: -+ disabled_module_list = os.environ["PYTHON_DISABLE_MODULES"].split() -+except KeyError: -+ disabled_module_list = [] -+try: -+ disable_ssl = os.environ["PYTHON_DISABLE_SSL"] -+except KeyError: -+ disable_ssl = 0 - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -240,6 +247,7 @@ - return sys.platform - - def detect_modules(self): -+ global disable_ssl - # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -@@ -451,7 +459,8 @@ - ] ) - - if (ssl_incs is not None and -- ssl_libs is not None): -+ ssl_libs is not None and -+ not disable_ssl): - exts.append( Extension('_ssl', ['_ssl.c'], - include_dirs = ssl_incs, - library_dirs = ssl_libs, diff --git a/dev-lang/python/python-2.3.2-r2.ebuild b/dev-lang/python/python-2.3.2-r2.ebuild index 466ec1c2de67..57df4410e4c1 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.6 2003/12/13 11:43:43 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.2-r2.ebuild,v 1.7 2003/12/24 04:24:20 bazik Exp $ inherit flag-o-matic python @@ -53,7 +53,6 @@ pkg_setup() { src_unpack() { unpack ${A} # adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03) - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path.patch # adds support for PYTHON_DONTCOMPILE shell environment to # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) |