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

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

3 files changed, 35 insertions, 23 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/Manifest b/dev-python/egenix-mx-base/Manifest
index be8dadcf58a4..58688a826449 100644
--- a/dev-python/egenix-mx-base/Manifest
+++ b/dev-python/egenix-mx-base/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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 1792 RMD160 d75267f285cb6925499aa9144c4b7850940bd2ba SHA1 ffcf18a47bf7a567810a4363ba3069c65b44972e SHA256 b267bce38ac4b18512786c777f29e9086e3c1a2de77ebb9ef219add84f8bce51
-MISC ChangeLog 8481 RMD160 d0455ee75d93ed7d673f5c7c2ccda1be9548aa4a SHA1 93d78248c2f81b6bfb996eeaaeee39d78f046460 SHA256 07ce27cdcda63da44d24dc320d162741a76b9c4d2375b7ecbf94fb23a0f62199
+EBUILD egenix-mx-base-3.2.3.ebuild 2029 RMD160 8cdab8a08629beab469c9898b13ba8f5caed0178 SHA1 9d2ad6b485f1f51065d9c3832746c3f56cbdbc39 SHA256 e985a613a104eecd743327a00524fe24d25148dd6b3a805ca05cd64ec0461c57
+MISC ChangeLog 8679 RMD160 7979969ceb825bdad0a47d46da9d8902ca9182de SHA1 2fb837d536e39190ca1f236608d17821b58e2f2e SHA256 4bca93f4ad5d9ae4347323814491a9be5d8849cc288e91f851b3b457de44f2a2
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk+QrNMACgkQC77qH+pIQ6TrgQD/VeNdCTdi1GgYAjjQNGcXEnvw
+xomRL5dHVQ56wCm5MMoBAJ/4whBeqRaRkF3Cy8TBmCa/i3d6cKz+pIo7B/QGf4Ml
+=U8PJ
+-----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 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
 }