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

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 35 insertions, 14 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/Manifest b/dev-python/pyenchant/Manifest
index 993ca11e0923..4a498bb03562 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX pyenchant-setup.patch 220 SHA256 0a94ecdf864ad09a4e422fb55ba157ae049cb416d1e609c96c326bdc6d327fa1 SHA512 8af9724d8600c6eb7972a6ff57c459dd0aed6621750549317f8f66528904ae3f3aa6252c46ffdf60cab0a85812b3958f805b83530a0343868d64a23f84308bfa WHIRLPOOL 459a42cb20dcdb5f2dcb02b42c7b3173f123d3ae24b73a2ca3497e423afc0197755781e52297c715a1ad826bbbfb933a1bf8e9a4396610c0591bd858bac01ea9
 DIST pyenchant-1.6.5.tar.gz 62294 SHA256 623f332a9fbb70ae6c9c2d0d4e7f7bae5922d36ba0fe34be8e32df32ebbb4f84 SHA512 de90f6e224880244c02537efeb38b4717973ef3aa117503ed4f582819c3ef651a1d5572c0a988bff44543e4b4b733a1a821758e329f57b40480cab97b39e8ea8 WHIRLPOOL 4b7d4e561a2a4aefe811a27f3cb6880df316273d198f8160b1150087adb6e8ff592579ccb69b6025666b27c836fc37dff66b66d8445d718bd965c2cd0e3c798d
-EBUILD pyenchant-1.6.5-r1.ebuild 885 SHA256 0e66e7ae13f1aa5e8b942f7b7719186cf5132dcd25f35d90237dc016759afbc5 SHA512 b059550452ad6e63091d4ef71c2775c423f0aa08e99540b03ddddeee4a79dbe50bca9ae12e7a97425b2c6db6fd8ccddc33306c7a0e01d11cd6599e01e4e641ec WHIRLPOOL 869a41f4ff626c5042218cf0acc0023f5c0e2bdea2be957cf1e67c1c975bce6e28edbe02d63cd87b279e58663580f436fc5667ea32190dc27f77b0d4083bdddb
-EBUILD pyenchant-1.6.5.ebuild 928 SHA256 b8d1017ba450d8cb6e55fa9d3cd8d1386c1268e650afb0a5c61e8a7a2b78fc14 SHA512 634f3113657ebe0cb871695a21ad6dec8605eb6c3bc84703236ef84c0ff4cf2a0b55539dae4220e39797fb139b73f8f310fab15963433627eb71077b43678cf3 WHIRLPOOL 5e8c5e005e85199a371c867960dafbe3662a95d5b5f8416d0c46788562cca2ea7f752e7b9d1755c6affa8c950e1b4ffb672f2eb6e5d46d43009d1ed6f2f9c7c2
-MISC ChangeLog 5619 SHA256 1a4ab96fdc5c579f3aa2a6b7b579b05d867e8d2033e3acd4fae4b99e104593b1 SHA512 e145048fd67b69a4a07975164e60e4fdde6e3a7b9b8571ad7bc8062f26a14399b645609b43403fca91075316b67d4f5fcef700f3ee4cc2db3b044e902373e6c8 WHIRLPOOL 4b74aef5e265f5c42723aa636e39bd9c375075bac8515221a2afaa4a5c40308221aaa80a6ac7f245a23b1509b0e5a1711fa53d79fcd048170a50f04a4341cb9c
+EBUILD pyenchant-1.6.5-r1.ebuild 927 SHA256 d82122920f1f29a65de7b3e9ee7a57d96b922f1b519edaa95ea9d1d167e53bfd SHA512 a589215576f1794052f1106fd1964c45640a3436245c751c924f01e4783a72b31d6caf0ea69e67da5c8e28477573226fe4d76dc6cb870ef5a49440134596e8ea WHIRLPOOL 6c7a8b1846b6a0d827ab2dd7cfd4857193e58d34958dd8d85db9fafacf6c6203714556372db120b4ae418689882ae66fd7fcd2b8a82e2eed1211ed4ac7784b32
+EBUILD pyenchant-1.6.5.ebuild 1015 SHA256 2e2860d7bc283e9d53d8ac7fea6f730a7c84aadcaca4bb2b36a27f3f3fb1c314 SHA512 43c544838424ffb2253591faca6e161121adb7971d527b9a9afce9814877ffb61992d934cdf0e8eb54597e697429342b104ed3562ea013066906df51781ed99f WHIRLPOOL 6105153867bfe8b9ad1e2db72773dc0cb9241f03917b6871840219f74377084f813771e14834a4b042ccba202d86cbae170ff37a8808bc581dd6f3a4fff66168
+MISC ChangeLog 5834 SHA256 92fe92aa0dab38757b611604f6ba755ca0fec9ea5494187a62daaf8d74d0446d SHA512 79a6c5af29a282678c74a7b9b560a78753557f5a55b851175900de72ce05993eb3de3b9207bbd6ee721e83cb75e94a6cc2f6bd21dbb4a41645c84a66f6f6f693 WHIRLPOOL a6c1313f42723c77f57de89f451d31f63bff8cb628ada022179e9d71a733c9290212106f08f6cd329833aa7d25f01a88856a398ebea5c58671b4954145fb2e43
 MISC metadata.xml 684 SHA256 11872a4c3eb9616e56922776407c40fd650bd5d976254b6d577071623e301b9f SHA512 de050b963f6af72058054ff9ba330583f5659b2ac51a17d8e33202e5433a96d25eb8d24a2dc3ec1e4934a666f5f04e528b2ea41f7e3ad16321ceaac560b4e378 WHIRLPOOL 90e15e2c83921e7728704c46ccf555c67a9f3903b2d8bb24175d2b1528783a33970da0362614d96161f1dfa493011f794b603479e8ce73c1769728afc40c19dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlHO/xYACgkQgAnW8HDreRZPNgCfS2e4Z+wSSAqKg/xdvd/uyDA1
-qa0Ani/iQ+tsiKuBWvjTrJR0AcdCM+a4
-=zcA8
+iF4EAREIAAYFAlHXayQACgkQC77qH+pIQ6QrAQD/fniQZPB5DSeGwcJLBBxT0ehl
+R73nihGBseTswEsHuccA/0TxQRof1dycBmelI771qVGBqooj68JRAbwm7Vhcvtkw
+=AE3s
 -----END PGP SIGNATURE-----
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"