From 9c0960d5fea85beeb96350bb179a859f911140f3 Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Sun, 20 Aug 2006 11:54:57 +0000 Subject: bumping python 2.5 to rc1 svn path=/; revision=60 --- dev-lang/python/Manifest | 37 +++++ dev-lang/python/python-2.5_rc1.ebuild | 304 ++++++++++++++++++++++++++++++++++ 2 files changed, 341 insertions(+) create mode 100644 dev-lang/python/python-2.5_rc1.ebuild diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 1687742..1905bcc 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,3 +1,23 @@ +AUX patches/2.4-mimetypes_apache.patch 454 RMD160 231f61334fea15adef48cbf06300ce4409a8a3aa SHA1 2cf17759b0131282f8001787fd171f347d13f50f SHA256 8c16e5a4ce52b2c7b7bc30e55f6113d13e0e57dfb41cd3510548137d803fda61 +MD5 ec16631b538a7481f0537191d5f23b27 files/patches/2.4-mimetypes_apache.patch 454 +RMD160 231f61334fea15adef48cbf06300ce4409a8a3aa files/patches/2.4-mimetypes_apache.patch 454 +SHA256 8c16e5a4ce52b2c7b7bc30e55f6113d13e0e57dfb41cd3510548137d803fda61 files/patches/2.4-mimetypes_apache.patch 454 +AUX patches/2.4.1-libdir.patch 7572 RMD160 3988180968a5cb73fc8f2fb1b9c930023e5acc52 SHA1 a56b5531e97f3f1851472db64860375c467ed264 SHA256 8b699cadfcd488745f13c9c1943277ff367b7128217df4da839a3f7719fa7e0e +MD5 5fcb80fb9e7ae452d9ec09c99d7c7431 files/patches/2.4.1-libdir.patch 7572 +RMD160 3988180968a5cb73fc8f2fb1b9c930023e5acc52 files/patches/2.4.1-libdir.patch 7572 +SHA256 8b699cadfcd488745f13c9c1943277ff367b7128217df4da839a3f7719fa7e0e files/patches/2.4.1-libdir.patch 7572 +AUX patches/2.4.1-st_flags.patch 5649 RMD160 e8cb5e59e84cd65bef96d08614af59b884d8cf43 SHA1 877ca3573c9b7a497eb275aec4e4fc3860b4f448 SHA256 f9f234de9af0288c6c6fda1a3c5b3dfa382ddb3f20f0e90e6225b0101e4afe5d +MD5 5af982af8ad4befbf15567ae399cf2b9 files/patches/2.4.1-st_flags.patch 5649 +RMD160 e8cb5e59e84cd65bef96d08614af59b884d8cf43 files/patches/2.4.1-st_flags.patch 5649 +SHA256 f9f234de9af0288c6c6fda1a3c5b3dfa382ddb3f20f0e90e6225b0101e4afe5d files/patches/2.4.1-st_flags.patch 5649 +AUX patches/2.4.2-readline.patch 8628 RMD160 a2d1e726ad16006f13ac63adb150c26f4522eb52 SHA1 26a6a469aef0a61c1382ef84ce4b400ea74c928b SHA256 f4a4b5136e8675650a7c7b21931a2d1529214189dd373da0f751d30d183e3954 +MD5 36b36bac050785b8e393dc72f8e51d2f files/patches/2.4.2-readline.patch 8628 +RMD160 a2d1e726ad16006f13ac63adb150c26f4522eb52 files/patches/2.4.2-readline.patch 8628 +SHA256 f4a4b5136e8675650a7c7b21931a2d1529214189dd373da0f751d30d183e3954 files/patches/2.4.2-readline.patch 8628 +AUX patches/2.4.3-libdir.patch 7186 RMD160 ebe3f055fa4d910c3552542d5a24e07f60c42b9a SHA1 edae781cf4972478d9fb47ed60ca45c3e207e568 SHA256 9d6dc08f2962735e6f4b62e711d5dd49dc300f406418f876a1bbd3fbaee64b2c +MD5 74288b8ef90ca7bab4a21748bd4cda8b files/patches/2.4.3-libdir.patch 7186 +RMD160 ebe3f055fa4d910c3552542d5a24e07f60c42b9a files/patches/2.4.3-libdir.patch 7186 +SHA256 9d6dc08f2962735e6f4b62e711d5dd49dc300f406418f876a1bbd3fbaee64b2c files/patches/2.4.3-libdir.patch 7186 AUX patches/2.5-libdir.patch 5865 RMD160 1e4ce24e05f2d1b1c9587d9047d36facc93d7a2f SHA1 f9d15014e53a346fe02e00595b5611369a6cccd3 SHA256 aa960b6e9a45d263fa6b87d29ad1198c1c18877d11169fb20ae81820ab17fa4e MD5 447c7d1e97dca1d3a361dc968e8272b9 files/patches/2.5-libdir.patch 5865 RMD160 1e4ce24e05f2d1b1c9587d9047d36facc93d7a2f files/patches/2.5-libdir.patch 5865 @@ -46,15 +66,32 @@ AUX python-updater-r1~ 8776 RMD160 ad05cecf76ad41caab8d80c2320fb4b50928f527 SHA1 MD5 6fb23a460b8e2dc3fdb0838839521af6 files/python-updater-r1~ 8776 RMD160 ad05cecf76ad41caab8d80c2320fb4b50928f527 files/python-updater-r1~ 8776 SHA256 cac748e88d5fa7a5e42a3a2195dcca43ce705498ce345e85dccddad634e27254 files/python-updater-r1~ 8776 +DIST Python-2.4.3.tar.bz2 8005915 RMD160 c86247554975e6c44f91d05e44e68e280d5244dc SHA1 d6b81e1aec0045b5acff99676f2abe303da1b384 SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c DIST Python-2.5b3.tar.bz2 9362705 RMD160 ba16dd5043a13b2c8945b33707c6033ab1a8f449 SHA1 31741b7a5b37cb03de1dfbfdfbcf6adc6668297c SHA256 c2c673763addd4a48df1a148656085a09730579b8165519f0acacaab44f66301 +DIST Python-2.5c1.tar.bz2 9355537 RMD160 664f132bfa442657737c8ae3360160c05e748e3f SHA1 ad487ae0917f1f02ce492ca2ad7e12f5795fd53f SHA256 f54e9ed517f7015737547db3188701e0384d9b4c4b59723073b164a3f2873908 +DIST python-2.4-patches-2.tar.bz2 9219 RMD160 bd4c3502b42f4f9a10f423c434f31ad370d9da4b SHA1 812f0796e348e1788ba56a851050932c0b69218d SHA256 e66ee41328999e89bea833ff3dc58b4691a6d16ada029e88a8ba9df35979352a +EBUILD python-2.4.3-r2.ebuild 9752 RMD160 26841c24e90fbad23a8ebccb218655be8395fe99 SHA1 42c110dd2a713be66355f4978d90828647ec8725 SHA256 ab458ca1303cdeb575531f84529d65fc8bb838516391d106b88af6c894d1a55e +MD5 57dcf4f73e0fa66a66262a836c7f5e02 python-2.4.3-r2.ebuild 9752 +RMD160 26841c24e90fbad23a8ebccb218655be8395fe99 python-2.4.3-r2.ebuild 9752 +SHA256 ab458ca1303cdeb575531f84529d65fc8bb838516391d106b88af6c894d1a55e python-2.4.3-r2.ebuild 9752 EBUILD python-2.5_beta3.ebuild 9919 RMD160 32db7a89f7f74a63b95faac54e8b0eeb66ee3477 SHA1 2d2723387c65ee246f0c22253885e33e97bd9353 SHA256 657bc5b226ee45f84a9f374bd042761c29a0d6597ce51ff3552d8c67e3e2e626 MD5 3898af9fbc6acc2c4acec0c0478313d6 python-2.5_beta3.ebuild 9919 RMD160 32db7a89f7f74a63b95faac54e8b0eeb66ee3477 python-2.5_beta3.ebuild 9919 SHA256 657bc5b226ee45f84a9f374bd042761c29a0d6597ce51ff3552d8c67e3e2e626 python-2.5_beta3.ebuild 9919 +EBUILD python-2.5_rc1.ebuild 9917 RMD160 454b22c6ad04230240b7c6f901e68cd7b3ce0015 SHA1 60ed991fe7b855b669debf534db211769898621d SHA256 ba0eaa3d3604c708464e89d8457a5ae95cdc55ced4728e9eeb6c3ea65e15347c +MD5 0ec10e573f794f4b7fe7d195f6b57cf1 python-2.5_rc1.ebuild 9917 +RMD160 454b22c6ad04230240b7c6f901e68cd7b3ce0015 python-2.5_rc1.ebuild 9917 +SHA256 ba0eaa3d3604c708464e89d8457a5ae95cdc55ced4728e9eeb6c3ea65e15347c python-2.5_rc1.ebuild 9917 MISC ChangeLog 155 RMD160 772b207477cbeaba16c741ac99bd6d55b64721b2 SHA1 388a6d5f2ec32891f08ac6988b67b64734326bfa SHA256 831fdedcc11b019982f511f889d824abacde88daf08a5c9fd62823528e60b015 MD5 09d24c69cfd168f3dc5e0a4199b581bd ChangeLog 155 RMD160 772b207477cbeaba16c741ac99bd6d55b64721b2 ChangeLog 155 SHA256 831fdedcc11b019982f511f889d824abacde88daf08a5c9fd62823528e60b015 ChangeLog 155 +MD5 074466092860a2451d114cf7fad357f2 files/digest-python-2.4.3-r2 503 +RMD160 71a7eceb40337728f36e0d2970e1fb3956b7496a files/digest-python-2.4.3-r2 503 +SHA256 3f77c805317ac37a5bbe788bc0ad4b723c3584c0d676d6ee4e2040291cb4177d files/digest-python-2.4.3-r2 503 MD5 df32ea3ca3ce2ace66a93ceb4c8b122c files/digest-python-2.5_beta3 244 RMD160 33139c5a65fc7c84bf0ed3deba446cdcfe1a9753 files/digest-python-2.5_beta3 244 SHA256 a3002eae29f02dd011208972c0fc18bf870d5132f2633b7b347d77a1d1f9721c files/digest-python-2.5_beta3 244 +MD5 1134bff627ecae969e1e906f08a62f20 files/digest-python-2.5_rc1 244 +RMD160 122427709eee3fa8bbbf5fd3fb66f2a75cc2e636 files/digest-python-2.5_rc1 244 +SHA256 cc053703f2a9a55921c0ac8ab56f7ecaa4504041088acf2bc422fb75c1690b9d files/digest-python-2.5_rc1 244 diff --git a/dev-lang/python/python-2.5_rc1.ebuild b/dev-lang/python/python-2.5_rc1.ebuild new file mode 100644 index 0000000..e3daa01 --- /dev/null +++ b/dev-lang/python/python-2.5_rc1.ebuild @@ -0,0 +1,304 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.3-r1.ebuild,v 1.12 2006/07/20 17:25:17 blubb 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 autotools flag-o-matic python multilib versionator toolchain-funcs + +# 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="${PYVER_MAJOR}.${PYVER_MINOR}" + +MY_PV=${PV/_rc/c} +MY_P="Python-${MY_PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." +HOMEPAGE="http://www.python.org/" +SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2" + +LICENSE="PSF-2.2" +SLOT="2.5" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 sqlite doc nocxx" + +# NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs} +# do not conflict with the ones in python proper. - liquidx + +DEPEND=">=sys-libs/zlib-1.1.3 + !build? ( + sqlite? ( !=dev-python/pysqlite-2* + >=dev-db/sqlite-3 ) + tk? ( >=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 + )" + +# 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" + +PROVIDE="virtual/python" + +# confcache breaks a dlopen check, causing python to not support +# loading .so files - marienz +RESTRICT="confcache" + +src_unpack() { + unpack ${A} + cd ${S} + + # unnecessary termcap dep in readline (#79013) + epatch "${FILESDIR}/patches/2.5-readline.patch" + # db4.2 support + epatch "${FILESDIR}/patches/${PN}-2.4.3-db4.patch" + + # adds support for PYTHON_DONTCOMPILE shell environment to + # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) + epatch "${FILESDIR}/patches/${PN}-2.4-gentoo_py_dontcompile.patch" + epatch "${FILESDIR}/patches/${PN}-2.4-disable_modules_and_ssl.patch" + epatch "${FILESDIR}/patches/2.5-mimetypes_gentoo_apache.patch" + + # prepends /usr/lib/portage/pym to sys.path + epatch "${FILESDIR}/patches/${PN}-2.4-add_portage_search_path.patch" + + epatch "${FILESDIR}/patches/2.5-libdir.patch" + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Makefile.pre.in \ + Modules/Setup.dist \ + Modules/getpath.c \ + setup.py || die + + # 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}/patches/${PN}-2.4.1-crosscompile.patch" + fi + + # fix gentoo/obsd problems (bug 117261) + epatch "${FILESDIR}/patches/${PN}-2.4.3-gentoo_obsd-r1.patch" + + eautoreconf +} + +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 _sqlite3" + 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 tk \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter" + use ncurses \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel" + use sqlite \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _sqlite3" + use ssl \ + || export PYTHON_DISABLE_SSL=1 + export PYTHON_DISABLE_MODULES + echo $PYTHON_DISABLE_MODULES + fi +} + +src_compile() { + filter-flags -malign-double + + # Seems to no longer be necessary + #[ "${ARCH}" = "amd64" ] && append-flags -fPIC + [ "${ARCH}" = "alpha" ] && 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 || use nocxx ; 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 + + if tc-is-cross-compiler ; then + OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \ + ./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 + + # export CXX so it ends up in /usr/lib/python2.x/config/Makefile + tc-export CXX + # set LINKCC to prevent python from being linked to libstdc++.so + export LINKCC="\$(PURIFY) \$(CC)" + econf \ + --with-fpectl \ + --enable-shared \ + `use_enable ipv6` \ + --infodir='${prefix}'/share/info \ + --mandir='${prefix}'/share/man \ + --with-threads \ + --with-libc='' \ + ${myconf} || die + emake || die "Parallel make failed" +} + +src_install() { + dodir /usr + src_configure + make DESTDIR="${D}" altinstall maninstall || die + + # install our own custom python-config + 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 + + # 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 + 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 + + # install python-updater in /usr/sbin + #dosbin ${FILESDIR}/python-updater + newsbin ${FILESDIR}/python-updater-r1 python-updater + + if use build ; then + rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test} + else + use elibc_uclibc && rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test} + use berkdb || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/bsddb + use tk || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/lib-tk + fi + + prep_ml_includes usr/include/python${PYVER} +} + +pkg_postrm() { + python_makesym + python_mod_cleanup /usr/lib/python${PYVER} + [[ "$(get_libdir)" == "lib" ]] || python_mod_cleanup /usr/$(get_libdir)/python${PYVER} +} + +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} + [[ "$(get_libdir)" == "lib" ]] || python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/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.3/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.4/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 + + # try to upgrade to new python automatically - something to think about + #if [ "${ROOT}" = "/" ]; then + # /usr/sbin/python-updater + #fi + + echo + ewarn + ewarn "If you have just upgraded from an older version of python 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-${PYVER}." + ewarn + ewarn "Your original Python is still installed and can be accessed via" + ewarn "/usr/bin/python2.x." + 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="distutils global mimetools minidom mmap strptime subprocess syntax tcl time urllib urllib2 webbrowser" + + for test in ${skip_tests} ; do + mv ${S}/Lib/test/test_${test}.py ${T} + done + + # rerun failed tests in verbose mode (regrtest -w) + EXTRATESTOPTS="-w" 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." +} -- cgit v1.2.3-65-gdbad