* [gentoo-commits] gentoo-x86 commit in dev-python/egenix-mx-base: egenix-mx-base-3.2.3.ebuild ChangeLog
@ 2012-04-20 0:24 Mike Gilbert (floppym)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2012-04-20 0:24 UTC (permalink / raw
To: gentoo-commits
floppym 12/04/20 00:24:45
Modified: egenix-mx-base-3.2.3.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.2 dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild?r1=1.1&r2=1.2
Index: egenix-mx-base-3.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- egenix-mx-base-3.2.3.ebuild 16 Mar 2012 07:44:33 -0000 1.1
+++ egenix-mx-base-3.2.3.ebuild 20 Apr 2012 00:24:45 -0000 1.2
@@ -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 @@
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
}
1.68 dev-python/egenix-mx-base/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/ChangeLog?r1=1.67&r2=1.68
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog 16 Mar 2012 07:44:33 -0000 1.67
+++ ChangeLog 20 Apr 2012 00:24:45 -0000 1.68
@@ -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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/egenix-mx-base: egenix-mx-base-3.2.3.ebuild ChangeLog
@ 2012-04-23 11:12 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2012-04-23 11:12 UTC (permalink / raw
To: gentoo-commits
xarthisius 12/04/23 11:12:49
Modified: egenix-mx-base-3.2.3.ebuild ChangeLog
Log:
Fix distutils mess in python 2.7, revert broken sed and shorten description. Fixes bug #412739 by Anton Kochkov <anton.kochkov@gmail.com>
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild?r1=1.2&r2=1.3
Index: egenix-mx-base-3.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- egenix-mx-base-3.2.3.ebuild 20 Apr 2012 00:24:45 -0000 1.2
+++ egenix-mx-base-3.2.3.ebuild 23 Apr 2012 11:12:49 -0000 1.3
@@ -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 @@
# 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() {
1.69 dev-python/egenix-mx-base/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/ChangeLog?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/ChangeLog?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/ChangeLog?r1=1.68&r2=1.69
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog 20 Apr 2012 00:24:45 -0000 1.68
+++ ChangeLog 23 Apr 2012 11:12:49 -0000 1.69
@@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-23 11:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-23 11:12 [gentoo-commits] gentoo-x86 commit in dev-python/egenix-mx-base: egenix-mx-base-3.2.3.ebuild ChangeLog Kacper Kowalik (xarthisius)
-- strict thread matches above, loose matches on Subject: below --
2012-04-20 0:24 Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox