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/ipython: ipython-1.0.0.ebuild ipython-0.13.2.ebuild ChangeLog
Date: Thu, 26 Sep 2013 17:59:08
Message-Id: 20130926175901.E401A20036@flycatcher.gentoo.org
1 floppym 13/09/26 17:59:01
2
3 Modified: ipython-1.0.0.ebuild ipython-0.13.2.ebuild
4 ChangeLog
5 Log:
6 Add patch to ensure consistent setuptools behavior with python2.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
9
10 Revision Changes Path
11 1.12 dev-python/ipython/ipython-1.0.0.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild?rev=1.12&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild?rev=1.12&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild?r1=1.11&r2=1.12
16
17 Index: ipython-1.0.0.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild,v
20 retrieving revision 1.11
21 retrieving revision 1.12
22 diff -u -r1.11 -r1.12
23 --- ipython-1.0.0.ebuild 15 Sep 2013 16:00:19 -0000 1.11
24 +++ ipython-1.0.0.ebuild 26 Sep 2013 17:59:01 -0000 1.12
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild,v 1.11 2013/09/15 16:00:19 maekke Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild,v 1.12 2013/09/26 17:59:01 floppym Exp $
30
31 EAPI=5
32
33 @@ -62,6 +62,10 @@
34 octave? ( ${PY2_REQUSE} )
35 wxwidgets? ( ${PY2_REQUSE} )"
36
37 +PATCHES=(
38 + "${FILESDIR}/ipython-1.0.0-setuptools.patch"
39 +)
40 +
41 python_prepare_all() {
42 # fix for gentoo python scripts
43 sed -i \
44
45
46
47 1.10 dev-python/ipython/ipython-0.13.2.ebuild
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild?rev=1.10&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild?rev=1.10&content-type=text/plain
51 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild?r1=1.9&r2=1.10
52
53 Index: ipython-0.13.2.ebuild
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild,v
56 retrieving revision 1.9
57 retrieving revision 1.10
58 diff -u -r1.9 -r1.10
59 --- ipython-0.13.2.ebuild 12 Sep 2013 22:29:31 -0000 1.9
60 +++ ipython-0.13.2.ebuild 26 Sep 2013 17:59:01 -0000 1.10
61 @@ -1,6 +1,6 @@
62 # Copyright 1999-2013 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild,v 1.9 2013/09/12 22:29:31 mgorny Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild,v 1.10 2013/09/26 17:59:01 floppym Exp $
66
67 EAPI=5
68
69 @@ -50,9 +50,12 @@
70 wxwidgets? ( ${PY2_REQUSE} )"
71 DISTUTILS_IN_SOURCE_BUILD=1
72
73 -python_prepare_all() {
74 - epatch "${FILESDIR}"/${PN}-0.12-globalpath.patch
75 +PATCHES=(
76 + "${FILESDIR}/${PN}-0.12-globalpath.patch"
77 + "${FILESDIR}/ipython-1.0.0-setuptools.patch"
78 +)
79
80 +python_prepare_all() {
81 # fix for gentoo python scripts
82 sed -i \
83 -e "/ipython_cmd/s/ipython3/ipython/g" \
84 @@ -182,6 +185,7 @@
85 elisp-install ${PN} ${PN}.el*
86 elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
87 fi
88 + distutils-r1_python_install_all
89 }
90
91 pkg_postinst() {
92
93
94
95 1.125 dev-python/ipython/ChangeLog
96
97 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ChangeLog?rev=1.125&view=markup
98 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ChangeLog?rev=1.125&content-type=text/plain
99 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ChangeLog?r1=1.124&r2=1.125
100
101 Index: ChangeLog
102 ===================================================================
103 RCS file: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v
104 retrieving revision 1.124
105 retrieving revision 1.125
106 diff -u -r1.124 -r1.125
107 --- ChangeLog 15 Sep 2013 16:00:19 -0000 1.124
108 +++ ChangeLog 26 Sep 2013 17:59:01 -0000 1.125
109 @@ -1,6 +1,11 @@
110 # ChangeLog for dev-python/ipython
111 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
112 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.124 2013/09/15 16:00:19 maekke Exp $
113 +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.125 2013/09/26 17:59:01 floppym Exp $
114 +
115 + 26 Sep 2013; Mike Gilbert <floppym@g.o>
116 + +files/ipython-1.0.0-setuptools.patch, ipython-0.13.2.ebuild,
117 + ipython-1.0.0.ebuild:
118 + Add patch to ensure consistent setuptools behavior with python2.
119
120 15 Sep 2013; Markus Meier <maekke@g.o> ipython-1.0.0.ebuild:
121 add ~arm, bug #481462