From 6d3a9f40d00eb81879da2fd2e0c1adce906351af Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Thu, 5 Sep 2019 12:29:14 +0200 Subject: app-portage/prefix-toolkit: drop /portage from child's PORTAGE_TMPDIR Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Michael Haubenwallner (cherry picked from commit 4cd61342d847cb65569cf938728b995b8f0c20ca) --- prefix-stack-setup | 2 +- prefix-toolkit-5.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/prefix-stack-setup b/prefix-stack-setup index 428fa53..6527fba 100644 --- a/prefix-stack-setup +++ b/prefix-stack-setup @@ -132,7 +132,7 @@ ebegin "creating make.conf" echo "EPREFIX=\"${CHILD_EPREFIX}\"" echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\"" echo "BROOT=\"${PARENT_EPREFIX}\"" - echo "PORTAGE_TMPDIR=\"\${EPREFIX}/var/tmp/portage\"" + echo "PORTAGE_TMPDIR=\"\${EPREFIX}/var/tmp\"" # Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6. # We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only. echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\"" diff --git a/prefix-toolkit-5.ebuild b/prefix-toolkit-5.ebuild index 88068a0..62f9452 100644 --- a/prefix-toolkit-5.ebuild +++ b/prefix-toolkit-5.ebuild @@ -455,7 +455,7 @@ ebegin "creating make.conf" echo "EPREFIX=\"${CHILD_EPREFIX}\"" echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\"" echo "BROOT=\"${PARENT_EPREFIX}\"" - echo "PORTAGE_TMPDIR=\"\${EPREFIX}/var/tmp/portage\"" + echo "PORTAGE_TMPDIR=\"\${EPREFIX}/var/tmp\"" # Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6. # We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only. echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\"" -- cgit v1.2.3-65-gdbad