diff options
author | 2013-07-25 22:09:16 +0000 | |
---|---|---|
committer | 2013-07-25 22:09:16 +0000 | |
commit | 2c76fe9f3c11957c240aacdd5a2f4fe8c3d1edf7 (patch) | |
tree | f3ad99e54fe7a21d34e97d2689c021a82de800f9 /sys-apps | |
parent | QA: utilize default src_prepare from cmake-utils eclass (diff) | |
download | gentoo-2-2c76fe9f3c11957c240aacdd5a2f4fe8c3d1edf7.tar.gz gentoo-2-2c76fe9f3c11957c240aacdd5a2f4fe8c3d1edf7.tar.bz2 gentoo-2-2c76fe9f3c11957c240aacdd5a2f4fe8c3d1edf7.zip |
Adjust make.globals for prefix support.
(Portage version: 2.2.0_alpha188_p56/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/ChangeLog | 5 | ||||
-rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index a1449826b7f4..1a5996e15ac6 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1314 2013/07/25 18:11:37 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1315 2013/07/25 22:09:16 zmedico Exp $ + + 25 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: + Adjust make.globals for prefix support. 25 Jul 2013; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: Adjust repos.conf main-repo for prefix support. diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 24ee24044548..f496c6529651 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.83 2013/07/25 18:11:37 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.84 2013/07/25 22:09:16 zmedico Exp $ EAPI=3 PYTHON_COMPAT=( @@ -276,7 +276,8 @@ src_prepare() { done < <(find . -type f -print0) einfo "Adjusting make.globals ..." - sed -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \ + sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ + -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ -i cnf/make.globals || die "sed failed" einfo "Adjusting repos.conf ..." |