diff options
author | 2009-09-22 18:53:50 +0000 | |
---|---|---|
committer | 2009-09-22 18:53:50 +0000 | |
commit | 0d9bf3bc941e77c797c7302d02986ae603283a88 (patch) | |
tree | 328a1e109f8afef1605eaa2cb2b400a545b96829 /dev-lang | |
parent | make desktop file pass desktop-file-validate (diff) | |
download | historical-0d9bf3bc941e77c797c7302d02986ae603283a88.tar.gz historical-0d9bf3bc941e77c797c7302d02986ae603283a88.tar.bz2 historical-0d9bf3bc941e77c797c7302d02986ae603283a88.zip |
Use external libffi on some architectures (bug #209673).
Package-Manager: portage-14375-svn/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/python/ChangeLog | 9 | ||||
-rw-r--r-- | dev-lang/python/Manifest | 6 | ||||
-rw-r--r-- | dev-lang/python/python-2.6.2-r2.ebuild | 312 | ||||
-rw-r--r-- | dev-lang/python/python-3.1.1-r1.ebuild | 271 |
4 files changed, 596 insertions, 2 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 941b83cbf3a7..52e5b52f4d95 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/python # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.415 2009/09/22 13:39:28 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.416 2009/09/22 18:53:50 arfrever Exp $ + +*python-3.1.1-r1 (22 Sep 2009) +*python-2.6.2-r2 (22 Sep 2009) + + 22 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + +python-2.6.2-r2.ebuild, +python-3.1.1-r1.ebuild: + Use external libffi on some architectures (bug #209673). 22 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild: diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 8f11f79232cf..95e711778deb 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -12,10 +12,14 @@ DIST Python-3.1.1.tar.bz2 9757032 RMD160 d60b64e1346b2ff15d65b032ea35fb3ad8b0dc6 DIST python-gentoo-patches-2.4.6.tar.bz2 10983 RMD160 c06dc76edec86d708a0c0e37126ae50f49f61bd3 SHA1 bbc04083fe74cff8c723c5c3cab70b1b814c987f SHA256 0508a66408f218c655823303833599344d2edeec1ffc683c6ada3fc33731590d DIST python-gentoo-patches-2.5.4-r2.tar.bz2 20722 RMD160 86c25ad3647b7a3ca44c8e781a4572187d6c1934 SHA1 a859d75092303ee445cebd7af4221beeed58b74d SHA256 54236f25147bb26e15f6f204975513515410292a343b6dfb2116806aa9123afc DIST python-gentoo-patches-2.6.2-r4.tar.bz2 11802 RMD160 d04d80d3ed2ead001dbdbe24a89e8cfe5e6e56c7 SHA1 eca475efb4dd47f688fa49d510ae8f53afe3dff0 SHA256 a0b881c332991aafd885a337432c9ef3c4a29d41ed50898e12261801aad6f83a +DIST python-gentoo-patches-2.6.2-r5.tar.bz2 12206 RMD160 43f321ac4df2b4c6ccb5777d3627c089d46b9024 SHA1 2e35f77a7216b61a9aac9508eac2ddce882c993a SHA256 f3e1593911130ed4bb5879c13e5afa4edd0a873682e1e8609184ec24cae244e1 DIST python-gentoo-patches-3.1.1-r1.tar.bz2 8545 RMD160 9893c8bab409790548e2e88658ce8a49fb49e3f9 SHA1 3423bf03e5e08af1747cfa2e7173f9ae55cdc521 SHA256 2e4f6b3bb13b1658314ebf165e8b82948d33314539a0f1ef0e102f86716f7962 +DIST python-gentoo-patches-3.1.1-r2.tar.bz2 8929 RMD160 26afbdbbec3bf0e394cb3082d77abd75d4c75a6b SHA1 e7e775954777a336eff8e9c6c2600d053338fdb2 SHA256 d72acfbf1adeb0ab19da4833bf4663acc9ba4518c614ca92e990dde088d9a07c EBUILD python-2.4.6.ebuild 9381 RMD160 7d73a3afc2c6536dae072aad3ac021b772b242a3 SHA1 d9ffca5012c079d03fa38fc1b5d1f698bdca7506 SHA256 28944d10331da2391f1253b018a76927695c629092b83fe8f043fc6e3aa354cc EBUILD python-2.5.4-r3.ebuild 9524 RMD160 960c87c63e165ab0f01643b7ff0522dfd506f801 SHA1 b69dcd90b10fe0612865338c1bcf5348fda428ee SHA256 445a1288120c8644201bf8d84440024cc9e7097193b8ebefad76e64ff989af2e EBUILD python-2.6.2-r1.ebuild 9996 RMD160 ccd6f3394c7118c32fbf0f9f66dd795a7572e84e SHA1 0763fc240cccc1a899b4eef8a34d9b00a0349657 SHA256 9cfcb11d30762c754369066d69dbeee858e3b45626740fa5363cf9ce6e660a05 +EBUILD python-2.6.2-r2.ebuild 10245 RMD160 c5d4d15a727b5711e411843fd2d20a1dac695092 SHA1 4e30ef8525322ed871b67159be64c5cec24bf27b SHA256 226007af3a20b51af5a82e0e19133d9518173726257b5a0381770fda04902249 +EBUILD python-3.1.1-r1.ebuild 8520 RMD160 aa9e28162a1a70fe1b67b5934ab96037d2d0e05c SHA1 93b3502a2e91c832ea02021cf246c2a3acce5450 SHA256 d9122f53acf60fd59ea9d73a87f19a82740d07cff471e6c002e7aa03c2d4ba75 EBUILD python-3.1.1.ebuild 8230 RMD160 c6081723a73a16a77ab22ccf0b73d490fdaa970f SHA1 f58905246e9e2e5cb303b778dc36526c788b43c8 SHA256 b8afd52ef3626e0517888c8e365404f37a812939bfbe537ea6eb6c57b5901268 -MISC ChangeLog 72398 RMD160 6fe0f8c76c3d1c3759d18ed284956ec38551fab1 SHA1 c5516e0141c309d5ba1e587ffb439ac83e0382c3 SHA256 708013d2f033a35042d00c786bf1f111400672e18dc8aab9aaba9196d1f034dd +MISC ChangeLog 72646 RMD160 35458b5b829a818b2c953fc86c7d000f5eac0bfe SHA1 8b87f1366577ae049e585176a965e3f0347e460c SHA256 146c179c364106ae7ab036e9985ba164f8d9b504b51700892478c89e986e4d44 MISC metadata.xml 501 RMD160 0cc2c851a7c59ed77809c1f3ac2130710f0700e9 SHA1 59bfd447cf15419f68077913de7228f3556ce6e3 SHA256 51c09ee221463f34722a6c655db605a7d6d683069453d173947e4416a43a071c diff --git a/dev-lang/python/python-2.6.2-r2.ebuild b/dev-lang/python/python-2.6.2-r2.ebuild new file mode 100644 index 000000000000..bdffb6ecc6ba --- /dev/null +++ b/dev-lang/python/python-2.6.2-r2.ebuild @@ -0,0 +1,312 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.1 2009/09/22 18:53:50 arfrever 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. + +EAPI="2" + +inherit autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs versionator + +# We need this so that we don't depend on python.eclass. +PYVER_MAJOR=$(get_major_version) +PYVER_MINOR=$(get_version_component_range 2) +PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" + +MY_P="Python-${PV}" +S="${WORKDIR}/${MY_P}" + +PATCHSET_REVISION="5" + +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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 ncurses readline sqlite ssl +threads tk ucs2 wininst +xml" + +# NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes} +# do not conflict with the ones in python proper. - liquidx + +RDEPEND=">=app-admin/eselect-python-20080925 + >=sys-libs/zlib-1.1.3 + !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 ) + ) + !m68k? ( !mips? ( !sparc-fbsd? ( !x86-fbsd? ( virtual/libffi ) ) ) )" +DEPEND="${RDEPEND} + !m68k? ( !mips? ( !sparc-fbsd? ( !x86-fbsd? ( dev-util/pkgconfig ) ) ) )" +PDEPEND="${RDEPEND} 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." + ebeep 6 + fi +} + +src_prepare() { + if tc-is-cross-compiler; then + epatch "${FILESDIR}/python-2.5-cross-printf.patch" + epatch "${FILESDIR}/python-2.6-chflags-cross.patch" + epatch "${FILESDIR}/python-2.6-test-cross.patch" + else + 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 + + # Don't silence output of setup.py. + sed -e '/setup\.py -q build/d' -i Makefile.pre.in + + # 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 + + export OPT="${CFLAGS}" + + local myconf + + # 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+=" --enable-unicode=ucs2" \ + || myconf+=" --enable-unicode=ucs4" + + 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." + + if ! use m68k && ! use mips && ! use sparc-fbsd && ! use x86-fbsd; then + myconf+=" --with-system-ffi" + fi + + econf \ + --with-fpectl \ + --enable-shared \ + $(use_enable ipv6) \ + $(use_with threads) \ + --infodir='${prefix}'/share/info \ + --mandir='${prefix}'/share/man \ + --with-libc='' \ + ${myconf} +} + +src_test() { + # Tests won't 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 global httpservers mimetools minidom mmap posix pyexpat sax strptime subprocess syntax tcl time urllib urllib2 xml_etree" + + # 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'd like to run them, you may:" + elog "cd /usr/$(get_libdir)/python${PYVER}/test" + elog "and run the tests separately." +} + +src_install() { + emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed" + + mv "${D}usr/bin/python${PYVER}-config" "${D}usr/bin/python-config-${PYVER}" + + # Fix collisions between different slots of Python. + mv "${D}usr/bin/2to3" "${D}usr/bin/2to3-${PYVER}" + mv "${D}usr/bin/pydoc" "${D}usr/bin/pydoc${PYVER}" + mv "${D}usr/bin/idle" "${D}usr/bin/idle${PYVER}" + mv "${D}usr/share/man/man1/python.1" "${D}usr/share/man/man1/python${PYVER}.1" + rm -f "${D}usr/bin/smtpd.py" + + # Fix the OPT variable so that it doesn't have any flags listed in it. + # Prevents the problem with compiling things with conflicting flags later. + sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile" + + if use build; then + rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,email,encodings,lib-tk,sqlite3,test} + else + use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb/test,test} + use berkdb || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,test/test_bsddb*} + use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite*} + use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/lib-tk" + fi + + use threads || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/multiprocessing" + + prep_ml_includes usr/include/python${PYVER} + + 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} + + # Installs empty directory. + rmdir "${D}usr/$(get_libdir)/${PN}${PYVER}/lib-old" +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then + python_updater_warning="1" + fi +} + +pkg_postinst() { + eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 + + python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER} + [[ "$(get_libdir)" != "lib" ]] && python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER} + + 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' to rebuild Python modules." + ewarn + ewarn "\e[1;31m************************************************************************\e[0m" + ewarn + ebeep 12 + fi +} + +pkg_postrm() { + eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 + + python_mod_cleanup /usr/lib/python${PYVER} + [[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER} +} diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild new file mode 100644 index 000000000000..12f7fa270dbf --- /dev/null +++ b/dev-lang/python/python-3.1.1-r1.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.1 2009/09/22 18:53:50 arfrever Exp $ + +EAPI="2" + +inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs versionator + +# We need this so that we don't depend on python.eclass. +PYVER_MAJOR=$(get_major_version) +PYVER_MINOR=$(get_version_component_range 2) +PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" + +MY_P="Python-${PV}" +S="${WORKDIR}/${MY_P}" + +PATCHSET_REVISION="2" + +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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="build doc elibc_uclibc examples gdbm ipv6 ncurses readline sqlite ssl +threads tk ucs2 wininst +xml" + +RDEPEND=">=app-admin/eselect-python-20080925 + >=sys-libs/zlib-1.1.3 + !build? ( + sqlite? ( >=dev-db/sqlite-3 ) + tk? ( >=dev-lang/tk-8.0 ) + ncurses? ( >=sys-libs/ncurses-5.2 + readline? ( >=sys-libs/readline-4.1 ) ) + gdbm? ( sys-libs/gdbm ) + ssl? ( dev-libs/openssl ) + doc? ( dev-python/python-docs:${SLOT} ) + xml? ( >=dev-libs/expat-2 ) + ) + !m68k? ( !mips? ( !sparc-fbsd? ( !x86-fbsd? ( virtual/libffi ) ) ) )" +DEPEND="${RDEPEND} + !m68k? ( !mips? ( !sparc-fbsd? ( !x86-fbsd? ( dev-util/pkgconfig ) ) ) )" +PDEPEND="${RDEPEND} app-admin/python-updater" + +PROVIDE="virtual/python" + +src_prepare() { + 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 + + # Don't silence output of setup.py. + sed -e '/setup\.py -q build/d' -i Makefile.pre.in + + # 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 + + export OPT="${CFLAGS}" + + local myconf + + 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+=":gdbm" + fi + dbmliborder="${dbmliborder#:}" + + if ! use m68k && ! use mips && ! use sparc-fbsd && ! use x86-fbsd; then + myconf+=" --with-system-ffi" + fi + + econf \ + --with-fpectl \ + --enable-shared \ + $(use_enable ipv6) \ + $(use_with threads) \ + $(use_with !ucs2 wide-unicode) \ + --infodir='${prefix}'/share/info \ + --mandir='${prefix}'/share/man \ + --with-libc='' \ + --with-dbmliborder=${dbmliborder} \ + ${myconf} +} + +src_test() { + # Tests won't 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_debuglevel from test_telnetlib.py fails sometimes with + # socket.error: [Errno 104] Connection reset by peer + skip_tests+=" telnetlib" + + # 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'd like to run them, you may:" + elog "cd /usr/$(get_libdir)/python${PYVER}/test" + elog "and run the tests separately." +} + +src_install() { + emake DESTDIR="${D}" altinstall || die "emake altinstall failed" + + mv "${D}usr/bin/python${PYVER}-config" "${D}usr/bin/python-config-${PYVER}" + + # Fix collisions between different slots of Python. + mv "${D}usr/bin/2to3" "${D}usr/bin/2to3-${PYVER}" + mv "${D}usr/bin/pydoc3" "${D}usr/bin/pydoc${PYVER}" + mv "${D}usr/bin/idle3" "${D}usr/bin/idle${PYVER}" + rm -f "${D}usr/bin/smtpd.py" + + # Fix the OPT variable so that it doesn't have any flags listed in it. + # Prevents the problem with compiling things with conflicting flags later. + sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile" + + if use build; then + rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{email,encodings,sqlite3,test,tkinter} + else + use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/test" + use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite*} + use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{tkinter,test/test_tk*} + fi + + use threads || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/multiprocessing" + + prep_ml_includes usr/include/python${PYVER} + + 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_postinst() { + # Update symlink temporarily for byte-compiling. + eselect python update + + python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER} + [[ "$(get_libdir)" != "lib" ]] && python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER} + + # Update symlink back to old version. + # Remove this after testing is done. + eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 + + ewarn + ewarn "WARNING!" + ewarn "Many Python modules haven't been ported yet to Python 3.*." + ewarn "Python 3 hasn't been activated and Python wrapper is still configured to use Python 2." + ewarn + ebeep +} + +pkg_postrm() { + eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 + + python_mod_cleanup /usr/lib/python${PYVER} + [[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER} +} |