diff options
author | Mike Gilbert <floppym@gentoo.org> | 2012-03-21 16:27:07 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2012-03-21 16:27:07 +0000 |
commit | 99852c01545f0d1a54d4c15de26321751effd9d2 (patch) | |
tree | 6b5153c0f40e902cd847e7825929700c68df5c5d /dev-lang | |
parent | marked x86 per bug 408993 (diff) | |
download | gentoo-2-99852c01545f0d1a54d4c15de26321751effd9d2.tar.gz gentoo-2-99852c01545f0d1a54d4c15de26321751effd9d2.tar.bz2 gentoo-2-99852c01545f0d1a54d4c15de26321751effd9d2.zip |
Resolve distutils issue with unicode characters in egg-info files. Patch backported by mgorny. Bug 343721.
(Portage version: 2.2.0_alpha93/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/python/ChangeLog | 11 | ||||
-rw-r--r-- | dev-lang/python/files/python-3-distutils-egg-utf8.patch | 43 | ||||
-rw-r--r-- | dev-lang/python/python-3.1.4-r4.ebuild | 361 | ||||
-rw-r--r-- | dev-lang/python/python-3.2.2-r1.ebuild | 365 |
4 files changed, 779 insertions, 1 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 0246ef4ffbca..b5615990d3e1 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-lang/python # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.574 2012/03/07 19:25:11 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.575 2012/03/21 16:27:07 floppym Exp $ + +*python-3.1.4-r4 (21 Mar 2012) +*python-3.2.2-r1 (21 Mar 2012) + + 21 Mar 2012; Mike Gilbert <floppym@gentoo.org> + +files/python-3-distutils-egg-utf8.patch, +python-3.1.4-r4.ebuild, + +python-3.2.2-r1.ebuild: + Resolve distutils issue with unicode characters in egg-info files. Patch + backported by mgorny. Bug 343721. 07 Mar 2012; Brent Baude <ranger@gentoo.org> python-3.2.2.ebuild: Marking python-3.2.2 ppc for bug 403875 diff --git a/dev-lang/python/files/python-3-distutils-egg-utf8.patch b/dev-lang/python/files/python-3-distutils-egg-utf8.patch new file mode 100644 index 000000000000..d3213f39e9a5 --- /dev/null +++ b/dev-lang/python/files/python-3-distutils-egg-utf8.patch @@ -0,0 +1,43 @@ + +# HG changeset patch +# User Victor Stinner <victor.stinner@haypocalc.com> +# Date 1315259096 -7200 +# Node ID fb4d2e6d393e96baac13c4efc216e361bf12c293 +# Parent cb47cf5138a4567718a25d69a79d1c62d13f187c +Issue #9561: distutils now reads and writes egg-info files using UTF-8 + +instead of the locale encoding. + +diff --git a/Lib/distutils/command/install_egg_info.py b/Lib/distutils/command/install_egg_info.py +--- a/Lib/distutils/command/install_egg_info.py ++++ b/Lib/distutils/command/install_egg_info.py +@@ -40,9 +40,8 @@ class install_egg_info(Command): + "Creating "+self.install_dir) + log.info("Writing %s", target) + if not self.dry_run: +- f = open(target, 'w') +- self.distribution.metadata.write_pkg_file(f) +- f.close() ++ with open(target, 'w', encoding='UTF-8') as f: ++ self.distribution.metadata.write_pkg_file(f) + + def get_outputs(self): + return self.outputs +diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py +--- a/Lib/distutils/dist.py ++++ b/Lib/distutils/dist.py +@@ -1010,11 +1010,9 @@ class DistributionMetadata: + def write_pkg_info(self, base_dir): + """Write the PKG-INFO file into the release tree. + """ +- pkg_info = open(os.path.join(base_dir, 'PKG-INFO'), 'w') +- try: ++ with open(os.path.join(base_dir, 'PKG-INFO'), 'w', ++ encoding='UTF-8') as pkg_info: + self.write_pkg_file(pkg_info) +- finally: +- pkg_info.close() + + def write_pkg_file(self, file): + """Write the PKG-INFO format data to a file object. + diff --git a/dev-lang/python/python-3.1.4-r4.ebuild b/dev-lang/python/python-3.1.4-r4.ebuild new file mode 100644 index 000000000000..5f3649308cae --- /dev/null +++ b/dev-lang/python/python-3.1.4-r4.ebuild @@ -0,0 +1,361 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.4-r4.ebuild,v 1.1 2012/03/21 16:27:07 floppym Exp $ + +EAPI="3" +WANT_AUTOMAKE="none" + +inherit autotools eutils flag-o-matic multilib python toolchain-funcs + +if [[ "${PV}" == *_pre* ]]; then + inherit mercurial + + EHG_REPO_URI="http://hg.python.org/cpython" + EHG_REVISION="" +else + MY_PV="${PV%_p*}" + MY_P="Python-${MY_PV}" +fi + +PATCHSET_REVISION="0" + +DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." +HOMEPAGE="http://www.python.org/" +if [[ "${PV}" == *_pre* ]]; then + SRC_URI="" +else + SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz + mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2" +fi + +LICENSE="PSF-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 + app-arch/bzip2 + >=sys-libs/zlib-1.1.3 + virtual/libffi + virtual/libintl + !build? ( + gdbm? ( sys-libs/gdbm ) + ncurses? ( + >=sys-libs/ncurses-5.2 + readline? ( >=sys-libs/readline-4.1 ) + ) + sqlite? ( >=dev-db/sqlite-3.3.3:3 ) + ssl? ( dev-libs/openssl ) + tk? ( + >=dev-lang/tk-8.0 + dev-tcltk/blt + ) + xml? ( >=dev-libs/expat-2 ) + )" +DEPEND="${RDEPEND} + $([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*") + dev-util/pkgconfig + $([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] && echo "doc? ( dev-python/sphinx )") + !sys-devel/gcc[libffi]" +RDEPEND+=" !build? ( app-misc/mime-types ) + $([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")" +PDEPEND="app-admin/python-updater" + +if [[ "${PV}" != *_pre* ]]; then + S="${WORKDIR}/${MY_P}" +fi + +pkg_setup() { + python_pkg_setup +} + +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 [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]]; then + if [[ "$(hg branch)" != "default" ]]; then + die "Invalid EHG_REVISION" + fi + fi + + if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then + if [[ "$(hg branch)" != "${SLOT}" ]]; then + die "Invalid EHG_REVISION" + fi + + if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then + # Update micro version, release level and version string. + local micro_version="${PV%_pre*}" + micro_version="${micro_version##*.}" + local version_string="${PV%.*}.$((${micro_version} - 1))+" + sed \ + -e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \ + -e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \ + -e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \ + -i Include/patchlevel.h || die "sed failed" + fi + fi + + local excluded_patches + if ! tc-is-cross-compiler; then + excluded_patches="*_all_crosscompile.patch" + fi + + local patchset_dir + if [[ "${PV}" == *_pre* ]]; then + patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}" + else + patchset_dir="${WORKDIR}/${MY_PV}" + fi + + EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}" + epatch "${FILESDIR}/linux2.patch" + # https://bugs.gentoo.org/show_bug.cgi?id=343721 + epatch "${FILESDIR}"/python-3-distutils-egg-utf8.patch + + # Linux-3 compat. Bug #374579 (upstream issue12571) + cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die + + 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@@" + + eautoconf + eautoheader +} + +src_configure() { + if use build; then + # Disable extraneous modules with extra dependencies. + 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-flagq -O3; then + is-flagq -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 EPYTHON="python${PV%%.*}" || 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 + + if ! use threads; then + ewarn "Disabling tests due to USE=\"-threads\"" + return + fi + + # Byte compiling should be enabled here. + # Otherwise test_import fails. + python_enable_pyc + + # Skip failing tests. + local skipped_tests="distutils" + + for test in ${skipped_tests}; do + mv "${S}/Lib/test/test_${test}.py" "${T}" + done + + # Rerun failed tests in verbose mode (regrtest -w). + emake test EXTRATESTOPTS="-w" < /dev/tty + local result="$?" + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py" + done + + elog "The following tests have been skipped:" + for test in ${skipped_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 + + if [[ "${result}" -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + emake DESTDIR="${D}" altinstall || die "emake altinstall failed" + python_clean_installation_image -q + + 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" + use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe + + dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r "${S}/Tools" || die "doins failed" + fi + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + + if use kernel_linux; then + if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then + cp -r "${ED}$(python_get_libdir)/plat-linux2" \ + "${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed" + else + cp -r "${ED}$(python_get_libdir)/plat-linux3" \ + "${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed" + fi + fi + + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${SLOT}:" \ + -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + python_mod_optimize -f -x "/(site-packages|test|tests)/" $(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 switch active version of Python ${PV%%.*} and run" + ewarn "'python-updater \${options}' to rebuild Python modules." + ewarn + ewarn "\e[1;31m************************************************************************\e[0m" + ewarn + + local n + for ((n = 0; n < 12; n++)); do + echo -ne "\a" + sleep 1 + done + fi +} + +pkg_postrm() { + eselect_python_update + + python_mod_cleanup $(python_get_libdir) +} diff --git a/dev-lang/python/python-3.2.2-r1.ebuild b/dev-lang/python/python-3.2.2-r1.ebuild new file mode 100644 index 000000000000..1a7c097281a5 --- /dev/null +++ b/dev-lang/python/python-3.2.2-r1.ebuild @@ -0,0 +1,365 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.2-r1.ebuild,v 1.1 2012/03/21 16:27:07 floppym Exp $ + +EAPI="3" +WANT_AUTOMAKE="none" + +inherit autotools eutils flag-o-matic multilib python toolchain-funcs + +if [[ "${PV}" == *_pre* ]]; then + inherit subversion + + ESVN_PROJECT="python" + ESVN_REPO_URI="http://svn.python.org/projects/python/branches/release32-maint" + ESVN_REVISION="" +else + MY_PV="${PV%_p*}" + MY_P="Python-${MY_PV}" +fi + +PATCHSET_REVISION="0" + +DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." +HOMEPAGE="http://www.python.org/" +if [[ "${PV}" == *_pre* ]]; then + SRC_URI="" +else + SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz + mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2" +fi + +LICENSE="PSF-2" +SLOT="3.2" +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? ( + gdbm? ( sys-libs/gdbm ) + ncurses? ( + >=sys-libs/ncurses-5.2 + readline? ( >=sys-libs/readline-4.1 ) + ) + sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) + ssl? ( dev-libs/openssl ) + tk? ( + >=dev-lang/tk-8.0 + dev-tcltk/blt + ) + xml? ( >=dev-libs/expat-2 ) + )" +DEPEND=">=sys-devel/autoconf-2.65 + ${RDEPEND} + $([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*") + $([[ "${PV}" != *_pre* ]] && echo "app-arch/xz-utils") + dev-util/pkgconfig + $([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] && echo "doc? ( dev-python/sphinx )") + !sys-devel/gcc[libffi]" +RDEPEND+=" !build? ( app-misc/mime-types ) + $([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")" +PDEPEND="app-admin/python-updater" + +if [[ "${PV}" != *_pre* ]]; then + S="${WORKDIR}/${MY_P}" +fi + +pkg_setup() { + python_pkg_setup +} + +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 [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then + if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then + # Update micro version, release level and version string. + local micro_version="${PV%_pre*}" + micro_version="${micro_version##*.}" + local version_string="${PV%.*}.$((${micro_version} - 1))+" + sed \ + -e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \ + -e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \ + -e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \ + -i Include/patchlevel.h || die "sed failed" + fi + fi + + local excluded_patches + if ! tc-is-cross-compiler; then + excluded_patches="*_all_crosscompile.patch" + fi + + local patchset_dir + if [[ "${PV}" == *_pre* ]]; then + patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}" + else + patchset_dir="${WORKDIR}/${MY_PV}" + fi + + EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}" + # https://bugs.gentoo.org/show_bug.cgi?id=343721 + epatch "${FILESDIR}"/python-3-distutils-egg-utf8.patch + + # Linux-3 compat. Bug #374579 (upstream issue12571) + cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Lib/sysconfig.py \ + Lib/test/test_site.py \ + Makefile.pre.in \ + Modules/Setup.dist \ + Modules/getpath.c \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + # The setup.py file hardcodes /usr/lib64! + sed -i -e "s:/lib64:/$(get_libdir):g" setup.py || die + + if ! use wininst; then + # Remove Microsoft Windows executables. + rm Lib/distutils/command/wininst-*.exe + fi + + # Support versions of Autoconf other than 2.65. + sed -e "/version_required(2\.65)/d" -i configure.in || die "sed failed" + + # Disable ABI flags. + sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.in || die "sed failed" + + if [[ "${PV}" == *_pre* ]]; then + sed -e "s/\(-DSVNVERSION=\).*\( -o\)/\1\\\\\"${ESVN_REVISION}\\\\\"\2/" -i Makefile.pre.in || die "sed failed" + fi + + eautoconf + eautoheader +} + +src_configure() { + if use build; then + # Disable extraneous modules with extra dependencies. + 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-flagq -O3; then + is-flagq -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.2 correctly. + # Needed on FreeBSD unless Python 3.2 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="" \ + --enable-loadable-sqlite-extensions \ + --with-system-expat \ + --with-system-ffi +} + +src_compile() { + emake EPYTHON="python${PV%%.*}" CPPFLAGS="" CFLAGS="" LDFLAGS="" || 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 failing tests. + local skip_tests="distutils gdb" + + for test in ${skip_tests}; do + mv "${S}/Lib/test/test_${test}.py" "${T}" + done + + # Rerun failed tests in verbose mode (regrtest -w). + emake test EXTRATESTOPTS="-w" CPPFLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty + local result="$?" + + 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 + + if [[ "${result}" -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + emake DESTDIR="${D}" altinstall || die "emake altinstall failed" + python_clean_installation_image -q + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${ED}$(python_get_libdir)/config-${SLOT}/Makefile" || die "sed failed" + + mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}" + + 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" + + dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r "${S}/Tools" || die "doins failed" + fi + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + + if use kernel_linux; then + if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then + cp -r "${ED}$(python_get_libdir)/plat-linux2" \ + "${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed" + else + cp -r "${ED}$(python_get_libdir)/plat-linux3" \ + "${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed" + fi + fi + + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${SLOT}:" \ + -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + python_mod_optimize -f -x "/(site-packages|test|tests)/" $(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 + + local n + for ((n = 0; n < 12; n++)); do + echo -ne "\a" + sleep 1 + done + fi +} + +pkg_postrm() { + eselect_python_update + + python_mod_cleanup $(python_get_libdir) +} |