Fix building with Python >=2.7.3_pre20120212:2.7. Backport other changes from Progress Overlay. Patch by Arfrever.

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

2 files changed, 23 insertions, 21 deletions

diff --git a/dev-python/egenix-mx-base/ChangeLog b/dev-python/egenix-mx-base/ChangeLog
index bd9f90c478a8..3108570d1d58 100644
--- a/dev-python/egenix-mx-base/ChangeLog
+++ b/dev-python/egenix-mx-base/ChangeLog
@@ -1,6 +1,10 @@
 # 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.67 2012/03/16 07:44:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v 1.68 2012/04/20 00:24:45 floppym Exp $
+
+  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
+  Progress Overlay. Patch by Arfrever.
 
 *egenix-mx-base-3.2.3 (16 Mar 2012)
 
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 54b4919280fb..3a04f6a1f598 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.1 2012/03/16 07:44:33 patrick Exp $
+# $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 $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 
-inherit distutils flag-o-matic
+inherit distutils
 
-DESCRIPTION="eGenix utils for Python"
+DESCRIPTION="eGenix mx Base Distribution for Python - mxDateTime, mxTextTools, mxProxy, mxTools, mxBeeBase, mxStack, mxQueue, mxURL, mxUID"
 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"
 
@@ -25,37 +25,35 @@ PYTHON_MODNAME="mx"
 
 src_prepare() {
 	distutils_src_prepare
-	# doesn't play well with -fstack-protector (#63762)
-	rm "mx/TextTools/Examples/pytag.py"
-
-	# We do the optimization ourselves
-	sed -i \
-		-e 's/^\(optimize\) = 1/\1 = 0/' \
-		setup.cfg || die "sed failed"
-
-	# And we don't want the docs in site-packages
-	sed -i \
-		-e '/\/Doc\//d' \
-		egenix_mx_base.py || die "sed failed"
+
+	# Don't install documentation in site-packages directories.
+	sed -e "/\/Doc\//d" -i egenix_mx_base.py || die "sed failed"
+
+	# 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"
 }
 
 src_compile() {
-	replace-flags "-O[3s]" "-O2"
-	#Build system wants to have BASECFLAGS in environ, not CFLAGS.
+	# mxSetup.py uses BASECFLAGS variable.
 	BASECFLAGS="${CFLAGS}" distutils_src_compile
 }
 
 src_install() {
 	distutils_src_install
+
 	dohtml -a html -r mx
 	insinto /usr/share/doc/${PF}
 	find -iname "*.pdf" | xargs doins
 
 	installation_of_headers() {
+		local header
 		dodir "$(python_get_includedir)/mx" || return 1
-		find "${ED}$(python_get_sitedir)/mx" -type f -name "*.h" -print0 | while read -d $'\0' header; do
+		while read -d $'\0' header; do
 			mv -f "${header}" "${ED}$(python_get_includedir)/mx" || return 1
-		done
+		done < <(find "${ED}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
 	}
 	python_execute_function -q installation_of_headers
 }