Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/python: python-2.6.2-r2.ebuild python-3.1.1-r1.ebuild
Date: Thu, 01 Oct 2009 20:03:58
Message-Id: E1MtRsX-0002PI-8N@stork.gentoo.org
1 arfrever 09/10/01 20:03:53
2
3 Modified: python-2.6.2-r2.ebuild python-3.1.1-r1.ebuild
4 Log:
5 Small updates.
6 (Portage version: 14469-svn/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.9 dev-lang/python/python-2.6.2-r2.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild?rev=1.9&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild?rev=1.9&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild?r1=1.8&r2=1.9
14
15 Index: python-2.6.2-r2.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v
18 retrieving revision 1.8
19 retrieving revision 1.9
20 diff -u -r1.8 -r1.9
21 --- python-2.6.2-r2.ebuild 29 Sep 2009 20:02:56 -0000 1.8
22 +++ python-2.6.2-r2.ebuild 1 Oct 2009 20:03:52 -0000 1.9
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2009 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.8 2009/09/29 20:02:56 arfrever Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.9 2009/10/01 20:03:52 arfrever Exp $
28
29 EAPI="2"
30
31 @@ -51,9 +51,9 @@
32 tk? ( >=dev-lang/tk-8.0 )
33 xml? ( >=dev-libs/expat-2 )
34 )
35 - !m68k? ( !mips? ( !sparc-fbsd? ( virtual/libffi ) ) )"
36 + !m68k? ( !sparc-fbsd? ( virtual/libffi ) )"
37 DEPEND="${RDEPEND}
38 - !m68k? ( !mips? ( !sparc-fbsd? ( dev-util/pkgconfig ) ) )"
39 + !m68k? ( !sparc-fbsd? ( dev-util/pkgconfig ) )"
40 RDEPEND+=" !build? ( app-misc/mime-types )"
41 PDEPEND="app-admin/python-updater"
42
43 @@ -70,7 +70,9 @@
44
45 src_prepare() {
46 # Ensure that internal copy of libffi isn't used.
47 - rm -fr Modules/_ctypes/libffi*
48 + if ! use m68k && ! use sparc-fbsd; then
49 + rm -fr Modules/_ctypes/libffi*
50 + fi
51
52 if tc-is-cross-compiler; then
53 epatch "${FILESDIR}/python-2.5-cross-printf.patch"
54 @@ -183,7 +185,7 @@
55 # Please query BSD team before removing this!
56 append-ldflags "-L."
57
58 - if ! use m68k && ! use mips && ! use sparc-fbsd; then
59 + if ! use m68k && ! use sparc-fbsd; then
60 myconf+=" --with-system-ffi"
61 fi
62
63
64
65
66 1.8 dev-lang/python/python-3.1.1-r1.ebuild
67
68 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?rev=1.8&view=markup
69 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?rev=1.8&content-type=text/plain
70 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?r1=1.7&r2=1.8
71
72 Index: python-3.1.1-r1.ebuild
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v
75 retrieving revision 1.7
76 retrieving revision 1.8
77 diff -u -r1.7 -r1.8
78 --- python-3.1.1-r1.ebuild 29 Sep 2009 20:02:56 -0000 1.7
79 +++ python-3.1.1-r1.ebuild 1 Oct 2009 20:03:52 -0000 1.8
80 @@ -1,6 +1,6 @@
81 # Copyright 1999-2009 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.7 2009/09/29 20:02:56 arfrever Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.8 2009/10/01 20:03:52 arfrever Exp $
85
86 EAPI="2"
87
88 @@ -40,9 +40,9 @@
89 tk? ( >=dev-lang/tk-8.0 )
90 xml? ( >=dev-libs/expat-2 )
91 )
92 - !m68k? ( !mips? ( !sparc-fbsd? ( virtual/libffi ) ) )"
93 + !m68k? ( !sparc-fbsd? ( virtual/libffi ) )"
94 DEPEND="${RDEPEND}
95 - !m68k? ( !mips? ( !sparc-fbsd? ( dev-util/pkgconfig ) ) )"
96 + !m68k? ( !sparc-fbsd? ( dev-util/pkgconfig ) )"
97 RDEPEND+=" !build? ( app-misc/mime-types )"
98 PDEPEND="app-admin/python-updater
99 =dev-lang/python-2*"
100 @@ -51,7 +51,9 @@
101
102 src_prepare() {
103 # Ensure that internal copy of libffi isn't used.
104 - rm -fr Modules/_ctypes/libffi*
105 + if ! use m68k && ! use sparc-fbsd; then
106 + rm -fr Modules/_ctypes/libffi*
107 + fi
108
109 if ! tc-is-cross-compiler; then
110 rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
111 @@ -155,7 +157,7 @@
112 fi
113 dbmliborder="${dbmliborder#:}"
114
115 - if ! use m68k && ! use mips && ! use sparc-fbsd; then
116 + if ! use m68k && ! use sparc-fbsd; then
117 myconf+=" --with-system-ffi"
118 fi