Remove old unused versions.

(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key 0x4D269A1B)

17 files changed, 11 insertions, 877 deletions

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
index 599b8713139f..20dd81e602db 100644
--- a/app-portage/ufed/ChangeLog
+++ b/app-portage/ufed/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-portage/ufed
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.95 2013/03/17 16:04:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.96 2013/03/26 15:47:56 fuzzyray Exp $
+
+  26 Mar 2013; Paul Varner <fuzzyray@gentoo.org> -ufed-0.40-r6.ebuild,
+  -ufed-0.40-r10.ebuild, -ufed-0.40-r11.ebuild, -ufed-0.40.1.ebuild,
+  -ufed-0.40.1-r1.ebuild, -files/ufed-0.40.1-make.globals-path.patch,
+  -ufed-0.40.2.ebuild, -files/ufed-0.40-comments.patch,
+  -files/ufed-0.40-masked.patch, -files/ufed-0.40-multiple-inheritance.patch,
+  -files/ufed-0.40-noremove.patch, -files/ufed-0.40-packageusemask.patch,
+  -files/ufed-0.40-source.patch, -files/ufed-0.40-termsize.patch,
+  -files/ufed-0.40-termsize-2.patch, -files/ufed-0.40-useorder.patch:
+  Remove old unused versions.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/app-portage/ufed/files/ufed-0.40-comments.patch b/app-portage/ufed/files/ufed-0.40-comments.patch
deleted file mode 100644
index 852545ea5050..000000000000
--- a/app-portage/ufed/files/ufed-0.40-comments.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ufed-0.40/Portage.pm
-+++ ufed-0.40/Portage.pm
-@@ -220,9 +220,9 @@
- 
- sub read_sh($) {
- 	my $BLANK = qr{(?:[ \n\t]+|#.*)+};         # whitespace and comments
--	my $IDENT = qr{([^ \\\n\t'"{}=]+)};        # identifiers
-+	my $IDENT = qr{([^ \\\n\t'"{}=#]+)};       # identifiers
- 	my $ASSIG = qr{=};                         # assignment operator
--	my $UQVAL = qr{((?:[^ \\\n\t'"]+|\\.)+)}s; # unquoted value
-+	my $UQVAL = qr{((?:[^ \\\n\t'"#]+|\\.)+)}s;# unquoted value
- 	my $SQVAL = qr{'([^']*)'};                 # singlequoted value
- 	my $DQVAL = qr{"((?:[^\\"]|\\.)*)"}s;      # doublequoted value
- 
---- ufed-0.40/ufed.pl
-+++ ufed-0.40/ufed.pl
-@@ -140,12 +140,12 @@
- 		[ \n\t]+ |
- 		\#[ \t]*USE[ \t]*=.*(\n?) | # place capture after USE=... line
- 		\#.*)+}x;
--	my $IDENT = qr{([^ \\\n\t'"{}=]+)};             # identifiers
-+	my $IDENT = qr{([^ \\\n\t'"{}=#]+)};            # identifiers
- 	my $ASSIG = qr{=};                              # assignment operator
--	my $UQVAL = qr{(?:[^ \\\n\t'"]+|\\.)+}s;        # unquoted value
-+	my $UQVAL = qr{(?:[^ \\\n\t'"#]+|\\.)+}s;       # unquoted value
- 	my $SQVAL = qr{'[^']*'};                        # singlequoted value
- 	my $DQVAL = qr{"(?:[^\\"]|\\.)*"}s;             # doublequoted value
--	my $BNUQV = qr{(?:[^ \\\n\t'"]+|\\\n()|\\.)+}s; # unquoted value (scan for \\\n)
-+	my $BNUQV = qr{(?:[^ \\\n\t'"#]+|\\\n()|\\.)+}s;# unquoted value (scan for \\\n)
- 	my $BNDQV = qr{"(?:[^\\"]|\\\n()|\\.)*"}s;      # doublequoted value (scan for \\\n)
- 
- 	my (@flags) = @_;
diff --git a/app-portage/ufed/files/ufed-0.40-masked.patch b/app-portage/ufed/files/ufed-0.40-masked.patch
deleted file mode 100644
index e51c5aa48ad3..000000000000
--- a/app-portage/ufed/files/ufed-0.40-masked.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ufed-0.40/ufed.pl
-+++ ufed-0.40/ufed.pl
-@@ -33,8 +33,13 @@
- }
- @{$use_descriptions{'-*'}} = 'Never enable any flags other than those specified in /etc/make.conf';
- 
--for(keys %Portage::use_masked_flags)
--{ delete $use_descriptions{$_} if $Portage::use_masked_flags{$_} }
-+for(keys %Portage::use_masked_flags) {
-+	if($Portage::use_masked_flags{$_}) {
-+		delete $Portage::default_flags{$_};
-+		delete $Portage::all_flags{$_};
-+		delete $use_descriptions{$_};
-+	}
-+}
- 
- flags_dialog;
- 
diff --git a/app-portage/ufed/files/ufed-0.40-multiple-inheritance.patch b/app-portage/ufed/files/ufed-0.40-multiple-inheritance.patch
deleted file mode 100644
index c5608f7c9d67..000000000000
--- a/app-portage/ufed/files/ufed-0.40-multiple-inheritance.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-  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/files/ufed-0.40-noremove.patch b/app-portage/ufed/files/ufed-0.40-noremove.patch
deleted file mode 100644
index 8a133d1c983e..000000000000
--- a/app-portage/ufed/files/ufed-0.40-noremove.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- ufed-0.40/ufed.pl
-+++ ufed-0.40/ufed.pl
-@@ -23,7 +23,7 @@
- 
- delete @use_descriptions{qw(bootstrap build)};
- 
--$Portage::all_flags{'-*'} = 1 if defined $Portage::make_conf_flags{'*'} && !$Portage::make_conf_flags{'*'};
-+$Portage::make_conf_flags{'-*'} = 1 if defined $Portage::make_conf_flags{'*'} && !$Portage::make_conf_flags{'*'};
- 
- for(keys %Portage::all_flags) {
- 	@{$use_descriptions{$_}} = "(Unknown)"
-@@ -39,21 +39,13 @@
- flags_dialog;
- 
- sub finalise(@) {
--	my %flags;
--	@flags{@_} = ();
--	if(exists $flags{'-*'}) {
--		return sort keys %flags;
--	} else {
--		my(@enabled, @disabled);
--		my %all_flags;
--		@all_flags{keys %flags, keys %Portage::default_flags} = ();
--		for(sort keys %all_flags) {
--			next if $_ eq '*';
--			push @enabled,    $_  if exists $flags{$_} && !$Portage::default_flags{$_};
--			push @disabled, "-$_" if $Portage::default_flags{$_} && !exists $flags{$_};
--		}
--		return @enabled, @disabled;
--	}
-+	return sort {
-+		($a ne '-*') <=> ($b ne '-*')
-+		||
-+		($a =~ /^-/) <=> ($b =~ /^-/)
-+		||
-+		$a cmp $b
-+	} @_;
- }
- 
- sub flags_dialog() {
-@@ -82,7 +74,8 @@
- 		my %descriptions;
- 		for(my $flag=0; $flag<@flags; $flag++) {
- 			my $flag = $flags[$flag];
--			print $fh $flag, $Portage::all_flags{$flag} ? ' on ' : ' off ';
-+			print $fh $flag;
-+			print $fh defined $Portage::make_conf_flags{$flag} ? $Portage::make_conf_flags{$flag} ? ' on ' : ' off ' : ' def ';
- 			print $fh exists $Portage::make_defaults_flags{$flag} ? $Portage::make_defaults_flags{$flag} ? '(+' :'(-' :'( ' ;
- 			print $fh exists  $Portage::use_defaults_flags{$flag} ?  $Portage::use_defaults_flags{$flag} ?  '+' : '-' : ' ' ;
- 			print $fh exists     $Portage::make_conf_flags{$flag} ?     $Portage::make_conf_flags{$flag} ?  '+)': '-)': ' )';
-@@ -99,8 +92,8 @@
- 	if(POSIX::WIFEXITED($?)) {
- 		my $rc = POSIX::WEXITSTATUS($?);
- 		if($rc==0) {
--			my @flags = do { local $/; split /\n/, <$fh> };
-+			my @flags = grep { $_ ne '--*' } do { local $/; split /\n/, <$fh> };
--			save_flags finalise sort @flags;
-+			save_flags finalise @flags;
- 		} elsif($rc==1)
- 		{ print "Cancelled, not saving changes.\n" }
- 		exit $rc;
---- ufed-0.40/ufed-curses-checklist.c
-+++ ufed-0.40/ufed-curses-checklist.c
-@@ -95,8 +95,10 @@
- 
- 		line[on.end] = '\0';
- 		if(!strcmp(&line[on.start], "on"))
--			flag->on = 'X';
-+			flag->on = '+';
- 		else if(!strcmp(&line[on.start], "off"))
-+			flag->on = '-';
-+		else if(!strcmp(&line[on.start], "def"))
- 			flag->on = ' ';
- 		else
- 			exit(-1);
-@@ -179,8 +181,10 @@
- 		goto descriptiononly;
- 	}
- 	wmove(win(List), y, 0);
--	sprintf(buf, " [%c] %-*s %-5.5s ",
--		flag->on,
-+	sprintf(buf, " %c%c%c %-*s %-5.5s ",
-+		flag->on == ' ' ? '(' : '[',
-+		flag->on == ' ' ? flag->state[1] : flag->on,
-+		flag->on == ' ' ? ')' : ']',
- 		minwidth-12, flag->name,
- 		flag->state);
- 	d = &flag->descr[0];
-@@ -297,12 +301,23 @@
- 		if(yesno("Cancel? (Y/N) "))
- 			return 1;
- 		break;
--	case ' ':
--		((struct flag *) *currentitem)->on ^= ' '^'X';
--		wattrset(win(List), COLOR_PAIR(3) | A_BOLD | A_REVERSE);
--		mvwhline(win(List), (*currentitem)->top-topy, 2, ((struct flag *) *currentitem)->on, 1);
-+	case ' ': {
-+		switch (((struct flag *) *currentitem)->on) {
-+		case '+':
-+			((struct flag *) *currentitem)->on = '-';
-+			break;
-+		case '-':
-+			((struct flag *) *currentitem)->on = ' ';
-+			break;
-+		default:
-+			((struct flag *) *currentitem)->on = '+';
-+			break;
-+		}
-+		drawflag(*currentitem, TRUE);
-+		wmove(win(List), (*currentitem)->top-topy, 2);
- 		wrefresh(win(List));
- 		break;
-+	}
- 	case KEY_LEFT:
- 		if(descriptionleft>0)
- 			descriptionleft--;
-@@ -318,7 +333,20 @@
- 		break;
- #ifdef NCURSES_MOUSE_VERSION
- 	case KEY_MOUSE:
--		((struct flag *) *currentitem)->on ^= ' '^'X';
-+		switch (((struct flag *) *currentitem)->on) {
-+		case '+':
-+			((struct flag *) *currentitem)->on = '-';
-+			break;
-+		case '-':
-+			((struct flag *) *currentitem)->on = ' ';
-+			break;
-+		default:
-+			((struct flag *) *currentitem)->on = '+';
-+			break;
-+		}
-+		drawflag(*currentitem, TRUE);
-+		wmove(win(List), (*currentitem)->top-topy, 2);
-+		wrefresh(win(List));
- 		break;
- #endif
- 	case '?':
-@@ -347,8 +375,15 @@
- 		FILE *output = fdopen(4, "w");
- 		struct flag *flag = flags;
- 		do {
--			if(flag->on=='X')
-+			switch(flag->on)
-+			{
-+			case '+':
- 				fprintf(output, "%s\n", flag->name);
-+				break;
-+			case '-':
-+				fprintf(output, "-%s\n", flag->name);
-+				break;
-+			}
- 			flag = (struct flag *) flag->item.next;
- 		} while(flag!=flags);
- 		fclose(output);
diff --git a/app-portage/ufed/files/ufed-0.40-packageusemask.patch b/app-portage/ufed/files/ufed-0.40-packageusemask.patch
deleted file mode 100644
index fee6cef25cd6..000000000000
--- a/app-portage/ufed/files/ufed-0.40-packageusemask.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- ufed-0.40/ufed.pl
-+++ ufed-0.40/ufed.pl
-@@ -25,16 +25,23 @@
- 
- $Portage::all_flags{'-*'} = 1 if defined $Portage::make_conf_flags{'*'} && !$Portage::make_conf_flags{'*'};
- 
--Portage::merge %Portage::use_masked_flags, %Portage::archs;
--
- for(keys %Portage::all_flags) {
- 	@{$use_descriptions{$_}} = "(Unknown)"
- 	if not exists $use_descriptions{$_};
- }
- @{$use_descriptions{'-*'}} = 'Never enable any flags other than those specified in /etc/make.conf';
- 
-+for(@Portage::archs) {
-+	delete $Portage::default_flags{$_};
-+	delete $Portage::all_flags{$_};
-+	delete $use_descriptions{$_};
-+}
- for(keys %Portage::use_masked_flags) {
--	if($Portage::use_masked_flags{$_}) {
-+	my $masked = 1;
-+	for(values %{$Portage::use_masked_flags{$_}}) {
-+		last if not($masked &&= $_);
-+	}
-+	if($masked) {
- 		delete $Portage::default_flags{$_};
- 		delete $Portage::all_flags{$_};
- 		delete $use_descriptions{$_};
---- ufed-0.40/Portage.pm
-+++ ufed-0.40/Portage.pm
-@@ -60,9 +60,6 @@
- 	die "Sorry, USE_ORDER without make.conf overriding global USE flags are not currently supported by ufed.\n";
- }
- 
--for(keys %use_masked_flags)
--{ delete $all_flags{$_} if $use_masked_flags{$_} and exists $all_flags{$_} }
--
- sub have_package($) {
- 	my ($cp) = @_;
- 	return $packages{$cp};
-@@ -216,6 +213,7 @@
- 			redo PARENT;
- 		}
- 	}
-+	push @profiles, '/etc/portage/profile';
- }
- 
- sub read_sh($) {
-@@ -301,7 +299,15 @@
- 	for my $dir(@profiles) {
- 		for(noncomments "$dir/use.mask") {
- 			my $off = s/^-//;
--			$use_masked_flags{$_} = !$off;
-+			$use_masked_flags{$_} = { '' => !$off };
-+		}
-+		for(noncomments "$dir/package.use.mask") {
-+			my($pkg, @flags) = split;
-+			for(@flags) {
-+				my $off = s/^-//;
-+				$use_masked_flags{$_}{''} ||= 0;
-+				$use_masked_flags{$_}{$pkg} = !$off;
-+			}
- 		}
- 	}
- }
diff --git a/app-portage/ufed/files/ufed-0.40-source.patch b/app-portage/ufed/files/ufed-0.40-source.patch
deleted file mode 100644
index 236928334bb7..000000000000
--- a/app-portage/ufed/files/ufed-0.40-source.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- ufed-0.40/ufed.pl
-+++ ufed-0.40/ufed.pl
-@@ -161,6 +161,7 @@
- 		close $makeconf;
- 	}
- 
-+	my $sourcing = 0;
- 	eval {
- 		# USE comment start/end (start/end of newline character at the end, specifically)
- 		# default to end of make.conf, to handle make.confs without #USE=
-@@ -180,8 +181,12 @@
- 			/\G$IDENT/gc or die;
- 			my $name = $1;
- 			/\G$BLANK/gc;
-+			if($name ne 'source') {
- 			/\G$ASSIG/gc or die;
- 			/\G$BLANK/gc;
-+			} else {
-+				$sourcing = 1;
-+			}
- 			die if pos == length;
- 			if($name ne 'USE') {
- 				/\G(?:$UQVAL|$SQVAL|$DQVAL)+/gc or die;
-@@ -265,8 +270,12 @@
- 				/\G$IDENT/gc or die;
- 				my $name = $1;
- 				/\G$BLANK/gc;
-+				if($name ne 'source') {
- 				/\G$ASSIG/gc or die;
- 				/\G$BLANK/gc;
-+				} else {
-+					$sourcing = 1;
-+				}
- 				/\G(?:$UQVAL|$SQVAL|$DQVAL)+/gc or die;
- 				my $end = pos;
- 				if($name eq 'USE') {
-@@ -278,6 +287,10 @@
- 	};
- 	die "Parse error when writing make.conf - did you modify it while ufed was running?\n" if $@;
- 
-+	print STDERR <<EOF if $sourcing;
-+Warning: source command found in /etc/make.conf. Flags may
-+be saved incorrectly if the sourced file modifies them.
-+EOF
- 	{
- 		open my $makeconf, '>', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n";
- 		print $makeconf $_;
---- ufed-0.40/Portage.pm
-+++ ufed-0.40/Portage.pm
-@@ -237,8 +237,10 @@
- 				/\G$IDENT/gc or die;
- 				my $name = $1;
- 				/\G$BLANK/gc;
-+				if($name ne 'source') {
- 				/\G$ASSIG/gc or die;
- 				/\G$BLANK/gc;
-+				}
- 				die if pos == length;
- 				my $value = '';
- 				for(;;) {
-@@ -262,7 +264,20 @@
- 						last
- 					}
- 				}
-+				if($name eq 'source') {
-+					open my $f, '<', $value or die;
-+					my $pos = pos;
-+					substr($_, pos, 0) = do {
-+						local $/;
-+						my $text = <$f>;
-+						die if not defined $text;
-+						$text;
-+					};
-+					pos = $pos;
-+					close $f or die;
-+				} else {
- 				$env{$name} = $value;
-+				}
- 			}
- 		};
- 		die "Parse error in $fname\n" if $@;
diff --git a/app-portage/ufed/files/ufed-0.40-termsize-2.patch b/app-portage/ufed/files/ufed-0.40-termsize-2.patch
deleted file mode 100644
index ae0834e76682..000000000000
--- a/app-portage/ufed/files/ufed-0.40-termsize-2.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-
-  Allow termsizes as small as allowing only one line in the list.
-  Bug #273309 by ulm
-
---- ufed-0.40/ufed-curses.c
-+++ ufed-0.40/ufed-curses.c
-@@ -21,7 +21,7 @@
- static const struct key *keys;
- 
- static struct item *items, *currentitem;
--int topy, minheight, minwidth;
-+int topy, minwidth;
- 
- static void checktermsize(void);
- 
-@@ -53,7 +53,7 @@
- }
- 
- static void checktermsize(void) {
--	while(wHeight(List) < minheight
-+	while(wHeight(List) < 1
- 	   || wWidth(List)  < minwidth) {
- #ifdef KEY_RESIZE
- 		clear();
-@@ -227,32 +227,13 @@
- }
- 
- void scrollcurrent(void) {
--	int oldtopy = topy;
- 	if(currentitem->top < topy)
--		topy = currentitem->top;
-+		topy = max(currentitem->top, currentitem->top+currentitem->height-wHeight(List));
- 	else if(currentitem->top+currentitem->height > topy+wHeight(List))
--		topy = currentitem->top+currentitem->height-wHeight(List);
-+		topy = min(currentitem->top+currentitem->height-wHeight(List), currentitem->top);
- 	else
- 		return;
--	if(abs(topy-oldtopy)>wHeight(List)) {
--		drawitems();
-+	drawitems();
--	} else {
--		struct item *item = currentitem;
--		scrollok(win(List), TRUE);
--		wscrl(win(List), topy-oldtopy);
--		scrollok(win(List), FALSE);
--		if(topy<oldtopy)
--			while((item=item->next)!=items
--			 && item->top < oldtopy
--			 && item->top < topy + wHeight(List))
--				(*drawitem)(item, FALSE);
--		else
--			while((item=item->prev)->next!=items
--			 && item->top > oldtopy
--			 && item->top + item->height-1 >= topy)
--				(*drawitem)(item, FALSE);
--		mvwhline(win(List), wHeight(List), 0, ' ', wWidth(List));
--	}
- 	drawscrollbar();
- }
- 
-@@ -282,8 +263,8 @@
- 					window[w].win = newwin(wHeight(w), wWidth(w), wTop(w), wLeft(w));
- 				} }
- 				/* this won't work for the help viewer, but it doesn't use yesno() */
--				currentitem = items;
- 				topy = 0;
-+				scrollcurrent();
- 				draw();
- 				wattrset(win(Input), COLOR_PAIR(4) | A_BOLD | A_REVERSE);
- 				mvwhline(win(Input), 0, 0, ' ', wWidth(Input));
-@@ -463,7 +444,11 @@
- 
- 			switch(c) {
- 				case KEY_UP:
--					if(currentitem!=items) {
-+					if(currentitem->top<topy) {
-+						(*drawitem)(currentitem, FALSE);
-+						topy--;
-+						(*drawitem)(currentitem, TRUE);
-+					} else if(currentitem!=items || topy>currentitem->top) {
- 						(*drawitem)(currentitem, FALSE);
- 						currentitem = currentitem->prev;
- 						scrollcurrent();
-@@ -472,7 +457,11 @@
- 					break;
- 	
- 				case KEY_DOWN:
--					if(currentitem->next!=items) {
-+					if(currentitem->top+currentitem->height>topy+wHeight(List)) {
-+						(*drawitem)(currentitem, FALSE);
-+						topy++;
-+						(*drawitem)(currentitem, TRUE);
-+					} else if(currentitem->next!=items) {
- 						(*drawitem)(currentitem, FALSE);
- 						currentitem = currentitem->next;
- 						scrollcurrent();
-@@ -484,9 +473,9 @@
- 					if(currentitem!=items) {
- 						struct item *olditem = currentitem;
- 						(*drawitem)(currentitem, FALSE);
-+						do currentitem = currentitem->prev;
- 						while(currentitem!=items
--						 && olditem->top - currentitem->prev->top <= wHeight(List))
-+						 && olditem->top - currentitem->prev->top <= wHeight(List));
--							currentitem = currentitem->prev;
- 						scrollcurrent();
- 						(*drawitem)(currentitem, TRUE);
- 					}
-@@ -496,10 +485,10 @@
- 					if(currentitem->next!=items) {
- 						struct item *olditem = currentitem;
- 						(*drawitem)(currentitem, FALSE);
-+						do currentitem = currentitem->next;
- 						while(currentitem->next!=items
- 						 && (currentitem->next->top + currentitem->next->height)
--						     - (olditem->top + olditem->height) <= wHeight(List))
-+						     - (olditem->top + olditem->height) <= wHeight(List));
--							currentitem = currentitem->next;
- 						scrollcurrent();
- 						(*drawitem)(currentitem, TRUE);
- 					}
-@@ -531,11 +520,11 @@
- 						delwin(window[w].win);
- 						window[w].win = newwin(wHeight(w), wWidth(w), wTop(w), wLeft(w));
- 					} }
--					if(result==-1)
-+					if(result==-1) {
--						currentitem = items;
-+						topy = 0;
-+						scrollcurrent();
--					else
-+					} else
- 						items = currentitem;
--					topy = 0;
- 					draw();
- 					break;
- #endif
---- ufed-0.40/ufed-curses-checklist.c
-+++ ufed-0.40/ufed-curses-checklist.c
-@@ -109,8 +109,6 @@
- 		flag->state = &line[state.start];
- 
- 		flag->item.height = ndescr;
--		if(ndescr > minheight)
--			minheight = ndescr;
- 		{ int i; for(i=0; i<ndescr; i++) {
- 			flag->descr[i] = getline(input);
- 		} }
-@@ -174,11 +172,12 @@
- 		wattrset(win(List), COLOR_PAIR(3));
- 	else
- 		wattrset(win(List), COLOR_PAIR(3) | A_BOLD | A_REVERSE);
--	if(y < 0) {
-+	if(y >= 0 || -y >= flag->item.height) {
-+		d = &flag->descr[0];
-+	} else {
- 		wmove(win(List), 0, 0);
- 		d = &flag->descr[-y];
- 		y = 0;
--		goto descriptiononly;
- 	}
- 	wmove(win(List), y, 0);
- 	sprintf(buf, " %c%c%c %-*s %-5.5s ",
-@@ -187,7 +186,6 @@
- 		flag->on == ' ' ? ')' : ']',
- 		minwidth-12, flag->name,
- 		flag->state);
--	d = &flag->descr[0];
- 	if(d != &flag->descr[flag->item.height]) {
- 		for(;;) {
- 			sprintf(buf+minwidth, "%-*.*s",
-@@ -198,7 +196,6 @@
- 			waddstr(win(List), buf);
- 			d++;
- 			y++;
--		descriptiononly:
- 			if(d!=&flag->descr[flag->item.height] && y<wHeight(List)) {
- 				char *p;
- 				for(p=buf; p!=buf+minwidth; p++)
-@@ -214,7 +211,7 @@
- 		y++;
- 	}
- 	if(highlight)
--		wmove(win(List), flag->item.top - topy, 2);
-+		wmove(win(List), max(flag->item.top - topy, 0), 2);
- 	wnoutrefresh(win(List));
- }
- 
---- ufed-0.40/ufed-curses.h
-+++ ufed-0.40/ufed-curses.h
-@@ -45,6 +45,8 @@
- static inline int wLeft  (enum win w) { return (window[w].left  >= 0 ? 0 : COLS ) + window[w].left  ; }
- static inline int wHeight(enum win w) { return (window[w].height > 0 ? 0 : LINES) + window[w].height; }
- static inline int wWidth (enum win w) { return (window[w].width  > 0 ? 0 : COLS ) + window[w].width ; }
-+static inline int min(int a, int b) { return a < b ? a : b; }
-+static inline int max(int a, int b) { return a > b ? a : b; }
- 
--extern int minheight, minwidth;
-+extern int minwidth;
- extern int topy;
diff --git a/app-portage/ufed/files/ufed-0.40-termsize.patch b/app-portage/ufed/files/ufed-0.40-termsize.patch
deleted file mode 100644
index e6179646e1f1..000000000000
--- a/app-portage/ufed/files/ufed-0.40-termsize.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-  Don't draw scroll thumb if the terminal is large enough to not
-  need one. Reported by Martin von Gagern <Martin.vGagern@gmx.net>.
-
---- ufed-0.40/ufed-curses.c
-+++ ufed-0.40/ufed-curses.c
-@@ -109,7 +109,8 @@
- 	wattrset(w, COLOR_PAIR(3) | A_BOLD);
- 	mvwaddch(w, 0, 0, ACS_UARROW);
- 	wvline(w, ACS_CKBOARD, wHeight(Scrollbar)-3);
-+	if(items->prev->top+items->prev->height > wHeight(List))
--	mvwaddch(w, 1+(wHeight(Scrollbar)-3)*topy/(items->prev->top+items->prev->height-(wHeight(List)-1)), 0, ACS_BLOCK);
-+		mvwaddch(w, 1+(wHeight(Scrollbar)-3)*topy/(items->prev->top+items->prev->height-(wHeight(List)-1)), 0, ACS_BLOCK);
- 	mvwaddch(w, wHeight(Scrollbar)-2, 0, ACS_DARROW);
- 	mvwaddch(w, wHeight(Scrollbar)-1, 0, ACS_VLINE);
- 	wnoutrefresh(w);
-@@ -380,7 +381,9 @@
- 			mousekey = c; \
- 		goto check_key; \
- 	}
-+						if(items->prev->top+items->prev->height > wHeight(List))
-+							{}
--						if(event.y == 0)
-+						else if(event.y == 0)
- 							SIM(UP)
- 						else if(event.y == wHeight(Scrollbar)-2)
- 							SIM(DOWN)
diff --git a/app-portage/ufed/files/ufed-0.40-useorder.patch b/app-portage/ufed/files/ufed-0.40-useorder.patch
deleted file mode 100644
index 6df4645cccba..000000000000
--- a/app-portage/ufed/files/ufed-0.40-useorder.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ufed-0.40/Portage.pm
-+++ ufed-0.40/Portage.pm
-@@ -40,13 +43,25 @@
- read_make_defaults;
- read_make_conf;
- read_archs;
--read_use_descs;
- 
--%default_flags = %make_defaults_flags;
--merge %default_flags, %use_defaults_flags;
--
--%all_flags = %default_flags;
--merge %all_flags, %make_conf_flags;
-+my $lastorder;
-+for(reverse split /:/, $environment{USE_ORDER} || "env:pkg:conf:auto:defaults") {
-+	if($_ eq 'defaults') {
-+		merge %default_flags, %make_defaults_flags;
-+		merge %all_flags, %make_defaults_flags;
-+	} elsif($_ eq 'auto') {
-+		merge %default_flags, %use_defaults_flags;
-+		merge %all_flags, %use_defaults_flags;
-+	} elsif($_ eq 'conf') {
-+		merge %all_flags, %make_conf_flags;
-+	} else {
-+		next;
-+	}
-+	$lastorder = $_;
-+}
-+if($lastorder ne 'conf') {
-+	die "Sorry, USE_ORDER without make.conf overriding global USE flags are not currently supported by ufed.\n";
-+}
- 
- for(keys %use_masked_flags)
- { delete $all_flags{$_} if $use_masked_flags{$_} and exists $all_flags{$_} }
diff --git a/app-portage/ufed/files/ufed-0.40.1-make.globals-path.patch b/app-portage/ufed/files/ufed-0.40.1-make.globals-path.patch
deleted file mode 100644
index c6ae03999b76..000000000000
--- a/app-portage/ufed/files/ufed-0.40.1-make.globals-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/427862
-http://bugs.gentoo.org/431064
-
---- Portage.pm
-+++ Portage.pm
-@@ -150,7 +150,7 @@
- }
- 
- sub read_make_globals() {
--	for my $dir(@profiles, '/etc') {
-+	for my $dir(@profiles, '/usr/share/portage/config') {
- 		read_sh "$dir/make.globals";
- 	}
- }
diff --git a/app-portage/ufed/ufed-0.40-r10.ebuild b/app-portage/ufed/ufed-0.40-r10.ebuild
deleted file mode 100644
index 97971dbb876e..000000000000
--- a/app-portage/ufed/ufed-0.40-r10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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-r10.ebuild,v 1.8 2008/10/25 22:37:37 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~truedfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-useorder.patch
-	epatch "${FILESDIR}"/${P}-source.patch
-	epatch "${FILESDIR}"/${P}-comments.patch
-	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() {
-	./configure || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	newsbin ufed.pl ufed || die
-	doman ufed.8
-	insinto /usr/lib/ufed
-	doins *.pm || die
-	exeinto /usr/lib/ufed
-	doexe ufed-curses || die
-}
diff --git a/app-portage/ufed/ufed-0.40-r11.ebuild b/app-portage/ufed/ufed-0.40-r11.ebuild
deleted file mode 100644
index 56ea9fcf6d1b..000000000000
--- a/app-portage/ufed/ufed-0.40-r11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40-r11.ebuild,v 1.4 2013/02/02 12:15:02 alexxy Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~truedfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-useorder.patch
-	epatch "${FILESDIR}"/${P}-source.patch
-	epatch "${FILESDIR}"/${P}-comments.patch
-	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
-	epatch "${FILESDIR}"/${P}-termsize-2.patch
-}
-
-src_configure() {
-	tc-export CC
-	./configure || die
-}
-
-src_install() {
-	newsbin ufed.pl ufed || die
-	doman ufed.8
-	insinto /usr/lib/ufed
-	doins *.pm || die
-	exeinto /usr/lib/ufed
-	doexe ufed-curses || die
-}
diff --git a/app-portage/ufed/ufed-0.40-r6.ebuild b/app-portage/ufed/ufed-0.40-r6.ebuild
deleted file mode 100644
index d282a3244b22..000000000000
--- a/app-portage/ufed/ufed-0.40-r6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40-r6.ebuild,v 1.12 2010/10/20 18:55:34 leio Exp $
-
-inherit eutils
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~truedfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-useorder.patch
-	epatch "${FILESDIR}"/${P}-source.patch
-	epatch "${FILESDIR}"/${P}-comments.patch
-	epatch "${FILESDIR}"/${P}-masked.patch
-	epatch "${FILESDIR}"/${P}-packageusemask.patch
-}
-
-src_compile() {
-	./configure || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	newsbin ufed.pl ufed || die
-	doman ufed.8
-	insinto /usr/lib/ufed
-	doins *.pm || die
-	exeinto /usr/lib/ufed
-	doexe ufed-curses || die
-}
diff --git a/app-portage/ufed/ufed-0.40.1-r1.ebuild b/app-portage/ufed/ufed-0.40.1-r1.ebuild
deleted file mode 100644
index dda303e0f3e1..000000000000
--- a/app-portage/ufed/ufed-0.40.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40.1-r1.ebuild,v 1.1 2012/08/12 11:44:53 ssuominen Exp $
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~truedfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.globals-path.patch
-}
-
-src_configure() {
-	econf --libexecdir=/usr/$(get_libdir)/ufed
-}
diff --git a/app-portage/ufed/ufed-0.40.1.ebuild b/app-portage/ufed/ufed-0.40.1.ebuild
deleted file mode 100644
index 7c76e86149d7..000000000000
--- a/app-portage/ufed/ufed-0.40.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40.1.ebuild,v 1.9 2012/06/02 07:01:30 zmedico Exp $
-
-EAPI=2
-
-inherit multilib
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~truedfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_configure() {
-	econf --libexecdir=/usr/$(get_libdir)/ufed
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/app-portage/ufed/ufed-0.40.2.ebuild b/app-portage/ufed/ufed-0.40.2.ebuild
deleted file mode 100644
index 9e511563abcb..000000000000
--- a/app-portage/ufed/ufed-0.40.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40.2.ebuild,v 1.1 2012/11/02 21:06:34 fuzzyray Exp $
-
-EAPI=2
-
-inherit multilib autotools
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-	eautoreconf
-}
-src_configure() {
-	econf --libexecdir=/usr/$(get_libdir)/ufed
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}