From: Marius Mauch Date: Wed, 6 Oct 2004 16:21:56 +0000 (+0000) Subject: adding a patch for cascaded profile support (not perfect) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=192b28db9e97e8bb278e75d149a6c71b39022055;p=gentoo.git adding a patch for cascaded profile support (not perfect) --- diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog index 0316e1f16793..5f2c3fc0d50e 100644 --- a/app-portage/ufed/ChangeLog +++ b/app-portage/ufed/ChangeLog @@ -1,168 +1,11 @@ # ChangeLog for app-portage/ufed # Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.7 2004/07/17 21:52:30 aliz Exp $ -# -# This file is automatically generated from CVS checkin logs. Please do NOT -# insert content in it directly. It is in a cronjob to run every hour. +# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.8 2004/10/06 16:21:56 genone Exp $ -2004-06-02 09:40 Fred Van Andel - - * ufed.pl, Version 0.35 Fixes bugs 35915, 50112, 51781 - -2003-08-10 09:40 Fred Van Andel - - * ufed.pl, Version 0.34 second attempt at bug 26360 - -2003-08-10 07:30 Fred Van Andel - - * ufed.pl, Version 0.34 fixed bug 26360 - -2003-07-21 09:19 Fred Van Andel - - * ufed.pl, Version 0.33 fixed bug 22680 and 24670 - -2003-06-20 10:11 Robin Johnson - - * ufed.pl, ufed2.pl: update blizzy's email address as per his - private email - -2003-05-09 21:35 Robin Johnson - - * docs/: DESIGN.ufed2, DESIGN.ufed2.fava: updating design docs - -2003-05-06 11:46 Fred Van Andel - - * docs/DESIGN.ufed2.fava: My (fava's) comments on robbat2's design - doc. - -2003-04-30 13:24 Fred Van Andel - - * ufed.pl: Ufed was sometimes confusing gif with ungif, fixed - - -2003-04-30 10:05 Robin Johnson - - * ufed.pl: Bumped version - -2003-04-30 10:04 Robin Johnson - - * ufed.pl: Added note about version number - -2003-04-29 07:27 Damien Krotkine - - * ufed2.pl: typo corrected, debug - -2003-04-28 22:18 Fred Van Andel - - * ufed.pl: ufed 0.31 bug fixes - -2003-04-28 22:08 Fred Van Andel - - * ufed.pl, build/mktarball, docs/ufed.8: Version 0.31 of ufed, - general bug fixes - -2003-04-28 05:06 Damien Krotkine - - * ufed2.pl: rewritten ufed in real perl - -2003-04-28 03:30 Robin Johnson - - * docs/TODO: again - -2003-04-28 03:21 Robin Johnson - - * docs/DESIGN.ufed2: new design doc - -2003-04-28 03:17 Robin Johnson - - * docs/TODO: updated TODO - -2003-04-25 01:22 Robin Johnson - - * build/mktarball: cleaned up code to build easier - -2003-04-25 00:28 Robin Johnson - - * build/clup: more cleaning - -2003-04-25 00:25 Robin Johnson - - * build/clup: added force option - -2003-04-25 00:22 Robin Johnson - - * build/clup: more work on cleaner handling - -2003-04-25 00:20 Robin Johnson - - * build/clup: added cleaner checking - -2003-04-25 00:16 Robin Johnson - - * COPYING, docs/TODO: Add actual license and TODO document - -2003-04-25 00:07 Robin Johnson - - * build/clup: bugfix in header handling - -2003-04-24 23:56 Robin Johnson - - * build/clup: updated changelog automation stuff - -2003-04-24 23:53 Robin Johnson - - * build/: clup, cvs2cl.pl: Automated ChangeLog Stuff - -2003-04-24 23:49 Robin Johnson - - * ufed.pl: fixed copyright year added note about ChangeLog - -2003-04-24 23:47 Robin Johnson - - * ufed.pl: spelling fixes - -2003-04-24 23:47 Robin Johnson - - * ufed.build: removed tmp builder, moved to build/mktarball - -2003-04-24 23:46 Robin Johnson - - * docs/ufed.8: Added manpage - -2003-04-24 23:46 Robin Johnson - - * build/mktarball: Added tarball building script - -2003-04-24 22:02 Fred Van Andel - - * ufed.pl: [no log message] - -2003-04-24 21:08 Fred Van Andel - - * ufed.pl: [no log message] - -2003-04-24 20:56 Robin Johnson - - * ufed.build: slight fix - -2003-04-24 20:54 Robin Johnson - - * ufed.build: added tarball builder - -2003-04-24 20:50 Fred Van Andel - - * ufed.pl: - General bug fixes and new features - -2003-04-03 01:53 Robin Johnson - - * ufed.pl: starting on use.local.desc - -2002-12-28 18:05 Blizzy - - * ufed.pl: fixed problem with extra spaces - -2002-10-12 01:08 Blizzy - - * ufed.pl: Initial revision +*ufed-0.35-r1 (06 Oct 2004) + 06 Oct 2004; +files/cascaded-profile-support.patch, + +ufed-0.35-r1.ebuild +ChangeLog.old: + adding a patch to support cascading profiles (bug #62261), thanks to lu_zero + for providing that patch. + Previous entries moved to ChangeLog.old as they aren't echangelog compatible. diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest index d4d515ee377f..a3bdf76d53d9 100644 --- a/app-portage/ufed/Manifest +++ b/app-portage/ufed/Manifest @@ -1,16 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 6553547cfde0e48f11aeabd7a683f610 ChangeLog 4237 MD5 5b239a48dca80f4d77638418f77c1534 metadata.xml 175 MD5 b854d7b32009a942ddeac70bbf723867 ufed-0.34.ebuild 584 MD5 10c952ad8b1ed9e276d99822b5d478cc ufed-0.35.ebuild 594 +MD5 8d6e09a37304879924684d4009aca831 ChangeLog 534 +MD5 990d282eb2356c942cfc907774409d2c ufed-0.35-r1.ebuild 692 MD5 35a8e5d4b5839bd2b35920e1a8c36ac6 files/digest-ufed-0.34 61 MD5 a7da464cbe65178edc2a25fdf2c17a58 files/digest-ufed-0.35 61 +MD5 a7da464cbe65178edc2a25fdf2c17a58 files/digest-ufed-0.35-r1 61 +MD5 8d2bc2f609d970b14ec9d0a612455aec files/cascaded-profile-support.patch 1895 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.5 (GNU/Linux) +Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBKTkv6J2i8a8J4okRAi0VAJ44aTPuiZQIDYSGi77Ne/PDH9AQagCff35+ -pkJGirhsCStnr2fEv1JLdwY= -=eEkm +iD8DBQFBZBuw6J2i8a8J4okRAlVHAKCIL+wXZPqNb8+dToQl32Qd6/H3wACgmBMA +lgjK7m5wpAoDb/mjfeQ2PlA= +=LDDT -----END PGP SIGNATURE----- diff --git a/app-portage/ufed/files/cascaded-profile-support.patch b/app-portage/ufed/files/cascaded-profile-support.patch new file mode 100644 index 000000000000..482801c06f20 --- /dev/null +++ b/app-portage/ufed/files/cascaded-profile-support.patch @@ -0,0 +1,72 @@ +--- ufed.pl.org 2004-09-21 09:26:50.000000000 +0200 ++++ ufed.pl 2004-06-03 06:58:49.000000000 +0200 +@@ -510,25 +510,57 @@ + # the associated flag is emabled + my ($flag, $package); + my @flags; ++ my $tmppath; ++ my @tmpitem; ++ my @items; ++ my $path; ++ #open(FILE, '/etc/make.profile/use.defaults') or die ('couldn\'t open ' . "use.defaults"); ++ $path = readlink '/etc/make.profile'; ++ $path =~ s!\.\.!!; ++ @items = split /\//, $path ; ++ while(@items) ++ { ++ $tmppath = join '/', @items ; ++ if (open(FILE1,$tmppath . "/use.defaults")) ++ { ++ while () ++ { ++ s!#.*!!; ++ ($flag, $package) = split (m![\t ]+!); ++ $flag =~ s![ \t]!!g; ++ $package =~ s![ \t]!!g; ++ chomp($package); +- open(FILE, '/etc/make.profile/use.defaults') or die ('couldn\'t open ' . "use.defaults"); + ++ if ((defined($package)) and my_glob("/var/db/pkg/$package")) ++ { ++ #the package exists, therefore we add the use flag ++ push (@flags, $flag); ++ } ++ } ++ close(FILE1); ++ } +- while () +- { +- s!#.*!!; +- ($flag, $package) = split (m![\t ]+!); +- $flag =~ s![ \t]!!g; +- $package =~ s![ \t]!!g; +- chomp($package); + ++ open (FILE,$tmppath . '/parent') or last; ++ while () +- if ((defined($package)) and my_glob("/var/db/pkg/$package")) + { ++ s!#.*!!; ++ s!\n!!g; ++ @tmpitem = split /\//, $_; ++ for my $buf (@tmpitem) ++ { ++ if ($buf =~ /\.\./) ++ { ++ pop @items; ++ } ++ else ++ { ++ push @items, $buf; ++ } ++ } +- +- #the package exists, therefore we add the use flag +- push (@flags, $flag); + } ++ close(FILE); + } +- close(FILE); + return (@flags); + } + diff --git a/app-portage/ufed/files/digest-ufed-0.35-r1 b/app-portage/ufed/files/digest-ufed-0.35-r1 new file mode 100644 index 000000000000..3379e589a5e8 --- /dev/null +++ b/app-portage/ufed/files/digest-ufed-0.35-r1 @@ -0,0 +1 @@ +MD5 1c652f530e0112e733730a5fa7967847 ufed-0.35.tar.bz2 15126 diff --git a/app-portage/ufed/ufed-0.35-r1.ebuild b/app-portage/ufed/ufed-0.35-r1.ebuild new file mode 100644 index 000000000000..628f116e9d60 --- /dev/null +++ b/app-portage/ufed/ufed-0.35-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.35-r1.ebuild,v 1.1 2004/10/06 16:21:56 genone Exp $ + +inherit eutils + +DESCRIPTION="Gentoo Linux USE flags editor" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64" +IUSE="" + +RDEPEND="dev-lang/perl + dev-util/dialog + dev-perl/TermReadKey" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/cascaded-profile-support.patch +} + +src_install() { + newsbin ufed.pl ufed || die + doman ufed.8 + dodoc ChangeLog +}