commit: 9f0c5aaae1d7e26f131a9ae93dd94d3214e8549c
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 11:38:28 2019 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 11:38:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9f0c5aaa
dev-lang/python-3.6.5-r1: apply cygwin patches
Package-Manager: Portage-2.3.55.1-prefix, Repoman-2.3.12
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>
dev-lang/python/Manifest | 1 +
dev-lang/python/python-3.6.5-r1.ebuild | 25 ++++++++++++++++++++++---
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 3ed1a4ef38..22f367d1dd 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -5,6 +5,7 @@ DIST Python-3.4.8.tar.xz 14576444 BLAKE2B
262b82fbc0e4852216d2edf05f9e9194bc93be
DIST Python-3.5.4.tar.xz 15332320 BLAKE2B
1fc3ba4eb1ed949062961c13fd1f9851c7f9cbeb4916c06a0389349ee2d4872b2b1c2d30138822e6329b6a715f35a66df704b7a04aa4adeb95b685b8d6e45d61
SHA512
dbbe2740ee1cce5404b7b6436a9b3887e15f415a1006efa22014ec7e5b1e48c43eed0ff98f6f5b365c527b8d2525be4ce72bbe404ce71c0835529fcd6f0267ff
DIST Python-3.5.5.tar.xz 15351440 BLAKE2B
217cb7f51e04d57983ce053ff4276d056e17c8223b6f3d87b69f556453fe2ae3d4dc2c1a6b9c2c6aad033cea9b40cd32264d8208cc81a1ec34ff252379bf95b8
SHA512
c9056baee6a2d1fe7f14b1f310db95b78e8972766d086f8ae10954f38f8182956171580bde01ddadebe897f2545a6fbe47669ca3e4887026ac1fae5ee9197f22
DIST Python-3.6.5.tar.xz 17049912 BLAKE2B
f393e9563a18a46c457afcd2e174d9eacda20fe2b0ae5461e11c582fa4d27b85c01bbe7b602f45511b6b44f635c6330205b12fb3e8325ffd07e87b78a8258889
SHA512
6b26fcd296b9bd8e67861eff10d14db7507711ddba947288d16d6def53135c39326b7f969c04bb2b2993f924d9e7ad3f5c5282a3915760bc0885cf0a8ea5eb51
+DIST f11d606e98b00f5b143cba92bfee8b7f5ba779b0.zip 15834 BLAKE2B
4d9febb5605fbdefde672efdd5680792c627f4d04ace02f3cec76d152569af94f6daded47c8406405694e8cff1ebab396196f1eee9f8d6a9849ce0f899d16628
SHA512
ab009e9c1ad4c44d00d87cf3216ae4bf44008a45be612a0887c82426fe9b3d9bce7769bcba2a3e7e693606470342d87318ee8c054bfbf8ad81a429b591f775f1
DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B
0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad
SHA512
6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
DIST python-gentoo-patches-3.4.6-0.tar.xz 11728 BLAKE2B
2a636f5500f4c7d354f421133f086cba9a25c30d5feaaa2dc25c9c588125d7c9097baecaa11f31548fa598b5dc137ca310ad86222510c0a955fa632a6d0a4b06
SHA512
41c22dc8f1db8800fc0b97eed2b27bf1873e5de1369bd4aecf7a7a91e609a78e45a4b56fc89d575317f33a7704c0c1cad1494e8a993415a198f256e8338f49ab
DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B
4a7d71feff18c7c8c109bed10748348484d314183c3de3ec950d5ca5ce7048bb322c470f3f5bff2d63eb7f2ed99c0fe75c621df050273d9d118681b28926061d
SHA512
d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec
diff --git a/dev-lang/python/python-3.6.5-r1.ebuild
b/dev-lang/python/python-3.6.5-r1.ebuild
index bc82204e5a..6ae8b4f56c 100644
--- a/dev-lang/python/python-3.6.5-r1.ebuild
+++ b/dev-lang/python/python-3.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -9,6 +9,7 @@ inherit autotools flag-o-matic pax-utils python-utils-r1
toolchain-funcs epatch
MY_P="Python-${PV}"
PATCHSET_VERSION="3.6.4"
PREFIX_PATCHREV="3.6.5-gentoo-patches-r0"
+CYGWINPORTS_GITREV="f11d606e98b00f5b143cba92bfee8b7f5ba779b0"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="https://www.python.org/";
@@ -16,9 +17,12 @@
SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
https://dev.gentoo.org/~grobian/distfiles/python-prefix-${PREFIX_PATCHREV}.tar.xz";
+[[ -n ${CYGWINPORTS_GITREV} ]] &&
+SRC_URI+=" elibc_Cygwin? (
https://github.com/cygwinports/python3/archive/${CYGWINPORTS_GITREV}.zip )"
+
LICENSE="PSF-2"
SLOT="3.6/3.6m"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="aqua bluetooth build examples gdbm hardened ipv6 libressl +ncurses
+readline sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
@@ -57,6 +61,9 @@ DEPEND="${RDEPEND}
RDEPEND+=" !build? ( app-misc/mime-types )"
PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+[[ -n ${CYGWINPORTS_GITREV} ]] &&
+DEPEND+=" elibc_Cygwin? ( app-arch/unzip )"
+
S="${WORKDIR}/${MY_P}"
PYVER=${SLOT%/*}
@@ -80,6 +87,18 @@ src_prepare() {
EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
epatch "${WORKDIR}"/python-prefix-${PREFIX_PATCHREV}
+ if [[ -n ${CYGWINPORTS_GITREV} ]] && use elibc_Cygwin; then
+ local p d="${WORKDIR}/python3-${CYGWINPORTS_GITREV}"
+ for p in $(
+ sed -ne '/PATCH_URI="/,/"/{s/.*="//;s/".*$//;p}' \
+ < "${d}/python3.cygport"
+ ); do
+ # dropped by 01_all_prefix-no-patch-invention.patch
+ [[ ${p} == *-tkinter-* ]] && continue
+ epatch "${d}/${p}"
+ done
+ fi
+
# we provide a fully working readline also on Darwin, so don't force
# usage of less functional libedit
sed -i -e 's/__APPLE__/__NO_MUCKING_AROUND__/g' Modules/readline.c ||
die
@@ -176,7 +195,7 @@ src_configure() {
# pymalloc #452720
local myeconfargs=(
$(use aqua && echo --config-cache) \
- --with-fpectl
+ $(use_with !elibc_Cygwin fpectl)
--enable-shared
$(use_enable ipv6)
$(use_with threads)
