| 1 |
commit: 30ef8835181b1a392c3a70d396f60fd89f700f84 |
| 2 |
Author: layman <layman <AT> localhost> |
| 3 |
AuthorDate: Tue Jan 21 13:27:01 2014 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 21 17:56:04 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=30ef8835 |
| 7 |
|
| 8 |
dev-lang/python: bump to 3.3.3 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
RepoMan-Options: --force |
| 12 |
|
| 13 |
--- |
| 14 |
...on-3.3.2-r99.ebuild => python-3.3.3-r99.ebuild} | 29 ++++++++++------------ |
| 15 |
1 file changed, 13 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/python/python-3.3.2-r99.ebuild b/dev-lang/python/python-3.3.3-r99.ebuild |
| 18 |
similarity index 90% |
| 19 |
rename from dev-lang/python/python-3.3.2-r99.ebuild |
| 20 |
rename to dev-lang/python/python-3.3.3-r99.ebuild |
| 21 |
index b76b949..e501b72 100644 |
| 22 |
--- a/dev-lang/python/python-3.3.2-r99.ebuild |
| 23 |
+++ b/dev-lang/python/python-3.3.3-r99.ebuild |
| 24 |
@@ -1,24 +1,25 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.2-r2.ebuild,v 1.18 2014/01/05 17:48:59 ago Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.3.ebuild,v 1.12 2014/01/19 12:34:50 maekke Exp $ |
| 29 |
|
| 30 |
-EAPI="3" |
| 31 |
+EAPI="4" |
| 32 |
WANT_AUTOMAKE="none" |
| 33 |
WANT_LIBTOOL="none" |
| 34 |
|
| 35 |
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing |
| 36 |
|
| 37 |
MY_P="Python-${PV}" |
| 38 |
-PATCHSET_REVISION="2" |
| 39 |
+PATCHSET_REVISION="0" |
| 40 |
|
| 41 |
DESCRIPTION="An interpreted, interactive, object-oriented programming language" |
| 42 |
HOMEPAGE="http://www.python.org/" |
| 43 |
SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz |
| 44 |
+ http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz |
| 45 |
mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz" |
| 46 |
|
| 47 |
LICENSE="PSF-2" |
| 48 |
SLOT="3.3" |
| 49 |
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 50 |
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 51 |
IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml" |
| 52 |
|
| 53 |
# Do not add a dependency on dev-lang/python to this ebuild. |
| 54 |
@@ -68,12 +69,8 @@ src_prepare() { |
| 55 |
local EPATCH_EXCLUDE="05_all_regenerate_platform-specific_modules.patch" |
| 56 |
fi |
| 57 |
|
| 58 |
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}" |
| 59 |
+ EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" |
| 60 |
|
| 61 |
- epatch "${FILESDIR}/python-3.3-CVE-2013-2099.patch" |
| 62 |
- epatch "${FILESDIR}/CVE-2013-4238_py33.patch" |
| 63 |
- |
| 64 |
- # Fix for class with posix_close on musl |
| 65 |
epatch "${FILESDIR}/python-3.3-fix-posix-close-clash.patch" |
| 66 |
|
| 67 |
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ |
| 68 |
@@ -184,7 +181,7 @@ src_compile() { |
| 69 |
touch Include/graminit.h Python/graminit.c || die |
| 70 |
|
| 71 |
cd "${BUILD_DIR}" || die |
| 72 |
- emake CPPFLAGS="" CFLAGS="" LDFLAGS="" || die "emake failed" |
| 73 |
+ emake CPPFLAGS="" CFLAGS="" LDFLAGS="" |
| 74 |
|
| 75 |
# Work around bug 329499. See also bug 413751 and 457194. |
| 76 |
if has_version dev-libs/libffi[pax_kernel]; then |
| 77 |
@@ -236,7 +233,7 @@ src_install() { |
| 78 |
|
| 79 |
cd "${BUILD_DIR}" || die |
| 80 |
|
| 81 |
- emake DESTDIR="${D}" altinstall || die "emake altinstall failed" |
| 82 |
+ emake DESTDIR="${D}" altinstall |
| 83 |
|
| 84 |
sed \ |
| 85 |
-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ |
| 86 |
@@ -244,7 +241,7 @@ src_install() { |
| 87 |
-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed" |
| 88 |
|
| 89 |
# Backwards compat with Gentoo divergence. |
| 90 |
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die |
| 91 |
+ dosym python${SLOT}-config /usr/bin/python-config-${SLOT} |
| 92 |
|
| 93 |
# Fix collisions between different slots of Python. |
| 94 |
rm -f "${ED}usr/$(get_libdir)/libpython3.so" |
| 95 |
@@ -260,20 +257,20 @@ src_install() { |
| 96 |
use threads || rm -fr "${libdir}/multiprocessing" |
| 97 |
use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe |
| 98 |
|
| 99 |
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" |
| 100 |
+ dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} |
| 101 |
|
| 102 |
if use examples; then |
| 103 |
insinto /usr/share/doc/${PF}/examples |
| 104 |
find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr |
| 105 |
- doins -r "${S}"/Tools || die "doins failed" |
| 106 |
+ doins -r "${S}"/Tools |
| 107 |
fi |
| 108 |
insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 |
| 109 |
local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ |
| 110 |
emake --no-print-directory -s -f - 2>/dev/null) |
| 111 |
newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py |
| 112 |
|
| 113 |
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" |
| 114 |
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" |
| 115 |
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} |
| 116 |
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} |
| 117 |
sed \ |
| 118 |
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ |
| 119 |
-e "s:@PYDOC@:pydoc${SLOT}:" \ |
Archives