diff options
| -rw-r--r-- | dev-lang/python/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/python/Manifest | 78 | ||||
| -rw-r--r-- | dev-lang/python/files/digest-python-2.3.5 | 1 | ||||
| -rw-r--r-- | dev-lang/python/python-2.3.5.ebuild | 237 |
4 files changed, 289 insertions, 34 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 1808b796c30e..62d430c3d163 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/python # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.129 2005/02/09 11:19:04 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.130 2005/02/17 18:19:40 pythonhead Exp $ + +*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 diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 0e29ffc2c52d..431bb8576449 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,44 +1,56 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 c7b10d946978825004433860895b6b5b ChangeLog 22049 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221 -MD5 99f8bbd61c29e69242730071f964faf4 python-2.4-r1.ebuild 6826 +MD5 b0dabb5b661c34b2054f5ae852c2fd45 python-2.1.3-r1.ebuild 2329 MD5 1e424541a26b4d5785a6e830e6a14fe8 python-2.2.3-r6.ebuild 4498 +MD5 d6caef1d9e32c8f6a3c0f04de5152fb1 python-2.3.3-r2.ebuild 7182 MD5 f43ad5e1c25844dc81582998028f88af python-2.3.4-r1.ebuild 7179 -MD5 b0dabb5b661c34b2054f5ae852c2fd45 python-2.1.3-r1.ebuild 2329 -MD5 263c0702df522c98505f6270e9fbf3a1 ChangeLog 21925 +MD5 99f8bbd61c29e69242730071f964faf4 python-2.4-r1.ebuild 6826 MD5 6b261eaea5fd05bd8c0730d1b06b588c python-2.4-r2.ebuild 6799 -MD5 d6caef1d9e32c8f6a3c0f04de5152fb1 python-2.3.3-r2.ebuild 7182 -MD5 2b953054102d344834597bc73b209e12 files/python-2.4-disable_modules_and_ssl.patch 1285 +MD5 396245c203626a66a3f756534777e944 python-2.3.5.ebuild 7750 +MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235 +MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 +MD5 55af7ba61954f03e09bcafbce1227c61 files/python-2.2.3-xmlrpc.patch 3659 +MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.3-xmlrpc.patch 4228 +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 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779 -MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179 -MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62 -MD5 5bee9fa15d4effc7423e76d2f7f47655 files/python-2.4-add_portage_search_path.patch 556 -MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454 -MD5 2b561d7e687d43260b6c5b324998a151 files/python-2.4-libdir.patch 8200 -MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178 +MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732 MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607 -MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.3-xmlrpc.patch 4228 MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015 -MD5 2121d3986faa4b6c2c3ed472f77f2a9d files/python-2.4-gentoo_py_dontcompile.patch 477 -MD5 55af7ba61954f03e09bcafbce1227c61 files/python-2.2.3-xmlrpc.patch 3659 -MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614 -MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66 -MD5 1cf4c21ad3b0aafc571b05b9a9e54594 files/python-updater 8761 -MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3-r2 66 -MD5 7ed8f8f52ed392ef28dd320b130e3c6b files/python-2.4-lib64.patch 9941 +MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478 +MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454 +MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285 +MD5 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 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.4-xmlrpc.patch 4228 -MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212 MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178 -MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 +MD5 1cf4c21ad3b0aafc571b05b9a9e54594 files/python-updater 8761 +MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.4-xmlrpc.patch 4228 MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r2 64 -MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152 -MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220 -MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997 -MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r1 64 -MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732 -MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454 MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.4-db4.2.patch 1015 -MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235 -MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178 +MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614 +MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779 +MD5 5bee9fa15d4effc7423e76d2f7f47655 files/python-2.4-add_portage_search_path.patch 556 +MD5 2b953054102d344834597bc73b209e12 files/python-2.4-disable_modules_and_ssl.patch 1285 +MD5 2121d3986faa4b6c2c3ed472f77f2a9d files/python-2.4-gentoo_py_dontcompile.patch 477 +MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454 +MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179 +MD5 7ed8f8f52ed392ef28dd320b130e3c6b files/python-2.4-lib64.patch 9941 +MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3-r2 66 +MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66 +MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r1 64 +MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62 +MD5 2b561d7e687d43260b6c5b324998a151 files/python-2.4-libdir.patch 8200 +MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5 66 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.0 (GNU/Linux) + +iD8DBQFCFOB7z2gxt1z4IGYRAiyXAKDmHRbDFbwt+eD14+mW8s9t9e6W5wCfXn7I +bxlbOBNist1M3FHI4OXt1MQ= +=ejRI +-----END PGP SIGNATURE----- diff --git a/dev-lang/python/files/digest-python-2.3.5 b/dev-lang/python/files/digest-python-2.3.5 new file mode 100644 index 000000000000..aa7299a5af82 --- /dev/null +++ b/dev-lang/python/files/digest-python-2.3.5 @@ -0,0 +1 @@ +MD5 c12b57c6e0cf8bc676fd9444d71c9e18 Python-2.3.5.tar.bz2 7230000 diff --git a/dev-lang/python/python-2.3.5.ebuild b/dev-lang/python/python-2.3.5.ebuild new file mode 100644 index 000000000000..fed0b2f015da --- /dev/null +++ b/dev-lang/python/python-2.3.5.ebuild @@ -0,0 +1,237 @@ +# 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.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 + +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}.tar.bz2" + +LICENSE="PSF-2.2" +SLOT="2.3" +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="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 ) ) + berkdb? ( >=sys-libs/db-3.1 ) + gdbm? ( sys-libs/gdbm ) + ssl? ( dev-libs/openssl ) + doc? ( =dev-python/python-docs-${PV}* ) + dev-libs/expat + )" + +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} + 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) + epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path_take_2.patch + # adds support for PYTHON_DONTCOMPILE shell environment to + # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) + epatch ${FILESDIR}/${PN}-2.3-gentoo_py_dontcompile.patch + 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 + [ "${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 +} + +src_configure() { + # disable extraneous modules with extra dependencies + if use build; then + export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter" + export PYTHON_DISABLE_SSL=1 + else + use gdbm \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm" + use berkdb \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb" + use readline \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline" + ( use !X || use !tcltk ) \ + && PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter" + use ncurses \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel" + use ssl \ + || export PYTHON_DISABLE_SSL=1 + export PYTHON_DISABLE_MODULES + echo $PYTHON_DISABLE_MODULES + fi +} + +src_compile() { + filter-flags -malign-double + + [ "${ARCH}" = "alpha" ] && append-flags -fPIC + [ "${ARCH}" = "amd64" ] && append-flags -fPIC + + # http://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flag -O3; then + is-flag -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + export OPT="${CFLAGS}" + + local myconf + #if we are creating a new build image, we remove the dependency on g++ + if use build && ! use bootstrap; then + myconf="--with-cxx=no" + fi + + # super-secret switch. don't use this unless you know what you're + # doing. enabling UCS2 support will break your existing python + # modules + use ucs2 \ + && myconf="${myconf} --enable-unicode=ucs2" \ + || myconf="${myconf} --enable-unicode=ucs4" + + src_configure + + econf --with-fpectl \ + --enable-shared \ + `use_enable ipv6` \ + --infodir='${prefix}'/share/info \ + --mandir='${prefix}'/share/man \ + --with-threads \ + --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 + make DESTDIR="${D}" altinstall || die + + # install our own custom python-config + exeinto /usr/bin + newexe ${FILESDIR}/python-config-${PYVER} 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 + + # seems like the build do not install Makefile.pre.in anymore + # it probably shouldn't - use DistUtils, people! + 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. + 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/lib/python2.3/{test,encodings,email,lib-tk,bsddb/test} + else + use uclibc && rm -rf ${D}/usr/lib/python2.3/{test,bsddb/test} + use berkdb || rm -rf ${D}/usr/lib/python2.3/bsddb + ( use !X || use !tcltk ) && rm -rf ${D}/usr/lib/python2.3/lib-tk + fi +} + +pkg_postrm() { + python_makesym + 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/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 + if [ -f ${myroot}/usr/lib/python2.2/site-packages/portage.py ]; then + einfo "Working around possible python-portage upgrade breakage" + mkdir -p ${myroot}/usr/lib/portage/pym + cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym + python_mod_optimize ${myroot}/usr/lib/portage/pym + fi + fi + + echo + ewarn + ewarn "If you have just upgraded from python-2.2.x you will need to run:" + ewarn + ewarn "/usr/sbin/python-updater" + ewarn + ewarn "This will automatically rebuild all the python dependent modules" + ewarn "to run with python-2.3." + ewarn + ewarn "Python 2.2 is still installed and can be accessed via /usr/bin/python2.2." + ewarn "Portage-2.0.49-r8 and below will continue to use python-2.2.x, so" + ewarn "think twice about uninstalling it, otherwise your system will break." + ewarn + ebeep 5 +} |