another patch injection for ufed

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
index 5f2c3fc0d50efa53d4f42bfddf64580bd9e30c31..9bb08c386b993e7ee1fb36bc6c8dc19c8313d238 100644 (file)
--- a/app-portage/ufed/ChangeLog
+++ b/app-portage/ufed/ChangeLog
@@ -1,6 +1,19 @@
 # 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.8 2004/10/06 16:21:56 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.9 2004/11/22 05:44:27 genone Exp $
+
+*ufed-0.35-r2 (22 Nov 2004)
+
+  22 Nov 2004; Marius Mauch <genone@gentoo.org>
+  +files/disabled-defaults.patch, +files/no-partial-match.patch,
+  +files/quote-escape.patch, +files/too-many-flags.patch,
+  +ufed-0.35-r2.ebuild:
+  new revision featuring patches for bugs #59004, #68691, #68924 and #70776.
+  Thanks to fn_x@hotmail.com for providing those. Also made the dialog
+  dep more strict.Ideally this should be bumped straight to stable as some of
+  these bugs prevent ufed from working at all, but the new dialog dep isn't yet
+  stable on all archs. ufed-0.35 will probably be the last version of the perl
+  version, it will likely be replaced by a python version soon.
 
 *ufed-0.35-r1 (06 Oct 2004)
 

diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index a3bdf76d53d9606528b7869baf0ed19f935b89dd..5e96db88014c75571090d5f49fe07c9ee4f4838b 100644 (file)
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -4,16 +4,22 @@ Hash: SHA1
 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 290bd64a06741ea86d9a188349a512f0 ChangeLog 1208
+MD5 3c58199c37538795349dfe5cbaa5a519 ufed-0.35-r2.ebuild 680
 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
+MD5 a7da464cbe65178edc2a25fdf2c17a58 files/digest-ufed-0.35-r2 61
+MD5 9aa470b56ba7c7059ec8b31cc43e2718 files/disabled-defaults.patch 526
+MD5 f6d051548c2dd570064edc49440d3eba files/no-partial-match.patch 318
+MD5 acdcf613e49b8e59907b9be7acfe0267 files/quote-escape.patch 682
+MD5 c8a0516c5520c99e559d7fb0c65983e9 files/too-many-flags.patch 875
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBZBuw6J2i8a8J4okRAlVHAKCIL+wXZPqNb8+dToQl32Qd6/H3wACgmBMA
-lgjK7m5wpAoDb/mjfeQ2PlA=
-=LDDT
+iD8DBQFBoYr96J2i8a8J4okRArEmAKCaiTBF7Ew7G/zcVKk3oJipAWZn9wCeKbP4
+SMlJjeHt/vTpiJ8RlGxPHwE=
+=MLf1
 -----END PGP SIGNATURE-----

diff --git a/app-portage/ufed/files/digest-ufed-0.35-r2 b/app-portage/ufed/files/digest-ufed-0.35-r2
new file mode 100644 (file)
index 0000000..3379e58
--- /dev/null
+++ b/app-portage/ufed/files/digest-ufed-0.35-r2
@@ -0,0 +1 @@
+MD5 1c652f530e0112e733730a5fa7967847 ufed-0.35.tar.bz2 15126

diff --git a/app-portage/ufed/files/disabled-defaults.patch b/app-portage/ufed/files/disabled-defaults.patch
new file mode 100644 (file)
index 0000000..8d7edc0
--- /dev/null
+++ b/app-portage/ufed/files/disabled-defaults.patch
@@ -0,0 +1,13 @@
+--- ufed-0.35.orig/ufed.pl
++++ ufed-0.35/ufed.pl
+@@ -672,7 +672,8 @@
+    #$All = "Make.def : " . join(' ', @make_defaults_flags) . "\n";
+ 
+    #Step 2)
+-   $Results =  resolve_flags(join (' ', @make_defaults_flags),
+-                             join (' ', @use_defaults_flags));
++   $Results =  resolve_flags(resolve_flags('',
++                             join (' ', @make_defaults_flags)),
++                             join (' ', @use_defaults_flags));
+ 
+    #$All .= "Use.def : " . join(' ', @use_defaults_flags) . "\n";

diff --git a/app-portage/ufed/files/no-partial-match.patch b/app-portage/ufed/files/no-partial-match.patch
new file mode 100644 (file)
index 0000000..d46718a
--- /dev/null
+++ b/app-portage/ufed/files/no-partial-match.patch
@@ -0,0 +1,11 @@
+--- ufed-0.35.orig/ufed.pl
++++ ufed-0.35/ufed.pl
+@@ -753,7 +753,7 @@
+       for $i (@use_mask_flags) 
+          { 
+             next if($i eq "");
+-            $final_list =~ s!-?$i!!g; 
++            $final_list =~ s!-?\b$i\b!!g; 
+             #$All .= "$i ";            
+          }
+       #$All .= "\n";            

diff --git a/app-portage/ufed/files/quote-escape.patch b/app-portage/ufed/files/quote-escape.patch
new file mode 100644 (file)
index 0000000..92458f3
--- /dev/null
+++ b/app-portage/ufed/files/quote-escape.patch
@@ -0,0 +1,18 @@
+--- ufed-0.35.orig/ufed.pl
++++ ufed-0.35/ufed.pl
+@@ -163,6 +163,7 @@
+       $line =~ s/[\r\n]//g;
+       ($flag, $desc) =  ($line =~ m!([^ ]+)[ \t]+-[ \t]+(.*)!); # match the "flag - description" syntax
+       $desc =~ s/[ \t]+/ /;
++      $desc =~ s/[\\\$"]/\\$&/g;
+       $flag =~ s/[ \t]+//;
+ 
+       # now eliminate comments, blanklines and internal flags
+@@ -209,6 +210,7 @@
+       $line =~ s/[\r\n]//g;
+       ($package, $flag, $desc) =  ($line =~ m!([^:]*):([^ ]+)[ \t]+-[ \t]+(.*)!); # match the "package:flag - description" syntax
+       $desc =~ s/[ \t]+/ /;
++      $desc =~ s/[\\\$"]/\\$&/g;
+       $flag =~ s/[ \t]+//;
+       
+       # now eliminate comments, blanklines

diff --git a/app-portage/ufed/files/too-many-flags.patch b/app-portage/ufed/files/too-many-flags.patch
new file mode 100644 (file)
index 0000000..7c9b265
--- /dev/null
+++ b/app-portage/ufed/files/too-many-flags.patch
@@ -0,0 +1,23 @@
+--- ufed-0.35.orig/ufed.pl
++++ ufed-0.35/ufed.pl
+@@ -294,8 +294,8 @@
+    # stderr output was not messing up the parsing of the results anymore.
+    # Thanks Brandon
+ 
+-   $rc = system('exec 3> ' . $tempfile . ' ; DIALOG_ESC="" dialog '
+-               . ' --output-fd 3'
++   my ($cmdfh, $cmdfile) = tempfile('dialog.XXXXXX', DIR => '/tmp', UNLINK => 1);
++   print $cmdfh  ' --output-fd 3'
+                . ' --separate-output '
+                . '--no-shadow --backtitle "Gentoo Linux USE flags editor '
+                . $version . '" '
+@@ -305,7 +305,8 @@
+                . $lines . ' '
+                . $cols . ' '
+                . ($lines - 8) . ' '
+-               . $items) >> 8;
++               . $items;
++   $rc = system('exec 3> ' . $tempfile . ' ; DIALOG_ESC="" dialog --file ' . $cmdfile) >> 8;
+    if ($rc == 1)
+       { return 'CANCEL'; }
+    if ($rc == 255)

diff --git a/app-portage/ufed/ufed-0.35-r2.ebuild b/app-portage/ufed/ufed-0.35-r2.ebuild
new file mode 100644 (file)
index 0000000..7133844
--- /dev/null
+++ b/app-portage/ufed/ufed-0.35-r2.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-r2.ebuild,v 1.1 2004/11/22 05:44:27 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-1.0.20040731
+       dev-perl/TermReadKey"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/*.patch
+}
+
+src_install() {
+       newsbin ufed.pl ufed || die
+       doman ufed.8
+       dodoc ChangeLog
+}