[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/, scripts/

[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/, scripts/

[Fabian Groffen]

commit:     4a166370fa9dc6c75c3ea9ebafdabd8877ad46e5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 20:24:51 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 20:46:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4a166370

scripts/bootstrap-prefix: bump bootstrap python for darwin9

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-lang/python/python-3.8.5.ebuild |  1 +
 scripts/bootstrap-prefix.sh         | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/dev-lang/python/python-3.8.5.ebuild b/dev-lang/python/python-3.8.5.ebuild
index 32c823df81..9f83f7cd5c 100644
--- a/dev-lang/python/python-3.8.5.ebuild
+++ b/dev-lang/python/python-3.8.5.ebuild
@@ -107,6 +107,7 @@ src_prepare() {
 		sed -i \
 			-e 's/KQUEUE/KQUEUE_DISABLED/' \
 			configure.ac configure || die
+		eapply "${FILESDIR}"/${PN}-3.8.5-darwin9.patch
 	fi
 
 	# side-effect of disabling scproxy (see below), make sure we don't

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 20748bde66..bd518bfcbc 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -330,6 +330,11 @@ configure_toolchain() {
 					compiler_stage1=${compiler_stage1/" dev-libs/mpfr "/" <dev-libs/mpfr-4 "}
 					;;
 			esac
+			local nmout=$(nm -B 2>&1)
+			case "${nmout}" in
+				*/dev/null*)  :                            ;;  # apparently GNU
+				*)            export NM="$(type -P nm) -p" ;;  # Solaris nm
+			esac
 			;;
 		*-*-aix*)
 			linker=sys-devel/native-cctools
@@ -970,10 +975,8 @@ bootstrap_gnu() {
 
 PYTHONMAJMIN=3.8   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-	PV=3.8.5
+	PV=3.8.6
 	A=Python-${PV}.tar.xz
-	patch=true
-
 	einfo "Bootstrapping ${A%-*}"
 
 	# don't really want to put this on the mirror, since they are
@@ -986,9 +989,9 @@ bootstrap_python() {
 	mkdir -p "${S}"
 	cd "${S}"
 	case ${A} in
-	*bz2) bzip2 -dc "${DISTDIR}"/${A} | tar -xf - ;;
-	*xz) xz -dc "${DISTDIR}"/${A} | tar -xf - ;;
-	*) einfo "Don't know to unpack ${A}" ;;
+		*bz2) bzip2 -dc "${DISTDIR}"/${A} | tar -xf - ;;
+		*xz)  xz -dc "${DISTDIR}"/${A} | tar -xf -    ;;
+		*)    einfo "Don't know to unpack ${A}"       ;;
 	esac
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/Python-${PV}
@@ -996,13 +999,6 @@ bootstrap_python() {
 	rm -rf Modules/_ctypes/libffi* || return 1
 	rm -rf Modules/zlib || return 1
 
-	if ${patch}; then
-		# This patch is critical and needs to be applied even
-		# when using the otherwise unpatched sources.
-		efetch "http://dev.gentoo.org/~grobian/distfiles/python-3.6-02_all_disable_modules_and_ssl.patch"
-		patch -p0 < "${DISTDIR}"/python-3.6-02_all_disable_modules_and_ssl.patch
-	fi
-
 	case ${CHOST} in
 	(*-*-cygwin*)
 		# apply patches from cygwinports much like the ebuild does
@@ -1044,6 +1040,9 @@ bootstrap_python() {
 		sed -i \
 			-e 's/KQUEUE/KQUEUE_DISABLED/' \
 			configure
+		# fixup thread id detection
+		efetch "http://dev.gentoo.org/~grobian/distfiles/python-3.8.6-darwin9.patch"
+		patch -p1 < "${DISTDIR}"/python-3.8.6-darwin9.patch
 		;;
 	esac
 
@@ -1109,7 +1108,6 @@ bootstrap_python() {
 	export HOME="${S}"
 
 	export PYTHON_DISABLE_MODULES="_bsddb bsddb bsddb185 bz2 crypt _ctypes_test _curses _curses_panel dbm _elementtree gdbm _locale nis pyexpat readline _sqlite3 _tkinter"
-	export PYTHON_DISABLE_SSL=1
 	export OPT="${CFLAGS}"
 
 	einfo "Compiling ${A%-*}"

[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/, scripts/

[Fabian Groffen]

commit:     c97a84bfbedcd46c12c4f0e12caa17545d21f069
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 12:46:56 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 12:46:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c97a84bf

scripts/startprefix: comes from app-portage/prefix-toolkit nowadays

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-lang/python/python-3.8.7.ebuild |  3 ---
 scripts/startprefix.in              | 52 -------------------------------------
 2 files changed, 55 deletions(-)

diff --git a/dev-lang/python/python-3.8.7.ebuild b/dev-lang/python/python-3.8.7.ebuild
index 9f21f8ecb3..bd0e52b48c 100644
--- a/dev-lang/python/python-3.8.7.ebuild
+++ b/dev-lang/python/python-3.8.7.ebuild
@@ -114,9 +114,6 @@ src_prepare() {
 	sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \
 		Lib/urllib/request.py || die
 
-	# disable SDK usage on Darwin/macOS
-	sed -i -e '/^MACOS = /s/darwin/no-darwin/' setup.py || die
-
 	eautoreconf
 }
 

diff --git a/scripts/startprefix.in b/scripts/startprefix.in
deleted file mode 100644
index 861f02dd04..0000000000
--- a/scripts/startprefix.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-# Copyright 2006-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Id: startprefix.in 61219 2012-09-04 19:05:55Z grobian $
-
-# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
-# Enters the prefix environment by starting a login shell from the
-# prefix.  The SHELL environment variable is elevated in order to make
-# applications that start login shells to work, such as `screen`.
-
-# if you come from a substantially polluted environment (another
-# Prefix), a cleanup as follows resolves most oddities I've ever seen:
-# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
-# hence this script starts the Prefix shell like this
-
-
-# What is our prefix?
-EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-
-if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
-	echo "You appear to be in prefix already (SHELL=$SHELL)" > /dev/stderr
-	exit -1
-fi
-
-# not all systems have the same location for shells, however what it
-# boils down to, is that we need to know what the shell is, and then we
-# can find it in the bin dir of our prefix
-SHELL=${SHELL##*/}
-# set the prefix shell in the environment
-export SHELL=${EPREFIX}/bin/${SHELL}
-# check if the shell exists
-if [[ ! -x $SHELL ]] ; then
-	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
-	echo "because you didn't emerge the shell ${SHELL##*/}" > /dev/stderr
-	exit -1
-fi
-
-# give a small notice
-echo "Entering Gentoo Prefix ${EPREFIX}"
-# start the login shell, clean the entire environment but what's needed
-RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
-# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
-[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
-# ssh-agent is handy to keep, of if set, inherit it
-[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
-# if we're on some X terminal, makes sense to inherit that too
-[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
-# do it!
-env -i $RETAIN $SHELL -l
-# and leave a message when we exit... the shell might return non-zero
-# without having real problems, so don't send alarming messages about
-# that
-echo "Leaving Gentoo Prefix with exit status $?"