Fix distutils mess in python 2.7, revert broken sed and shorten description. Fixes bug #412739 by Anton Kochkov <anton.kochkov@gmail.com>

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 64 insertions, 12 deletions

diff --git a/dev-python/egenix-mx-base/ChangeLog b/dev-python/egenix-mx-base/ChangeLog
index 3108570d1d58..0b6bffc4b133 100644
--- a/dev-python/egenix-mx-base/ChangeLog
+++ b/dev-python/egenix-mx-base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/egenix-mx-base
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v 1.68 2012/04/20 00:24:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v 1.69 2012/04/23 11:12:49 xarthisius Exp $
+
+  23 Apr 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/egenix-mx-base-3.2.3-distutils.patch, egenix-mx-base-3.2.3.ebuild:
+  Fix distutils mess in python 2.7, revert broken sed and shorten description.
+  Fixes bug #412739 by Anton Kochkov <anton.kochkov@gmail.com>
 
   20 Apr 2012; Mike Gilbert <floppym@gentoo.org> egenix-mx-base-3.2.3.ebuild:
   Fix building with Python >=2.7.3_pre20120212:2.7. Backport other changes from
diff --git a/dev-python/egenix-mx-base/Manifest b/dev-python/egenix-mx-base/Manifest
index 58688a826449..734928269b46 100644
--- a/dev-python/egenix-mx-base/Manifest
+++ b/dev-python/egenix-mx-base/Manifest
@@ -1,18 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX egenix-mx-base-3.2.3-distutils.patch 1273 RMD160 f23b1d79b051e739451e83c256ba0593ae57e5cd SHA1 914c8d9af6c7229d763811eefc4f67bcdc426de5 SHA256 d322f9786db314ac0c548082f19221b9a9a0e540af3438e0b2607831e30901ac
 DIST egenix-mx-base-3.1.3.tar.gz 8170718 RMD160 1629f25e4113493766bb0696856543dc7096c347 SHA1 4bedefb9a698bad754b8847ab6432e77d1c58227 SHA256 1cba48164817298db1cb7dde5f524023fd05fa06c75febaf886b5c7523ad83f2
 DIST egenix-mx-base-3.2.1.tar.gz 4571912 RMD160 d9ca3ac5748a1feec038f8e2f7b4f639cdd3b363 SHA1 a82f7f155ea92f26f40a6a3bf9160bfac7c52a00 SHA256 4cf18ba4b4c827d8ff8de5a1a6e4cf7f241de6d1f940aa6107807c0a3003b301
 DIST egenix-mx-base-3.2.3.tar.gz 4574421 RMD160 63943d5e33ca69ba5fde6ef1b0be5966a25f8317 SHA1 6f56a301859b8f9513141fbeeca3e537e082aa53 SHA256 174eefba8835025416a69697d35671210ac028c504290fe381515f70507a97ad
 EBUILD egenix-mx-base-3.1.3.ebuild 1694 RMD160 0198f61586feac8f23018c7b2a3d52f6bae425f5 SHA1 afca5f7bf240213cff8dbc84f8f51bcbfe30eb8d SHA256 7d96d9bf4a415f25c9f2fa1c920e5b8c0d68938d16fe5468adfea8a67a714f5c
 EBUILD egenix-mx-base-3.2.1-r1.ebuild 1785 RMD160 0581f02fab818eee6dbbf35db9272cbaaa17e15d SHA1 98525d2a8c597abd41cb472edce2a9e4c6cf771f SHA256 888144273eaded275812aedeb8eba91bf02de70418c73db59ef8481ccd5018b1
-EBUILD egenix-mx-base-3.2.3.ebuild 2029 RMD160 8cdab8a08629beab469c9898b13ba8f5caed0178 SHA1 9d2ad6b485f1f51065d9c3832746c3f56cbdbc39 SHA256 e985a613a104eecd743327a00524fe24d25148dd6b3a805ca05cd64ec0461c57
-MISC ChangeLog 8679 RMD160 7979969ceb825bdad0a47d46da9d8902ca9182de SHA1 2fb837d536e39190ca1f236608d17821b58e2f2e SHA256 4bca93f4ad5d9ae4347323814491a9be5d8849cc288e91f851b3b457de44f2a2
+EBUILD egenix-mx-base-3.2.3.ebuild 1782 RMD160 4c8007dce529803aa325e16d8f713beb87ab042e SHA1 689120736823d9ab85f64c7ca64d0b6f2a8ec7e6 SHA256 d923d6f9959e2f7e73012282df540f3a9ab80bc354ec36d19d1ceadd585012d8
+MISC ChangeLog 8955 RMD160 c16f58007bca43f10ac4546ad1a0b407f50cb1e1 SHA1 85ef671d27242124ce140073ea96ef2a24b14209 SHA256 541660083cd17fbdb3c77c3ed6e39a8d2418d3cd12c96162205f8991ef36f425
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+QrNMACgkQC77qH+pIQ6TrgQD/VeNdCTdi1GgYAjjQNGcXEnvw
-xomRL5dHVQ56wCm5MMoBAJ/4whBeqRaRkF3Cy8TBmCa/i3d6cKz+pIo7B/QGf4Ml
-=U8PJ
+iQIcBAEBCAAGBQJPlTlVAAoJEF0huFKJUZL5qiAQAKSB8yIhAsBcUQ1K16hXSzie
+50wobfG2G8KSnvW4oue0GOLTBs4uNOaVmk5j/6Q5r31rvVEdFuIKp07mEjydTCoW
+zPc+CVIEUw/dQnKVTHCtNsRHXv+0/cMtk4N+Cf5yF0ojDsRgNeFlB2EVcgeRSR/Z
+Gri7kYMllIjBtg9n1odl0QoyYksuOJPfudEMPWjAMj0xnHE6Yl1GKL0iIb95+G5S
+clA68OFMgFaJ1YWZgbueHsLk+yrwWWsdGypqhic2yf3hYuqdLVu/lvfYdmHferPD
+PuqKWPZWNFeLThEFb3OqXlcsngonpaxrsajoltyFoJZ0fCnKDd6b1CF+SVaqJK1M
+T2TF4/bkhCYUa448mi6yGWIkqz2DkCgnEhgcNTCaS+0z/fc2H02SkX0L5cuq7dYr
+N2a7oRDEDpa+IV1vmcaYsEwKRr3CxIHJ9VZgPnTnG0sCfU/ezXfL/wp+VQxsnwxB
+YDC8/9nmnQ0mWas0teG9YbSS8QbZRBaO3DQoUWHFyHQOxtNE4E7E26gxABvsnnIT
+L7SPIf/+5te5SqIUtBGYrQKZHyN8/mNZNxyjAzbt6Yz7eGd3uav2o6FGKcEKDymN
+/K4eqDplc5u6zzIQM3J/tVfxR/DJzXNMex3zToDn+F50pmXsibpkcE/CJV+7QiM4
+rxBhoiikkemkwG7mZ0tR
+=G250
 -----END PGP SIGNATURE-----
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild
index 3a04f6a1f598..ee1a65f8188a 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild,v 1.2 2012/04/20 00:24:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild,v 1.3 2012/04/23 11:12:49 xarthisius Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 
-inherit distutils
+inherit distutils eutils
 
-DESCRIPTION="eGenix mx Base Distribution for Python - mxDateTime, mxTextTools, mxProxy, mxTools, mxBeeBase, mxStack, mxQueue, mxURL, mxUID"
+DESCRIPTION="eGenix utils for Python"
 HOMEPAGE="http://www.egenix.com/products/python/mxBase http://pypi.python.org/pypi/egenix-mx-base"
 SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
 
@@ -32,8 +32,7 @@ src_prepare() {
 	# Avoid unnecessary overriding of settings. Distutils in Gentoo is patched in better way.
 	sed -e 's/if compiler.compiler_type == "unix":/if False:/' -i mxSetup.py || die "sed failed"
 
-	# http://hg.python.org/cpython/rev/6240ff5dfebe
-	sed -e "s/from distutils.ccompiler import customize_compiler/from distutils.sysconfig import customize_compiler/" -i mxSetup.py || die "sed failed"
+	epatch "${FILESDIR}"/${P}-distutils.patch
 }
 
 src_compile() {
diff --git a/dev-python/egenix-mx-base/files/egenix-mx-base-3.2.3-distutils.patch b/dev-python/egenix-mx-base/files/egenix-mx-base-3.2.3-distutils.patch
new file mode 100644
index 000000000000..a414b6239168
--- /dev/null
+++ b/dev-python/egenix-mx-base/files/egenix-mx-base-3.2.3-distutils.patch
@@ -0,0 +1,37 @@
+Upstream move customize_compiler yet again...
+
+http://lists.egenix.com/mailman-archives/egenix-users/2012-April/114841.html
+http://hg.python.org/cpython/rev/6240ff5dfebe
+https://bugs.gentoo.org/show_bug.cgi?id=412739
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/mxSetup.py
++++ b/mxSetup.py
+@@ -298,10 +298,15 @@
+ from distutils.command.clean import clean
+ import distutils.archive_util
+ 
++try:
++    from distutils.sysconfig import customize_compiler
++except ImportError:
++    from distutils.ccompiler import customize_compiler
++
+ if (python_version < '2.7' or
+     (python_version > '3.0' and python_version < '3.2')):
+     from distutils.sysconfig import \
+-         get_config_h_filename, parse_config_h, customize_compiler, \
++         get_config_h_filename, parse_config_h, \
+          get_config_vars, get_python_version
+     from distutils.util import get_platform
+ 
+@@ -313,10 +318,6 @@
+          get_config_h_filename, parse_config_h, get_path, \
+          get_config_vars, get_python_version, get_platform
+ 
+-    # This API was moved from distutils.sysconfig to distutils.ccompiler
+-    # in Python 2.7
+-    from distutils.ccompiler import customize_compiler
+-
+ def get_python_include_dir():
+ 
+     """ Return the path to the Python include dir.