Prevent distribute bootstrap. Resolves error with setuptools-0.7, bug 475290.

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 27 insertions, 7 deletions

diff --git a/dev-python/pyenchant/ChangeLog b/dev-python/pyenchant/ChangeLog
index e63ed1b61196..4d935b472450 100644
--- a/dev-python/pyenchant/ChangeLog
+++ b/dev-python/pyenchant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyenchant
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyenchant/ChangeLog,v 1.44 2013/06/29 15:36:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyenchant/ChangeLog,v 1.45 2013/07/06 00:56:03 floppym Exp $
+
+  06 Jul 2013; Mike Gilbert <floppym@gentoo.org> +files/pyenchant-setup.patch,
+  pyenchant-1.6.5-r1.ebuild, pyenchant-1.6.5.ebuild:
+  Prevent distribute bootstrap. Resolves error with setuptools-0.7, bug 475290.
 
 *pyenchant-1.6.5-r1 (29 Jun 2013)
 
@@ -169,4 +173,3 @@
   +pyenchant-1.1.5.ebuild:
   New package, based on an ebuild from Ryan Kelly (ryan-gentoo@rfk.id.au).
   Closes bug #85959.
-
diff --git a/dev-python/pyenchant/files/pyenchant-setup.patch b/dev-python/pyenchant/files/pyenchant-setup.patch
new file mode 100644
index 000000000000..757b759b7146
--- /dev/null
+++ b/dev-python/pyenchant/files/pyenchant-setup.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -6,8 +6,6 @@
+ #
+ 
+ 
+-import distribute_setup
+-distribute_setup.use_setuptools()
+ from setuptools import setup, find_packages, Extension
+ from distutils.archive_util import make_archive
+ 
diff --git a/dev-python/pyenchant/pyenchant-1.6.5-r1.ebuild b/dev-python/pyenchant/pyenchant-1.6.5-r1.ebuild
index c0a101969ecb..002fb02c33fb 100644
--- a/dev-python/pyenchant/pyenchant-1.6.5-r1.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyenchant/pyenchant-1.6.5-r1.ebuild,v 1.1 2013/06/29 15:36:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyenchant/pyenchant-1.6.5-r1.ebuild,v 1.2 2013/07/06 00:56:03 floppym Exp $
 
 EAPI=5
 
@@ -19,10 +19,11 @@ IUSE=""
 
 DEPEND="
 	>=app-text/enchant-${PV%.*}
-	<dev-python/setuptools-0.7[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 DOCS=( README.txt TODO.txt )
+PATCHES=( "${FILESDIR}/${PN}-setup.patch" )
 
 python_test() {
 	if [[ -n "$(LC_ALL="en_US.UTF-8" bash -c "" 2>&1)" ]]; then
diff --git a/dev-python/pyenchant/pyenchant-1.6.5.ebuild b/dev-python/pyenchant/pyenchant-1.6.5.ebuild
index ef01b2d267b4..55bfa09a94bd 100644
--- a/dev-python/pyenchant/pyenchant-1.6.5.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyenchant/pyenchant-1.6.5.ebuild,v 1.7 2013/06/29 15:36:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyenchant/pyenchant-1.6.5.ebuild,v 1.8 2013/07/06 00:56:03 floppym Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Python bindings for the Enchant spellchecking system"
 HOMEPAGE="http://pyenchant.sourceforge.net http://pypi.python.org/pypi/pyenchant"
@@ -20,12 +20,17 @@ IUSE=""
 
 DEPEND="
 	>=app-text/enchant-${PV%.*}
-	<dev-python/setuptools-0.7"
+	dev-python/setuptools"
 RDEPEND="${DEPEND}"
 
 DOCS="README.txt TODO.txt"
 PYTHON_MODNAME="enchant"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-setup.patch"
+	distutils_src_prepare
+}
+
 src_test() {
 	if [[ -n "$(LC_ALL="en_US.UTF-8" bash -c "" 2>&1)" ]]; then
 		ewarn "Disabling tests due to missing en_US.UTF-8 locale"