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 000000000000..af6a67301128
--- /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 af9278e85fcf..c1a1247dff44 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
+}