commit: 26581ccc941f3b0d48abd79751a63d761065ea0c Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Jan 31 04:34:32 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Jan 31 04:43:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26581ccc
dev-python/pyparsing: force distutils to avoid circular dep with setuptools Bug: https://bugs.gentoo.org/607770 Package-Manager: Portage-2.3.3_p42_p432967, Repoman-2.3.1_p35_p432968 dev-python/pyparsing/files/distutils.patch | 11 +++++++++++ dev-python/pyparsing/pyparsing-2.1.10.ebuild | 21 ++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dev-python/pyparsing/files/distutils.patch b/dev-python/pyparsing/files/distutils.patch new file mode 100644 index 00000000..af6a673 --- /dev/null +++ b/dev-python/pyparsing/files/distutils.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -1,7 +1,7 @@ + #!/usr/bin/env python + + """Setup script for the pyparsing module distribution.""" +-from setuptools import setup ++from distutils.core import setup + + import sys + import os diff --git a/dev-python/pyparsing/pyparsing-2.1.10.ebuild b/dev-python/pyparsing/pyparsing-2.1.10.ebuild index af9278e..c1a1247 100644 --- a/dev-python/pyparsing/pyparsing-2.1.10.ebuild +++ b/dev-python/pyparsing/pyparsing-2.1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,11 +16,14 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - # not contained in the tarball RESTRICT=test +PATCHES=( + # Avoid circular dep with setuptools + "${FILESDIR}/distutils.patch" +) + python_install_all() { local HTML_DOCS=( HowToUsePyparsing.html ) if use doc; then @@ -34,3 +37,15 @@ python_install_all() { python_test() { ${PYTHON} unitTests.py || die } + +pkg_preinst() { + _remove_egg_info() { + local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')" + local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info" + if [[ -d ${egginfo} ]]; then + einfo "Removing ${egginfo}" + rm -r "${egginfo}" || die + fi + } + python_foreach_impl _remove_egg_info +}
