Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/egenix-mx-base: egenix-mx-base-3.2.3.ebuild ChangeLog
Date: Fri, 20 Apr 2012 00:24:56
Message-Id: 20120420002445.941782004B@flycatcher.gentoo.org
1 floppym 12/04/20 00:24:45
2
3 Modified: egenix-mx-base-3.2.3.ebuild ChangeLog
4 Log:
5 Fix building with Python >=2.7.3_pre20120212:2.7. Backport other changes from Progress Overlay. Patch by Arfrever.
6
7 (Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild
11
12 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
13 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
14 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
15
16 Index: egenix-mx-base-3.2.3.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.3.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- egenix-mx-base-3.2.3.ebuild 16 Mar 2012 07:44:33 -0000 1.1
23 +++ egenix-mx-base-3.2.3.ebuild 20 Apr 2012 00:24:45 -0000 1.2
24 @@ -1,15 +1,15 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $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 $
28 +# $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 $
29
30 EAPI="3"
31 PYTHON_DEPEND="2"
32 SUPPORT_PYTHON_ABIS="1"
33 -RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
34 +RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
35
36 -inherit distutils flag-o-matic
37 +inherit distutils
38
39 -DESCRIPTION="eGenix utils for Python"
40 +DESCRIPTION="eGenix mx Base Distribution for Python - mxDateTime, mxTextTools, mxProxy, mxTools, mxBeeBase, mxStack, mxQueue, mxURL, mxUID"
41 HOMEPAGE="http://www.egenix.com/products/python/mxBase http://pypi.python.org/pypi/egenix-mx-base"
42 SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
43
44 @@ -25,37 +25,35 @@
45
46 src_prepare() {
47 distutils_src_prepare
48 - # doesn't play well with -fstack-protector (#63762)
49 - rm "mx/TextTools/Examples/pytag.py"
50
51 - # We do the optimization ourselves
52 - sed -i \
53 - -e 's/^\(optimize\) = 1/\1 = 0/' \
54 - setup.cfg || die "sed failed"
55 -
56 - # And we don't want the docs in site-packages
57 - sed -i \
58 - -e '/\/Doc\//d' \
59 - egenix_mx_base.py || die "sed failed"
60 + # Don't install documentation in site-packages directories.
61 + sed -e "/\/Doc\//d" -i egenix_mx_base.py || die "sed failed"
62 +
63 + # Avoid unnecessary overriding of settings. Distutils in Gentoo is patched in better way.
64 + sed -e 's/if compiler.compiler_type == "unix":/if False:/' -i mxSetup.py || die "sed failed"
65 +
66 + # http://hg.python.org/cpython/rev/6240ff5dfebe
67 + sed -e "s/from distutils.ccompiler import customize_compiler/from distutils.sysconfig import customize_compiler/" -i mxSetup.py || die "sed failed"
68 }
69
70 src_compile() {
71 - replace-flags "-O[3s]" "-O2"
72 - #Build system wants to have BASECFLAGS in environ, not CFLAGS.
73 + # mxSetup.py uses BASECFLAGS variable.
74 BASECFLAGS="${CFLAGS}" distutils_src_compile
75 }
76
77 src_install() {
78 distutils_src_install
79 +
80 dohtml -a html -r mx
81 insinto /usr/share/doc/${PF}
82 find -iname "*.pdf" | xargs doins
83
84 installation_of_headers() {
85 + local header
86 dodir "$(python_get_includedir)/mx" || return 1
87 - find "${ED}$(python_get_sitedir)/mx" -type f -name "*.h" -print0 | while read -d $'\0' header; do
88 + while read -d $'\0' header; do
89 mv -f "${header}" "${ED}$(python_get_includedir)/mx" || return 1
90 - done
91 + done < <(find "${ED}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
92 }
93 python_execute_function -q installation_of_headers
94 }
95
96
97
98 1.68 dev-python/egenix-mx-base/ChangeLog
99
100 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/ChangeLog?rev=1.68&view=markup
101 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/ChangeLog?rev=1.68&content-type=text/plain
102 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/egenix-mx-base/ChangeLog?r1=1.67&r2=1.68
103
104 Index: ChangeLog
105 ===================================================================
106 RCS file: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v
107 retrieving revision 1.67
108 retrieving revision 1.68
109 diff -u -r1.67 -r1.68
110 --- ChangeLog 16 Mar 2012 07:44:33 -0000 1.67
111 +++ ChangeLog 20 Apr 2012 00:24:45 -0000 1.68
112 @@ -1,6 +1,10 @@
113 # ChangeLog for dev-python/egenix-mx-base
114 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
115 -# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v 1.67 2012/03/16 07:44:33 patrick Exp $
116 +# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v 1.68 2012/04/20 00:24:45 floppym Exp $
117 +
118 + 20 Apr 2012; Mike Gilbert <floppym@g.o> egenix-mx-base-3.2.3.ebuild:
119 + Fix building with Python >=2.7.3_pre20120212:2.7. Backport other changes from
120 + Progress Overlay. Patch by Arfrever.
121
122 *egenix-mx-base-3.2.3 (16 Mar 2012)