From 0d32311a973bec15fc96e237eb3fc30a9b26529c Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sat, 1 May 2010 21:54:38 +0000 Subject: [PATCH] 2.6.5-r2: Don't add GENTOO_PYTHON_WRAPPER_SCRIPT_PATH to os.environ (bug #315919). Fix failure of test_zlib with zlib 1.2.4 (Python issue #8193). Backport some fixes from 2.6 branch. 3.1.2-r3: Don't add GENTOO_PYTHON_WRAPPER_SCRIPT_PATH to os.environ (bug #315919). Backport some fixes from 3.1 branch. Use EAPI="3". Package-Manager: portage-HEAD/cvs/Linux x86_64 --- dev-lang/python/ChangeLog | 17 +- dev-lang/python/Manifest | 6 +- dev-lang/python/python-2.6.5-r2.ebuild | 305 +++++++++++++++++++++++++ dev-lang/python/python-3.1.2-r3.ebuild | 295 ++++++++++++++++++++++++ 4 files changed, 621 insertions(+), 2 deletions(-) create mode 100644 dev-lang/python/python-2.6.5-r2.ebuild create mode 100644 dev-lang/python/python-3.1.2-r3.ebuild diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 6631ea99d0c2..febe79fa2b07 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for dev-lang/python # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.464 2010/04/11 21:22:49 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.465 2010/05/01 21:54:37 arfrever Exp $ + +*python-3.1.2-r3 (01 May 2010) + + 01 May 2010; Arfrever Frehtes Taifersar Arahesis + +python-3.1.2-r3.ebuild: + Don't add GENTOO_PYTHON_WRAPPER_SCRIPT_PATH to os.environ (bug #315919). + Backport some fixes from 3.1 branch. Use EAPI="3". + +*python-2.6.5-r2 (01 May 2010) + + 01 May 2010; Arfrever Frehtes Taifersar Arahesis + +python-2.6.5-r2.ebuild: + Don't add GENTOO_PYTHON_WRAPPER_SCRIPT_PATH to os.environ (bug #315919). + Fix failure of test_zlib with zlib 1.2.4 (Python issue #8193). Backport + some fixes from 2.6 branch. *python-3.1.2-r2 (11 Apr 2010) diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index dce19f74ea7f..fe355a5551d1 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -17,19 +17,23 @@ DIST python-gentoo-patches-2.6.4-r1.tar.bz2 12570 RMD160 2a58eb651ce5adc68c4667f DIST python-gentoo-patches-2.6.4.tar.bz2 11032 RMD160 83903892ef18880f876e7a140c803c1e8a67e24b SHA1 51d4174b2a4136a11c64ae0007b59e4c2f0e13f2 SHA256 19a66a0855df270c030438f21c29260e7ff69b299830409f6aa9140611b721e2 DIST python-gentoo-patches-2.6.5-r1.tar.bz2 13946 RMD160 20447eca8f3510602b547459a56fdd568b8e7fc4 SHA1 f1517cbed9df9e7909d08af55ec6b65dae4c1573 SHA256 c9757bd62f0e23a9a83df7edfa614c25e859bf0643d8c437024c4853c569c180 DIST python-gentoo-patches-2.6.5-r2.tar.bz2 15706 RMD160 b1605f3c3b0887c7e7fd46f277265635c4ddd464 SHA1 e0c121d10b1eab9c2deec7ccbe4f0749c4e81e3b SHA256 f0ab4c40326ae22cfb91a919cd507bbdd23d823bc4ee75d42a139c52db136459 +DIST python-gentoo-patches-2.6.5-r3.tar.bz2 68622 RMD160 8bf81032b09e5ac1c9e353c470ad595e99a3a1e0 SHA1 f641546d86c39db6af8bd99258336ec5db30aadd SHA256 44763f4b9b9d34ef923d7a939b9883c28c1451718866cc0153a5df4339cb97ee DIST python-gentoo-patches-3.1.1-r4.tar.bz2 10200 RMD160 418852c54bf7169eb7bab078e78997e22799139e SHA1 0c063cd446a22833e267710f59351cb157098b21 SHA256 c065659242df3e921290ff044aee6f543c8b5cd2290db5bf668065cf97fcbbbe DIST python-gentoo-patches-3.1.2-r1.tar.bz2 11601 RMD160 af8150aa23097931c28a611631e917bbd8f23f4f SHA1 227f2b094189de3d8723b6c707445ad73819e7ff SHA256 4575b76e99dc420f95b51b1e7098522bea7e72fd894c73da2d710074ba72dce0 DIST python-gentoo-patches-3.1.2-r2.tar.bz2 12239 RMD160 6fe97b9875edb8a940774bfe1f508bdbfa0d2a44 SHA1 65db74ee0462b6fad7216833baebbd82869eb42c SHA256 bf7c0fb6d5522169c9d0266554055e0b5260ab0dc216dbc5f2a63d1ba21f5fa9 DIST python-gentoo-patches-3.1.2-r3.tar.bz2 12576 RMD160 69713fa35cbf84ad98a604e29d909a8aa0179c0e SHA1 01b15dbe60aef5f4fdce5d373338dfb2eb4833d7 SHA256 ea9b6446da6490c88ef24743e18e9033c44a72abb4e8390e31e3a6801b36a0a5 +DIST python-gentoo-patches-3.1.2-r4.tar.bz2 67323 RMD160 ee17f79322e3ddb02148f34cdaed27f071377b7b SHA1 ba83c0085de6030978552e01d638e457591c2b23 SHA256 14e644b0cff26a90d042bcb4d9b72c7a753db917e50d2ca9f4801902e4ff40ae EBUILD python-2.4.6.ebuild 8966 RMD160 d48e302f289834896434b38113d1d98e7c0a4dbd SHA1 08004c836e1fa10401689ae2455b3790503ae0fc SHA256 f26f980b2d3697e8842dd36ca06b44f7eba921bca06b2388d8621d95065fcfc2 EBUILD python-2.5.4-r4.ebuild 9306 RMD160 c11c7d75f4298228e5f1164b7315fb8d00294833 SHA1 36bae88672be35eb877f9b3ad0b1fd5dbf491a48 SHA256 30c8f1f29d2af9565e9b97f1ec266bf1aff283018f882ee9dbfbe02e175e48a2 EBUILD python-2.6.4-r1.ebuild 9559 RMD160 99a85580a38955be98e2217dc65cb48d84082080 SHA1 d9620d4205f605d38d4058416b93f997b4313578 SHA256 3b968bae7990af61dc74a1c98c60f60e0fd711a444bdfbfd43dfe165688e3fc2 EBUILD python-2.6.4.ebuild 9491 RMD160 a297ff0934fd2df2aca38db02fb21e8c8e839772 SHA1 3eaced72f6b57c5978c925223d27adb4ea82a0e4 SHA256 97ebe170095882d2dc1eb6d723b771787d2c3cabf2ec30ce3d8ae8138b4df054 EBUILD python-2.6.5-r1.ebuild 9231 RMD160 69a339bf15f769c0c0455e25827a498747274af7 SHA1 22fb2c7d2f66c8dbfcf436f3b8c0f7e94b98fb55 SHA256 c8f45a4011f82858fdf11a72e586ee3bcc53ed577c7456afcb42a12e6a40acab +EBUILD python-2.6.5-r2.ebuild 9335 RMD160 37a61c38f5d7df34d7c8aed5b8b35cb1cff8252d SHA1 83d28d231c11deb78c6e5e8c2247a25a6e34b7cd SHA256 8bb347ac43ad2d5c2238b04d6e3dac39af35e4753de894f6a5b89409c7b19b61 EBUILD python-2.6.5.ebuild 9228 RMD160 47b7340932deac8dea68779629cb448d706b42e6 SHA1 0a71fb985750482e2caa8e6d11614fd59bdfb249 SHA256 6692689ef3ab26b449ed3ba43f8635c939e9e11802ed16bc9a7d5f0e38a4b3bf EBUILD python-3.1.1-r1.ebuild 9134 RMD160 7ff62378f1c80f92ec9ca3c8106558e2705a9987 SHA1 ddb6cfa8e905c24f85afc6efff5168187523443d SHA256 e5ab994e0a2fa74e8c801fe629773c81ec50ec2d6316eac1d899ee88c8ec71f1 EBUILD python-3.1.2-r1.ebuild 8802 RMD160 efaacc0e401f5e8b53ce0315888a3fca35b51e68 SHA1 1a725ed73a70de4fc68821bbeba0eda87845b889 SHA256 c2fab3e279559b9fd2f00c745313973a16849e3ec771c33c48ce18e747c856cb EBUILD python-3.1.2-r2.ebuild 8802 RMD160 d66f3bec04cc5c2ed67112c85d47bee82ae0f3f9 SHA1 2815db9e7cdd51698b698aadd4612b47c25d54db SHA256 73166aed679d683f320d872fcd06bbabe56357953707616178e607620cc87dc7 +EBUILD python-3.1.2-r3.ebuild 8865 RMD160 472f59241b82b89e5d5301b2f6380373b9dadcba SHA1 3497c5b83b0e8d09078b94a6d14649794897dd43 SHA256 c8a63ce9312af75520a030f5a6ef005cf452d83d33187977d7346a980c98dc5c EBUILD python-3.1.2.ebuild 8799 RMD160 5e5979e2f91367805b87fc66819f1228d1b96c0c SHA1 71ca84ddb3ae055b95fffe10958a9073c1a062aa SHA256 586d1b9d6fe0b4d94139a657c2235d29788e4601079a97408c38b21df1c0ae51 -MISC ChangeLog 82441 RMD160 7d07c32616aefb8111a7b625b3600b327896d814 SHA1 e493f26b0763da6386e72c0052f6c88758153819 SHA256 f16496608efae178695f5eb7b70cc29d56f2cf882265cec45478708a7be134f8 +MISC ChangeLog 83014 RMD160 94c1359fde1fe04fa4d8f6596a96668db0efd6b1 SHA1 606df3d94ada3daa96aead46cc1dfb9e1f3b4b66 SHA256 8f8703abbe0d0ea0f9270038821ebcd4e61ecdbdb25061d1dffcaacfbd5e2377 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 diff --git a/dev-lang/python/python-2.6.5-r2.ebuild b/dev-lang/python/python-2.6.5-r2.ebuild new file mode 100644 index 000000000000..30951ede2059 --- /dev/null +++ b/dev-lang/python/python-2.6.5-r2.ebuild @@ -0,0 +1,305 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.1 2010/05/01 21:54:38 arfrever Exp $ + +EAPI="2" + +inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs + +MY_P="Python-${PV}" +S="${WORKDIR}/${MY_P}" + +PATCHSET_REVISION="3" + +DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." +HOMEPAGE="http://www.python.org/" +SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2 + mirror://gentoo/python-gentoo-patches-${PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2" + +LICENSE="PSF-2.2" +SLOT="2.6" +PYTHON_ABI="${SLOT}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" + +# NOTE: dev-python/{elementtree,celementtree,pysqlite} +# do not conflict with the ones in python proper. - liquidx + +RDEPEND=">=app-admin/eselect-python-20091230 + >=sys-libs/zlib-1.1.3 + virtual/libffi + virtual/libintl + !build? ( + berkdb? ( || ( + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 + sys-libs/db:4.4 + sys-libs/db:4.3 + sys-libs/db:4.2 + ) ) + doc? ( dev-python/python-docs:${SLOT} ) + gdbm? ( sys-libs/gdbm ) + ncurses? ( + >=sys-libs/ncurses-5.2 + readline? ( >=sys-libs/readline-4.1 ) + ) + sqlite? ( >=dev-db/sqlite-3 ) + ssl? ( dev-libs/openssl ) + tk? ( >=dev-lang/tk-8.0 ) + xml? ( >=dev-libs/expat-2 ) + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + !sys-devel/gcc[libffi]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND="app-admin/python-updater" + +PROVIDE="virtual/python" + +pkg_setup() { + if use berkdb; then + ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python. It has" + ewarn "been additionally removed in Python 3. You should use external, still maintained \"bsddb3\"" + ewarn "module provided by dev-python/bsddb3 which supports both Python 2 and Python 3." + fi +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat + rm -fr Modules/_ctypes/libffi* + rm -fr Modules/zlib + + if ! tc-is-cross-compiler; then + rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch + fi + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}" + + 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 "sed failed to replace @@GENTOO_LIBDIR@@" + + # 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 ! use wininst; then + # Remove Microsoft Windows executables. + rm Lib/distutils/command/wininst-*.exe + fi + + # Fix OtherFileTests.testStdin() not to assume + # that stdin is a tty for bug #248081. + sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed" + + eautoreconf +} + +src_configure() { + # Disable extraneous modules with extra dependencies. + if use build; then + export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" + export PYTHON_DISABLE_SSL="1" + else + # dbm module can be linked against berkdb or gdbm. + # Defaults to gdbm when both are enabled, #204343. + local disable + use berkdb || use gdbm || disable+=" dbm" + use berkdb || disable+=" _bsddb" + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC + + # https://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 + + if tc-is-cross-compiler; then + OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \ + ./configure --{build,host}=${CBUILD} || 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 "sed failed" + fi + + # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython2.6 correctly. + # Needed on FreeBSD unless Python 2.6 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + OPT="" econf \ + --with-fpectl \ + --enable-shared \ + $(use_enable ipv6) \ + $(use_with threads) \ + $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ + --infodir='${prefix}/share/info' \ + --mandir='${prefix}/share/man' \ + --with-libc="" \ + --with-system-ffi +} + +src_compile() { + emake EXTRA_CFLAGS="${CFLAGS}" || die "emake failed" +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Byte compiling should be enabled here. + # Otherwise test_import fails. + python_enable_pyc + + # Skip all tests that fail during emerge but pass without emerge: + # (See bug #67970) + local skip_tests="distutils httpservers minidom pyexpat sax tcl" + + # test_ctypes fails with PAX kernel (bug #234498). + host-is-pax && skip_tests+=" ctypes" + + 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 + + elog "The following tests have been skipped:" + for test in ${skip_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd ${EPREFIX}$(python_get_libdir)/test" + elog "and run the tests separately." + + python_disable_pyc +} + +src_install() { + [[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/" + + emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed" + + mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}" + + # Fix collisions between different slots of Python. + mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}" + mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}" + mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" + mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1" + rm -f "${ED}usr/bin/smtpd.py" + + if use build; then + rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test} + else + use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test} + use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,test/test_bsddb*} + use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*} + use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk} + fi + + use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing" + + prep_ml_includes $(python_get_includedir) + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r "${S}/Tools" || die "doins failed" + fi + + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} + newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} + + # Do not install empty directory. + rmdir "${ED}$(python_get_libdir)/lib-old" +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + local eselect_python_options= + [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2" + + # Create python2 symlink. + eselect python update --python2 > /dev/null + + eselect python update ${eselect_python_options} +} + +pkg_postinst() { + eselect_python_update + + python_mod_optimize -x "(site-packages|test)" $(python_get_libdir) + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn + ewarn "\e[1;31m************************************************************************\e[0m" + ewarn + ewarn "You have just upgraded from an older version of Python." + ewarn "You should run 'python-updater \${options}' to rebuild Python modules." + ewarn + ewarn "\e[1;31m************************************************************************\e[0m" + ewarn + ebeep 12 + fi +} + +pkg_postrm() { + eselect_python_update + + python_mod_cleanup $(python_get_libdir) +} diff --git a/dev-lang/python/python-3.1.2-r3.ebuild b/dev-lang/python/python-3.1.2-r3.ebuild new file mode 100644 index 000000000000..929df0908f62 --- /dev/null +++ b/dev-lang/python/python-3.1.2-r3.ebuild @@ -0,0 +1,295 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.1 2010/05/01 21:54:38 arfrever Exp $ + +EAPI="3" + +inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs + +MY_P="Python-${PV}" +S="${WORKDIR}/${MY_P}" + +PATCHSET_REVISION="4" + +DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." +HOMEPAGE="http://www.python.org/" +SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2 + mirror://gentoo/python-gentoo-patches-${PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2" + +LICENSE="PSF-2.2" +SLOT="3.1" +PYTHON_ABI="${SLOT}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" + +RDEPEND=">=app-admin/eselect-python-20091230 + >=sys-libs/zlib-1.1.3 + virtual/libffi + virtual/libintl + !build? ( + doc? ( dev-python/python-docs:${SLOT} ) + gdbm? ( sys-libs/gdbm ) + ncurses? ( + >=sys-libs/ncurses-5.2 + readline? ( >=sys-libs/readline-4.1 ) + ) + sqlite? ( >=dev-db/sqlite-3 ) + ssl? ( dev-libs/openssl ) + tk? ( >=dev-lang/tk-8.0 ) + xml? ( >=dev-libs/expat-2 ) + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + !sys-devel/gcc[libffi]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-admin/python-updater-0.8 + || ( dev-lang/python:2.7 dev-lang/python:2.6 )" + +PROVIDE="virtual/python" + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat + rm -fr Modules/_ctypes/libffi* + rm -fr Modules/zlib + + if ! tc-is-cross-compiler; then + rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch + fi + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}" + + 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 "sed failed to replace @@GENTOO_LIBDIR@@" + + # 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 ! use wininst; then + # Remove Microsoft Windows executables. + rm Lib/distutils/command/wininst-*.exe + fi + + # Fix OtherFileTests.testStdin() not to assume + # that stdin is a tty for bug #248081. + sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed" + + eautoreconf +} + +src_configure() { + # Disable extraneous modules with extra dependencies. + if use build; then + export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" + export PYTHON_DISABLE_SSL="1" + else + local disable + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC + + # https://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 + + if tc-is-cross-compiler; then + OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \ + ./configure --{build,host}=${CBUILD} || 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 "sed failed" + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.1 correctly. + # Needed on FreeBSD unless Python 3.1 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + OPT="" econf \ + --with-fpectl \ + --enable-shared \ + $(use_enable ipv6) \ + $(use_with threads) \ + $(use_with wide-unicode) \ + --infodir='${prefix}/share/info' \ + --mandir='${prefix}/share/man' \ + --with-computed-gotos \ + --with-dbmliborder="${dbmliborder}" \ + --with-libc="" \ + --with-system-ffi +} + +src_compile() { + emake EXTRA_CFLAGS="${CFLAGS}" || die "emake failed" +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Byte compiling should be enabled here. + # Otherwise test_import fails. + python_enable_pyc + + # Skip all tests that fail during emerge but pass without emerge: + # (See bug #67970) + local skip_tests="distutils" + + # test_ctypes fails with PAX kernel (bug #234498). + host-is-pax && skip_tests+=" ctypes" + + 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 + + elog "The following tests have been skipped:" + for test in ${skip_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd ${EPREFIX}$(python_get_libdir)/test" + elog "and run the tests separately." + + python_disable_pyc +} + +src_install() { + emake DESTDIR="${D}" altinstall || die "emake altinstall failed" + + mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}" + + # Fix collisions between different slots of Python. + mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}" + mv "${ED}usr/bin/pydoc3" "${ED}usr/bin/pydoc${SLOT}" + mv "${ED}usr/bin/idle3" "${ED}usr/bin/idle${SLOT}" + rm -f "${ED}usr/bin/smtpd.py" + + if use build; then + rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,sqlite3,test,tkinter} + else + use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/test" + use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*} + use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,tkinter,test/test_tk*} + fi + + use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing" + + prep_ml_includes $(python_get_includedir) + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r "${S}/Tools" || die "doins failed" + fi + + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} + newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + local eselect_python_options= + [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2" + + # Create python3 symlink. + eselect python update --python3 > /dev/null + + eselect python update ${eselect_python_options} +} + +pkg_postinst() { + eselect_python_update + + python_mod_optimize -x "(site-packages|test)" $(python_get_libdir) + + if [[ "$(eselect python show)" == "python2."* ]]; then + ewarn + ewarn "WARNING!" + ewarn "Many Python modules have not been ported yet to Python 3.*." + ewarn "Python 3 has not been activated and Python wrapper is still configured to use Python 2." + ewarn "You can manually activate Python ${SLOT} using \`eselect python set python${SLOT}\`." + ewarn "It is recommended to currently have Python wrapper configured to use Python 2." + ewarn "Having Python wrapper configured to use Python 3 is unsupported." + ewarn + ebeep 6 + fi + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn + ewarn "\e[1;31m************************************************************************\e[0m" + ewarn + ewarn "You have just upgraded from an older version of Python." + ewarn "You should run 'python-updater \${options}' to rebuild Python modules." + ewarn + ewarn "\e[1;31m************************************************************************\e[0m" + ewarn + ebeep 12 + fi +} + +pkg_postrm() { + eselect_python_update + + python_mod_cleanup $(python_get_libdir) +} -- 2.26.2