diff options
| author |   Harald van Dijk <truedfx@gentoo.org> | 2008-05-10 16:27:41 +0000 |
|---|---|---|
| committer | Harald van Dijk <truedfx@gentoo.org> | 2008-05-10 16:27:41 +0000 |
| commit | 1a6047eefe9080259ab68cda66284d68aca5c6c5 (patch) | |
| tree | 59a9b4d4113d252e85bc4f4b0be339a081daa6a2 /app-portage | |
| parent | Fix typo. (diff) | |
| download | gentoo-2-1a6047eefe9080259ab68cda66284d68aca5c6c5.tar.gz gentoo-2-1a6047eefe9080259ab68cda66284d68aca5c6c5.tar.bz2 gentoo-2-1a6047eefe9080259ab68cda66284d68aca5c6c5.zip | |
Handle multiple parent profiles, bug #221151
(Portage version: 2.1.5_rc10)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/ufed/ChangeLog | 9 | ||||
| -rw-r--r-- | app-portage/ufed/files/ufed-0.40-multiple-inheritance.patch | 22 | ||||
| -rw-r--r-- | app-portage/ufed/ufed-0.40-r9.ebuild (renamed from app-portage/ufed/ufed-0.40-r7.ebuild) | 4 |
3 files changed, 33 insertions, 2 deletions
diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog index 11df7445a996..016c97770c9e 100644 --- a/app-portage/ufed/ChangeLog +++ b/app-portage/ufed/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/ufed # Copyright 2003-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.61 2008/04/28 16:37:38 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.62 2008/05/10 16:27:40 truedfx Exp $ + +*ufed-0.40-r9 (10 May 2008) + + 10 May 2008; Harald van Dijk <truedfx@gentoo.org> + +files/ufed-0.40-multiple-inheritance.patch, -ufed-0.40-r7.ebuild, + +ufed-0.40-r9.ebuild: + Handle multiple parent profiles, bug #221151 *ufed-0.40-r8 (28 Apr 2008) diff --git a/app-portage/ufed/files/ufed-0.40-multiple-inheritance.patch b/app-portage/ufed/files/ufed-0.40-multiple-inheritance.patch new file mode 100644 index 000000000000..c5608f7c9d67 --- /dev/null +++ b/app-portage/ufed/files/ufed-0.40-multiple-inheritance.patch @@ -0,0 +1,22 @@ + + Several profiles use multiple parent directories now. ufed used + to read only the first, causing flags to be missed. Reported by + Ryan Hill and investigated by Martin Väth. + http://bugs.gentoo.org/221151 + +--- ufed-0.40/Portage.pm ++++ ufed-0.40/Portage.pm +@@ -198,10 +198,9 @@ + $_ = readlink '/etc/make.profile'; + die "/etc/make.profile is not a symlink\n" if not defined $_; + @profiles = norm_path '/etc', $_; +- PARENT: { +- for(noncomments "$profiles[0]/parent") { +- unshift @profiles, norm_path $profiles[0], $_; +- redo PARENT; ++ for (my $i = -1; $i >= -@profiles; $i--) { ++ for(noncomments "$profiles[$i]/parent") { ++ splice @profiles, $i, 0, norm_path $profiles[$i], $_; + } + } + } diff --git a/app-portage/ufed/ufed-0.40-r7.ebuild b/app-portage/ufed/ufed-0.40-r9.ebuild index 4a5ad41f5cdf..42ae26acf086 100644 --- a/app-portage/ufed/ufed-0.40-r7.ebuild +++ b/app-portage/ufed/ufed-0.40-r9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40-r7.ebuild,v 1.1 2008/01/07 20:53:27 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40-r9.ebuild,v 1.1 2008/05/10 16:27:40 truedfx Exp $ inherit eutils @@ -27,6 +27,8 @@ src_unpack() { epatch "${FILESDIR}"/${P}-masked.patch epatch "${FILESDIR}"/${P}-packageusemask.patch epatch "${FILESDIR}"/${P}-noremove.patch + epatch "${FILESDIR}"/${P}-termsize.patch + epatch "${FILESDIR}"/${P}-multiple-inheritance.patch } src_compile() { |