Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/, scripts/
Date: Sat, 02 Jan 2021 12:47:40
Message-Id: 1609591616.c97a84bfbedcd46c12c4f0e12caa17545d21f069.grobian@gentoo
1 commit: c97a84bfbedcd46c12c4f0e12caa17545d21f069
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 2 12:46:56 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 2 12:46:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c97a84bf
7
8 scripts/startprefix: comes from app-portage/prefix-toolkit nowadays
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 dev-lang/python/python-3.8.7.ebuild | 3 ---
13 scripts/startprefix.in | 52 -------------------------------------
14 2 files changed, 55 deletions(-)
15
16 diff --git a/dev-lang/python/python-3.8.7.ebuild b/dev-lang/python/python-3.8.7.ebuild
17 index 9f21f8ecb3..bd0e52b48c 100644
18 --- a/dev-lang/python/python-3.8.7.ebuild
19 +++ b/dev-lang/python/python-3.8.7.ebuild
20 @@ -114,9 +114,6 @@ src_prepare() {
21 sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \
22 Lib/urllib/request.py || die
23
24 - # disable SDK usage on Darwin/macOS
25 - sed -i -e '/^MACOS = /s/darwin/no-darwin/' setup.py || die
26 -
27 eautoreconf
28 }
29
30
31 diff --git a/scripts/startprefix.in b/scripts/startprefix.in
32 deleted file mode 100644
33 index 861f02dd04..0000000000
34 --- a/scripts/startprefix.in
35 +++ /dev/null
36 @@ -1,52 +0,0 @@
37 -#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
38 -# Copyright 2006-2014 Gentoo Foundation; Distributed under the GPL v2
39 -# $Id: startprefix.in 61219 2012-09-04 19:05:55Z grobian $
40 -
41 -# Fabian Groffen <grobian@g.o> -- 2007-03-10
42 -# Enters the prefix environment by starting a login shell from the
43 -# prefix. The SHELL environment variable is elevated in order to make
44 -# applications that start login shells to work, such as `screen`.
45 -
46 -# if you come from a substantially polluted environment (another
47 -# Prefix), a cleanup as follows resolves most oddities I've ever seen:
48 -# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
49 -# hence this script starts the Prefix shell like this
50 -
51 -
52 -# What is our prefix?
53 -EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
54 -
55 -if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
56 - echo "You appear to be in prefix already (SHELL=$SHELL)" > /dev/stderr
57 - exit -1
58 -fi
59 -
60 -# not all systems have the same location for shells, however what it
61 -# boils down to, is that we need to know what the shell is, and then we
62 -# can find it in the bin dir of our prefix
63 -SHELL=${SHELL##*/}
64 -# set the prefix shell in the environment
65 -export SHELL=${EPREFIX}/bin/${SHELL}
66 -# check if the shell exists
67 -if [[ ! -x $SHELL ]] ; then
68 - echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
69 - echo "because you didn't emerge the shell ${SHELL##*/}" > /dev/stderr
70 - exit -1
71 -fi
72 -
73 -# give a small notice
74 -echo "Entering Gentoo Prefix ${EPREFIX}"
75 -# start the login shell, clean the entire environment but what's needed
76 -RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
77 -# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
78 -[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
79 -# ssh-agent is handy to keep, of if set, inherit it
80 -[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
81 -# if we're on some X terminal, makes sense to inherit that too
82 -[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
83 -# do it!
84 -env -i $RETAIN $SHELL -l
85 -# and leave a message when we exit... the shell might return non-zero
86 -# without having real problems, so don't send alarming messages about
87 -# that
88 -echo "Leaving Gentoo Prefix with exit status $?"