From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51D0D138334 for ; Thu, 6 Dec 2018 13:49:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47279E088B; Thu, 6 Dec 2018 13:49:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A9C6E088B for ; Thu, 6 Dec 2018 13:49:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E942C335C07 for ; Thu, 6 Dec 2018 13:49:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 129014CB for ; Thu, 6 Dec 2018 13:49:33 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1544104163.f88f91600be7bd6772d19885d117b29096110001.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: sys-apps/portage/Manifest sys-apps/portage/files/portage-2.3.45-ebuildshell.patch sys-apps/portage/portage-2.3.45.ebuild X-VCS-Directories: sys-apps/portage/files/ sys-apps/portage/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: f88f91600be7bd6772d19885d117b29096110001 X-VCS-Branch: master Date: Thu, 6 Dec 2018 13:49:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b4773120-3b69-4f50-932a-fa5648e4fd9b X-Archives-Hash: 01ea9cb2942b35c7af2c705bc9a1a65d commit: f88f91600be7bd6772d19885d117b29096110001 Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 6 13:49:23 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 6 13:49:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f88f9160 sys-apps/portage: small version bump to allow newer repoman Package-Manager: Portage-2.3.45-prefix, Repoman-2.3.12 Signed-off-by: Fabian Groffen gentoo.org> sys-apps/portage/Manifest | 1 + .../portage/files/portage-2.3.45-ebuildshell.patch | 354 +++++++++++++++++++++ sys-apps/portage/portage-2.3.45.ebuild | 274 ++++++++++++++++ 3 files changed, 629 insertions(+) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 61a3d79f0d..f2ff336e7c 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -2,3 +2,4 @@ DIST prefix-portage-2.2.28.tar.bz2 1187416 BLAKE2B 1ec27def0b427f60b38dc60178461 DIST prefix-portage-2.3.13.tar.bz2 1205509 BLAKE2B 851492dc1d3bd55721dfc1662af98a193c8071d87b6b64a09a736864031fa6482fe59a1662789ce8320b156241470688a9a815d79f7367b79500e590a41604f5 SHA512 4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c DIST prefix-portage-2.3.18.tar.bz2 1230290 BLAKE2B 9a7a290493293f166520931aab32a720519ebec15f4c74fe0b0dcd7cc930d591c24e3c87cae4722da119d57826b020b37092ec492bb4e12b774e51334eccf156 SHA512 508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7 DIST prefix-portage-2.3.40.3.tar.bz2 1253190 BLAKE2B 53e60b561e1f9b2a5367a1a23a74ba315358b8e7eb05eead2a46078198b92786745dbd07ab1bf69587866f462955a5dd6c0bc3eb51dbe507bfbff31d899c5f45 SHA512 67c2d7554c9236748b25a8b9f0f60736beda535298395ba2eb86dd5634b6520d645df193914f079d2c61cfa0d8f263f67c3476828319e2395dec2e45cf4b9b14 +DIST prefix-portage-2.3.45.tar.bz2 1255719 BLAKE2B 2a53b526418747edc02ab4cc8127425b92e8ae0f7fdc27af730f991f7cb6074aac51cdfd0ca75f7e6376c8059df1e02817963a0386cf1b1986eb798f21b8cf8c SHA512 dfea0774b5d801b3ca02fdd570c89c08b78f4e02e57c1b897a50af0056d4ed4522c6d236dcaf98ea3f1c446b0164abd1b45fd2cae12ed5ef6c34c83668894b5b diff --git a/sys-apps/portage/files/portage-2.3.45-ebuildshell.patch b/sys-apps/portage/files/portage-2.3.45-ebuildshell.patch new file mode 100644 index 0000000000..e495ee4c24 --- /dev/null +++ b/sys-apps/portage/files/portage-2.3.45-ebuildshell.patch @@ -0,0 +1,354 @@ +From 8c6b115fa0325b5bed2e1a9c4c8e8af45cdecc2e Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner +Date: Wed, 6 Nov 2013 12:40:05 +0100 +Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161. + +--- + bin/ebuild.sh | 146 ++++++++++++++++++++++++++++++++++- + bin/filter-bash-environment.py | 55 +++++++++---- + bin/save-ebuild-env.sh | 2 +- + man/make.conf.5 | 6 ++ + lib/_emerge/AbstractEbuildProcess.py | 1 + + lib/portage/const.py | 1 + + 6 files changed, 194 insertions(+), 17 deletions(-) + +diff --git a/bin/ebuild.sh b/bin/ebuild.sh +index f76a48d8e..683a4e9c1 100755 +--- a/bin/ebuild.sh ++++ b/bin/ebuild.sh +@@ -121,7 +121,7 @@ __qa_source() { + __qa_call() { + local shopts=$(shopt) OLDIFS="$IFS" + local retval +- "$@" ++ __call-ebuildshell "$@" + retval=$? + set +e + [[ $shopts != $(shopt) ]] && +@@ -547,6 +547,150 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then + unset BIN_PATH BIN BODY FUNC_SRC + fi + ++__call-ebuildshell() { ++ if ! has ebuildshell ${FEATURES}; then ++ "$@" ++ return $? ++ fi ++ local __ebuildshell_args=( "$@" ) ++ # These are the variables I have seen 'bash -i' maintaining the values for: ++ local __ebuildshell_bash_i_vars="__ebuildshell_.* ++ _ BASH_ARGC BASH_ARGV BASH_COMMAND BASH_LINENO BASH_SOURCE ++ BASH_VERSINFO BASH_SUBSHELL BASHOPTS BASHPID COMP_WORDBREAKS ++ DIRSTACK EUID FUNCNAME GROUPS HISTCMD HISTFILE LINENO PIPESTATUS ++ PPID PS1 PS2 PS3 PS4 PWD RANDOM SECONDS SHELLOPTS UID" ++ # Allow recursive ebuildshell, for use in multibuild.eclass and similar: ++ local __ebuildshell_pid=${BASHPID:-$(__bashpid)} ++ local __ebuildshell_tmpf="${T}/ebuildshell.${__ebuildshell_pid}" ++ rm -f "${__ebuildshell_tmpf}."{ebuild,return}-{env,rovars} ++ ( ++ cat <<-EOE ++ # local variables of functions using recursive ebuildshell are ++ # visible to the EXIT trap of that recursive ebuildshell. To ++ # keep them local, we have to filter them from that recursive ++ # ebuildshell's return-env. As 'declare -p' is unable to tell ++ # local-ity of variables, we abuse the trace attribute for local ++ # variables to filter them from the return-env. So we need the ++ # local alias active before declaring any functions. ++ # On a sidehand, this allows for copy&paste of function body ++ # lines including the local keyword. ++ alias local='declare -t' ++ shopt -s expand_aliases ++ EOE ++ ( ++ declare -p ++ declare -fp ++ shopt -p ++ [[ ${BASH_VERSINFO[0]} == 3 ]] && export ++ ) | ++ ( ++ # we need everything but the bash vars after 'env -i' ++ 2>"${__ebuildshell_tmpf}.ebuild-rovars" \ ++ "${PORTAGE_PYTHON:-/tools/haubi/gentoo/s01en24/usr/bin/python}" \ ++ "${PORTAGE_BIN_PATH}"/filter-bash-environment.py \ ++ --report-readonly-variables \ ++ --preserve-readonly-attribute \ ++ "${__ebuildshell_bash_i_vars}" \ ++ || die "filter-bash-environment.py failed" ++ ) ++ # 'declare -g' is available since bash-4.2, ++ # https://bugs.gentoo.org/show_bug.cgi?id=155161#c35 ++ if (( ${BASH_VERSINFO[0]} > 4 )) || ++ (( ${BASH_VERSINFO[0]} == 4 && ${BASH_VERSINFO[1]} >= 2 )) ++ then ++ __ebuildshell_bash42_true= ++ __ebuildshell_bash42_false='#bash-4.2#' ++ else ++ __ebuildshell_bash42_true='#bash-4.2#' ++ __ebuildshell_bash42_false= ++ fi ++ # The already readonly variables, without bash maintained ones: ++ __ebuildshell_ro_ebuild_vars=$(<"${__ebuildshell_tmpf}.ebuild-rovars") ++ cat <<-EOE ++ # properly quote the function arguments ++ $(declare -p __ebuildshell_args) ++ set -- "\${__ebuildshell_args[@]}" ++ unset __ebuildshell_args ++ # be informative about what to do ++ PS1="EBUILD ${PN} $1 \$ " ++ type $1 ++ ${__ebuildshell_bash42_false}echo 'warning: preserving variables across phases requires bash-4.2' ++ echo "WANTED: \$@" ++ echo "or use: \"\\\$@\"" ++ # use bash history, but not the 'user's real one ++ HISTFILE=~/.bash_history ++ # but do not use history-expansion with '!', ++ # for copy&paste of function body lines containing: ! ++ set +H ++ # this is a debugging shell already ++ shopt -u extdebug ++ trap - DEBUG ++ # at exit, dump the current environment ++ trap " ++ unalias local ++ unset -f __call-ebuildshell ++ rm -f '${__ebuildshell_tmpf}.return-'* ++ ( ++ ( ++ # declare -p does not tell the -g flag, ++ # so we add it by aliasing declare. ++ ${__ebuildshell_bash42_true}echo \"alias declare='declare -g'\" ++ declare -p ++ ${__ebuildshell_bash42_true}echo \"unalias declare\" ++ declare -fp ++ shopt -p | grep -v '\\(expand_aliases\\|extdebug\\)$' ++ $([[ ${BASH_VERSINFO[0]} == 3 ]] && echo export) ++ ) | ++ ( ++ # We may have more readonly variables now, yet we ++ # need to filter variables that were readonly before. ++ # And filter local variables by their trace attribute. ++ 2>'${__ebuildshell_tmpf}.return-rovars' \\ ++ '${PORTAGE_PYTHON:-/tools/haubi/gentoo/s01en24/usr/bin/python}' \\ ++ '${PORTAGE_BIN_PATH}'/filter-bash-environment.py \\ ++ --report-readonly-variables \\ ++ --preserve-readonly-attribute \\ ++ --filter-traced-variables \\ ++ '${__ebuildshell_bash_i_vars} \ ++ ${__ebuildshell_ro_ebuild_vars}' \\ ++ || die 'filter-bash-environment.py failed' ++ ) ++ ) > '${__ebuildshell_tmpf}.return-env' ++ " EXIT ++ # can do some cleanup right now ++ rm -f '${__ebuildshell_tmpf}.ebuild-'* ++ EOE ++ ) > "${__ebuildshell_tmpf}.ebuild-env" ++ ++ # pre-fill the history with "$@" ++ echo '"$@"' >> ~/.bash_history ++ chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} ~/.bash_history &>/dev/null ++ ++ env -i HOME=~ ${BASH} --rcfile "${__ebuildshell_tmpf}.ebuild-env" -i ++ ++ # The environment- and exit-status handling after leaving the ebuildshell ++ # prompt is expected to be identical as without the ebuildshell prompt. ++ local __ebuildshell_status=$? ++ ++ # We might be in a recursive ebuildshell, but do not want ++ # any aliases being active while sourcing the return-env. ++ local __ebuildshell_orig_aliases=$(alias) ++ unalias -a ++ source "${__ebuildshell_tmpf}.return-env" ++ unalias -a ++ eval "${__ebuildshell_orig_aliases}" ++ ++ # Portage has a whitelist of readonly variables: If an ebuild defines ++ # additional readonly variables, their readonly attribute is removed ++ # across ebuild phases. If we ever want to preserve the readonly ++ # attribute of additional ebuild-defined variables across phases, ++ # when returning from the ebuildshell their names are in ++ # "${__ebuildshell_tmpf}.return-rovars" ++ rm -f "${__ebuildshell_tmpf}."{ebuild,return}-{env,rovars} ++ ++ return ${__ebuildshell_status} ++} ++ + # Subshell/helper die support (must export for the die helper). + export EBUILD_MASTER_PID=${BASHPID:-$(__bashpid)} + trap 'exit 1' SIGTERM +diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py +index 06cac7214..5590dbfc4 100755 +--- a/bin/filter-bash-environment.py ++++ b/bin/filter-bash-environment.py +@@ -12,7 +12,8 @@ func_end_re = re.compile(br'^\}$') + + var_assign_re = re.compile(br'(^|^declare\s+-\S+\s+|^declare\s+|^export\s+)([^=\s]+)=("|\')?.*$') + close_quote_re = re.compile(br'(\\"|"|\')\s*$') +-readonly_re = re.compile(br'^declare\s+-(\S*)r(\S*)\s+') ++readonly_re = re.compile(br'^declare\s+-(\S*)r(\S*)\s+([^=\s]+)') ++trace_re = re.compile(br'^declare\s+-\S*t\S*\s+') + # declare without assignment + var_declare_re = re.compile(br'^declare(\s+-\S+)?\s+([^=\s]+)\s*$') + +@@ -27,7 +28,7 @@ def have_end_quote(quote, line): + return close_quote_match is not None and \ + close_quote_match.group(1) == quote + +-def filter_declare_readonly_opt(line): ++def filter_declare_readonly_opt(line, options): + readonly_match = readonly_re.match(line) + if readonly_match is not None: + declare_opts = b'' +@@ -35,14 +36,19 @@ def filter_declare_readonly_opt(line): + group = readonly_match.group(i) + if group is not None: + declare_opts += group ++ var = readonly_match.group(3) ++ if '--report-readonly-variables' in options: ++ getattr(sys.stderr, 'buffer', sys.stderr).write(var + b'\n') ++ if '--preserve-readonly-attribute' in options: ++ declare_opts += b'r' + if declare_opts: + line = b'declare -' + declare_opts + \ +- b' ' + line[readonly_match.end():] ++ b' ' + var + line[readonly_match.end():] + else: +- line = b'declare ' + line[readonly_match.end():] ++ line = b'declare ' + var + line[readonly_match.end():] + return line + +-def filter_bash_environment(pattern, file_in, file_out): ++def filter_bash_environment(pattern, file_in, file_out, options): + # Filter out any instances of the \1 character from variable values + # since this character multiplies each time that the environment + # is saved (strange bash behavior). This can eventually result in +@@ -66,6 +72,8 @@ def filter_bash_environment(pattern, file_in, file_out): + quote = var_assign_match.group(3) + filter_this = pattern.match(var_assign_match.group(2)) \ + is not None ++ if not filter_this and '--filter-traced-variables' in options: ++ filter_this = trace_re.match(line) is not None + # Exclude the start quote when searching for the end quote, + # to ensure that the start quote is not misidentified as the + # end quote (happens if there is a newline immediately after +@@ -75,7 +83,7 @@ def filter_bash_environment(pattern, file_in, file_out): + multi_line_quote = quote + multi_line_quote_filter = filter_this + if not filter_this: +- line = filter_declare_readonly_opt(line) ++ line = filter_declare_readonly_opt(line, options) + file_out.write(line.replace(b"\1", b"")) + continue + else: +@@ -84,8 +92,10 @@ def filter_bash_environment(pattern, file_in, file_out): + # declare without assignment + filter_this = pattern.match(declare_match.group(2)) \ + is not None ++ if not filter_this and '--filter-traced-variables' in options: ++ filter_this = trace_re.match(line) is not None + if not filter_this: +- line = filter_declare_readonly_opt(line) ++ line = filter_declare_readonly_opt(line, options) + file_out.write(line) + continue + +@@ -122,13 +132,28 @@ if __name__ == "__main__": + "while leaving bash function definitions and here-documents " + \ + "intact. The PATTERN is a space separated list of variable names" + \ + " and it supports python regular expression syntax." +- usage = "usage: %s PATTERN" % os.path.basename(sys.argv[0]) +- args = sys.argv[1:] +- +- if '-h' in args or '--help' in args: +- sys.stdout.write(usage + "\n") +- sys.stdout.flush() +- sys.exit(os.EX_OK) ++ usage = "usage: %s [-h|] PATTERN" % os.path.basename(sys.argv[0]) ++ args = [] ++ known_options = { ++ '--report-readonly-variables': ++ "Write names of readonly variables to stderr.", ++ '--preserve-readonly-attribute': ++ "Preserve the '-r' flag in 'declare -r'.", ++ '--filter-traced-variables': ++ "Filter out variables declared with '-t' attribute." ++ } ++ options = {} ++ for arg in sys.argv[1:]: ++ if arg in known_options.keys(): ++ options[arg] = True ++ continue ++ if '-h' == arg or '--help' == arg: ++ sys.stdout.write(usage + "\n\nKnown :\n\n") ++ for option, descr in known_options.items(): ++ sys.stdout.write(" " + option + "\t" + descr + "\n") ++ sys.stdout.flush() ++ sys.exit(os.EX_OK) ++ args.append(arg) + + if len(args) != 1: + sys.stderr.write(usage + "\n") +@@ -151,5 +176,5 @@ if __name__ == "__main__": + + var_pattern = b'^(' + b'|'.join(var_pattern) + b')$' + filter_bash_environment( +- re.compile(var_pattern), file_in, file_out) ++ re.compile(var_pattern), file_in, file_out, options) + file_out.flush() +diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh +index bb17382d4..af35a3327 100755 +--- a/bin/save-ebuild-env.sh ++++ b/bin/save-ebuild-env.sh +@@ -53,7 +53,7 @@ __save_ebuild_env() { + einfo einfon ewarn eerror ebegin __eend eend KV_major \ + KV_minor KV_micro KV_to_int get_KV has \ + __has_phase_defined_up_to \ +- hasv hasq __qa_source __qa_call \ ++ hasv hasq __qa_source __qa_call __call-ebuildshell \ + addread addwrite adddeny addpredict __sb_append_var \ + use usev useq has_version portageq \ + best_version use_with use_enable register_die_hook \ +diff --git a/man/make.conf.5 b/man/make.conf.5 +index b0c1aa4f2..568f350a0 100644 +--- a/man/make.conf.5 ++++ b/man/make.conf.5 +@@ -408,6 +408,12 @@ exist). Also see the related \fIunmerge\-backup\fR feature. + Use locks to ensure that unsandboxed ebuild phases never execute + concurrently. Also see \fIparallel\-install\fR. + .TP ++.B ebuildshell ++Drop into an interactive shell for each phase function, meant for ++debugging. Because the shell would normally be used to execute the ++phase function, commands like src_unpack or epatch are available in the ++interactive shell. Use `die` to terminate the merge. ++.TP + .B fail\-clean + Clean up temporary files after a build failure. This is particularly useful + if you have \fBPORTAGE_TMPDIR\fR on tmpfs. If this feature is enabled, you +diff --git a/lib/_emerge/AbstractEbuildProcess.py b/lib/_emerge/AbstractEbuildProcess.py +index 370cac529..a521596e5 100644 +--- a/lib/_emerge/AbstractEbuildProcess.py ++++ b/lib/_emerge/AbstractEbuildProcess.py +@@ -181,6 +181,7 @@ class AbstractEbuildProcess(SpawnProcess): + self.fd_pipes = {} + null_fd = None + if 0 not in self.fd_pipes and \ ++ "ebuildshell" not in self.settings.features and \ + self.phase not in self._phases_interactive_whitelist and \ + "interactive" not in self.settings.get("PROPERTIES", "").split(): + null_fd = os.open('/dev/null', os.O_RDONLY) +diff --git a/lib/portage/const.py b/lib/portage/const.py +index 3c23c85ed..d9c57f300 100644 +--- a/lib/portage/const.py ++++ b/lib/portage/const.py +@@ -161,6 +161,7 @@ SUPPORTED_FEATURES = frozenset([ + "distlocks", + "downgrade-backup", + "ebuild-locks", ++ "ebuildshell", + "fail-clean", + "fakeroot", + "fixlafiles", +-- +2.16.1 + diff --git a/sys-apps/portage/portage-2.3.45.ebuild b/sys-apps/portage/portage-2.3.45.ebuild new file mode 100644 index 0000000000..ee4c5d27f7 --- /dev/null +++ b/sys-apps/portage/portage-2.3.45.ebuild @@ -0,0 +1,274 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_4 python3_5 python3_6 python3_7 + python2_7 +) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit eutils distutils-r1 multilib + +DESCRIPTION="Portage package manager used in Gentoo Prefix" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" +LICENSE="GPL-2" +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" +SLOT="0" +IUSE="build doc epydoc +ipc +native-extensions selinux xattr prefix-chaining" + +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +RDEPEND=" + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ + python{2_7,3_4,3_5} pypy) + ) + elibc_FreeBSD? ( !prefix? ( sys-freebsd/freebsd-bin ) ) + elibc_glibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) ) + elibc_uclibc? ( !prefix? ( >=sys-apps/sandbox-2.2 ) ) + kernel_linux? ( >=app-misc/pax-utils-0.1.17 ) + kernel_SunOS? ( >=app-misc/pax-utils-0.1.17 ) + kernel_FreeBSD? ( >=app-misc/pax-utils-0.1.17 ) + kernel_Darwin? ( >=app-misc/pax-utils-0.1.18 ) + kernel_AIX? ( >=sys-apps/aix-miscutils-0.1.1634 ) + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ + python2_7 pypy) + ) ) + !> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if [[ -n ${EPREFIX} ]] ; then + # PREFIX LOCAL: only hack const_autotool + local extrapath="/usr/sbin:/usr/bin:/sbin:/bin" + # ok, we can't rely on PORTAGE_ROOT_USER being there yet, as people + # tend not to update that often, as long as we are a separate ebuild + # we can assume when unset, it's time for some older trick + if [[ -z ${PORTAGE_ROOT_USER} ]] ; then + PORTAGE_ROOT_USER=$(python -c 'from portage.const import rootuser; print rootuser') + fi + local defaultpath="${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin" + # We need to probe for bash in the Prefix, because it may not + # exist, in which case we fall back to the currently in use + # bash. This logic is necessary in particular during bootstrap, + # where we pull ourselves out of a temporary place with tools + local bash="${EPREFIX}/bin/bash" + [[ ! -x ${bash} ]] && bash=${BASH} + + einfo "Adjusting sources for ${EPREFIX}" + find . -type f -exec \ + sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \ + -e "s|@PORTAGE_MV@|$(type -P mv)|" \ + -e "s|@PORTAGE_BASH@|${bash}|" \ + -e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \ + -e "s|@DEFAULT_PATH@|${defaultpath}|" \ + -e "s|@EXTRA_PATH@|${extrapath}|" \ + -e "s|@portagegroup@|${PORTAGE_GROUP:-portage}|" \ + -e "s|@portageuser@|${PORTAGE_USER:-portage}|" \ + -e "s|@rootuser@|${PORTAGE_ROOT_USER:-root}|" \ + -e "s|@rootuid@|$(id -u ${PORTAGE_ROOT_USER:-root})|" \ + -e "s|@rootgid@|$(id -g ${PORTAGE_ROOT_USER:-root})|" \ + -e "s|@sysconfdir@|${EPREFIX}/etc|" \ + -i '{}' + || \ + die "Failed to patch sources" + # We don't need the below, since setup.py deals with this (and + # more) so we don't have to make this correct + # -e "s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \ + + # remove Makefiles, or else they will get installed + find . -name "Makefile.*" -delete + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f -print0) + + einfo "Setting gentoo_prefix as reponame for emerge-webrsync" + sed -i -e 's/repo_name=gentoo/repo_name=gentoo_prefix/' \ + bin/emerge-webrsync || die + + einfo "Making absent gemato non-fatal" + sed -i -e '/exitcode = 127/d' \ + lib/portage/sync/modules/rsync/rsync.py || die + + if [[ ${CHOST} == powerpc*-darwin* ]] ; then + # asyncio triggers some python bug, not worth fixing on + # ppc-macos, bug #656830 + sed -i -e '/^_asyncio_enabled/s/=.*$/= False/' \ + lib/portage/util/_eventloop/global_event_loop.py || die + fi + # END PREFIX LOCAL + fi + + # PREFIX LOCAL: make.conf is written by bootstrap-prefix.sh + if use !prefix ; then + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use epydoc && targets+=( epydoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + # comment out sanity test until it is fixed to work + # with the new PORTAGE_PYM_PATH + #if [[ $ROOT == / ]] ; then + ## Run some minimal tests as a sanity check. + #local test_runner=$(find "${ED}" -name runTests) + #if [[ -n $test_runner && -x $test_runner ]] ; then + #einfo "Running preinst sanity tests..." + #"$test_runner" || die "preinst sanity tests failed" + #fi + #fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown ${PORTAGE_USER}:${PORTAGE_GROUP} "${ED}"var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} + fi +}