diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-07-27 07:52:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-07-27 07:52:42 +0000 |
| commit | 03ef0ba3bb1b4e241409d7eeb169df243355d0d8 (patch) | |
| tree | ffa766e191554ab52b3c3b882ee033030031ae0d /sys-apps | |
| parent | Remove deprecated comment in ebuild and remove debug USE flag. (diff) | |
| download | gentoo-2-03ef0ba3bb1b4e241409d7eeb169df243355d0d8.tar.gz gentoo-2-03ef0ba3bb1b4e241409d7eeb169df243355d0d8.tar.bz2 gentoo-2-03ef0ba3bb1b4e241409d7eeb169df243355d0d8.zip | |
Fix installation of sets/portage.conf (was sets.conf):
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=addd9a9b6027260bfbde35efc5408b5efe5341d6
(Portage version: 2.2_rc67_p275/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 | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 1d9e69b04112..0cd633144caa 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.706 2010/07/20 23:10:32 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.707 2010/07/27 07:52:42 zmedico Exp $ + + 27 Jul 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: + Fix installation of sets/portage.conf (was sets.conf). 20 Jul 2010; Zac Medico <zmedico@gentoo.org> -portage-2.2_rc62.ebuild: Remove old version. diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 7aae72028d9e..eac4903224f8 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.4 2010/04/28 07:26:51 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.5 2010/07/27 07:52:42 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -137,8 +137,10 @@ src_install() { insinto /etc doins etc-update.conf dispatch-conf.conf || die - insinto "${portage_share_config}" - doins "${S}/cnf/"{sets.conf,make.globals} || die + insinto "$portage_share_config/sets" + doins "$S"/cnf/sets/*.conf || die + insinto "$portage_share_config" + doins "$S/cnf/make.globals" || die if [ -f "make.conf.${ARCH}".diff ]; then patch make.conf "make.conf.${ARCH}".diff || \ die "Failed to patch make.conf.example" |