diff options
Diffstat (limited to 'dev-lang/python')
24 files changed, 372 insertions, 1311 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 8aa273371131..c3c17f024d19 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,766 +1,6 @@ # ChangeLog for dev-lang/python -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.184 2005/11/24 18:22:12 corsair Exp $ - - 24 Nov 2005; Markus Rothe <corsair@gentoo.org> python-2.4.2.ebuild: - Stable on ppc64 - - 17 Nov 2005; Guy Martin <gmsoft@gentoo.org> python-2.4-r3.ebuild, - python-2.4.1.ebuild, python-2.4.1-r1.ebuild, python-2.4.2.ebuild: - Readded critical fix for HPPA. - - 21 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> python-2.4.2.ebuild: - Stable on mips. - - 15 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> python-2.4.2.ebuild: - Stable on sh. - - 15 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> python-2.4.2.ebuild: - Stable on hppa, ppc. - - 14 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> python-2.4.2.ebuild: - Stable on sparc - - 14 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.4.2.ebuild: - Stable on alpha. - - 13 Oct 2005; Luis Medinas <metalgod@gentoo.org> python-2.4.2.ebuild: - Marked Stable on amd64. - - 13 Oct 2005; Aron Griffis <agriffis@gentoo.org> python-2.4.2.ebuild: - Mark 2.4.2 stable on ia64 - - 13 Oct 2005; Rob Cakebread <pythonhead@gentoo.org> python-2.4.2.ebuild: - Marked x86 stable per Mr_Bones_ - memory leak in posix.access() - - 10 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> - python-2.4.1-r1.ebuild: - Stable on sparc - - 10 Oct 2005; Luis Medinas <metalgod@gentoo.org> python-2.4.1-r1.ebuild: - Marked Stable on amd64. - - 10 Oct 2005; Markus Rothe <corsair@gentoo.org> python-2.4.1-r1.ebuild: - Stable on ppc64 - - 09 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> - python-2.4.1-r1.ebuild: - Stable on hppa, ppc. - - 08 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.4.1-r1.ebuild: - Stable python-2.4 on alpha, ia64 and x86. - - 01 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r2.ebuild, - python-2.4.1-r1.ebuild, python-2.4.2.ebuild: - Disable additional test, fixing bug 82469, 94859, 96366 and 96488. - -*python-2.4.2 (28 Sep 2005) - - 28 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> - +files/python-2.4.2-readline.patch, +python-2.4.2.ebuild: - Bump version to 2.4.2. - - 14 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> python-2.3.5-r2.ebuild: - 2.3.5-r2 stable on mips for security bug #104009. - - 11 Sep 2005; Simon Stelling <blubb@gentoo.org> python-2.3.5-r2.ebuild: - stable on amd64 wrt bug 104009 - - 10 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> - python-2.3.5-r2.ebuild: - Stable on ppc and hppa. - - 10 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> python-2.3.5-r2.ebuild: - Stable on sh. - - 09 Sep 2005; Josh Grebe <squash@gentoo.org> python-2.3.5-r2.ebuild: - Sparc stable bump for bug #104009 - - 09 Sep 2005; Markus Rothe <corsair@gentoo.org> python-2.3.5-r2.ebuild: - Stable on ppc64 - - 08 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r2.ebuild: - Stable on x86, alpha and ia64 - bug 104009. - -*python-2.3.5-r2 (08 Sep 2005) - - 08 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> - +files/python-2.3-pcre.patch, +python-2.3.5-r2.ebuild: - Version bump to fix pcre security vulnerability, bug 104009. - - 16 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.4-r1.ebuild, - python-2.3.5.ebuild: - Add fix for bug 88777 to arch versions. - - 15 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r1.ebuild, - python-2.4.1-r1.ebuild: - Fix bug 88777 in ~arch versions. - - 11 Aug 2005; Mike Frysinger <vapier@gentoo.org> - +files/python-2.4.1-bindir-libdir.patch, - +files/python-2.4.1-crosscompile.patch, python-2.4.1-r1.ebuild: - Add support for cross-compiling. Grabbed patches from uClibc/OpenEmbedded. - - 19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> - +files/python-2.4.1-st_flags.patch, python-2.4.1-r1.ebuild: - Update st_flags patch, bug 94637. - - 03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild: - Stable on alpha. - - 27 Jun 2005; Markus Rothe <corsair@gentoo.org> python-2.3.5.ebuild: - Stable on ppc64 - - 18 Jun 2005; Markus Rothe <corsair@gentoo.org> python-2.4.1-r1.ebuild: - added ~ppc64 - -*python-2.4.1-r1 (16 Jun 2005) -*python-2.3.5-r1 (16 Jun 2005) - - 16 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> - +files/python-2.3.5-st_flags.patch, +python-2.3.5-r1.ebuild, - +python-2.4.1-r1.ebuild: - Add st_flags patch, requested in bug 94637. - - 09 Jun 2005; Herbie Hopkins <herbs@gentoo.org> - files/python-2.4.1-libdir.patch, python-2.4.1.ebuild: - Fix libdir patch to work with amd64s no-symlink profile, removed - append-flags -fPIC as this seems to no longer be necessary. - - 29 May 2005; <solar@gentoo.org> python-2.3.4-r1.ebuild, python-2.3.5.ebuild, - python-2.4-r3.ebuild, python-2.4.1.ebuild: - echangelog - update package to use libc expanded variable elibc_uclibc vs - uclibc so USE=-* works - - 29 May 2005; Alastair Tse <liquidx@gentoo.org> - files/python-2.4.1-libdir.patch: - remove zlib from libpython dependency (#90545) - - 28 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.1.3-r1.ebuild, - python-2.2.3-r6.ebuild, python-2.3.4-r1.ebuild, python-2.3.5.ebuild, - python-2.4-r3.ebuild, python-2.4.1.ebuild: - Add missing inherit versionator. - - 21 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.1.3-r1.ebuild: - Fix PROVIDE according to bug 93028. - - 18 May 2005; Markus Rothe <corsair@gentoo.org> python-2.3.5.ebuild: - Added ~ppc64 to KEYWORDS - - 11 May 2005; Marcus D. Hanwell <cryos@gentoo.org> python-2.3.5.ebuild: - Stable on amd64. - - 07 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild, - python-2.4.1.ebuild: - Fix FEATURES=test using slightly modified patch by Rob Cakebread, bug 67970. - - 01 May 2005; Stephen Bennett <spb@gentoo.org> python-2.3.4-r1.ebuild, - python-2.3.5.ebuild, python-2.4.1.ebuild: - Added compile fix for when $LIBC is set. - - 30 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> python-2.3.5.ebuild: - Stable on ppc. - - 28 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> python-2.3.5.ebuild: - Stable on sparc - -*python-2.4.1 (27 Apr 2005) - - 27 Apr 2005; Alastair Tse <liquidx@gentoo.org> - +files/python-2.4.1-db4.patch, +files/python-2.4.1-libdir.patch, - +files/python-2.4.1-readline.patch, files/python-2.4-readline.patch, - -python-2.3.3-r2.ebuild, python-2.3.5.ebuild, -python-2.4-r1.ebuild, - -python-2.4-r2.ebuild, +python-2.4.1.ebuild: - version bump for 2.4.1, clean up readling, db4 and libdir patch for 2.4.1. - - 20 Apr 2005; Alastair Tse <liquidx@gentoo.org> python-2.3.5.ebuild, - python-2.4-r3.ebuild: - reverting changes to deps and adding note about why they are arranged in - that way (to remind myself never to touch them again :) - - 20 Apr 2005; Alastair Tse <liquidx@gentoo.org> - +files/python-2.3-readline.patch, +files/python-2.4-readline.patch, - python-2.3.5.ebuild, python-2.4-r3.ebuild: - fixing readline support to not require termcap (#79013). fixed DEPEND - and RDEPEND order (python-fchksum isn't a DEPEND only) - - 08 Apr 2005; Markus Rothe <corsair@gentoo.org> python-2.3.4-r1.ebuild: - Stable on ppc64 - -*python-2.4-r3 (19 Mar 2005) - - 19 Mar 2005; Rob Cakebread <pythonhead@gentoo.org> - files/python-2.4-libdir.patch, +python-2.4-r3.ebuild: - Removed multiple dirs in sys path. bug# 83109 - - 15 Mar 2005; Alastair Tse <liquidx@gentoo.org> python-2.3.5.ebuild: - more multilib fixes (#76791) - - 01 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild, - python-2.4-r1.ebuild: - Fix conditional c++ support for remaining versions. - - 27 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.3-r2.ebuild, - python-2.3.4-r1.ebuild, python-2.4-r2.ebuild: - Disable c++ conditionally. - -*python-2.3.5 (17 Feb 2005) - - 17 Feb 2005; Rob Cakebread <pythonhead@gentoo.org> +python-2.3.5.ebuild: - Version bump. - - 09 Feb 2005; Luca Barbato <lu_zero@gentoo.org> python-2.3.4-r1.ebuild: - Marked ppc - -*python-2.4-r2 (07 Feb 2005) - - 07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - +files/python-2.4-libdir.patch, files/python-updater, +python-2.4-r2.ebuild: - Multilib releated cleanup. - -*python-2.2.3-r6 (06 Feb 2005) - - 06 Feb 2005; Rob Cakebread <pythonhead@gentoo.org> - +files/python-2.2.3-xmlrpc.patch, +files/python-2.3-xmlrpc.patch, - +files/python-2.4-xmlrpc.patch, -python-2.2.3-r5.ebuild, - +python-2.2.3-r6.ebuild, -python-2.3.3-r1.ebuild, +python-2.3.3-r2.ebuild, - -python-2.3.3.ebuild, +python-2.3.4-r1.ebuild, -python-2.3.4.ebuild, - +python-2.4-r1.ebuild, -python-2.4.ebuild: - Patches and version bumps for security bug# 80592 Python bug# PSF-2005-001 xmlrpc - vulnerability. Removed obsolete versions. - - 06 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.4.ebuild: - Fix broken Manifest. - - 05 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> python-2.4.ebuild: - Only apply lib64 patch on CONF_LIBDIR == lib64 - - 04 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> - +files/python-2.4-lib64.patch, python-2.4.ebuild: - Added lib64 patch - -*python-2.4 (04 Jan 2005) - - 04 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> - +files/python-2.4-add_portage_search_path.patch, - +files/python-2.4-db4.2.patch, - +files/python-2.4-disable_modules_and_ssl.patch, - +files/python-2.4-gentoo_py_dontcompile.patch, - +files/python-2.4-mimetypes_apache.patch, files/python-updater, - +python-2.4.ebuild: - Version bump. bug# 68775 - - 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 06 Nov 2004; Joshua Kinard <kumba@gentoo.org> python-2.3.4.ebuild: - Marked stable on mips. - - 29 Oct 2004; Alastair Tse <liquidx@gentoo.org> files/python-updater: - improvements with tmp log creation with python-updater (#68843) - - 19 Oct 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.4.ebuild: - Stable on hppa. - - 19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> python-2.3.4.ebuild: - Stable on amd64. - - 19 Oct 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.4.ebuild: - fix problem with tk-inter and USE flags handing (grumble) - - 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. - - 24 Sep 2004; Alastair Tse <liquidx@gentoo.org> -python-2.2.2.ebuild, - python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild, - -python-2.3.4_rc1.ebuild: - adding workaround for -fstack-protector-all (#50309) - - 06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> python-2.3.3-r1.ebuild, - python-2.3.3.ebuild, python-2.3.4.ebuild, python-2.3.4_rc1.ebuild: - Switch to use epause and ebeep, bug #62950 - - 31 Aug 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.4.ebuild: - Removed useless -fPIC for hppa. - - 18 Aug 2004; Aron Griffis <agriffis@gentoo.org> python-2.3.4.ebuild: - stable on alpha - - 14 Aug 2004; Travis Tilley <lv@gentoo.org> +files/python-2.3.4-lib64.patch, - python-2.3.3-r1.ebuild, python-2.3.4.ebuild: - added logic for installing to /usr/lib64, triggered by the CONF_LIBDIR - variable. proper CONF_LIBDIR support will require portage 2.0.51_pre18, soon - to be released. - - 20 Jul 2004; Lars Weiler <pylon@gentoo.org> python-2.1.3-r1.ebuild: - Made python-2.1 stable on ppc as there are still some ebuilds which require - this version. - - 03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> python-2.3.3-r1.ebuild: - Stable on alpha. - - 03 Jul 2004; Grant Goodyear <g2boojum@gentoo.org> python-2.3.4.ebuild: - x86-obsd minor fix - - 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> - python-2.1.3-r1.ebuild, python-2.2.2.ebuild, python-2.2.3-r5.ebuild, - python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild, - python-2.3.4_rc1.ebuild: - virtual/glibc -> virtual/libc - - 25 Jun 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.2.ebuild, - python-2.2.3-r5.ebuild, python-2.3.3-r1.ebuild, python-2.3.3.ebuild, - python-2.3.4.ebuild, python-2.3.4_rc1.ebuild: - QA - fix use invocation and a bug in the 2.3.4 ebuilds: - [ -z "use X" -o -z "use tcltk" ] doesn't do what you meant it to do - - 20 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> python-2.3.3-r1.ebuild: - Sparc happy stable - - 15 Jun 2004; <solar@gentoo.org> python-2.3.3-r1.ebuild: - USE= cleanups and added uclibc - - 12 Jun 2004; Tom Gall <tgall@gentoo.org> python-2.3.3-r1.ebuild: - stable on ppc64, bug #53575 - - 06 Jun 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.3-r5.ebuild, - python-2.3.3-r1.ebuild, python-2.3.4.ebuild, python-2.3.4_rc1.ebuild: - Fix use invocation - -*python-2.3.4 (04 Jun 2004) - - 04 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +python-2.3.4.ebuild: - Bump version. - - 02 Jun 2004; Travis Tilley <lv@gentoo.org> python-2.3.3-r1.ebuild: - stable on amd64 - - 30 May 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3-r1.ebuild: - Marked stable on hppa. - - 22 May 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3-r1.ebuild, - python-2.3.3.ebuild, python-2.3.4_rc1.ebuild: - Fix os.utime() on hppa. utimes it not supported but unfortunately reported as - working. - -*python-2.3.4_rc1 (15 May 2004) - - 15 May 2004; Joshua Kinard <kumba@gentoo.org> python-2.3.3-r1.ebuild, - python-2.3.4_rc1.ebuild: - Marking 2.3.3 stable on mips (someone yanked the ~mips keyword at some - point...), and 2.3.4 unstable. - - 27 Apr 2004; Michael McCabe <randy@gentoo.org> python-2.3.3-r1.ebuild: - Marked stable on s390 - -*python-2.3.3-r1 (12 Apr 2004) - - 12 Apr 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3-r1.ebuild, - files/python-2.3-add_portage_search_path_take_2.patch: - add workaround for python-2.2 to python-2.3 upgrade possibly breaking older - portage versions. make /usr/lib/portage/pym appear before - /usr/lib/python*/site-packages in sys.path (not really critical, but better be - safe than sorry). also removed c++ support to reduce gcc/glibc upgrade pain - - 11 Mar 2004; Alastair Tse <liquidx@gentoo.org> python-2.2.1-r5.ebuild: - removing 2.2.1 from tree for security reasons (#44230) - - 09 Mar 2004; <agriffis@gentoo.org> python-2.3.3.ebuild: - stable on alpha and ia64 - - 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. - - 27 Feb 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - completely removed pkg_setup(), added note at the top of the ebuild where you - can't miss it. - - 27 Feb 2004; Jason Stubbs <jstubbs@gentoo.org> python-2.3.3.ebuild: - Removing portage version check again as it's preventing new installations. - Bug #43036 - - 25 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> python-2.3.3.ebuild: - Reinstating portage version check as people keep upgrading python without - upgrading portage. - - 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> python-2.1.3-r1.ebuild: - Fix duplicate KEYWORDS settings and mark stable on alpha and ia64 for the sake - of dev-python/PyXML-py21 - - 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> python-2.1.3-r1.ebuild: - add ~alpha for the sake of dev-python/Imaging-py21 - - 10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> python-2.3.3.ebuild: - set ppc in keywords - - 10 Feb 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild, - files/python-2.3-db4.2.patch: - add fix to make python-2.3.3 db-4.2 (gentoo flavour) aware - - 06 Feb 2004; <gustavoz@gentoo.org> python-2.3.3.ebuild: - Stable on sparc - - 03 Feb 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3.ebuild : - Marked stable on hppa. - - 02 Feb 2004; Alastair Tse <liquidx@gentoo.org> files/depreorder.py: - update python-updater thanks to a well spotted mistake by Chris Bainbridge - <chrb@dcs.ed.ac.uk> (#40198) - - 27 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - disabling pkg_setup again after testing with stage2 - - 26 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - re-instating pkg_setup() warning/abort message. added apache mime.types to - mime type search list. modified to use tar.bz2 (saves 1MB of downloads) - - 24 Jan 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3.ebuild: - Added ~hppa to KEYWORDS. - - 24 Jan 2004; <gustavoz@gentoo.org> python-2.3.3.ebuild: - keyworded ~sparc - - 24 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - add missing doc IUSE (#39232) - - 22 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild, - files/depreorder.py: - updated python-updater for portage-2.0.50, installed python-updater in - /usr/sbin for convienence - - 19 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild, - python-2.3.3.ebuild: - disable portage check because stable portage already is compatible with - python-2.3 - - 18 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - make ROOT var more robust during postinst() - - 12 Jan 2004; Luca Barbato <lu_zero@gentoo.org> python-2.2.3-r5.ebuild: - Marked ppc - - 06 Jan 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.3-r5.ebuild: - Stable on ia64 to enable fix for bug 36954; portage-2.0.49-r20 depends on - this revision. - - 03 Jan 2004; Jason Wever <weeve@gentoo.org> python-2.2.3-r5.ebuild: - Marked stable on sparc as portage-2.0.49-r20 really depends on this version of - python rather than what the portage ebuild says. Fixes bug #36954 on sparc. - -*python-2.3.3 (03 Jan 2004) - - 03 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild, - python-2.3.3.ebuild, files/python-2.3.2-disable_modules_and_ssl.patch: - version bump to 2.3.3, re-add python disable_modules_and_ssl patch and changed - ebuild to build 'socket' module under USE=build - - 28 Dec 2003; Joshua Kinard <kumba@gentoo.org> python-2.2.3-r5.ebuild: - Move to mips stable (~mips -> mips) - - 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. - - 13 Dec 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild: - clarified warning to prevent more bug reports - - 13 Dec 2003; Luca Barbato <lu_zero@gentoo.org> python-2.3.2-r2.ebuild: - Marked ~ppc - - 08 Dec 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild, - python-2.3.2-r2.ebuild: - fix python .pyc .pyo cleaning code - - 03 Dec 2003; Aron Griffis <agriffis@gentoo.org> python-2.2.3-r5.ebuild: - Stable on alpha - - 27 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> python-2.2.3-r5.ebuild: - Make -fPIC compilation available for all platforms and not just amd64. - - 25 Nov 2003; Brad House <brad_mssw@gentoo.org> python-2.2.3-r5.ebuild: - mark stable on amd64 - - 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) - - 22 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild, - files/python-updater: - ucs4 is now default. if you previously had python-2.3 merged, you'll need to - update your packages again. (sorry, that is the price for running p.mask'ed - versions). to update your python packages if you had python-2.3 installed, - run : - - /usr/portage/dev-lang/python/files/python-updater -o 2.3 - - if you are upgrading from python-2.2, then you will need to run: - - /usr/portage/dev-lang/python/files/python-updater - - python-updater script also modified to have more robust command-line - parsing. hopefully this will be the last revision till we can go ~x86. - - 13 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r1.ebuild: - fix python-config install for python-2.3 - - 12 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild, - python-2.2.3-r2.ebuild, python-2.2.3-r3.ebuild, python-2.2.3-r4.ebuild, - python-2.3.2-r1.ebuild, python-2.3.2.ebuild, files/python-updater: - cleanup and add warning on python-updated or PORTDIR is not set - - 12 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> python-2.2.3-r5.ebuild : - Add a patch that adds CFLAGSFORSHARED variable to some extra modules defined in the Makefile. - This variable could hold -fPIC so that the compiled libraries will work on amd64 (and maybe others) - without using append-flags -fPIC. - - 03 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild, - python-2.3.2-r1.ebuild: - added ncurses and ssl to IUSE - - 03 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild: - export environment in src_install() - - 01 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild, - python-2.3.2-r1.ebuild, files/python-2.2.3-disable_modules_and_ssl.patch, - files/python-2.3.2-disable_modules_and_ssl.patch: - reordered deps to allow minimal python build for USE='build'. makes python - respect useflags explicitly even if the dependency exists. added support to - disable SSL. tweaked python_mod_optimize. - -*python-2.2.3-r5 (27 Oct 2003) - - 27 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild, - files/python-2.2.3-db4.patch: - rev bump. fixes to idle.py and bsddb with db-4.1 for 2.2.3 - - 26 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> python-2.2.3-r4.ebuild: - Fixed symlink to idle.py - -*python-2.2.3-r4 (22 Oct 2003) - - 22 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r4.ebuild, - files/python-2.2.3-gentoo_py_dontcompile.patch: - Fixed PYTHON_DONTCOMPILE patch for 2.2.3 thanks to TGL - <degrenier@easyconnect.fr> (#31730) - -*python-2.2.3-r3 (17 Oct 2003) - - 17 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r3.ebuild, - files/python-2.2.3-db4.patch, - files/python-2.2.3-gentoo_py_dontcompile.patch, files/python-updater: - Add support for db-4.1, fixes for ewarn hanging for python-updater - - 14 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r3.ebuild: - new 2.2.3 version that adds PYTHON_DONTCOMPILE support - - 10 Oct 2003; Alastair Tse <liquidx@gentoo.org> files/python-updater: - fix typo in python-updater - - 09 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r1.ebuild, - files/depreorder.py, files/python-2.2.3-gentoo_py_dontcompile.patch, - files/python-updater: - improved byte-compiling, fixed out-of-order python-updater and added - sys-apps/portage to exclusions - - 09 Oct 2003; <tuxus@gentoo.org> python-2.2.3-r1.ebuild: - stable on mips - -*python-2.3.2-r1 (08 Oct 2003) - - 08 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r1.ebuild, - files/python-2.3-gentoo_py_dontcompile.patch: - add patch to stop automatic generation of .pyc and .pyo by setting - PYTHON_DONTCOMPILE in your environment. also moved to use the new python - eclass to automatically optimize and cleanup compiled modules. - -*python-2.3.2 (07 Oct 2003) - - 07 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r2.ebuild, - python-2.3.2.ebuild, files/python-2.2.3-db4.patch, - files/python-2.3-add_portage_search_path.patch, files/python-config-2.3, - files/python-updater: - it has been a long time coming, but finally there's a 2.3.x release in portage - along with a python-2.2.3 update that should fix some niggling issues and also - uses the new alternative class. 2.3.2 is still masked and should stay that way - until we can confirm the rebuilding script works. - - 03 Oct 2003; Alexander Gabert <pappy@gentoo.org> python-2.2.3-r1.ebuild: - filter-flags because of segfaulting with fstackprotector in CFLAGS - - 23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> python-2.2.3-r1.ebuild: - set ppc in keywords - - 17 Sep 2003; Jon Portnoy <avenj@gentoo.org> python-2.2.3-r1.ebuild : - ia64 keywords. - - 16 Jul 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r1.ebuild, - python-2.2.3.ebuild: - marked 2.2.3 stable for x86 - - 13 Jul 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r1.ebuild: - add doc useflag to install python documentation. (#24318) - -*python-2.2.3-r1 (03 Jul 2003) - - 23 Jul 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.3-r1.ebuild : - Marked stable on hppa. - - 03 Jul 2003; Alastair Tse <liquidx@gentoo.org> metadata.xml, - python-2.2.3-r1.ebuild: - added db4 support and enabled threads (pthread) support - -*python-2.2.3 (02 Jun 2003) - - 06 Jul 2003; Joshua Kinard <kumba@gentoo.org> python-2.2.3.ebuild: - Changed ~mips to mips in KEYWORDS - - 01 Jul 2003; Todd Sunderlin <todd@gentoo.org> python-2.2.3.ebuild: - set stable on sparc - - 02 Jun 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild, - python-2.2.3.ebuild, files/python-config-2.2: - version bump to new bugfix release. fixed python-config location for unstable - versions - -*python-2.2.2-r1 (08 May 2003) - - 08 May 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild, - files/python-2.2.2-tk-8.4.x.patch: - backported patch to fix tk-8.4.x problems (#20318) - - 23 Feb 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.2.ebuild : - Added -fPIC to CFLAGS on hppa. It's needed by apps linking to some python libs. - - 21 Feb 2003; Zach Welch <zwelch@gentoo.org> python-2.2.2.ebuild : - Added arm to keywords. - - 07 Feb 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.2.ebuild : - Added hppa to keywords. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - - 29 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : - - Added missing python-config for 2.2.2. - -*python-2.2.2 (20 Oct 2002) - - 07 Jan 2003; Jan Seidel <tuxus@gentoo.org> python-2.2.2.ebuild : - Added mips to keywords - - 20 Oct 2002; Jon Nelson <jnelson@gentoo.org> : - 2.2.2 is released - -*python-2.2.1-r5 (03 Oct 2002) - - 15 Oct 2002; Martin Schlemmer <azarah@gentoo.org> : - Fix the sed on /usr/lib/python<ver>/config/Makefile to change - OPT to 'OPT = -DNDEBUG', and not 'OPT = -NDEBUG' which caused - gcc warnings. - - 03 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> : - Security update. - -*python-2.2.1-r4 (7 Sep 2002) - 7 Sep 2002; Nicholas Jones <carpaski@gentoo.org> python-2.2.1-r4.ebuild - Fix for bug #7641 -- Fixes the OPT flags in Makefile so that gcc - isn't confused by conflicting build types of i386 and user set. - -*python-2.2.1-r3 (2 Sep 2002) - 2 Sep 2002; Jon Nelson <jnelson@gentoo.org> python-2.2.1-r3.ebuild - Filter -malign-double from flags - -*python-2.1.3-r1 (2 Jul 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org> python-2.1.3-r1.ebuild - Added missing KEYWORDS - - 2 Jul 2002; Jon Nelson <jnelson@gentoo.org> python-2.1.3-r1.ebuild: - Fix Makefile.pre.in install (the one we want is located in Misc) - -*python-2.1.3 (1 Jul 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org> python-2.1.3.ebuild - Added missing KEYWORDS - - 1 Jul 2002; Jon Nelson <jnelson@gentoo.org>: python-2.1.3.ebuild - This is a python 2.1.3 ebuild that does *not* conflict with - python 2.2.* - Note that 99.9% of the people out there won't use it anyway, - because 2.2 will always be selected as most recent. ;-) - -*python-2.2.1-r2 (1 Jul 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1-r2.ebuild - Added missing KEYWORDS - - 30 Jun 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1-r2.ebuild - Add "-lm" to the python-config script. Closes bug #4217. - 2.2.1-r2 has a 100% identical ebuild file to 2.2.1-r1, just the - python-config file has changed. - -*python-2.2.1-r1 (29 May 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1-r1.ebuild - Added missing KEYWORDS - - 29 May 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1-r1.ebuild - Add expat to build depends (except during bootstrap), use econf - and emake, and don't mess with Modules/Setup.local because modules - are build as shared on Linux as default. - -*python-2.2.1 (2 May 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1.ebuild - Added missing KEYWORDS - - 2 May 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1.ebuild - Update to 2.2.1, and completely re-vamp build procedure - This should solve several build issues. - -*python-2.2-r7 (29 Apr 2002) - - 29 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: New rev to fix bug #2199; - python-config should now work properly. - -*python-2.2-r6 (24 Apr 2002) - - 24 Apr 2002; Jon Nelson <jnelson@gentoo.org> python-2.2-r6.ebuild : Make - python build with shared modules. Depends on python-fchksum, as fchksum *no - longer built in* - -*python-2.2-r5 (8 Apr 2002) - - 8 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> python-2.2-r5.ebuild : - - Added include flag for compilation of tcltk with python to compile - correctly. - - -------- - - 06 Apr 2002; Daniel Robbins <drobbins@gentoo.org> : the 2.2-r4 ebuild now - disables C++ support if we are creating a new build image (since we have no - C++ in that case). - - 30 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : changed PROVIDE from - virtual/python-2.2 to virtual/python. No rev bump. +# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $ *python-2.2-r4 (1 Feb 2002) diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index ac76d0e92be1..c0f08dd460d3 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,63 +1,13 @@ -MD5 7c1273e9a81c07bd2da25783ea9efde9 ChangeLog 29402 -MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221 -MD5 2632d539cd0ab18b40f9510118ed3099 python-2.1.3-r1.ebuild 2299 -MD5 5857a314767fd0ae2243590999fe78b2 python-2.2.3-r6.ebuild 4491 -MD5 21151b5cbaac120cb271bdac9bc95eb8 python-2.3.4-r1.ebuild 7259 -MD5 3dc06bf8e04bd9880be6ee4402234e8b python-2.3.5-r1.ebuild 7924 -MD5 4928085fdd7860dd8104011c9955a7f2 python-2.3.5.ebuild 7799 -MD5 eb681c731b011f69718d04351d341741 python-2.4-r3.ebuild 7355 -MD5 ee21268fe5f633029a2575a6e0808d75 python-2.4.1-r1.ebuild 9144 -MD5 83d5f6cfce039d87c651dbad4224912a python-2.4.1.ebuild 8344 -MD5 d49abed8e570e34660b16fae1f8efe82 python-2.3.5-r2.ebuild 8039 -MD5 e242166887a170f09effe024699b7553 python-2.4.2.ebuild 9141 -MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235 +MD5 77b3c329bc0bdf4ae8180eaa76a56542 ChangeLog 4827 +MD5 067b51e93b48ce7877df67399883c842 python-2.1.3-r1.ebuild 2345 +MD5 34b9eed0a2276490dbe1bf42e01b4b5d python-2.2.2-r1.ebuild 3122 +MD5 4acba90247dbf1f810e372bbb8f11cb9 python-2.2.1-r5.ebuild 2919 +MD5 81969a1011c98f45f1996ca956156d77 python-2.2.2.ebuild 3027 +MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2-r1 62 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 -MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62 -MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66 -MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5 66 -MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5-r1 66 -MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r3 64 -MD5 1e4084c2a8ee240668d02e703e7c171f files/digest-python-2.4.1 66 -MD5 1e4084c2a8ee240668d02e703e7c171f files/digest-python-2.4.1-r1 66 +MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62 +MD5 8f455a90c3fcabda33ce44fe9c030534 files/python-2.2.2-tk-8.4.x.patch 3148 +MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 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 55af7ba61954f03e09bcafbce1227c61 files/python-2.2.3-xmlrpc.patch 3659 -MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607 -MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614 -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 e9cc1b9be363e6c3f8df75cdb2ea9621 files/python-2.3-readline.patch 9596 -MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.3-xmlrpc.patch 4228 -MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285 -MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779 -MD5 b8e2b591eb203df14010db589089a522 files/python-2.3.5-st_flags.patch 1452 -MD5 5bee9fa15d4effc7423e76d2f7f47655 files/python-2.4-add_portage_search_path.patch 556 -MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.4-db4.2.patch 1015 -MD5 2b953054102d344834597bc73b209e12 files/python-2.4-disable_modules_and_ssl.patch 1285 -MD5 2121d3986faa4b6c2c3ed472f77f2a9d files/python-2.4-gentoo_py_dontcompile.patch 477 -MD5 7ed8f8f52ed392ef28dd320b130e3c6b files/python-2.4-lib64.patch 9941 -MD5 3c77f8f9d55bbedacd9476a428088250 files/python-2.4-libdir.patch 8358 -MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454 -MD5 6eab04aaa6abe2b795e4e5f4983bea38 files/python-2.4-readline.patch 9099 -MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.4-xmlrpc.patch 4228 -MD5 eaa33949f072a9787c453c37c1236108 files/python-2.4.1-db4.patch 1414 -MD5 5fdb512b55d4ed9b13a5a3af00a5ba40 files/python-2.4.1-libdir.patch 7875 -MD5 47e9455f3e16c3369c9e57388ba3d643 files/python-2.4.1-readline.patch 8984 -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 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179 -MD5 1cf4c21ad3b0aafc571b05b9a9e54594 files/python-updater 8761 -MD5 5af982af8ad4befbf15567ae399cf2b9 files/python-2.4.1-st_flags.patch 5649 -MD5 9bb508a4b15481e4722c1317b9fb02a3 files/python-2.4.1-bindir-libdir.patch 405 -MD5 ec1400ca4877399cae56ccefb72a200f files/python-2.4.1-crosscompile.patch 4126 -MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5-r2 66 -MD5 47ee57ffc9b69af4ff828a3a1ae26afd files/python-2.3-pcre.patch 4278 -MD5 678a7e4660de986e8e22808d18f93686 files/digest-python-2.4.2 66 -MD5 36b36bac050785b8e393dc72f8e51d2f files/python-2.4.2-readline.patch 8628 diff --git a/dev-lang/python/files/depreorder.py b/dev-lang/python/files/depreorder.py index 2305eb08aacd..2350da2e3b00 100644 --- a/dev-lang/python/files/depreorder.py +++ b/dev-lang/python/files/depreorder.py @@ -18,25 +18,18 @@ DEP_DEPLIST = 1 DEP_SLOT = 2 dep_cache = {} - # very simply, we extract the dependencies for each package for pkg in pkgs_to_reorder: try: - deps, slot = varapi.aux_get(pkg, ["DEPEND", "SLOT"]) + deps, slot = varapi.aux_get(pkg, ["DEPEND", "SLOT"]) except ValueError: - sys.stderr.write("Error getting dependency information off " + pkg + "\n") - continue - try: - realdeps = portage.dep_check(deps, fakedbapi) - except TypeError: - # we're probably running >=portage-2.0.50 - pkgsettings = portage.config(clone=portage.settings) - realdeps = portage.dep_check(deps, fakedbapi, pkgsettings) - + sys.stderr.write("Error getting dependency information off " + pkg + "\n") + continue + realdeps = portage.dep_check(deps, fakedbapi) vardeps = [] # match() finds the versions of all those that are installed for dep in realdeps[1]: - vardeps = vardeps + varapi.match(dep) + vardeps = vardeps + varapi.match(dep) dep_cache[pkg] = ( 0, vardeps, slot ) # then we just naively append to a sorted list of deps using this rule. @@ -47,9 +40,8 @@ for pkg in pkgs_to_reorder: for pkg, depinfo in dep_cache.items(): dep_to_add = [] for dep in depinfo[DEP_DEPLIST]: - if dep in pkgs_to_reorder: - dep_to_add.append(dep) - + if dep in pkgs_to_reorder: + dep_to_add.append(dep) pkgs_ordered += dep_to_add + [pkg] # now, because the packages may have nested or multple dependencies, we @@ -58,8 +50,8 @@ for pkg, depinfo in dep_cache.items(): # comes before the package that depends on it. pkgs_final_order = [] for pkg in pkgs_ordered: - if pkg not in pkgs_final_order: - pkgs_final_order += [pkg] + if pkg not in pkgs_final_order: + pkgs_final_order += [pkg] print string.join(pkgs_final_order, "\n") #print portage.dep_expand("=dev-python/sip-3.8", portage.portdb) diff --git a/dev-lang/python/files/python-2.2.1-r5-gentoo.diff b/dev-lang/python/files/python-2.2.1-r5-gentoo.diff index 7dd90f72f209..13d74f626918 100644 --- a/dev-lang/python/files/python-2.2.1-r5-gentoo.diff +++ b/dev-lang/python/files/python-2.2.1-r5-gentoo.diff @@ -84,6 +84,15 @@ retrieving revision 1.73.4.7 diff -u -r1.73.4.4 -r1.73.4.7 --- python/python/dist/src/setup.py 2002/03/26 13:43:04 1.73.4.4 +++ python/python/dist/src/setup.py 2002/08/08 19:52:42 1.73.4.7 +@@ -1,7 +1,7 @@ + # Autodetecting setup.py script for building the Python extensions + # + +-__version__ = "$Revision: 1.1 $" ++__version__ = "$Revision: 1.1 $" + + import sys, os, getopt + from distutils import sysconfig @@ -273,8 +273,6 @@ exts.append( Extension('pwd', ['pwdmodule.c']) ) # grp(3) diff --git a/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch b/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch index 0dc581cb630b..498100bc476e 100644 --- a/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch +++ b/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch @@ -5,6 +5,15 @@ retrieving revision 1.160.10.3 diff -u -r1.160.10.2 -r1.160.10.3 --- python/python/dist/src/Lib/lib-tk/Tkinter.py 2002/08/23 15:27:52 1.160.10.2 +++ python/python/dist/src/Lib/lib-tk/Tkinter.py 2003/03/29 09:48:12 1.160.10.3 +@@ -27,7 +27,7 @@ + tk.mainloop() + """ + +-__version__ = "$Revision: 1.1 $" ++__version__ = "$Revision: 1.1 $" + + import sys + if sys.platform == "win32": @@ -1024,38 +1024,54 @@ """Internal function.""" if len(args) != len(self._subst_format): return args diff --git a/dev-lang/python/files/python-2.2.3-db4.patch b/dev-lang/python/files/python-2.2.3-db4.patch index 2405f8e0fd0c..76180c95a745 100644 --- a/dev-lang/python/files/python-2.2.3-db4.patch +++ b/dev-lang/python/files/python-2.2.3-db4.patch @@ -1,15 +1,13 @@ --- Python-2.2.3/setup.py 2003-05-22 18:36:54.000000000 +0100 +++ Python-2.2.3.new/setup.py 2003-07-03 19:42:29.000000000 +0100 -@@ -429,8 +429,12 @@ +@@ -429,8 +429,10 @@ # Berkeley DB 3.x.) dblib = [] - if self.compiler.find_library_file(lib_dirs, 'db-3.2'): - dblib = ['db-3.2'] -+ if self.compiler.find_library_file(lib_dirs, 'db-4.1'): -+ dblib = ['db-4.1'] -+ elif self.compiler.find_library_file(lib_dirs, 'db-4.0'): -+ dblib = ['db-4.0'] ++ if self.compiler.find_library_file(lib_dirs, 'db-4'): ++ dblib = ['db-4'] + elif self.compiler.find_library_file(lib_dirs, 'db-3.2'): + dblib = ['db-3.2'] elif self.compiler.find_library_file(lib_dirs, 'db-3.1'): @@ -20,7 +18,7 @@ db185_incs = find_file('db_185.h', inc_dirs, - ['/usr/include/db3', '/usr/include/db2']) -+ ['/usr/include/db4.1','/usr/include/db4','/usr/include/db3', '/usr/include/db2']) ++ ['/usr/include/db4','/usr/include/db3', '/usr/include/db2']) db_inc = find_file('db.h', inc_dirs, ['/usr/include/db1']) if db185_incs is not None: exts.append( Extension('bsddb', ['bsddbmodule.c'], diff --git a/dev-lang/python/files/python-2.2.3-gentoo_py_dontcompile.patch b/dev-lang/python/files/python-2.2.3-gentoo_py_dontcompile.patch index 24d22e60659e..021f5226b70c 100644 --- a/dev-lang/python/files/python-2.2.3-gentoo_py_dontcompile.patch +++ b/dev-lang/python/files/python-2.2.3-gentoo_py_dontcompile.patch @@ -1,27 +1,23 @@ ---- Python-2.2.3/Python/import.c 2003-03-23 15:32:56.000000000 +0100 -+++ Python-2.2.3/Python/import.c 2003-10-21 20:15:42.000000000 +0200 +--- Python-2.2.3/Python/import.c 2003-03-23 14:32:56.000000000 +0000 ++++ /tmp/import.c 2003-10-09 09:45:51.000000000 +0100 @@ -719,6 +719,7 @@ write_compiled_module(PyCodeObject *co, char *cpathname, long mtime) { FILE *fp; -+ char *py_dontcompile; ++ char *py_dontcompile; if (CANT_WRITE(co->co_argcount) || CANT_WRITE(co->co_nlocals) || -@@ -731,8 +732,14 @@ +@@ -731,8 +732,10 @@ cpathname); return; } - - fp = open_exclusive(cpathname); -+ if ((py_dontcompile = getenv("PYTHON_DONTCOMPILE")) == NULL) -+ fp = open_exclusive(cpathname); -+ else { -+ if (Py_VerboseFlag) -+ PySys_WriteStderr( -+ "# PYTHON_DONTCOMPILE is set: won't create %s\n", cpathname); -+ return; -+ } ++ if ((py_dontcompile = getenv("PYTHON_DONTCOMPILE")) != NULL) ++ fp = open_exclusive(cpathname); ++ else ++ fp = NULL; if (fp == NULL) { if (Py_VerboseFlag) PySys_WriteStderr( diff --git a/dev-lang/python/files/python-2.4-lib64.patch b/dev-lang/python/files/python-2.4-lib64.patch index c3e2c4ffcca9..c2b37feb4946 100644 --- a/dev-lang/python/files/python-2.4-lib64.patch +++ b/dev-lang/python/files/python-2.4-lib64.patch @@ -1,6 +1,6 @@ -diff -Nru Python-2.4.old/Lib/distutils/command/install.py Lib/distutils/command/install.py ---- Python-2.4.old/Lib/distutils/command/install.py 2004-08-14 21:38:57.318696000 -0400 -+++ Lib/distutils/command/install.py 2004-08-14 21:39:41.285012104 -0400 +diff -Nru Python-2.3.4.old/Lib/distutils/command/install.py Python-2.3.4/Lib/distutils/command/install.py +--- Python-2.3.4.old/Lib/distutils/command/install.py 2004-08-14 21:38:57.318696000 -0400 ++++ Python-2.3.4/Lib/distutils/command/install.py 2004-08-14 21:39:41.285012104 -0400 @@ -39,14 +39,14 @@ INSTALL_SCHEMES = { 'unix_prefix': { @@ -18,9 +18,9 @@ diff -Nru Python-2.4.old/Lib/distutils/command/install.py Lib/distutils/command/ 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -diff -Nru Python-2.4.old/Lib/distutils/sysconfig.py Lib/distutils/sysconfig.py ---- Python-2.4.old/Lib/distutils/sysconfig.py 2004-08-14 21:38:57.367688552 -0400 -+++ Lib/distutils/sysconfig.py 2004-08-14 21:39:41.300009824 -0400 +diff -Nru Python-2.3.4.old/Lib/distutils/sysconfig.py Python-2.3.4/Lib/distutils/sysconfig.py +--- Python-2.3.4.old/Lib/distutils/sysconfig.py 2004-08-14 21:38:57.367688552 -0400 ++++ Python-2.3.4/Lib/distutils/sysconfig.py 2004-08-14 21:39:41.300009824 -0400 @@ -99,8 +99,12 @@ prefix = plat_specific and EXEC_PREFIX or PREFIX @@ -35,27 +35,46 @@ diff -Nru Python-2.4.old/Lib/distutils/sysconfig.py Lib/distutils/sysconfig.py if standard_lib: return libpython else: -diff -Nru Lib/site.py.old Lib/site.py ---- Lib/site.py.old 2005-01-05 10:50:32.642936080 -0800 -+++ Lib/site.py 2005-01-05 10:54:44.698617792 -0800 -@@ -179,9 +179,14 @@ - sitedirs = [os.path.join(prefix, "Lib", "site-packages")] - elif os.sep == '/': - sitedirs = [os.path.join(prefix, -+ "lib64", -+ "python" + sys.version[:3], -+ "site-packages"), -+ os.path.join(prefix, - "lib", - "python" + sys.version[:3], - "site-packages"), -+ os.path.join(prefix, "lib64", "site-python"), - os.path.join(prefix, "lib", "site-python")] - sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs - else: -diff -Nru Python-2.4.old/Makefile.pre.in Makefile.pre.in ---- Python-2.4.old/Makefile.pre.in 2004-08-14 21:39:00.506211424 -0400 -+++ Makefile.pre.in 2004-08-14 21:39:41.341003592 -0400 +diff -Nru Python-2.3.4.old/Lib/site.py Python-2.3.4/Lib/site.py +--- Python-2.3.4.old/Lib/site.py 2004-08-14 21:38:57.565658456 -0400 ++++ Python-2.3.4/Lib/site.py 2004-08-14 21:39:41.318007088 -0400 +@@ -166,9 +166,14 @@ + sitedirs = [os.path.join(prefix, "Lib", "site-packages")] + elif os.sep == '/': + sitedirs = [os.path.join(prefix, ++ "lib64", ++ "python" + sys.version[:3], ++ "site-packages"), ++ os.path.join(prefix, + "lib", + "python" + sys.version[:3], + "site-packages"), ++ os.path.join(prefix, "lib64", "site-python"), + os.path.join(prefix, "lib", "site-python")] + else: + sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] +diff -Nru Python-2.3.4.old/Lib/test/test_re.py Python-2.3.4/Lib/test/test_re.py +--- Python-2.3.4.old/Lib/test/test_re.py 2004-08-14 21:38:56.631800424 -0400 ++++ Python-2.3.4/Lib/test/test_re.py 2004-08-14 21:39:34.240083096 -0400 +@@ -497,6 +497,15 @@ + self.assert_(re.compile('bug_926075') is not + re.compile(eval("u'bug_926075'"))) + ++ def test_bug_931848(self): ++ try: ++ unicode ++ except NameError: ++ pass ++ pattern = eval('u"[\u002E\u3002\uFF0E\uFF61]"') ++ self.assertEqual(re.compile(pattern).split("a.b.c"), ++ ['a','b','c']) ++ + def run_re_tests(): + from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR + if verbose: +diff -Nru Python-2.3.4.old/Makefile.pre.in Python-2.3.4/Makefile.pre.in +--- Python-2.3.4.old/Makefile.pre.in 2004-08-14 21:39:00.506211424 -0400 ++++ Python-2.3.4/Makefile.pre.in 2004-08-14 21:39:41.341003592 -0400 @@ -79,11 +79,11 @@ # Expanded directories @@ -70,19 +89,19 @@ diff -Nru Python-2.4.old/Makefile.pre.in Makefile.pre.in # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) -diff -Nru Python-2.4.old/Modules/getpath.c Modules/getpath.c ---- Modules/Setup.dist.old 2005-01-05 11:59:12.421634520 -0800 -+++ Modules/Setup.dist 2005-01-05 12:00:58.292539696 -0800 -@@ -325,7 +325,7 @@ +diff -Nru Python-2.3.4.old/Modules/Setup.dist Python-2.3.4/Modules/Setup.dist +--- Python-2.3.4.old/Modules/Setup.dist 2004-08-14 21:39:00.761172664 -0400 ++++ Python-2.3.4/Modules/Setup.dist 2004-08-14 21:42:09.073544832 -0400 +@@ -343,7 +343,7 @@ # *** Uncomment and edit to reflect your Tcl/Tk versions: # -ltk8.2 -ltcl8.2 \ # *** Uncomment and edit to reflect where your X11 libraries are: -# -L/usr/X11R6/lib \ -+ -L/usr/X11R6/lib64 \ ++ -L/usr/X11R6/lib64 \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ # *** Uncomment these for TOGL extension only: -@@ -396,7 +396,7 @@ +@@ -417,7 +417,7 @@ #DB=/usr/local/BerkeleyDB.4.0 #DBLIBVER=4.0 #DBINC=$(DB)/include @@ -91,17 +110,18 @@ diff -Nru Python-2.4.old/Modules/getpath.c Modules/getpath.c #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) # Historical Berkeley DB 1.85 -@@ -442,7 +442,7 @@ +@@ -463,7 +463,7 @@ # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). - # See http://www.gzip.org/zlib/ + # See http://www.cdrom.com/pub/infozip/zlib/ -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz # Interface to the Expat XML parser # ---- Python-2.4.old/Modules/getpath.c 2004-08-14 21:39:00.750174336 -0400 -+++ Modules/getpath.c 2004-08-14 21:39:41.319006936 -0400 +diff -Nru Python-2.3.4.old/Modules/getpath.c Python-2.3.4/Modules/getpath.c +--- Python-2.3.4.old/Modules/getpath.c 2004-08-14 21:39:00.750174336 -0400 ++++ Python-2.3.4/Modules/getpath.c 2004-08-14 21:39:41.319006936 -0400 @@ -112,8 +112,8 @@ #endif @@ -139,20 +159,29 @@ diff -Nru Python-2.4.old/Modules/getpath.c Modules/getpath.c + joinpath(exec_prefix, "lib64/lib-dynload"); } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - -diff -Nru setup.py.old setup.py ---- setup.py.old 2005-01-05 12:05:34.809502728 -0800 -+++ setup.py 2005-01-05 12:14:29.522214040 -0800 -@@ -247,7 +247,7 @@ + +diff -Nru Python-2.3.4.old/setup.py Python-2.3.4/setup.py +--- Python-2.3.4.old/setup.py 2004-08-14 21:39:00.575200936 -0400 ++++ Python-2.3.4/setup.py 2004-08-14 21:39:41.340003744 -0400 +@@ -241,7 +241,7 @@ + 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.library_dirs, '/usr/local/lib64') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - # Add paths to popular package managers on OS X/darwin -@@ -437,11 +437,11 @@ + # fink installs lots of goodies in /sw/... - make sure we +@@ -264,7 +264,7 @@ + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +- lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib'] ++ lib_dirs = self.compiler.library_dirs + ['/lib64', '/usr/lib64'] + inc_dirs = self.compiler.include_dirs + ['/usr/include'] + exts = [] + +@@ -413,11 +413,11 @@ elif self.compiler.find_library_file(lib_dirs, 'curses'): readline_libs.append('curses') elif self.compiler.find_library_file(lib_dirs + @@ -165,8 +194,8 @@ diff -Nru setup.py.old setup.py + library_dirs=['/usr/lib64/termcap'], libraries=readline_libs) ) if platform not in ['mac']: - # crypt module. -@@ -470,8 +470,8 @@ + # crypt module. +@@ -446,8 +446,8 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, @@ -177,7 +206,7 @@ diff -Nru setup.py.old setup.py ] ) if (ssl_incs is not None and -@@ -502,23 +502,23 @@ +@@ -481,12 +481,12 @@ # order you wish to search - e.g., search for db4 before db3 db_try_this = { 'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',), @@ -191,28 +220,35 @@ diff -Nru setup.py.old setup.py + '/usr/local/lib64', '/opt/sfw', - '/sw/lib', -+ '/sw/libi64', ++ '/sw/lib64', ), - 'incdirs': ('/usr/include/db4.2', - '/usr/include/db4.1', + 'incdirs': ('/usr/local/BerkeleyDB.4.2/include', + '/usr/local/include/db42', +@@ -499,12 +499,12 @@ '/usr/include/db4', )}, - 'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',), + 'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',), - 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib', - '/usr/local/BerkeleyDB.3.2/lib', +- '/usr/local/BerkeleyDB.3.1/lib', - '/usr/local/lib', - '/opt/sfw/lib', - '/sw/lib', + 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib64', + '/usr/local/BerkeleyDB.3.2/lib64', ++ '/usr/local/BerkeleyDB.3.1/lib64', + '/usr/local/lib64', + '/opt/sfw/lib64', + '/sw/lib64', ), 'incdirs': ('/usr/local/BerkeleyDB.3.3/include', '/usr/local/BerkeleyDB.3.2/include', -@@ -1000,11 +1000,11 @@ - added_lib_dirs.append('/usr/X11R6/lib') +@@ -986,14 +986,14 @@ + added_lib_dirs.append('/usr/openwin/lib') + elif os.path.exists('/usr/X11R6/include'): + include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib') ++ added_lib_dirs.append('/usr/X11R6/lib64') elif os.path.exists('/usr/X11R5/include'): include_dirs.append('/usr/X11R5/include') - added_lib_dirs.append('/usr/X11R5/lib') diff --git a/dev-lang/python/files/python-2.4-libdir.patch b/dev-lang/python/files/python-2.4-libdir.patch index d60605c4416d..61ca31f58a53 100644 --- a/dev-lang/python/files/python-2.4-libdir.patch +++ b/dev-lang/python/files/python-2.4-libdir.patch @@ -35,9 +35,10 @@ diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/ if standard_lib: return libpython else: ---- ./Lib/site.py 2005-03-17 09:55:19.295156312 -0800 -+++ ./orgLib/site.py 2005-03-17 09:59:42.009217704 -0800 -@@ -179,10 +179,20 @@ +diff -Naurp Python-2.4.orig/Lib/site.py Python-2.4/Lib/site.py +--- Python-2.4.orig/Lib/site.py 2004-07-19 19:28:28.000000000 -0700 ++++ Python-2.4/Lib/site.py 2005-02-07 12:17:13.000000000 -0800 +@@ -179,9 +179,14 @@ def addsitepackages(known_paths): sitedirs = [os.path.join(prefix, "Lib", "site-packages")] elif os.sep == '/': sitedirs = [os.path.join(prefix, @@ -48,14 +49,8 @@ diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/ "lib", "python" + sys.version[:3], "site-packages"), -+ os.path.join(prefix, "lib64", "site-python"), ++ os.path.join(prefix, "lib64", "site-python"), os.path.join(prefix, "lib", "site-python")] -+ tmp_sitedirs = [] -+ for sdir in sitedirs: -+ if sdir not in tmp_sitedirs: -+ tmp_sitedirs.append(sdir) -+ sitedirs = tmp_sitedirs - sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs else: sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] diff -Naurp Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in diff --git a/dev-lang/python/files/python-2.4-readline.patch b/dev-lang/python/files/python-2.4-readline.patch index 7469b577979c..3dbeb8e02727 100644 --- a/dev-lang/python/files/python-2.4-readline.patch +++ b/dev-lang/python/files/python-2.4-readline.patch @@ -1,3 +1,19 @@ +Common subdirectories: Python-2.4/Demo and Python-2.4.new/Demo +Common subdirectories: Python-2.4/Doc and Python-2.4.new/Doc +Common subdirectories: Python-2.4/Grammar and Python-2.4.new/Grammar +Common subdirectories: Python-2.4/Include and Python-2.4.new/Include +Common subdirectories: Python-2.4/Lib and Python-2.4.new/Lib +Common subdirectories: Python-2.4/Mac and Python-2.4.new/Mac +Common subdirectories: Python-2.4/Misc and Python-2.4.new/Misc +Common subdirectories: Python-2.4/Modules and Python-2.4.new/Modules +Common subdirectories: Python-2.4/Objects and Python-2.4.new/Objects +Common subdirectories: Python-2.4/PC and Python-2.4.new/PC +Common subdirectories: Python-2.4/PCbuild and Python-2.4.new/PCbuild +Common subdirectories: Python-2.4/Parser and Python-2.4.new/Parser +Common subdirectories: Python-2.4/Python and Python-2.4.new/Python +Common subdirectories: Python-2.4/RISCOS and Python-2.4.new/RISCOS +Common subdirectories: Python-2.4/Tools and Python-2.4.new/Tools +Only in Python-2.4.new: autom4te.cache diff -up Python-2.4/configure Python-2.4.new/configure --- Python-2.4/configure 2004-11-07 01:24:12.000000000 +0000 +++ Python-2.4.new/configure 2005-04-20 17:35:32.380494843 +0100 diff --git a/dev-lang/python/files/python-2.4.1-libdir.patch b/dev-lang/python/files/python-2.4.1-libdir.patch index b9d6b50395d5..4a11d1e8514b 100644 --- a/dev-lang/python/files/python-2.4.1-libdir.patch +++ b/dev-lang/python/files/python-2.4.1-libdir.patch @@ -1,5 +1,6 @@ ---- Python-2.4.1/Lib/distutils/command/install.py -+++ Python-2.4.1/Lib/distutils/command/install.py +diff -Naurp Python-2.4.orig/Lib/distutils/command/install.py Python-2.4/Lib/distutils/command/install.py +--- Python-2.4.orig/Lib/distutils/command/install.py 2004-11-10 14:23:15.000000000 -0800 ++++ Python-2.4/Lib/distutils/command/install.py 2005-02-07 12:13:14.000000000 -0800 @@ -39,14 +39,14 @@ else: INSTALL_SCHEMES = { 'unix_prefix': { @@ -17,8 +18,9 @@ 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', ---- Python-2.4.1/Lib/distutils/sysconfig.py -+++ Python-2.4.1/Lib/distutils/sysconfig.py +diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/sysconfig.py +--- Python-2.4.orig/Lib/distutils/sysconfig.py 2004-10-13 08:54:16.000000000 -0700 ++++ Python-2.4/Lib/distutils/sysconfig.py 2005-02-07 12:16:17.000000000 -0800 @@ -99,8 +99,12 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX @@ -33,9 +35,9 @@ if standard_lib: return libpython else: ---- Python-2.4.1/Lib/site.py -+++ Python-2.4.1/Lib/site.py -@@ -179,10 +179,20 @@ def addsitepackages(known_paths): +--- ./Lib/site.py 2005-03-17 09:55:19.295156312 -0800 ++++ ./orgLib/site.py 2005-03-17 09:59:42.009217704 -0800 +@@ -179,10 +179,20 @@ sitedirs = [os.path.join(prefix, "Lib", "site-packages")] elif os.sep == '/': sitedirs = [os.path.join(prefix, @@ -56,8 +58,9 @@ sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs else: sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] ---- Python-2.4.1/Makefile.pre.in -+++ Python-2.4.1/Makefile.pre.in +diff -Naurp Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in +--- Python-2.4.orig/Makefile.pre.in 2004-09-26 10:26:55.000000000 -0700 ++++ Python-2.4/Makefile.pre.in 2005-02-07 12:18:39.000000000 -0800 @@ -79,7 +79,7 @@ exec_prefix= @exec_prefix@ # Expanded directories @@ -67,9 +70,10 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include ---- Python-2.4.1/Modules/Setup.dist -+++ Python-2.4.1/Modules/Setup.dist -@@ -329,7 +329,7 @@ GLHACK=-Dclear=__GLclear +diff -Naurp Python-2.4.orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist +--- Python-2.4.orig/Modules/Setup.dist 2004-08-31 06:50:12.000000000 -0700 ++++ Python-2.4/Modules/Setup.dist 2005-02-07 12:19:48.000000000 -0800 +@@ -325,7 +325,7 @@ GLHACK=-Dclear=__GLclear # *** Uncomment and edit to reflect your Tcl/Tk versions: # -ltk8.2 -ltcl8.2 \ # *** Uncomment and edit to reflect where your X11 libraries are: @@ -78,7 +82,7 @@ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ # *** Uncomment these for TOGL extension only: -@@ -400,7 +400,7 @@ GLHACK=-Dclear=__GLclear +@@ -396,7 +396,7 @@ GLHACK=-Dclear=__GLclear #DB=/usr/local/BerkeleyDB.4.0 #DBLIBVER=4.0 #DBINC=$(DB)/include @@ -87,17 +91,18 @@ #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) # Historical Berkeley DB 1.85 -@@ -446,7 +446,7 @@ GLHACK=-Dclear=__GLclear +@@ -442,7 +442,7 @@ GLHACK=-Dclear=__GLclear # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). # See http://www.gzip.org/zlib/ -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -+#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz ++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz # Interface to the Expat XML parser # ---- Python-2.4.1/Modules/getpath.c -+++ Python-2.4.1/Modules/getpath.c +diff -Naurp Python-2.4.orig/Modules/getpath.c Python-2.4/Modules/getpath.c +--- Python-2.4.orig/Modules/getpath.c 2004-08-07 18:00:47.000000000 -0700 ++++ Python-2.4/Modules/getpath.c 2005-02-07 12:22:15.137580048 -0800 @@ -113,7 +113,7 @@ #ifndef PYTHONPATH @@ -107,42 +112,7 @@ #endif #ifndef LANDMARK -@@ -125,6 +125,7 @@ static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; - static char lib_python[] = "lib/python" VERSION; -+static char lib_exec_python[] = "@@GENTOO_LIBDIR@@/python" VERSION; - - static void - reduce(char *dir) -@@ -321,7 +322,7 @@ search_for_exec_prefix(char *argv0_path, - strncpy(exec_prefix, delim+1, MAXPATHLEN); - else - strncpy(exec_prefix, home, MAXPATHLEN); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - return 1; - } -@@ -338,7 +339,7 @@ search_for_exec_prefix(char *argv0_path, - copy_absolute(exec_prefix, argv0_path); - do { - n = strlen(exec_prefix); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - if (isdir(exec_prefix)) - return 1; -@@ -348,7 +349,7 @@ search_for_exec_prefix(char *argv0_path, - - /* Look at configure's EXEC_PREFIX */ - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - if (isdir(exec_prefix)) - return 1; -@@ -525,7 +526,7 @@ calculate_path(void) +@@ -525,7 +525,7 @@ calculate_path(void) fprintf(stderr, "Could not find platform dependent libraries <exec_prefix>\n"); strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); @@ -151,8 +121,17 @@ } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ ---- Python-2.4.1/setup.py -+++ Python-2.4.1/setup.py +diff -Naurp Python-2.4.orig/setup.py Python-2.4/setup.py +--- Python-2.4.orig/setup.py 2005-02-07 12:11:30.000000000 -0800 ++++ Python-2.4/setup.py 2005-02-07 12:25:21.746978894 -0800 +@@ -248,6 +248,7 @@ class PyBuildExt(build_ext): + 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.library_dirs, '/usr/local/@@GENTOO_LIBDIR@@') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + + # Add paths to popular package managers on OS X/darwin @@ -274,7 +275,7 @@ class PyBuildExt(build_ext): # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. @@ -176,7 +155,7 @@ libraries=readline_libs) ) if platform not in ['mac']: # crypt module. -@@ -1015,7 +1016,7 @@ class PyBuildExt(build_ext): +@@ -996,7 +997,7 @@ class PyBuildExt(build_ext): added_lib_dirs.append('/usr/openwin/lib') elif os.path.exists('/usr/X11R6/include'): include_dirs.append('/usr/X11R6/include') diff --git a/dev-lang/python/files/python-config-2.2 b/dev-lang/python/files/python-config-2.2 index 056b27125ae9..253285032259 100644 --- a/dev-lang/python/files/python-config-2.2 +++ b/dev-lang/python/files/python-config-2.2 @@ -1,3 +1,3 @@ #!/usr/bin/python import distutils.sysconfig, string -print "-lpython2.2 -lm -L/usr/lib/python2.2/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS"))) +print "-lpython2.2",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS"))) diff --git a/dev-lang/python/files/python-config-2.2.1 b/dev-lang/python/files/python-config-2.2.1 index 056b27125ae9..2bcfdae49fb8 100644 --- a/dev-lang/python/files/python-config-2.2.1 +++ b/dev-lang/python/files/python-config-2.2.1 @@ -1,3 +1,3 @@ #!/usr/bin/python import distutils.sysconfig, string -print "-lpython2.2 -lm -L/usr/lib/python2.2/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS"))) +print "-lpython2.2 -L /usr/lib/python2.2/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS"))) diff --git a/dev-lang/python/files/python-updater b/dev-lang/python/files/python-updater index ca6ef7d4364e..95662876e54f 100644 --- a/dev-lang/python/files/python-updater +++ b/dev-lang/python/files/python-updater @@ -21,11 +21,13 @@ # PKGS_MASKED = list of packages that are installed, but masked. # +OLD_PY_VER=2.2 NEW_PY_VER=$(python -V 2>&1 | sed 's:Python ::' | cut -d. -f1-2) +OLD_MODULES_DIR=/usr/lib/python${OLD_PY_VER} -PKGS_EXCEPTIONS="dev-lang/python sys-apps/portage" +PKGS_EXCEPTIONS="dev-lang/python" PKGS_MANUAL="app-office/gnumeric app-office/dia x11-libs/vte" -LOGFILE="/var/log/python-updater.log" +LOGFILE="/tmp/python-updater.log" # portage variables PKG_DBDIR=/var/db/pkg @@ -35,31 +37,12 @@ PORTDIR_OVERLAYS=`portageq portdir_overlay` PRETEND=0 PKGS_TO_REMERGE="" PKGS_COUNT_REMERGE=0 -PORTAGE_PYTHON="/usr/bin/python" # load the gentoo-style info macros, but hack to get around # it thinking this is an rc script EBUILD="1" source /sbin/functions.sh - - -for old in 2.4 2.3 2.2 2.1; do - if [ "${old}" != "${NEW_PY_VER}" ]; then - if [ -e /usr/bin/python${old} ] ; then - OLD_PY_VER=${old} - break; - fi - fi -done - - -if [ -z "${OLD_PY_VER}" ] ; then - eerror "Can't determine any previous Python version(s)." - exit 1 -fi - - # misc helper functions eloginfo() { einfo $* @@ -77,88 +60,34 @@ elogecho() { elogerr() { eerror $* DATESTRING=`date +"%Y/%m/%d %H:%M:%S"` - echo "${DATESTRING} ! ${*}" >> ${LOGFILE} + echo "${DATESTRING} ! ${*}" >> ${LOGFILE} } elog() { DATESTRING=`date +"%Y/%m/%d %H:%M:%S"` - echo "${DATESTRING} - ${*}" >> ${LOGFILE} -} - - -usage() { - echo "usage: python-updater [-h|-p|-o X.X|-n X.X]" - echo " -h help" - echo " -p pretend (don't do anything)" - echo " -o X.X set old python version to upgrade from [default: ${OLD_PY_VER}]" - echo " -n X.X set new python version to upgrade to [default: ${NEW_PY_VER}]" + echo "${DATESTRING} - ${*}" >> ${LOGFILE} } -# -# Sanity check -# - -if [ -z "${PORTDIR}" ]; then - eerror "Unable to proceed. Can not find PORTDIR. Make sure the command:" - eerror " " - eerror " portageq portdir" - eerror " " - eerror "returns a value. If it doesn't, make sure you have updated to" - eerror "latest portage version." - eerror " " - eerror "Report bugs to http://bugs.gentoo.org/" - exit 1 -fi - -if [ ! -f ${LOGFILE} ]; then - if ! touch ${LOGFILE} 2>&1 > /dev/null; then - ewarn "Logging disabled due to permissions" - LOGFILE=/dev/null - fi -elif [ ! -w ${LOGFILE} -o ! -L ${LOGFILE} ]; then - ewarn "Logging disabled due to permissions" - LOGFILE=/dev/null -fi - # # # Command Line Parsing # # -while [ -n "$1" ]; do + +if [ -n "$1" ]; then case "$1" in - -h) - usage - exit 0 + -h) + echo "usage: python-updater [-h|-p]" + echo " -h help" + echo " -p pretend (don't do anything)" ;; -p) PRETEND=1 ;; - -o) - shift - OLD_PY_VER="$1" - ;; - -n) - shift - NEW_PY_VER="$1" - ;; *) - usage - echo "unrecognised option: $1" ;; esac - shift -done - -# -# Test where portage is, in python2.2 or somewhere else? -# -for py in /usr/bin/python /usr/bin/python${OLD_PY_VER} /usr/bin/python${NEW_PY_VER}; do - if ${py} -c "import portage"; then - PORTAGE_PYTHON=${py} - break; - fi -done +fi # # @@ -166,11 +95,9 @@ done # /usr/lib/python${OLD_PY_VER} # # -OLD_MODULES_DIRS="/usr/lib/python${OLD_PY_VER} /usr/lib32/python${OLD_PY_VER} /usr/lib64/python${OLD_PY_VER}" -OLD_INCLUDE_DIR=/usr/include/python${OLD_PY_VER} eloginfo "Starting Python Updater from ${OLD_PY_VER} to ${NEW_PY_VER} :" -eloginfo "Searching for packages with files in ${OLD_MODULES_DIRS} .." +eloginfo "Searching for packages with files in ${OLD_MODULES_DIR} .." # iterate thru all the installed package's contents for content in `find ${PKG_DBDIR} -name CONTENTS`; do @@ -190,14 +117,10 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do continue; fi - for OLD_MODULES_DIR in ${OLD_MODULES_DIRS}; do - if fgrep "${OLD_MODULES_DIR}" ${content} > /dev/null; then - PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" - elogecho "Adding to list: ${CATPKGVER}" - elif fgrep "${OLD_INCLUDE_DIR}" ${content} > /dev/null; then - PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" - fi - done + if fgrep "${OLD_MODULES_DIR}" ${content} > /dev/null; then + PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" + elogecho "Adding to list: ${CATPKGVER}" + fi done # now we have to do each emerge seperately because if an installed version @@ -227,14 +150,19 @@ for pkg in ${PKGS_TO_REMERGE}; do done # -# Use my super dumb package reordering algorithm that works most of the time +# Check the actual order which these should be merged (probably doesn't work) # eloginfo "Re-ordering packages to merge .." -PKGS_OK_SORTED="$(${PORTAGE_PYTHON} ${PORTDIR}/dev-lang/python/files/depreorder.py ${PKGS_OK} | xargs)" +PKGS_OK_SORTED_CMD="emerge -p " +for pkg in $PKGS_OK; do + PKGS_OK_SORTED_CMD="${PKGS_OK_SORTED_CMD} =$pkg" +done +PKGS_OK_SORTED_CMD="${PKGS_OK_SORTED_CMD}" eloginfo "Preparing to merge these packages in this order:" +PKGS_OK_SORTED="`${PKGS_OK_SORTED_CMD} | grep ebuild | sed 's:\[ebuild.*\] ::'`" for pkg in $PKGS_OK_SORTED; do elogecho "$pkg" done @@ -245,7 +173,7 @@ done COUNT=1 PKGS_FAILED="" if [ "${PRETEND}" != "1" ]; then - for pkg in ${PKGS_OK_SORTED}; do + for pkg in ${PKGS_OK}; do eloginfo "Starting to merge ($COUNT/$PKGS_COUNT_REMERGE) $pkg .." if ! emerge --oneshot --nodeps =$pkg; then PKGS_FAILED="${PKGS_FAILED} $pkg" @@ -264,42 +192,39 @@ OUTPUT_PKGS_FAILED="" for pkg in ${PKGS_FAILED}; do OUTPUT_PKGS_FAILED="${OUTPUT_PKGS_FAILED} \=$pkg"; done if [ -n "${PKGS_FAILED}" -o -n "${PKGS_MISSING}" -o -n "${PKGS_MASKED}" ]; then - echo ewarn "************************************************************" ewarn "* Packages that still need to be manually emerged : *" ewarn "************************************************************" if [ -n "${OUTPUT_PKGS_MASKED}" ]; then - echo ewarn " Masked Packages:" ewarn " ----------------" ewarn " Unmask the following packages (at your own risk) and " ewarn " emerge them using this command after removing the '-p'" ewarn " parameter." - echo + ewarn "" ewarn " emerge -p ${OUTPUT_PKGS_MASKED}" - echo + ewarn "" fi if [ -n "${OUTPUT_PKGS_MISSING}" ]; then - echo ewarn " Missing Packages:" ewarn " -----------------" ewarn " These packages need to be updated because their versions do" ewarn " not exist in portage anymore." - echo + ewarn "" for x in ${OUTPUT_PKGS_MISSING}; do echo " ${x}" done + ewarn "" fi if [ -n "${OUTPUT_PKGS_FAILED}" ]; then - echo ewarn " Failed Packaged:" ewarn " ----------------" ewarn " These packages have failed and need to be re-emerged again." ewarn " Alternatively, try re-running this script again to see if it" ewarn " can be fixed." - echo + ewarn "" ewarn " emerge -p ${OUTPUT_PKGS_FAILED}" - echo + ewarn "" fi elog "Python update completed with errors." @@ -319,4 +244,3 @@ if [ -n "${PKGS_FAILED}" -o -n "${PKGS_MISSING}" -o -n "${PKGS_MASKED}" ]; then else eloginfo "Python update completed successfully." fi - diff --git a/dev-lang/python/python-2.1.3-r1.ebuild b/dev-lang/python/python-2.1.3-r1.ebuild index cd481d4d322e..90029d837612 100644 --- a/dev-lang/python/python-2.1.3-r1.ebuild +++ b/dev-lang/python/python-2.1.3-r1.ebuild @@ -1,32 +1,28 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.1.3-r1.ebuild,v 1.22 2005/05/28 00:55:06 kloeri Exp $ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.1.3-r1.ebuild,v 1.1 2002/07/03 03:24:19 jnelson Exp $ -inherit versionator - -PYVER_MAJOR=$(get_major_version) -PYVER_MINOR=$(get_version_component_range 2) +PYVER_MAJOR="`echo ${PV} | cut -d '.' -f 1`" +PYVER_MINOR="`echo ${PV} | cut -d '.' -f 2`" PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" S=${WORKDIR}/Python-${PV} - DESCRIPTION="A really great language" -HOMEPAGE="http://www.python.org" SRC_URI="http://www.python.org/ftp/python/${PV}/Python-${PV}.tgz" +HOMEPAGE="http://www.python.org" LICENSE="PSF-2.1.1" -SLOT="2.1" -KEYWORDS="x86 sparc alpha ia64 ppc" -IUSE="readline tcltk berkdb" -DEPEND=">=sys-libs/zlib-1.1.3 +DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3 readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 ) berkdb? ( >=sys-libs/db-3 ) tcltk? ( >=dev-lang/tk-8.0 )" +RDEPEND="$DEPEND" # The dev-python/python-fchksum RDEPEND is needed to that this python provides # the functionality expected from previous pythons. -PROVIDE="virtual/python" +PROVIDE="virtual/python-2.1" +SLOT="2.1" src_compile() { export OPT="$CFLAGS" @@ -35,10 +31,10 @@ src_compile() { t=${S}/Makefile.pre.in cp $t $t.orig || die sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' $t.orig > $t - + local myopts #if we are creating a new build image, we remove the dependency on g++ - + econf --with-fpectl \ --with-threads \ --infodir='${prefix}'/share/info \ @@ -67,7 +63,7 @@ src_install() { # If USE tcltk lets install idle # Need to script the python version in the path if use tcltk; then - dodir /usr/lib/python${PYVER}/tools + mkdir "${D}/usr/lib/python${PYVER}/tools" mv "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/" dosym /usr/lib/python${PYVER}/tools/idle/idle.py /usr/bin/idle-${PV}.py fi diff --git a/dev-lang/python/python-2.2.3-r6.ebuild b/dev-lang/python/python-2.2.3-r6.ebuild index 657b851ae728..5352533d4833 100644 --- a/dev-lang/python/python-2.2.3-r6.ebuild +++ b/dev-lang/python/python-2.2.3-r6.ebuild @@ -1,24 +1,25 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r6.ebuild,v 1.4 2005/05/28 00:55:06 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r6.ebuild,v 1.1 2005/02/07 04:28:20 pythonhead Exp $ -inherit flag-o-matic eutils python versionator +inherit flag-o-matic eutils python -PYVER_MAJOR=$(get_major_version) -PYVER_MINOR=$(get_version_component_range 2) +IUSE="berkdb bootstrap build doc gdbm ncurses readline ssl tcltk" + +PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`" +PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`" PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" S="${WORKDIR}/Python-${PV}" DESCRIPTION="A really great language" -HOMEPAGE="http://www.python.org" SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tgz" +HOMEPAGE="http://www.python.org" LICENSE="PSF-2.2" -SLOT="2.2" KEYWORDS="amd64 x86 ppc sparc alpha mips hppa ia64 ppc64" -IUSE="berkdb bootstrap build doc gdbm ncurses readline ssl tcltk nocxx" -DEPEND=">=sys-libs/zlib-1.1.3 +DEPEND="virtual/libc + >=sys-libs/zlib-1.1.3 !build? ( tcltk? ( >=dev-lang/tk-8.0 ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) berkdb? ( >=sys-libs/db-3 ) @@ -35,6 +36,8 @@ RDEPEND="${DEPEND} dev-python/python-fchksum" PROVIDE="virtual/python" +SLOT="2.2" + src_unpack() { unpack ${A} #Fixes security vulnerability in XML-RPC server - pythonhead (06 Feb 05) @@ -82,7 +85,7 @@ src_compile() { local myopts #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap || use nocxx + if use build && ! use bootstrap then myopts="--with-cxx=no" fi diff --git a/dev-lang/python/python-2.3.4-r1.ebuild b/dev-lang/python/python-2.3.4-r1.ebuild index 2e957bc6903c..c9938f663854 100644 --- a/dev-lang/python/python-2.3.4-r1.ebuild +++ b/dev-lang/python/python-2.3.4-r1.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2005 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-r1.ebuild,v 1.10 2005/08/16 22:00:31 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4-r1.ebuild,v 1.1 2005/02/07 04:28:20 pythonhead Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage # in dev-lang/python. It _WILL_ stop people installing from # Gentoo 1.4 images. -inherit eutils flag-o-matic python versionator +inherit eutils flag-o-matic python -PYVER_MAJOR=$(get_major_version) -PYVER_MINOR=$(get_version_component_range 2) +PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`" +PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`" PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" S="${WORKDIR}/Python-${PV}" @@ -20,10 +20,11 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2" LICENSE="PSF-2.2" SLOT="2.3" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86 ppc64" -IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx" +KEYWORDS="alpha amd64 arm hppa ia64 mips ~ppc s390 sh sparc x86" +IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X" -DEPEND=">=sys-libs/zlib-1.1.3 +DEPEND="virtual/libc + >=sys-libs/zlib-1.1.3 !build? ( X? ( tcltk? ( >=dev-lang/tk-8.0 ) ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) @@ -34,9 +35,7 @@ DEPEND=">=sys-libs/zlib-1.1.3 dev-libs/expat )" -# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri - -PDEPEND="${DEPEND} dev-python/python-fchksum" +RDEPEND="${DEPEND} dev-python/python-fchksum" # The dev-python/python-fchksum RDEPEND is needed to that this python provides # the functionality expected from previous pythons. @@ -104,7 +103,7 @@ src_compile() { local myconf #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap || use nocxx ; then + if use build && ! use bootstrap; then myconf="--with-cxx=no" fi @@ -123,7 +122,7 @@ src_compile() { --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man \ --with-threads \ - --with-libc='' \ + --with-cxx=no \ ${myconf} || die emake || die "Parallel make failed" } @@ -164,7 +163,7 @@ src_install() { if use build ; then rm -rf ${D}/usr/lib/python2.3/{test,encodings,email,lib-tk,bsddb/test} else - use elibc_uclibc && rm -rf ${D}/usr/lib/python2.3/{test,bsddb/test} + 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 diff --git a/dev-lang/python/python-2.3.5-r1.ebuild b/dev-lang/python/python-2.3.5-r1.ebuild index 1ad08d5f78ae..783cec9c3cd4 100644 --- a/dev-lang/python/python-2.3.5-r1.ebuild +++ b/dev-lang/python/python-2.3.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r1.ebuild,v 1.2 2005/08/15 21:31:11 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r1.ebuild,v 1.1 2005/06/16 21:19:33 kloeri Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -41,9 +41,7 @@ DEPEND=">=sys-libs/zlib-1.1.3 # it to compile python. We just need to ensure that when we install # python, we definitely have fchksum support. - liquidx -# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri - -PDEPEND="${DEPEND} dev-python/python-fchksum" +RDEPEND="${DEPEND} dev-python/python-fchksum" PROVIDE="virtual/python" diff --git a/dev-lang/python/python-2.3.5-r2.ebuild b/dev-lang/python/python-2.3.5-r2.ebuild index 4eff901ae969..cf8a7b3e5339 100644 --- a/dev-lang/python/python-2.3.5-r2.ebuild +++ b/dev-lang/python/python-2.3.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r2.ebuild,v 1.10 2005/10/01 15:34:55 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r2.ebuild,v 1.1 2005/09/08 21:31:29 kloeri Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -20,7 +20,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2" LICENSE="PSF-2.2" SLOT="2.3" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx" DEPEND=">=sys-libs/zlib-1.1.3 @@ -220,7 +220,7 @@ src_test() { #skip all tests that fail during emerge but pass without emerge: #(See bug# 67970) - local skip_tests="global mimetools mmap strptime subprocess tcl time urllib urllib2 zipimport" + local skip_tests="subprocess tcl urllib urllib2" for test in ${skip_tests} ; do mv ${S}/Lib/test/test_${test}.py ${T} diff --git a/dev-lang/python/python-2.3.5.ebuild b/dev-lang/python/python-2.3.5.ebuild index c841b38e6509..fed0b2f015da 100644 --- a/dev-lang/python/python-2.3.5.ebuild +++ b/dev-lang/python/python-2.3.5.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5.ebuild,v 1.22 2005/08/16 22:00:31 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5.ebuild,v 1.1 2005/02/17 18:19:40 pythonhead Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage # in dev-lang/python. It _WILL_ stop people installing from # Gentoo 1.4 images. -inherit eutils flag-o-matic python versionator +inherit eutils flag-o-matic python -PYVER_MAJOR=$(get_major_version) -PYVER_MINOR=$(get_version_component_range 2) +PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`" +PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`" PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" S="${WORKDIR}/Python-${PV}" @@ -20,10 +20,11 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2" LICENSE="PSF-2.2" SLOT="2.3" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86" +IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X" -DEPEND=">=sys-libs/zlib-1.1.3 +DEPEND="virtual/libc + >=sys-libs/zlib-1.1.3 !build? ( X? ( tcltk? ( >=dev-lang/tk-8.0 ) ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) @@ -34,27 +35,16 @@ DEPEND=">=sys-libs/zlib-1.1.3 dev-libs/expat )" -# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python -# provides the functionality expected from previous pythons. - -# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need -# it to compile python. We just need to ensure that when we install -# python, we definitely have fchksum support. - liquidx - -# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri - -PDEPEND="${DEPEND} dev-python/python-fchksum" +RDEPEND="${DEPEND} dev-python/python-fchksum" +# The dev-python/python-fchksum RDEPEND is needed to that this python provides +# the functionality expected from previous pythons. PROVIDE="virtual/python" src_unpack() { unpack ${A} cd ${S} - - # fix readline detection problems due to missing termcap (#79013) - epatch ${FILESDIR}/${PN}-2.3-readline.patch - sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed" # adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03) # prepends /usr/lib/portage/pym to sys.path - liquidx (12 Apr 04) @@ -65,9 +55,8 @@ src_unpack() { epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch epatch ${FILESDIR}/${PN}-2.3-mimetypes_apache.patch epatch ${FILESDIR}/${PN}-2.3-db4.2.patch - # installs to lib64 - [ "$(get_libdir)" == "lib64" ] && epatch ${FILESDIR}/python-2.3.4-lib64.patch + [ "${CONF_LIBDIR}" == "lib64" ] && epatch ${FILESDIR}/python-2.3.4-lib64.patch # fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04) [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure } @@ -111,7 +100,7 @@ src_compile() { local myconf #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap || use nocxx ; then + if use build && ! use bootstrap; then myconf="--with-cxx=no" fi @@ -130,11 +119,38 @@ src_compile() { --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man \ --with-threads \ - --with-libc='' \ + --with-cxx=no \ ${myconf} || die emake || die "Parallel make failed" } +src_test() { + local skip_tests="import sax" + #Move known bad tests out of the way while we run good ones + for test in ${skip_tests} ; do + mv ${S}/Lib/test/test_${test}.py ${T} + done + + make test || die "make test failed" + + #Move bad tests back so they get emerged + for test in ${skip_tests} ; do + mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py + done + + einfo "Portage skipped the following tests which aren't able to run from emerge:" + for test in ${skip_tests} ; do + einfo "test_${test}.py" + done + einfo "These tests normally pass when not run from emerge." + einfo "If you'd like to run them, you may:" + einfo "cd /usr/lib/python${PYVER}/test" + einfo "and run the tests separately." + einfo "See bug# 67970" + ebeep 2 +} + + src_install() { dodir /usr src_configure @@ -149,38 +165,50 @@ src_install() { # seems like the build do not install Makefile.pre.in anymore # it probably shouldn't - use DistUtils, people! - insinto /usr/$(get_libdir)/python${PYVER}/config + if [ "${CONF_LIBDIR}" == "lib64" ] ;then + insinto /usr/lib64/python${PYVER}/config + else + insinto /usr/lib/python${PYVER}/config + fi doins ${S}/Makefile.pre.in # While we're working on the config stuff... Let's fix the OPT var # so that it doesn't have any opts listed in it. Prevents the problem # with compiling things with conflicting opts later. - dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/$(get_libdir)/python${PYVER}/config/Makefile + 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 + fi # install python-updater in /usr/sbin dosbin ${FILESDIR}/python-updater if use build ; then - rm -rf ${D}/usr/$(get_libdir)/python2.3/{test,encodings,email,lib-tk,bsddb/test} + rm -rf ${D}/usr/lib/python2.3/{test,encodings,email,lib-tk,bsddb/test} else - use elibc_uclibc && rm -rf ${D}/usr/$(get_libdir)/python2.3/{test,bsddb/test} - use berkdb || rm -rf ${D}/usr/$(get_libdir)/python2.3/bsddb - ( use !X || use !tcltk ) && rm -rf ${D}/usr/$(get_libdir)/python2.3/lib-tk + 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() { python_makesym - python_mod_cleanup /usr/$(get_libdir)/python2.3 + python_mod_cleanup /usr/lib/python2.3 + [ "${CONF_LIBDIR}" == "lib64" ] && python_mod_cleanup /usr/lib64/python2.3 } pkg_postinst() { local myroot myroot=$(echo $ROOT | sed 's:/$::') + python_makesym python_mod_optimize - python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER} + python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER} + [ "${CONF_LIBDIR}" == "lib64" ] && \ + python_mod_optimize -x site-packages -x test ${myroot}/usr/lib64/python${PYVER} # workaround possible python-upgrade-breaks-portage situation if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then @@ -207,32 +235,3 @@ pkg_postinst() { ewarn ebeep 5 } - -src_test() { - # PYTHON_DONTCOMPILE=1 breaks test_import - unset PYTHON_DONTCOMPILE - - #skip all tests that fail during emerge but pass without emerge: - #(See bug# 67970) - local skip_tests="subprocess tcl urllib urllib2" - - for test in ${skip_tests} ; do - mv ${S}/Lib/test/test_${test}.py ${T} - done - - make test || die "make test failed" - - for test in ${skip_tests} ; do - mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py - done - - einfo "Portage skipped the following tests which aren't able to run from emerge:" - for test in ${skip_tests} ; do - einfo "test_${test}.py" - done - - einfo "If you'd like to run them, you may:" - einfo "cd /usr/lib/python${PYVER}/test" - einfo "and run the tests separately." -} - diff --git a/dev-lang/python/python-2.4-r3.ebuild b/dev-lang/python/python-2.4-r3.ebuild index d5108e892423..be1a9539cc6f 100644 --- a/dev-lang/python/python-2.4-r3.ebuild +++ b/dev-lang/python/python-2.4-r3.ebuild @@ -1,29 +1,31 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4-r3.ebuild,v 1.8 2005/11/17 13:50:56 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4-r3.ebuild,v 1.1 2005/03/19 17:51:20 pythonhead Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage # in dev-lang/python. It _WILL_ stop people installing from # Gentoo 1.4 images. -inherit eutils flag-o-matic python multilib versionator +inherit eutils flag-o-matic python multilib -PYVER_MAJOR=$(get_major_version) -PYVER_MINOR=$(get_version_component_range 2) +PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`" +PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`" PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" MY_P="Python-${PV}" S="${WORKDIR}/${MY_P}" DESCRIPTION="A really great language" -HOMEPAGE="http://www.python.org/" SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2" +HOMEPAGE="http://www.python.org" +IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X" LICENSE="PSF-2.2" SLOT="2.4" + KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips" -IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx" -DEPEND=">=sys-libs/zlib-1.1.3 +DEPEND="virtual/libc + >=sys-libs/zlib-1.1.3 !build? ( X? ( tcltk? ( >=dev-lang/tk-8.0 ) ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) @@ -34,24 +36,16 @@ DEPEND=">=sys-libs/zlib-1.1.3 dev-libs/expat )" -# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python -# provides the functionality expected from previous pythons. - -# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need -# it to compile python. We just need to ensure that when we install -# python, we definitely have fchksum support. - liquidx +RDEPEND="${DEPEND} dev-python/python-fchksum" -RDEPEND="${DEPEND} dev-python/python-fchksum" +# The dev-python/python-fchksum RDEPEND is needed to that this python provides +# the functionality expected from previous pythons. PROVIDE="virtual/python" src_unpack() { unpack ${A} cd ${S} - - # unnecessary termcap dep in readline (#79013) - epatch ${FILESDIR}/${PN}-2.4-readline.patch - #Fixes security vulnerability in XML-RPC server - pythonhead (06 Feb 05) #http://www.python.org/security/PSF-2005-001/ epatch ${FILESDIR}/${PN}-2.4-xmlrpc.patch @@ -74,11 +68,6 @@ src_unpack() { Modules/Setup.dist \ Modules/getpath.c \ setup.py - - # fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04) - # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!! - [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure - } src_configure() { @@ -120,7 +109,7 @@ src_compile() { local myconf #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap || use nocxx ; then + if use build && ! use bootstrap; then myconf="--with-cxx=no" fi @@ -172,7 +161,7 @@ src_install() { if use build ; then rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test} else - use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test} + use uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test} use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb ( use !X || use !tcltk ) && rm -rf ${D}/usr/lib/python${PYVER}/lib-tk fi diff --git a/dev-lang/python/python-2.4.1-r1.ebuild b/dev-lang/python/python-2.4.1-r1.ebuild index 58904267ad6d..3f88e2e866bc 100644 --- a/dev-lang/python/python-2.4.1-r1.ebuild +++ b/dev-lang/python/python-2.4.1-r1.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1-r1.ebuild,v 1.13 2005/11/17 13:50:56 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1-r1.ebuild,v 1.1 2005/06/16 21:19:33 kloeri Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage # in dev-lang/python. It _WILL_ stop people installing from # Gentoo 1.4 images. -inherit eutils flag-o-matic python multilib versionator toolchain-funcs +inherit eutils flag-o-matic python multilib versionator # we need this so that we don't depends on python.eclass PYVER_MAJOR=$(get_major_version) @@ -22,7 +22,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2" LICENSE="PSF-2.2" SLOT="2.4" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sparc ~x86" IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx" DEPEND=">=sys-libs/zlib-1.1.3 @@ -44,9 +44,7 @@ DEPEND=">=sys-libs/zlib-1.1.3 # it to compile python. We just need to ensure that when we install # python, we definitely have fchksum support. - liquidx -# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri - -PDEPEND="${DEPEND} dev-python/python-fchksum" +RDEPEND="${DEPEND} dev-python/python-fchksum" PROVIDE="virtual/python" @@ -76,20 +74,10 @@ src_unpack() { Makefile.pre.in \ Modules/Setup.dist \ Modules/getpath.c \ - setup.py || die + setup.py # add support for struct stat st_flags attribute (bug 94637) - epatch ${FILESDIR}/python-2.4.1-st_flags.patch - - # fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04) - # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!! - [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure - - - if tc-is-cross-compiler ; then - epatch "${FILESDIR}"/python-2.4.1-bindir-libdir.patch - epatch "${FILESDIR}"/python-2.4.1-crosscompile.patch - fi + epatch ${FILESDIR}/python-2.3.5-st_flags.patch } src_configure() { @@ -145,22 +133,7 @@ src_compile() { src_configure - if tc-is-cross-compiler ; then - OPT="-O1" LDFLAGS="" \ - ./configure --with-cxx=no || die "cross-configure failed" - emake python Parser/pgen || die "cross-make failed" - mv python hostpython - mv Parser/pgen Parser/hostpgen - make distclean - sed -i \ - -e '/^HOSTPYTHON/s:=.*:=./hostpython:' \ - -e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \ - Makefile.pre.in || die - fi - - tc-export CXX - econf \ - --with-fpectl \ + econf --with-fpectl \ --enable-shared \ `use_enable ipv6` \ --infodir='${prefix}'/share/info \ @@ -263,7 +236,7 @@ src_test() { #skip all tests that fail during emerge but pass without emerge: #(See bug# 67970) - local skip_tests="distutils global mimetools minidom mmap strptime subprocess tcl time urllib urllib2" + local skip_tests="subprocess tcl urllib urllib2" for test in ${skip_tests} ; do mv ${S}/Lib/test/test_${test}.py ${T} diff --git a/dev-lang/python/python-2.4.1.ebuild b/dev-lang/python/python-2.4.1.ebuild index 2877879d9bdb..0545ff557b0b 100644 --- a/dev-lang/python/python-2.4.1.ebuild +++ b/dev-lang/python/python-2.4.1.ebuild @@ -1,31 +1,33 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1.ebuild,v 1.11 2005/11/17 13:50:56 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1.ebuild,v 1.1 2005/04/27 12:18:26 liquidx Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage # in dev-lang/python. It _WILL_ stop people installing from # Gentoo 1.4 images. -inherit eutils flag-o-matic python multilib versionator +inherit eutils flag-o-matic python multilib # we need this so that we don't depends on python.eclass -PYVER_MAJOR=$(get_major_version) -PYVER_MINOR=$(get_version_component_range 2) +PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`" +PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`" PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" MY_P="Python-${PV}" S="${WORKDIR}/${MY_P}" DESCRIPTION="Python is an interpreted, interactive, object-orientated programming language." -HOMEPAGE="http://www.python.org/" SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2" +HOMEPAGE="http://www.python.org" +IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X uclibc" LICENSE="PSF-2.2" SLOT="2.4" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sparc ~x86" -IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx" -DEPEND=">=sys-libs/zlib-1.1.3 +KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips" + +DEPEND="virtual/libc + >=sys-libs/zlib-1.1.3 !dev-python/cjkcodecs !build? ( X? ( tcltk? ( >=dev-lang/tk-8.0 ) ) @@ -75,12 +77,6 @@ src_unpack() { Modules/Setup.dist \ Modules/getpath.c \ setup.py - - - # fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04) - # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!! - [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure - } src_configure() { @@ -109,9 +105,8 @@ src_configure() { src_compile() { filter-flags -malign-double - # Seems to no longer be necessary - #[ "${ARCH}" = "amd64" ] && append-flags -fPIC [ "${ARCH}" = "alpha" ] && append-flags -fPIC + [ "${ARCH}" = "amd64" ] && append-flags -fPIC # http://bugs.gentoo.org/show_bug.cgi?id=50309 if is-flag -O3; then @@ -123,7 +118,7 @@ src_compile() { local myconf #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap || use nocxx ; then + if use build && ! use bootstrap; then myconf="--with-cxx=no" fi @@ -142,7 +137,6 @@ src_compile() { --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man \ --with-threads \ - --with-libc='' \ ${myconf} || die emake || die "Parallel make failed" } @@ -156,9 +150,6 @@ src_install() { exeinto /usr/bin newexe ${FILESDIR}/python-config-${PYVER} python-config - # Use correct libdir in python-config - dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config - # The stuff below this line extends from 2.1, and should be deprecated # in 2.3, or possibly can wait till 2.4 @@ -179,7 +170,7 @@ src_install() { if use build ; then rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test} else - use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test} + use uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test} use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb ( use !X || use !tcltk ) && rm -rf ${D}/usr/lib/python${PYVER}/lib-tk fi @@ -233,30 +224,3 @@ pkg_postinst() { ebeep 5 } -src_test() { - # PYTHON_DONTCOMPILE=1 breaks test_import - unset PYTHON_DONTCOMPILE - - #skip all tests that fail during emerge but pass without emerge: - #(See bug# 67970) - local skip_tests="subprocess tcl urllib urllib2" - - for test in ${skip_tests} ; do - mv ${S}/Lib/test/test_${test}.py ${T} - done - - make test || die "make test failed" - - for test in ${skip_tests} ; do - mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py - done - - einfo "Portage skipped the following tests which aren't able to run from emerge:" - for test in ${skip_tests} ; do - einfo "test_${test}.py" - done - - einfo "If you'd like to run them, you may:" - einfo "cd /usr/lib/python${PYVER}/test" - einfo "and run the tests separately." -} diff --git a/dev-lang/python/python-2.4.2.ebuild b/dev-lang/python/python-2.4.2.ebuild index 93696c318624..5a1e4b665871 100644 --- a/dev-lang/python/python-2.4.2.ebuild +++ b/dev-lang/python/python-2.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2.ebuild,v 1.14 2005/11/24 18:22:12 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2.ebuild,v 1.1 2005/09/28 18:13:31 kloeri Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -22,7 +22,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2" LICENSE="PSF-2.2" SLOT="2.4" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx" DEPEND=">=sys-libs/zlib-1.1.3 @@ -54,6 +54,7 @@ src_unpack() { unpack ${A} cd ${S} + echo "her er vi.. $(pwd)" # unnecessary termcap dep in readline (#79013) epatch ${FILESDIR}/${PN}-2.4.2-readline.patch # db4.2 support @@ -81,11 +82,6 @@ src_unpack() { # add support for struct stat st_flags attribute (bug 94637) epatch ${FILESDIR}/python-2.4.1-st_flags.patch - # fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04) - # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!! - [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure - - if tc-is-cross-compiler ; then epatch "${FILESDIR}"/python-2.4.1-bindir-libdir.patch epatch "${FILESDIR}"/python-2.4.1-crosscompile.patch @@ -263,7 +259,7 @@ src_test() { #skip all tests that fail during emerge but pass without emerge: #(See bug# 67970) - local skip_tests="distutils global mimetools minidom mmap strptime subprocess tcl time urllib urllib2" + local skip_tests="subprocess tcl urllib urllib2" for test in ${skip_tests} ; do mv ${S}/Lib/test/test_${test}.py ${T} |