subject:"\[gentoo\-commits\] repo\/proj\/prefix\:master commit in\: sys\-apps\/portage\/, sys\-apps\/portage\/files\/"

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

2024-02-21 Thread Fabian Groffen

commit: 468f5ff8c93f28533ca890a29998b4a6941b179c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Feb 22 07:54:45 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Feb 22 07:54:45 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=468f5ff8

sys-apps/portage-3.0.62: version bump

Closes: https://bugs.gentoo.org/923644
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   2 +-
 .../files/portage-2.3.62-prefix-stack.patch|  80 --
 sys-apps/portage/portage-3.0.34.2.ebuild   | 311 -
 sys-apps/portage/portage-3.0.62.ebuild | 302 
 4 files changed, 303 insertions(+), 392 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index dbd547b19e..529b7d9c4f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
-DIST prefix-portage-3.0.34.2.tar.bz2 1498499 BLAKE2B 
47f53e4917bdf204eb23dadd9dc821c06da07d2e5c68cf0a3de908089e4121d45542e2120e57744db1c808a156595624915956e77f547ab671b1584b2c67cf0b
 SHA512 
121dd885a73153e780e28c2e514d4b3babc44368aa6915b2009ed0b205051c2f6c37dd3ccfe8be5ea567e7bab2f9f9b0c5c5b81c49990fbac7360261721a5bb7
 DIST prefix-portage-3.0.49.tar.bz2 1421955 BLAKE2B 
ac6e5b512f943826d0bf06225037885a138f3810db973a60c6dbca4f80d516e3aef3054b532f42a143b35702661a3d35ee59945f745b849dcd6fefbd4ff8f3cc
 SHA512 
dee0035e048b1bfde5859b809bf6ffa3ca0674cd1d59d9cfcc14a279d87215223a6b4497274db7e443f27fd6dd05eadb043ae6872feb8fa8523994d9946b6879
 DIST prefix-portage-3.0.56.tar.bz2 1461156 BLAKE2B 
2b654c65c5b1e358789774f21e6ee0c6e0dfba0d3d7ca6159f89a6c3d99686f52bbcbace08456d679a4dce62e16547f8b3f85723924e41f0270c644fed16d32c
 SHA512 
10fcf17813dcdf216ac2d31aac9097ca53f4b31a01440c48d53b6d46908fa1c47a31237988b5e583cb7cc26bb8689340f5cf7dc3db0f10e463ed8f6ab375de61
+DIST prefix-portage-3.0.62.tar.bz2 1540010 BLAKE2B 
5228459672b9928881fcce58b01c30af4974cf56c5227f6b9a83ae14579821a65b5914a2c538ce3a2e6805a2abde226fb4a9c6b8fb4c8035a5b8a931e813e5b9
 SHA512 
07bb343c243ada777dd606318b49fb76b436c189d02f086ce069d6a1dbb4ce9fe5539b26c8bb0bb223ea981acaa92397ec43b21a669a8fcea89b4f4fc94d0b1d

diff --git a/sys-apps/portage/files/portage-2.3.62-prefix-stack.patch 
b/sys-apps/portage/files/portage-2.3.62-prefix-stack.patch
deleted file mode 100644
index b0bdf2a20e..00
--- a/sys-apps/portage/files/portage-2.3.62-prefix-stack.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 1fe30e79c368ce71e024d70c3ec07a6aed3ef262 Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner 
-Date: Fri, 22 Mar 2019 17:52:05 +0100
-Subject: [PATCH] from FEATURES=stacked-prefix to USE=prefix-stack
-
-Rather than telling the base prefix' portage to support stacked prefix,
-be explicit in the stacked prefix about to USE that feature.
-Bug: https://bugs.gentoo.org/658572

- bin/install-qa-check.d/05prefix | 10 +++---
- bin/phase-helpers.sh| 12 
- lib/portage/const.py|  1 -
- 3 files changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/bin/install-qa-check.d/05prefix b/bin/install-qa-check.d/05prefix
-index 03da3bbce..4f48e4216 100644
 a/bin/install-qa-check.d/05prefix
-+++ b/bin/install-qa-check.d/05prefix
-@@ -36,16 +36,12 @@ install_qa_check_prefix() {
-   local WHITELIST=" /usr/bin/env "
-   # shebang can be an absolutised path, bug #342929
-   local eprefix=$(canonicalize ${EPREFIX})
--  # Without the stacked-prefix feature, tests using BPREFIX
--  # are redundant to EPREFIX, but run only if we will fail.
-+  # Without USE=prefix-stack, tests using BPREFIX are
-+  # redundant to EPREFIX, but run only if we will fail.
-   # Otherways, BPREFIX really is BROOT (the EAPI 7 one).
-   local BPREFIX=${EPREFIX}
-   local bprefix=${eprefix}
--  if has stacked-prefix ${FEATURES} &&
-- [[ -z ${ROOT%/} ]] &&
-- [[ ${CBUILD} == ${CHOST} ]]&&
-- [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
--  :; then
-+  if has prefix-stack ${USE} ; then
-   BPREFIX=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}
-   bprefix=$(canonicalize ${BPREFIX})
-   fi
-diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
-index 606b1cdfd..c64f1106b 100644
 a/bin/phase-helpers.sh
-+++ b/bin/phase-helpers.sh
-@@ -932,18 +932,14 @@ ___best_version_and_has_version_common() {
-   fi ;;
-   esac
- 
--  # PREFIX LOCAL: stacked-prefix feature
-+  # PREFIX LOCAL: prefix-stack feature
-   if ___eapi_has_prefix_variables &&
-  has "${root_arg}" '--host-root' '-b' &&
-- has stacked-prefix ${FEATURES}   &&
-+ has prefix-stack ${USE}  &&
-  [[ -z ${ROOT%/} ]]   &&
-- [[ ${CBUILD} == ${CHOST} ]]  &&
-- [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
-   :; then

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

2022-01-25 Thread Fabian Groffen

commit: 78bc2780900963532f21545b65fe0c6a91379fa7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan 26 07:21:40 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan 26 07:21:40 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=78bc2780

sys-apps/portage-3.0.30.1: add interrevisions patch

Closes: https://bugs.gentoo.org/832062
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 .../files/portage-3.0.30-interrevisions.patch  | 68 ++
 sys-apps/portage/portage-3.0.30.1.ebuild   |  1 +
 2 files changed, 69 insertions(+)

diff --git a/sys-apps/portage/files/portage-3.0.30-interrevisions.patch 
b/sys-apps/portage/files/portage-3.0.30-interrevisions.patch
new file mode 100644
index 00..e53fbd233a
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.30-interrevisions.patch
@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/832062
+
+add (back) inter-revision support for Prefix Portage
+
+--- a/lib/portage/versions.py
 b/lib/portage/versions.py
+@@ -53,7 +53,9 @@
+ }
+ 
+ _v = r"(\d+)((\.\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\d*)*)"
+-_rev = r"\d+"
++# PREFIX_LOCAL hack: -r(\d+) -> -r(\d+|\d+\.\d+) (see below)
++_rev = r"(\d+|\d+\.\d+)"
++# END_PREFIX_LOCAL
+ _vr = _v + "(-r(" + _rev + "))?"
+ 
+ _cp = {
+@@ -287,15 +289,47 @@
+ if rval:
+ return rval
+ 
+-# the suffix part is equal to, so finally check the revision
++# PREFIX_LOCAL
++# The suffix part is equal too, so finally check the revision
++# Prefix hack: historically a revision starting with 0 was an
++# 'inter-revision', which means that it is possible to create
++# revisions on revisions.  An example is -r01.1 which is the
++# first revision of -r1.  Note that a period (.) is used to
++# separate the real revision and the secondary revision number.
++# In the current state, the leading 0 is no longer used, and
++# versions just can have a dot, which means the version is an
++# inter-revision.
++# This trick is in use to allow revision bumps in ebuilds synced
++# from the main tree for Prefix changes, while still staying in
++# the main tree versioning scheme.  As such it can be used in
++# any other overlay where ebuilds from the another tree are
++# shadowed.
+ if match1.group(9):
+-r1 = int(match1.group(9))
++if '.' in match1.group(9):
++t = match1.group(9).split(".")
++r1 = int(t[0])
++r3 = int(t[1])
++else:
++r1 = int(match1.group(9))
++r3 = 0
+ else:
+ r1 = 0
++r3 = 0
+ if match2.group(9):
+-r2 = int(match2.group(9))
++if '.' in match2.group(9):
++t = match2.group(9).split(".")
++r2 = int(t[0])
++r4 = int(t[1])
++else:
++r2 = int(match2.group(9))
++r4 = 0
++# END_PREFIX_LOCAL
+ else:
+ r2 = 0
++r4 = 0
++if r1 == r2 and (r3 != 0 or r4 != 0):
++r1 = r3
++r2 = r4
+ rval = (r1 > r2) - (r1 < r2)
+ return rval
+ 

diff --git a/sys-apps/portage/portage-3.0.30.1.ebuild 
b/sys-apps/portage/portage-3.0.30.1.ebuild
index 88a5cd8eac..90eda9f188 100644
--- a/sys-apps/portage/portage-3.0.30.1.ebuild
+++ b/sys-apps/portage/portage-3.0.30.1.ebuild
@@ -100,6 +100,7 @@ python_prepare_all() {
 
eapply "${FILESDIR}"/${PN}-3.0.30-prefix-stack.patch # 658572
eapply "${FILESDIR}"/${PN}-3.0.30-ebuildshell.patch # 155161
+   eapply "${FILESDIR}"/${PN}-3.0.30-interrevisions.patch # 832062
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

2022-01-14 Thread Fabian Groffen

commit: c6c1c09765855d9a1984b358066b4cadfb3c92da
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan 14 12:28:16 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan 14 12:28:16 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c6c1c097

sys-apps/portage-3.0.30: version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 .../portage/files/portage-3.0.30-ebuildshell.patch | 349 +
 .../files/portage-3.0.30-prefix-stack.patch|  81 +
 sys-apps/portage/portage-3.0.30.ebuild | 307 ++
 4 files changed, 738 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 13a1d23d2a..59b77c8363 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1 +1,2 @@
 DIST prefix-portage-3.0.21.tar.bz2 1339211 BLAKE2B 
019cf0f3d2d1c45e7849221fc40b49e2c84949b74c8a8c74fbd2ca451a2dd075fb7b8bfec121a173ca0848c57a5a57a62d465b2957c4eb4d87f6a180299da91e
 SHA512 
0aff5004ae80e2cd9dce740c56c3c2643ef390510c3b3821d893e5c76733d3a8d4e7648963febb29479b9ee155868ec11526a393beb3b383e741451178f39e5a
+DIST prefix-portage-3.0.30.tar.bz2 1465506 BLAKE2B 
5a575bc6c6c537518a1d4738f59d6f5eec467c834d434493e83cb0262c9c121b0e55906b9f1b877b6e68b4b78f69548df03d8901a619ce1c69d9ffe5f2623e55
 SHA512 
52bb91057c8c983f227f1d30dcda1bdf915aecc1de89375b2af648e7bfc5543a30f9b670b3d7720724f8277f3e65745a22dfe670038222d61e939fd75c9b7bfd

diff --git a/sys-apps/portage/files/portage-3.0.30-ebuildshell.patch 
b/sys-apps/portage/files/portage-3.0.30-ebuildshell.patch
new file mode 100644
index 00..20f0aab813
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.30-ebuildshell.patch
@@ -0,0 +1,349 @@
+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 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

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

2020-12-07 Thread Fabian Groffen

commit: f2225a34eaa02778907b77103bb920f2cd88a8de
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec  7 17:38:50 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec  7 17:38:50 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f2225a34

sys-apps/portage-3.0.12: version bump

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |  2 +-
 .../portage-3.0.10-multiprocessing-no-spawn.patch  | 32 --
 ...ge-3.0.10.3-r1.ebuild => portage-3.0.12.ebuild} |  3 --
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a2010f89eb..32f96fef4f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.10.3.tar.bz2 1316420 BLAKE2B 
296a26cd39f84f477434fc125a53ea0569b43c78f30d3aba6a59f07a112f7d55d6f1286f596c0cc4dcce5c1154cf20e78432fc50b04f7f5b92969c5f81cddc89
 SHA512 
1ebc43be3a6108bccc8bd8f3fa2c781402d0a73f18e012b341959fff5fc52603e27d5a8bd8fe08b82188d6694f041381654a0d3cd566e3f05b559d83ccbddbee
+DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 
04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c
 SHA512 
8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e

diff --git 
a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch 
b/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
deleted file mode 100644
index e93d2fc046..00
--- a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Alteration of the following patch to force fork mode iso spawn
-
-From f093da4a3a457d539e5682ccecdf91f254addd8c Mon Sep 17 00:00:00 2001
-From: Zac Medico 
-Date: Thu, 3 Dec 2020 21:37:39 -0800
-Subject: [PATCH] runTests.py: multiprocessing.set_start_method('spawn') for
- debugging bug 758230
-
-Force fork mode because spawn mode requires all argument to be
-pickle-able, which currently is not the case.  This is an issue because
-Python 3.8 changed the default from fork to spawn on macOS.
-
-diff --git a/bin/emerge b/bin/emerge
-index 8f1db61a6..3731a9081 100755
 a/bin/emerge
-+++ b/bin/emerge
-@@ -2,6 +2,7 @@
- # Copyright 2006-2020 Gentoo Authors
- # Distributed under the terms of the GNU General Public License v2
- 
-+import multiprocessing
- import platform
- import signal
- import sys
-@@ -44,6 +45,7 @@ try:
-   from _emerge.main import emerge_main
- 
-   if __name__ == "__main__":
-+  multiprocessing.set_start_method('fork')
-   from portage.exception import IsADirectory, ParseError, \
-   PermissionDenied
-   portage.process.sanitize_fds()

diff --git a/sys-apps/portage/portage-3.0.10.3-r1.ebuild 
b/sys-apps/portage/portage-3.0.12.ebuild
similarity index 98%
rename from sys-apps/portage/portage-3.0.10.3-r1.ebuild
rename to sys-apps/portage/portage-3.0.12.ebuild
index c3bac2e8fc..cf3cc74f4b 100644
--- a/sys-apps/portage/portage-3.0.10.3-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -94,9 +94,6 @@ pkg_pretend() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
-   # drop this patch when bug 758230 gets resolved
-   eapply "${FILESDIR}"/${PN}-3.0.10-multiprocessing-no-spawn.patch # 
758230
-
eapply "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572
eapply "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
if use gentoo-dev; then

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

2020-12-04 Thread Fabian Groffen

commit: c6672f91217e0b0ec7739faebbdfba76fd6e83e5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec  4 10:34:49 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Dec  4 10:37:54 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c6672f91

sys-apps/portage-3.0.10.3: fix Python 3.8 on macOS interaction

- added patch to temp force fork mode, to ensure we can run Portage with
  Python 3.8 (the only configured target nowadays) on Darwin
- this release includes a fix for Linux/Solaris users (ELF-targets) to
  silence invalid soname dependencies warnings about missing
  host-provided libs

Bug: https://bugs.gentoo.org/758230
Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/portage/Manifest  |   3 +-
 .../portage-3.0.10-multiprocessing-no-spawn.patch  |  32 +++
 ...age-3.0.10.2.ebuild => portage-3.0.10.3.ebuild} |   3 +
 sys-apps/portage/portage-3.0.8.ebuild  | 299 -
 4 files changed, 36 insertions(+), 301 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 18b009f14a..a2010f89eb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,2 @@
 DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 
165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db
 SHA512 
8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c
-DIST prefix-portage-3.0.10.2.tar.bz2 1332430 BLAKE2B 
cade8c882fa67abf1f1cd3f8589dc7976ac4d555aa92733cc4d360b1669467c81b18a27140f6255d34f7efbca0e92103e791144e6fec6a7de8285958c7491fc5
 SHA512 
ce13c8b93aec5bad9febdfd7911b2169c6418ddf351cbe6fb5226f01236c51607b7ad2cc0bf0b31bf3ba8aa78c3eaa05fbcffb81da59820d4040e98f79f50e6f
-DIST prefix-portage-3.0.8.tar.bz2 1360204 BLAKE2B 
b4d3046e4a2ac7ae611a54b1a669d3d13b337aa29a9adb540f6da5104b47ca8d41798cc268bc4ab464f553bb280173a598127b5b290871ba0bf57f2fbd15bf58
 SHA512 
fb532b4145952f9467e1a86349e753e80d20b8b35d17d2d99ede590ff5aa6d367f16be41f2335738ed01c82238e2f93179e9b35d588ad92859f4b1f135539a00
+DIST prefix-portage-3.0.10.3.tar.bz2 1316420 BLAKE2B 
296a26cd39f84f477434fc125a53ea0569b43c78f30d3aba6a59f07a112f7d55d6f1286f596c0cc4dcce5c1154cf20e78432fc50b04f7f5b92969c5f81cddc89
 SHA512 
1ebc43be3a6108bccc8bd8f3fa2c781402d0a73f18e012b341959fff5fc52603e27d5a8bd8fe08b82188d6694f041381654a0d3cd566e3f05b559d83ccbddbee

diff --git 
a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch 
b/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
new file mode 100644
index 00..19ae16b5ac
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch
@@ -0,0 +1,32 @@
+Alteration of the original patch to force fork mode iso spawn
+
+From f093da4a3a457d539e5682ccecdf91f254addd8c Mon Sep 17 00:00:00 2001
+From: Zac Medico 
+Date: Thu, 3 Dec 2020 21:37:39 -0800
+Subject: [PATCH] runTests.py: multiprocessing.set_start_method('spawn') for
+ debugging bug 758230
+
+Force fork mode because spawn mode requires all argument to be
+pickle-able, which currently is not the case.  This is an issue because
+Python 3.8 changed the default from fork to spawn on macOS.
+
+diff --git a/lib/portage/tests/runTests.py b/lib/portage/tests/runTests.py
+index 9514abebe0..6e33077aef 100755
+--- a/lib/portage/tests/runTests.py
 b/lib/portage/tests/runTests.py
+@@ -4,6 +4,7 @@
+ # Distributed under the terms of the GNU General Public License v2
+ 
+ import grp
++import multiprocessing
+ import os
+ import os.path as osp
+ import platform
+@@ -60,6 +61,7 @@ def debug_signal(signum, frame):
+   os.environ["PATH"] = ":".join(path)
+ 
+ if __name__ == "__main__":
++  multiprocessing.set_start_method('fork')
+   try:
+   sys.exit(tests.main())
+   finally:

diff --git a/sys-apps/portage/portage-3.0.10.2.ebuild 
b/sys-apps/portage/portage-3.0.10.3.ebuild
similarity index 98%
rename from sys-apps/portage/portage-3.0.10.2.ebuild
rename to sys-apps/portage/portage-3.0.10.3.ebuild
index cf3cc74f4b..c3bac2e8fc 100644
--- a/sys-apps/portage/portage-3.0.10.2.ebuild
+++ b/sys-apps/portage/portage-3.0.10.3.ebuild
@@ -94,6 +94,9 @@ pkg_pretend() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
+   # drop this patch when bug 758230 gets resolved
+   eapply "${FILESDIR}"/${PN}-3.0.10-multiprocessing-no-spawn.patch # 
758230
+
eapply "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572
eapply "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
if use gentoo-dev; then

diff --git a/sys-apps/portage/portage-3.0.8.ebuild 
b/sys-apps/portage/portage-3.0.8.ebuild
deleted file mode 100644
index cf3cc74f4b..00
--- a/sys-apps/portage/portage-3.0.8.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

2018-12-06 Thread Fabian Groffen

commit: f88f91600be7bd6772d19885d117b29096110001
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Dec  6 13:49:23 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Dec  6 13:49:23 2018 +
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 00..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

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

2016-04-27 Thread Michael Haubenwallner

commit: 8c67d8b37ea1f8ce7e29233e80229fc8fbf9fd35
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Wed Apr 27 13:03:36 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Apr 27 13:03:36 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8c67d8b3

prefix-portage: bump ebuildshell patch, bug#155161

 .../portage/files/portage-2.2.28-ebuildshell.patch | 311 +
 sys-apps/portage/portage-2.2.28-r1.ebuild  | 259 +
 2 files changed, 570 insertions(+)

diff --git a/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch 
b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
new file mode 100644
index 000..7e7e71d
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.2.28-ebuildshell.patch
@@ -0,0 +1,311 @@
+From 096a74009cea9c79bcc2729d18a3cbcb99783aeb Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner 
+Date: Wed, 6 Nov 2013 12:40:05 +0100
+Subject: [PATCH] Add ebuildshell feature, bug#155161.
+
+---
+ bin/ebuild.sh| 102 ++-
+ bin/filter-bash-environment.py   |  65 --
+ bin/save-ebuild-env.sh   |   2 +-
+ man/make.conf.5  |   6 +++
+ pym/_emerge/AbstractEbuildProcess.py |   1 +
+ pym/portage/const.py |   1 +
+ 6 files changed, 159 insertions(+), 18 deletions(-)
+
+diff --git a/bin/ebuild.sh b/bin/ebuild.sh
+index f1586b2..06c90df 100755
+--- a/bin/ebuild.sh
 b/bin/ebuild.sh
+@@ -130,7 +130,7 @@ __qa_source() {
+ __qa_call() {
+   local shopts=$(shopt) OLDIFS="$IFS"
+   local retval
+-  "$@"
++  __call-ebuildshell "$@"
+   retval=$?
+   set +e
+   [[ $shopts != $(shopt) ]] &&
+@@ -537,6 +537,106 @@ 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 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}
++  (
++  (
++  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"
++  )
++  # 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
++  echo "WANTED: \$@"
++  echo "or use: \"\\\$@\""
++  # use bash history, but not the user's real one
++  HISTFILE=~/.bash_history
++  # for copy function body lines containing: local
++  alias local=declare
++  # for copy function body lines containing: !
++  set +H
++  # at exit, dump the current environment
++  trap "
++  rm -f '${__ebuildshell_tmpf}.return-'*
++  (
++  (
++  declare -p
++

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/, sys-apps/portage/files/

7 matches

Site Navigation

Mail list logo

Footer information