diff options
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/ChangeLog | 5 | ||||
-rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 105bfc4a94a9..5000c71511a9 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.715 2010/08/30 21:55:25 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.716 2010/08/30 22:16:27 zmedico Exp $ + + 30 Aug 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: + Bug #267103 - Add /etc/portage to CONFIG_PROTECT_MASK. 30 Aug 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: Fix src_prepare to use the new VERSION sed template in order to substitute diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index e2f585023dac..288750fcf87a 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.8 2010/08/30 21:55:25 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.9 2010/08/30 22:16:27 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -140,6 +140,13 @@ src_install() { insinto /etc doins etc-update.conf dispatch-conf.conf || die + # This allows config file updates that are applied for package + # moves to take effect immediately. + echo 'CONFIG_PROTECT_MASK="/etc/portage"' > "$T"/50portage \ + || die "failed to create 50portage" + doenvd "$T"/50portage || die "doenvd 50portage failed" + rm "$T"/50portage + insinto "$portage_share_config/sets" doins "$S"/cnf/sets/*.conf || die insinto "$portage_share_config" |