commit: f9b900006df9c0561a60758f442b80ea99023154
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 08:39:40 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 08:39:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f9b90000
sys-apps/portage: version bump, includes stacked-prefix feature
Package-Manager: Portage-2.3.40.2-prefix, Repoman-2.3.9
sys-apps/portage/Manifest | 2 +-
.../files/portage-2.3.40-stacked-prefix.patch | 59 ----------------------
...age-2.3.40.2.ebuild => portage-2.3.40.3.ebuild} | 1 -
3 files changed, 1 insertion(+), 61 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d89f09de53..61a3d79f0d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
DIST prefix-portage-2.2.28.tar.bz2 1187416 BLAKE2B
1ec27def0b427f60b38dc60178461c2395d388500b6f20d5f9dcd76090c5e68e6578da0073cb5cc3b5b2beb2c2c55ef12afef70d7562fba0a6f0cf90847624ea
SHA512
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
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.2.tar.bz2 1216158 BLAKE2B
d8806b4047ded791e8646ea64c568f9fe0354a5cf2a54a1616c1fc1050f0476b218522c56a9f06636e2a70f70571d762186ba30057efe213ffb7270bc7ef503c
SHA512
d85e3eea4149f2fe3ec8dc2fb15d1fd65c5d78c67828c36f064f0663b6305c5d06c1a29f3d62c777f0d1b619aa60178e5a3fbfbadb0a03bbde0570c5913b0675
+DIST prefix-portage-2.3.40.3.tar.bz2 1253190 BLAKE2B
53e60b561e1f9b2a5367a1a23a74ba315358b8e7eb05eead2a46078198b92786745dbd07ab1bf69587866f462955a5dd6c0bc3eb51dbe507bfbff31d899c5f45
SHA512
67c2d7554c9236748b25a8b9f0f60736beda535298395ba2eb86dd5634b6520d645df193914f079d2c61cfa0d8f263f67c3476828319e2395dec2e45cf4b9b14
diff --git a/sys-apps/portage/files/portage-2.3.40-stacked-prefix.patch
b/sys-apps/portage/files/portage-2.3.40-stacked-prefix.patch
deleted file mode 100644
index d967d1faf7..0000000000
--- a/sys-apps/portage/files/portage-2.3.40-stacked-prefix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8a121d477a9a13569be3fb50eaeaa1162ed884bd Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <ha...@gentoo.org>
-Date: Tue, 19 Jun 2018 16:39:12 +0200
-Subject: [PATCH 1/2] introduce the 'stacked-prefix' FEATURE
-
-When we merge into another EPREFIX, but not into some ROOT,
-and CHOST is equal to CBUILD, build tools found in EPREFIX
-perfectly work for the current build environment.
-In a "stacked prefix" we explicitly utilize this situation.
-
-This is useful during prefix bootstrap (#655414, #655326), but also to
-build packages for targets unable to support the full portage toolchain
-(native Windows, MinGW), but otherwise do not require a full cross
-compilation setup.
----
- bin/phase-helpers.sh | 14 ++++++++++++++
- pym/portage/const.py | 1 +
- 2 files changed, 15 insertions(+)
-
-diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
-index 75d92b407..c5a818db7 100644
---- a/bin/phase-helpers.sh
-+++ b/bin/phase-helpers.sh
-@@ -927,6 +927,20 @@ ___best_version_and_has_version_common() {
- fi ;;
- esac
-
-+ if ___eapi_has_prefix_variables &&
-+ has "${root_arg}" '--host-root' '-b' &&
-+ has stacked-prefix ${FEATURES} &&
-+ [[ -z ${ROOT%/} ]] &&
-+ [[ ${CBUILD} == ${CHOST} ]] &&
-+ [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
-+ :; then
-+ # When we merge into another EPREFIX, but not into some ROOT,
-+ # and CHOST is equal to CBUILD, build tools found in EPREFIX
-+ # perfectly work for the current build environment.
-+ # In a "stacked prefix" we explicitly utilize this situation.
-+ "${FUNCNAME[1]}" "${atom}" && return 0
-+ fi
-+
- if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
- cmd+=("${PORTAGE_BIN_PATH}"/ebuild-ipc "${FUNCNAME[1]}"
"${root}" "${atom}")
- else
-diff --git a/pym/portage/const.py b/pym/portage/const.py
-index d9c57f300..be7bf1036 100644
---- a/pym/portage/const.py
-+++ b/pym/portage/const.py
-@@ -203,6 +203,7 @@ SUPPORTED_FEATURES = frozenset([
- "splitdebug",
- "split-elog",
- "split-log",
-+ "stacked-prefix",
- "strict",
- "strict-keepdir",
- "stricter",
---
-2.16.1
-
diff --git a/sys-apps/portage/portage-2.3.40.2.ebuild
b/sys-apps/portage/portage-2.3.40.3.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.3.40.2.ebuild
rename to sys-apps/portage/portage-2.3.40.3.ebuild
index 63935aaa09..2ebda124cb 100644
--- a/sys-apps/portage/portage-2.3.40.2.ebuild
+++ b/sys-apps/portage/portage-2.3.40.3.ebuild
@@ -92,7 +92,6 @@ python_prepare_all() {
distutils-r1_python_prepare_all
epatch "${FILESDIR}"/${PN}-2.3.40-ebuildshell.patch # 155161
- epatch "${FILESDIR}"/${PN}-2.3.40-stacked-prefix.patch # 658572
use prefix-chaining && # maybe useful even with stacked-prefix
epatch "${FILESDIR}"/${PN}-2.3.40-prefix-chaining.patch
