diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-12-22 04:46:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-22 04:46:55 +0000 |
| commit | be006faef308bfa9db9235a752aa4ecdd72eb509 (patch) | |
| tree | 0eba8df4cf4ba76a9dd0e94809cecaa0597172b2 /sys-apps | |
| parent | fixed a bug introduced in last commit (bug #334435#c8) (diff) | |
| download | gentoo-2-be006faef308bfa9db9235a752aa4ecdd72eb509.tar.gz gentoo-2-be006faef308bfa9db9235a752aa4ecdd72eb509.tar.bz2 gentoo-2-be006faef308bfa9db9235a752aa4ecdd72eb509.zip | |
Adjust make.globals PORTDIR and PORTAGE_TMPDIR for prefix installs.
(Portage version: 2.2.0_alpha81_p52/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 35fcefb0019a..ea6706b1865f 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.934 2011/12/21 21:42:47 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.935 2011/12/22 04:46:55 zmedico Exp $ + + 22 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: + Adjust make.globals PORTDIR and PORTAGE_TMPDIR for prefix installs. 21 Dec 2011; Markus Meier <maekke@gentoo.org> portage-2.1.10.41.ebuild: arm stable, bug #394695 diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 310b4a48b628..5be1ce8c8829 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.39 2011/12/11 20:18:53 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.40 2011/12/22 04:46:55 zmedico Exp $ EAPI=3 inherit git-2 eutils multilib python @@ -158,8 +158,10 @@ src_prepare() { fi done - einfo "Setting SYNC in make.globals ..." + einfo "Adjusting make.globals ..." sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \ + -e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \ + -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \ -i cnf/make.globals || die "sed failed" einfo "Adding FEATURES=force-prefix to make.globals ..." |