remove distutils fallback which is broken, thus enforcing usage of setuptools

(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)

3 files changed, 35 insertions, 3 deletions

diff --git a/dev-python/Babel/Babel-0.9.6.ebuild b/dev-python/Babel/Babel-0.9.6.ebuild
index b9f2b3f37253..1c28481db71f 100644
--- a/dev-python/Babel/Babel-0.9.6.ebuild
+++ b/dev-python/Babel/Babel-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-0.9.6.ebuild,v 1.9 2012/05/09 00:15:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-0.9.6.ebuild,v 1.10 2012/09/26 01:13:57 hasufell Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils
+inherit eutils distutils
 
 DESCRIPTION="A collection of tools for internationalizing Python applications"
 HOMEPAGE="http://babel.edgewall.org/ http://pypi.python.org/pypi/Babel"
@@ -25,6 +25,11 @@ RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="babel"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-setuptools.patch
+	distutils_src_prepare
+}
+
 src_install() {
 	distutils_src_install
 	dohtml -r doc/* || die "dohtml failed"
diff --git a/dev-python/Babel/ChangeLog b/dev-python/Babel/ChangeLog
index c1b43a15d4d1..10f3bbc55001 100644
--- a/dev-python/Babel/ChangeLog
+++ b/dev-python/Babel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/Babel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/ChangeLog,v 1.42 2012/05/09 00:15:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/ChangeLog,v 1.43 2012/09/26 01:13:57 hasufell Exp $
+
+  26 Sep 2012; Julian Ospald <hasufell@gentoo.org> Babel-0.9.6.ebuild,
+  +files/Babel-0.9.6-setuptools.patch:
+  remove distutils fallback which is broken, thus enforcing usage of setuptools
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> Babel-0.9.6.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-python/Babel/files/Babel-0.9.6-setuptools.patch b/dev-python/Babel/files/Babel-0.9.6-setuptools.patch
new file mode 100644
index 000000000000..ff4ba7bba7b1
--- /dev/null
+++ b/dev-python/Babel/files/Babel-0.9.6-setuptools.patch
@@ -0,0 +1,23 @@
+From: Ben Kohler
+Date: 2012-08-13 19:59:01 UTC
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=431278
+
+remove distutils fallback which silently fails resulting
+in a broken installation
+
+this patch enforces a real failure in case of broken setuptools
+
+--- Babel-0.9.6/setup.py
++++ Babel-0.9.6/setup.py
+@@ -16,10 +16,7 @@
+ import doctest
+ from glob import glob
+ import os
+-try:
+-    from setuptools import setup
+-except ImportError:
+-    from distutils.core import setup
++from setuptools import setup
+ import sys
+ 
+ sys.path.append(os.path.join('doc', 'common'))