| 1 |
floppym 13/05/01 02:16:37 |
| 2 |
|
| 3 |
Modified: python-2.7.4.ebuild python-3.2.4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Use Arfrever's patches. Remove some unnecessary || die. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 dev-lang/python/python-2.7.4.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.4.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.4.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.4.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: python-2.7.4.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.4.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- python-2.7.4.ebuild 27 Apr 2013 16:53:55 -0000 1.5 |
| 23 |
+++ python-2.7.4.ebuild 1 May 2013 02:16:37 -0000 1.6 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.4.ebuild,v 1.5 2013/04/27 16:53:55 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.4.ebuild,v 1.6 2013/05/01 02:16:37 floppym Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
WANT_AUTOMAKE="none" |
| 32 |
@@ -9,12 +9,12 @@ |
| 33 |
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing |
| 34 |
|
| 35 |
MY_P="Python-${PV}" |
| 36 |
-PATCHSET_REVISION="1" |
| 37 |
+PATCHSET_REVISION="2" |
| 38 |
|
| 39 |
DESCRIPTION="An interpreted, interactive, object-oriented programming language" |
| 40 |
HOMEPAGE="http://www.python.org/" |
| 41 |
SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz |
| 42 |
- mirror://bitbucket/gentoo/cpython/downloads/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz" |
| 43 |
+ mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz" |
| 44 |
|
| 45 |
LICENSE="PSF-2" |
| 46 |
SLOT="2.7" |
| 47 |
@@ -240,7 +240,7 @@ |
| 48 |
) \ |
| 49 |
PTHON_DISABLE_SSL="1" \ |
| 50 |
SYSROOT= \ |
| 51 |
- emake || die "cross-make failed" |
| 52 |
+ emake |
| 53 |
# See comment in src_configure about these. |
| 54 |
ln python ../${CHOST}/hostpython || die |
| 55 |
ln Parser/pgen ../${CHOST}/Parser/hostpgen || die |
| 56 |
@@ -296,12 +296,12 @@ |
| 57 |
local libdir=${ED}/usr/$(get_libdir)/python${SLOT} |
| 58 |
|
| 59 |
cd "${WORKDIR}"/${CHOST} |
| 60 |
- emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed" |
| 61 |
+ emake DESTDIR="${D}" altinstall maninstall |
| 62 |
|
| 63 |
sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed" |
| 64 |
|
| 65 |
# Backwards compat with Gentoo divergence. |
| 66 |
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die |
| 67 |
+ dosym python${SLOT}-config /usr/bin/python-config-${SLOT} |
| 68 |
|
| 69 |
# Fix collisions between different slots of Python. |
| 70 |
mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}" |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.2 dev-lang/python/python-3.2.4.ebuild |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.4.ebuild?rev=1.2&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.4.ebuild?rev=1.2&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.4.ebuild?r1=1.1&r2=1.2 |
| 79 |
|
| 80 |
Index: python-3.2.4.ebuild |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.4.ebuild,v |
| 83 |
retrieving revision 1.1 |
| 84 |
retrieving revision 1.2 |
| 85 |
diff -u -r1.1 -r1.2 |
| 86 |
--- python-3.2.4.ebuild 27 Apr 2013 19:54:48 -0000 1.1 |
| 87 |
+++ python-3.2.4.ebuild 1 May 2013 02:16:37 -0000 1.2 |
| 88 |
@@ -1,6 +1,6 @@ |
| 89 |
# Copyright 1999-2013 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.4.ebuild,v 1.1 2013/04/27 19:54:48 floppym Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.4.ebuild,v 1.2 2013/05/01 02:16:37 floppym Exp $ |
| 93 |
|
| 94 |
EAPI="4" |
| 95 |
WANT_AUTOMAKE="none" |
| 96 |
@@ -9,12 +9,12 @@ |
| 97 |
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing |
| 98 |
|
| 99 |
MY_P="Python-${PV}" |
| 100 |
-PATCHSET_REVISION="0" |
| 101 |
+PATCHSET_REVISION="1" |
| 102 |
|
| 103 |
DESCRIPTION="An interpreted, interactive, object-oriented programming language" |
| 104 |
HOMEPAGE="http://www.python.org/" |
| 105 |
SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz |
| 106 |
- mirror://bitbucket/gentoo/cpython/downloads/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz" |
| 107 |
+ mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz" |
| 108 |
|
| 109 |
LICENSE="PSF-2" |
| 110 |
SLOT="3.2" |
| 111 |
@@ -65,9 +65,9 @@ |
| 112 |
|
| 113 |
src_prepare() { |
| 114 |
# Ensure that internal copies of expat, libffi and zlib are not used. |
| 115 |
- rm -fr Modules/expat |
| 116 |
- rm -fr Modules/_ctypes/libffi* |
| 117 |
- rm -fr Modules/zlib |
| 118 |
+ rm -r Modules/expat |
| 119 |
+ rm -r Modules/_ctypes/libffi* |
| 120 |
+ rm -r Modules/zlib |
| 121 |
|
| 122 |
local excluded_patches |
| 123 |
if ! tc-is-cross-compiler; then |
| 124 |
@@ -216,7 +216,7 @@ |
| 125 |
) \ |
| 126 |
PTHON_DISABLE_SSL="1" \ |
| 127 |
SYSROOT= \ |
| 128 |
- emake || die "cross-make failed" |
| 129 |
+ emake |
| 130 |
# See comment in src_configure about these. |
| 131 |
ln python ../${CHOST}/hostpython || die |
| 132 |
ln Parser/pgen ../${CHOST}/Parser/hostpgen || die |
| 133 |
@@ -224,7 +224,7 @@ |
| 134 |
fi |
| 135 |
|
| 136 |
cd "${WORKDIR}"/${CHOST} |
| 137 |
- emake CPPFLAGS="" CFLAGS="" LDFLAGS="" || die "emake failed" |
| 138 |
+ emake CPPFLAGS="" CFLAGS="" LDFLAGS="" |
| 139 |
|
| 140 |
# Work around bug 329499. See also bug 413751. |
| 141 |
pax-mark m python |
| 142 |
@@ -272,7 +272,7 @@ |
| 143 |
local libdir=${ED}/usr/$(get_libdir)/python${SLOT} |
| 144 |
|
| 145 |
cd "${WORKDIR}"/${CHOST} |
| 146 |
- emake DESTDIR="${D}" altinstall || die "emake altinstall failed" |
| 147 |
+ emake DESTDIR="${D}" altinstall |
| 148 |
|
| 149 |
sed \ |
| 150 |
-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ |
| 151 |
@@ -280,10 +280,10 @@ |
| 152 |
-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed" |
| 153 |
|
| 154 |
# Backwards compat with Gentoo divergence. |
| 155 |
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die |
| 156 |
+ dosym python${SLOT}-config /usr/bin/python-config-${SLOT} |
| 157 |
|
| 158 |
# Fix collisions between different slots of Python. |
| 159 |
- rm -f "${ED}usr/$(get_libdir)/libpython3.so" |
| 160 |
+ rm "${ED}usr/$(get_libdir)/libpython3.so" || die |
| 161 |
|
| 162 |
if use build; then |
| 163 |
rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter} |
| 164 |
@@ -296,20 +296,20 @@ |
| 165 |
use threads || rm -fr "${libdir}/multiprocessing" |
| 166 |
use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe |
| 167 |
|
| 168 |
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" |
| 169 |
+ dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} |
| 170 |
|
| 171 |
if use examples; then |
| 172 |
insinto /usr/share/doc/${PF}/examples |
| 173 |
find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr |
| 174 |
- doins -r "${S}"/Tools || die "doins failed" |
| 175 |
+ doins -r "${S}"/Tools |
| 176 |
fi |
| 177 |
insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 |
| 178 |
local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ |
| 179 |
emake --no-print-directory -s -f - 2>/dev/null) |
| 180 |
newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py |
| 181 |
|
| 182 |
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" |
| 183 |
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" |
| 184 |
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} |
| 185 |
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} |
| 186 |
sed \ |
| 187 |
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ |
| 188 |
-e "s:@PYDOC@:pydoc${SLOT}:" \ |
| 189 |
|
| 190 |
|
| 191 |
|
| 192 |
1.653 dev-lang/python/ChangeLog |
| 193 |
|
| 194 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.653&view=markup |
| 195 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.653&content-type=text/plain |
| 196 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?r1=1.652&r2=1.653 |
| 197 |
|
| 198 |
Index: ChangeLog |
| 199 |
=================================================================== |
| 200 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v |
| 201 |
retrieving revision 1.652 |
| 202 |
retrieving revision 1.653 |
| 203 |
diff -u -r1.652 -r1.653 |
| 204 |
--- ChangeLog 29 Apr 2013 04:40:26 -0000 1.652 |
| 205 |
+++ ChangeLog 1 May 2013 02:16:37 -0000 1.653 |
| 206 |
@@ -1,6 +1,10 @@ |
| 207 |
# ChangeLog for dev-lang/python |
| 208 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 209 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.652 2013/04/29 04:40:26 chutzpah Exp $ |
| 210 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.653 2013/05/01 02:16:37 floppym Exp $ |
| 211 |
+ |
| 212 |
+ 01 May 2013; Mike Gilbert <floppym@g.o> python-2.7.4.ebuild, |
| 213 |
+ python-3.2.4.ebuild: |
| 214 |
+ Use Arfrever's patches. Remove some unnecessary || die. |
| 215 |
|
| 216 |
28 Apr 2013; Patrick McLean <chutzpah@g.o> python-3.3.1.ebuild: |
| 217 |
Re-add patch from Arfrever to fix compilation on non-UTF-8 platforms, drop |
Archives