Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/python: python-2.4.4-r6.ebuild ChangeLog
Date: Thu, 25 Oct 2007 23:53:35
Message-Id: E1IlCW2-0000Y9-P5@stork.gentoo.org
1 jer 07/10/25 23:53:30
2
3 Modified: python-2.4.4-r6.ebuild ChangeLog
4 Log:
5 Stable for HPPA (bug #192876). Fixed quoting issues.
6 (Portage version: 2.1.3.16)
7
8 Revision Changes Path
9 1.6 dev-lang/python/python-2.4.4-r6.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r6.ebuild?rev=1.6&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r6.ebuild?rev=1.6&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r6.ebuild?r1=1.5&r2=1.6
14
15 Index: python-2.4.4-r6.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r6.ebuild,v
18 retrieving revision 1.5
19 retrieving revision 1.6
20 diff -u -r1.5 -r1.6
21 --- python-2.4.4-r6.ebuild 25 Oct 2007 19:07:24 -0000 1.5
22 +++ python-2.4.4-r6.ebuild 25 Oct 2007 23:53:30 -0000 1.6
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2007 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.4.4-r6.ebuild,v 1.5 2007/10/25 19:07:24 armin76 Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r6.ebuild,v 1.6 2007/10/25 23:53:30 jer Exp $
28
29 # NOTE about python-portage interactions :
30 # - Do not add a pkg_setup() check for a certain version of portage
31 @@ -23,7 +23,7 @@
32
33 LICENSE="PSF-2.2"
34 SLOT="2.4"
35 -KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
36 +KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
37 IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx nothreads examples"
38
39 DEPEND=">=sys-libs/zlib-1.1.3
40 @@ -55,12 +55,12 @@
41
42 src_unpack() {
43 unpack ${A}
44 - cd ${S}
45 + cd "${S}"
46
47 if tc-is-cross-compiler ; then
48 [[ $(python -V 2>&1) != "Python ${PV}" ]] && \
49 die "Crosscompiling requires the same host and build versions."
50 - epatch ${FILESDIR}/python-2.4.4-test-cross.patch
51 + epatch "${FILESDIR}"/python-2.4.4-test-cross.patch
52 else
53 rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
54 fi
55 @@ -78,7 +78,7 @@
56 # fix os.utime() on hppa. utimes it not supported but unfortunately
57 # reported as working - gmsoft (22 May 04)
58 # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
59 - [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
60 + [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i "${S}"/configure
61
62 eautoreconf
63 }
64 @@ -175,25 +175,25 @@
65
66 # install our own custom python-config
67 exeinto /usr/bin
68 - newexe ${FILESDIR}/python-config-${PYVER}-r1 python-config-${PYVER}
69 + newexe "${FILESDIR}"/python-config-${PYVER}-r1 python-config-${PYVER}
70
71 # Use correct libdir in python-config
72 dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config-${PYVER}
73
74 if use build ; then
75 - rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
76 + rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
77 else
78 - use elibc_uclibc && rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test}
79 - use berkdb || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/bsddb
80 - use tk || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/lib-tk
81 + use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test}
82 + use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/bsddb
83 + use tk || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/lib-tk
84 fi
85
86 # Fix slotted collisions
87 - mv ${D}/usr/bin/pydoc ${D}/usr/bin/pydoc${PYVER}
88 - mv ${D}/usr/bin/idle ${D}/usr/bin/idle${PYVER}
89 - mv ${D}/usr/share/man/man1/python.1 \
90 - ${D}/usr/share/man/man1/python${PYVER}.1
91 - rm -f ${D}/usr/bin/smtpd.py
92 + mv "${D}"/usr/bin/pydoc "${D}"/usr/bin/pydoc${PYVER}
93 + mv "${D}"/usr/bin/idle "${D}"/usr/bin/idle${PYVER}
94 + mv "${D}"/usr/share/man/man1/python.1 \
95 + "${D}"/usr/share/man/man1/python${PYVER}.1
96 + rm -f "${D}"/usr/bin/smtpd.py
97
98 prep_ml_includes usr/include/python${PYVER}
99
100 @@ -203,7 +203,7 @@
101 # seems like the build do not install Makefile.pre.in anymore
102 # it probably shouldn't - use DistUtils, people!
103 insinto /usr/$(get_libdir)/python${PYVER}/config
104 - doins ${S}/Makefile.pre.in
105 + doins "${S}"/Makefile.pre.in
106
107 # While we're working on the config stuff... Let's fix the OPT var
108 # so that it doesn't have any opts listed in it. Prevents the problem
109 @@ -212,8 +212,8 @@
110 /usr/$(get_libdir)/python${PYVER}/config/Makefile
111
112 if use examples ; then
113 - mkdir -p ${D}/usr/share/doc/${P}/examples
114 - cp -r ${S}/Tools ${D}/usr/share/doc/${P}/examples
115 + mkdir -p "${D}"/usr/share/doc/${P}/examples
116 + cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
117 fi
118 }
119
120 @@ -293,14 +293,14 @@
121 local skip_tests="cookielib distutils global hotshot mimetools minidom mmap posix sax strptime subprocess syntax tcl time urllib urllib2"
122
123 for test in ${skip_tests} ; do
124 - mv ${S}/Lib/test/test_${test}.py ${T}
125 + mv "${S}"/Lib/test/test_${test}.py "${T}"
126 done
127
128 # rerun failed tests in verbose mode (regrtest -w)
129 EXTRATESTOPTS="-w" make test || die "make test failed"
130
131 for test in ${skip_tests} ; do
132 - mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py
133 + mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py
134 done
135
136 elog "Portage skipped the following tests which aren't able to run from emerge:"
137
138
139
140 1.288 dev-lang/python/ChangeLog
141
142 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.288&view=markup
143 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.288&content-type=text/plain
144 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?r1=1.287&r2=1.288
145
146 Index: ChangeLog
147 ===================================================================
148 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v
149 retrieving revision 1.287
150 retrieving revision 1.288
151 diff -u -r1.287 -r1.288
152 --- ChangeLog 25 Oct 2007 19:22:48 -0000 1.287
153 +++ ChangeLog 25 Oct 2007 23:53:30 -0000 1.288
154 @@ -1,6 +1,9 @@
155 # ChangeLog for dev-lang/python
156 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
157 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.287 2007/10/25 19:22:48 jer Exp $
158 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.288 2007/10/25 23:53:30 jer Exp $
159 +
160 + 25 Oct 2007; Jeroen Roovers <jer@g.o> python-2.4.4-r6.ebuild:
161 + Stable for HPPA (bug #192876). Fixed quoting issues.
162
163 25 Oct 2007; Jeroen Roovers <jer@g.o> python-2.3.6-r3.ebuild:
164 Stable for HPPA (bug #192876).
165
166
167
168 --
169 gentoo-commits@g.o mailing list