Drop stable keywords, bug 217582, remove old

Package-Manager: portage-2.1.5_rc3

12 files changed, 13 insertions, 469 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index b933edcb9164..a2af0ac5b620 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.173 2008/04/14 20:03:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.174 2008/04/15 01:18:08 beandog Exp $
+
+  15 Apr 2008; Steve Dibb <beandog@gentoo.org>
+  -files/webmin-1.170-postfix.patch,
+  -files/webmin-1.230-ldap-useradmin.patch,
+  -files/webmin-1.300-postfix.patch, -files/virtual-server-2.31-pgsql.patch,
+  -files/virtual-server-2.610-checkip.patch,
+  -files/1.390-iptables-gentoo.patch,
+  -files/virtual-server-2.31-namevirtual.patch,
+  -files/virtual-server-2.60-nocgibin.patch, -webmin-1.350.ebuild,
+  -webmin-1.400.ebuild:
+  Drop stable keywords, bug 217582, remove old
 
   14 Apr 2008; Jeroen Roovers <jer@gentoo.org> webmin-1.350.ebuild,
   webmin-1.400.ebuild:
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 970b2f677b52..0cfce64d2e99 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,27 +1,15 @@
-AUX 1.390-iptables-gentoo.patch 447 RMD160 7bb5adab1c39d66b9c4a8833370f5560bc47f2a2 SHA1 5ddb35a219927062b0ca8969920a531d3c8e5a57 SHA256 b405740f35aff6ce90d257f8e64f705b56ae1c68365ac89f73ef2f30b8a3c070
 AUX init.d.webmin 880 RMD160 9aab2eb11c28dfde803f5e5913ed7003fb2e8e0e SHA1 02d0708fc712b3f1c6702a0b4a26472b2878d8ca SHA256 aa09a0e8810611146f35f7c954f5c72449c7ea14b9d4b19d0591560a7a2d95de
 AUX uninstall.sh 260 RMD160 57b7230cda3c1fbc3ee0cff5bc6d5e1ce157bbaa SHA1 4a775779dad3c7392ce4283a6d0525cc8b1b3cd4 SHA256 91a47a503b8ded8eb14d1e1960729e9909004eb20382201fc91e2a884800160d
-AUX virtual-server-2.31-namevirtual.patch 2951 RMD160 1c2f888bedb57dc5a999115cb5ccb321acc84136 SHA1 106e1d045c49090a4ddac932c79f7e43f8ac8139 SHA256 51babd5be584606601eb9d8b0921240b6dfc452000712661eb0934fd61df2184
-AUX virtual-server-2.31-pgsql.patch 579 RMD160 3ee322cec151ce88326ed1a138bf7992c4133b41 SHA1 458b4b5da1d208f4a9d7fd3b8813706b565e5393 SHA256 33df7ca51ae9f5d7addd43e640c95b7506d595f4a07fe25548ec5f231bda4b37
-AUX virtual-server-2.60-nocgibin.patch 1277 RMD160 b434d3bf825b8e321502acffe1221dbc8a55f690 SHA1 1f0834e39cd006f7fba9a4e1333db1fb16b660d8 SHA256 7a364f75c9dca9ac230ecc88098f61410715fb1416e589513a6ddd575e77765a
-AUX virtual-server-2.610-checkip.patch 703 RMD160 21c32714ba93c489b545362e65d02c06cc28c92f SHA1 4a7834ffc22f275898de37e2ce64f8eb4ab6c1b3 SHA256 dbaebb30bc221aba099f2ea7f1a865edb82d9af8dcadbb4e616b04283257075d
 AUX virtual-server-3.23-nocgibin.patch 616 RMD160 61074351e8fd1bcb161e5360b57f477e2ec2b451 SHA1 efffa7d438a2f89049933284b7d0ce5444b02c25 SHA256 1a67a05d722994003b0751b8b62a9ca08b21d1638bb80491584ec558b634ab67
 AUX virtual-server-3.23-pgsql.patch 626 RMD160 91c79ab0615b9555888104b88181974fb36e7d69 SHA1 ec42024a389c66b52be8aa83b225b513af31dedb SHA256 deedb2228f710da2163714f4e76519e8ea6375a981946d3d1af9bf659750c1a9
 AUX webmin-1.140-apache2.patch 1250 RMD160 d6085f73b3631f28e4d8154288271fd911bce491 SHA1 f2c751f8e27cf8b250eed2934d054766e1d13363 SHA256 024291db8cd2606cdaeee3e6688c2abd75516f9ed8de6fceb337338e1601b6ac
-AUX webmin-1.170-postfix.patch 868 RMD160 c73c4be29a203431bb6a7314e63ffb65823a81d7 SHA1 53476b8d4d97d86f71fb93e3b0933756935308ca SHA256 3bab332f0a2605d6bbc7130a8a00d2743a9ab7c31870daf0419d9e4ef8aa5e28
 AUX webmin-1.170-setup-nocheck.patch 943 RMD160 a6fdb34184261c63ed738f9435c4a31f4d988cff SHA1 216b214a5d4042af7fe293a6ee4191d5de70bf73 SHA256 5bb71c9a5eb76d98757b2892cd3a0b656593f5136d5109f49bc7191b9a7f3aa1
-AUX webmin-1.230-ldap-useradmin.patch 905 RMD160 cd3f6812d5e7cf0bac7d9d9a43a43a1f4ea6b8b0 SHA1 6e7802ea8a2aa44535edfbb553222254fb81c05d SHA256 fea76b9353770fff0240bfb0bbe4f531d638861fb1021b2fdbe6950f8b79dc41
 AUX webmin-1.270-ldap-useradmin.patch 582 RMD160 a61b31b787aa1e8c4c63f04c00736ac574262fbe SHA1 e215c82adad1d0663ae02629e6791b99a811bde2 SHA256 57c8766c7c46a3d9a34099ba4285b39f23b538241f563455c83866945d3a73ef
-AUX webmin-1.300-postfix.patch 985 RMD160 1901eac1d2155c43c52cf9a3270666165c181d02 SHA1 6a5c68648e06dcd78752aebf43733ff154018550 SHA256 12a5fb28eebd1238b91e3bea0bf35ce46816d163663055e2744bec3671745f7e
 AUX webmin-gentoo-init 864 RMD160 6e584eb9bb77b014e688cc13bdce99f315fec41b SHA1 963d9fd8b6faee0e1751c1b898d832bddf9f463f SHA256 f27fb9f944f32994858a3d27aa78d03742618c53267f31bca85d9f65da1c757b
 AUX webmin-pam 128 RMD160 ee4f2cd70ed2bcaa7e4865fae26ac5c14c36c620 SHA1 91b34c1424bf69a1f8e292193e1a5e2add814a97 SHA256 fcb5cc28ad0db83e96652241621b27782fa71aeea5576cb67f2c7f5ccfaed4af
 DIST virtual-server-3.23.gpl.wbm.gz 379417 RMD160 912ba4ff66b7644f05e7e5b52286b5a41cf7163d SHA1 1b032a1463547ecf3f792ec051c93c5a79458086 SHA256 c5631f73921058df40a08b0d248bad1acf1dd5b7ded451c7c6f9fff1d923a360
-DIST webmin-1.350-minimal.tar.gz 1418154 RMD160 8478c31358b290438be7ca5c7219ab448ffb47a8 SHA1 be1f284ddd1837fde98acf3b0b668e31984a8deb SHA256 0d2909161f256d8a7a552ef6224ff1ee2b77118c0fa07ca7e29a59e5f2ed3cab
-DIST webmin-1.350.tar.gz 12832134 RMD160 a2bb929f3ee67a8240697f82a86595d6b415d067 SHA1 9834fce7db5fa3ba6709dcbbac9c812da6883895 SHA256 1941e2cbbd6af6b1d82d046b61a93b6df8ed100b6b0ebf54e6be8f46b7ecbe22
 DIST webmin-1.400-minimal.tar.gz 1570083 RMD160 3dab583852f374af5016e211a6460026815dfae6 SHA1 1be906dbe54a5d44170ea2637e58d207bacc984a SHA256 7cb4dc7e524f04ef5d9fc55ade7126a2fa596fb538307bcf96774ff74f24cc82
 DIST webmin-1.400.tar.gz 13457079 RMD160 4af2ca5eab965fc6f78d9745fa4d2b0c6565a088 SHA1 bf38da1278f0e2e0e468d60de7230b686dece224 SHA256 d937900de2ab2ae0bc63ba08cb4cd6f61e674ac6b7f9db6315f7adddd5e7a280
-EBUILD webmin-1.350.ebuild 3835 RMD160 097d30324b8939e3a1fdc0f058fcebaf3b859e5f SHA1 750f3b73d58eaa350ee879214f4ba4d3ec1653d1 SHA256 26005f6bf415e42a8a69d43f6b9240f156beaa86ff085120d486fce224dbc333
 EBUILD webmin-1.400-r1.ebuild 3791 RMD160 603d69ed61e6182e4d0e501dc2d72557718b7a4d SHA1 10dd433948204d77840acfb7c56e54cac46f5791 SHA256 d666157a8c06d4df3621d3ac2f61286cee34c242eff8fad066593e74bb8d58bc
-EBUILD webmin-1.400.ebuild 3769 RMD160 fae037b19de1d90c6291ece0ea9d9ff143524e39 SHA1 ad29229c4c49fc3feb9723c4b1c55ad66cb88169 SHA256 9cb939d4d5cbf087a34cd5a5dc4524fe25bff3af057d402490edb2c3fe13ec4b
-MISC ChangeLog 24071 RMD160 37c089e07b73bd2adcf47279af1b6cdb74166f6b SHA1 99bab94360125981dd7d081b0d282a629884e5e7 SHA256 844917a17b4c6a479184000473982d192d2ca97e802627eb98e4312fc2262210
+MISC ChangeLog 24550 RMD160 2bfea0218d3fcfd3c8de323517c1ae5ade862973 SHA1 44f6fafd00fdd23da0aa997fac2a8458fc744ce7 SHA256 777b37cf63b7c74d280dde609cf6c7349277f3219978aab235c79fc478004ff3
 MISC metadata.xml 222 RMD160 f67ae3f744b9db4bbf17b9141e8c01b185262bd5 SHA1 b5f83096136c0a206e39c3aef719439891b1d442 SHA256 a28546f6334805a80dab4dc57cb360aa28bffe3c675a73402fc5128daa97eb97
diff --git a/app-admin/webmin/files/1.390-iptables-gentoo.patch b/app-admin/webmin/files/1.390-iptables-gentoo.patch
deleted file mode 100644
index 59590afa8ed9..000000000000
--- a/app-admin/webmin/files/1.390-iptables-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- firewall/gentoo-linux-lib.pl.orig	2007-12-23 13:27:20.000000000 +0100
-+++ firewall/gentoo-linux-lib.pl	2007-12-23 13:27:28.000000000 +0100
-@@ -19,7 +19,7 @@
- # Applies the current iptables configuration from the save file
- sub apply_iptables
- {
--local $out = &backquote_logged("cd / ; /etc/init.d/iptables restart 2>&1");
-+local $out = &backquote_logged("cd / ; /etc/init.d/iptables reload 2>&1");
- return $? ? "<pre>$out</pre>" : undef;
- }
- 
diff --git a/app-admin/webmin/files/virtual-server-2.31-namevirtual.patch b/app-admin/webmin/files/virtual-server-2.31-namevirtual.patch
deleted file mode 100644
index 0669a84c9486..000000000000
--- a/app-admin/webmin/files/virtual-server-2.31-namevirtual.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur virtual-server.orig/feature-ssl.pl virtual-server/feature-ssl.pl
---- virtual-server.orig/feature-ssl.pl	2004-09-11 00:34:25.000000000 -0700
-+++ virtual-server/feature-ssl.pl	2004-11-17 22:48:20.000000000 -0800
-@@ -10,6 +10,24 @@
- local $web_sslport = $tmpl->{'web_sslport'} || 443;
- &require_apache();
- local $conf = &apache::get_config();
-+
-+# add NameVirtualHost if needed
-+if ($_[0]->{'name'}) {
-+	local $found;
-+	local @nv = &apache::find_directive("NameVirtualHost", $conf);
-+	foreach $nv (@nv) {
-+		$found++ if ($nv eq $_[0]->{'ip'} ||
-+			$nv =~ /^(\S+):(\S+)/ && $1 eq $_[0]->{'ip'} && $2 eq "443" ||
-+			$nv eq '*');
-+	}
-+	if(!$foundssl) {
-+		&apache::save_directive("NameVirtualHost",
-+		                        [ @nv, $_[0]->{'ip'}.":443" ],
-+		                        $conf, $conf);
-+		&flush_file_lines();
-+		}
-+	}
-+
- if ($apache::config{'virt_file'}) {
- 	$f = -d $apache::config{'virt_file'} ?
- 		"$apache::config{'virt_file'}/www.$_[0]->{'dom'}.conf" :
-diff -Naur virtual-server.orig/feature-web.pl virtual-server/feature-web.pl
---- virtual-server.orig/feature-web.pl	2004-10-07 17:07:06.000000000 -0700
-+++ virtual-server/feature-web.pl	2004-11-17 22:52:13.024826263 -0800
-@@ -40,7 +40,7 @@
- 	local @nv = &apache::find_directive("NameVirtualHost", $conf);
- 	foreach $nv (@nv) {
- 		$found++ if ( #$nv eq $_[0]->{'ip'} ||
--			     $nv =~ /^(\S+):(\S+)/ && $1 eq $_[0]->{'ip'} ||
-+			     $nv =~ /^(\S+):(\S+)/ && $1 eq $_[0]->{'ip'} && $2 eq $web_port ||
- 			     $nv eq '*');
- 		$found_no_port++ if $nv eq $_[0]->{'ip'};
- 		$nvstar++ if ($nv eq "*");
-@@ -248,7 +248,7 @@
- 		&$first_print($text{'save_apache'});
- 		local $lref = &read_file_lines($virt->{'file'});
- 		$lref->[$virt->{'line'}] =
--			$_[0]->{'name'} ? "<VirtualHost *>" :
-+			$_[0]->{'name'} && !$config{'all_namevirtual'} ? "<VirtualHost *>" :
- 				"<VirtualHost $_[0]->{'ip'}:$_[1]->{'web_port'}>";
- 		&flush_file_lines();
- 		$rv++;
-diff -Naur virtual-server.orig/help/iface.html virtual-server/help/iface.html
---- virtual-server.orig/help/iface.html	2004-02-09 23:13:33.000000000 -0800
-+++ virtual-server/help/iface.html	2004-11-17 22:53:18.404198519 -0800
-@@ -1,5 +1,9 @@
- <header>Network Interface</header>
- 
-+If you chose 'Create all webs as NameVirtualHost?' in the module configuration, this option will let you select the IP address to use for this site. <p>
-+
-+If you did not choose 'Create all webs as NameVirtualHost?' in the module configuration, you will have two options here: <p>
-+
- If you want to set up an IP-based virtual host (required for SSL websites or virtual FTP hosting), this option must be set to <b>Virtual interface with IP</b> and an un-used address entered. Virtualmin will activate this IP on your system when the server is created, and associate it with the server. <p>
- 
- If the <b>Shared</b> option is selected, the system's primary network interface address will be used for this server's website and DNS domain instead. <p>
diff --git a/app-admin/webmin/files/virtual-server-2.31-pgsql.patch b/app-admin/webmin/files/virtual-server-2.31-pgsql.patch
deleted file mode 100644
index 97109242db58..000000000000
--- a/app-admin/webmin/files/virtual-server-2.31-pgsql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur virtual-server.orig/domain_setup.cgi virtual-server/domain_setup.cgi
---- virtual-server.orig/domain_setup.cgi	2004-10-10 16:25:43.000000000 -0700
-+++ virtual-server/domain_setup.cgi	2004-11-17 22:41:50.285398317 -0800
-@@ -70,6 +70,11 @@
- 		$user =~ /^[^\t :]+$/ || &error($text{'setup_euser2'});
- 		defined(getpwnam($user)) && &error($text{'setup_euser'});
- 		}
-+
-+	if ($config{'postgres'} && $in{'postgres'}) {
-+		$user =~ /^[A-Za-z]/ || &error("Username must begin with a letter if you are using postgres.");
-+	}
-+
- 	if ($in{'mgroup_def'}) {
- 		$group = $user;
- 		}
diff --git a/app-admin/webmin/files/virtual-server-2.60-nocgibin.patch b/app-admin/webmin/files/virtual-server-2.60-nocgibin.patch
deleted file mode 100644
index 3379dffbf0fb..000000000000
--- a/app-admin/webmin/files/virtual-server-2.60-nocgibin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naurp webmin-1.210.orig/virtual-server/feature-dir.pl webmin-1.210/virtual-server/feature-dir.pl
---- webmin-1.210.orig/virtual-server/feature-dir.pl	2005-04-12 17:27:34.000000000 -0700
-+++ webmin-1.210/virtual-server/feature-dir.pl	2005-06-24 10:00:03.000000000 -0700
-@@ -38,8 +38,8 @@ if ($tmpl->{'skel'} ne "none") {
- # Setup web directories
- local $d;
- local $perms = $tmpl->{'web_html_perms'};
-+#             [ 'cgi-bin', '755' ],
- foreach $d ( [ &public_html_dir($_[0], 1), $perms ],
--             [ 'cgi-bin', '755' ],
-              [ 'logs', '755' ],
-              [ $config{'homes_dir'}, '755' ] ) {
-         &system_logged("mkdir -p $qh/$d->[0] 2>/dev/null");
-diff -Naurp webmin-1.210.orig/virtual-server/import.cgi webmin-1.210/virtual-server/import.cgi
---- webmin-1.210.orig/virtual-server/import.cgi	2005-02-21 21:01:02.000000000 -0800
-+++ webmin-1.210/virtual-server/import.cgi	2005-06-24 10:00:24.000000000 -0700
-@@ -164,8 +164,8 @@ if ($in{'confirm'}) {
- 
- 	# Setup web directories
- 	print $text{'import_dirs'},"<br>\n";
-+#		     [ 'cgi-bin', '755' ],
- 	foreach $d ( [ $config{'html_dir'} || 'public_html', '755' ],
--		     [ 'cgi-bin', '755' ],
- 		     [ 'logs', '755' ],
- 		     [ $config{'homes_dir'}, '755' ] ) {
- 		if (!-d "$uinfo{'home'}/$d->[0]") {
diff --git a/app-admin/webmin/files/virtual-server-2.610-checkip.patch b/app-admin/webmin/files/virtual-server-2.610-checkip.patch
deleted file mode 100644
index 70cc065a20ca..000000000000
--- a/app-admin/webmin/files/virtual-server-2.610-checkip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naurp webmin-1.260.orig/virtual-server/virtual-server-lib.pl webmin-1.260/virtual-server/virtual-server-lib.pl
---- webmin-1.260.orig/virtual-server/virtual-server-lib.pl	2005-12-18 14:42:40.000000000 -0800
-+++ webmin-1.260/virtual-server/virtual-server-lib.pl	2006-03-18 02:15:48.000000000 -0800
-@@ -2080,7 +2080,12 @@ if (!$config{'iface_manual'}) {
- 		$vmax = $b->{'virtual'}
- 			if ($b->{'name'} eq $iface->{'name'} &&
- 			    $b->{'virtual'} > $vmax);
-+
-+		if($b->{'address'} eq $_[0]->{'ip'}) {
-+			print "IP address is already active.<p>\n";
-+			return;
- 		}
-+	}
- 	local $virt = { 'address' => $_[0]->{'ip'},
- 			'netmask' => $net::virtual_netmask || $iface->{'netmask'},
- 			'broadcast' =>
diff --git a/app-admin/webmin/files/webmin-1.170-postfix.patch b/app-admin/webmin/files/webmin-1.170-postfix.patch
deleted file mode 100644
index 002cb7d84ef9..000000000000
--- a/app-admin/webmin/files/webmin-1.170-postfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur webmin-1.170.orig/postfix/postfix-lib.pl webmin-1.170/postfix/postfix-lib.pl
---- webmin-1.170.orig/postfix/postfix-lib.pl	2004-11-12 20:00:28.000000000 -0800
-+++ webmin-1.170/postfix/postfix-lib.pl	2004-11-17 22:10:48.298393107 -0800
-@@ -604,12 +604,12 @@
- {
- &get_maps($_[0], $_[2]);	# force cache init
- my @maps_files = $_[2] ? @{$_[2]} : &get_maps_files(&get_real_value($_[0]));
--local $lref = &read_file_lines($maps_files[0]);
-+local $lref = &read_file_lines($maps_files[$#maps_files]);
- push(@$lref, "$_[1]->{'name'}\t$_[1]->{'value'}");
- &flush_file_lines();
- 
--$_[1]->{'map_file'} = $maps_files[0];
--$_[1]->{'file'} = $maps_files[0];
-+$_[1]->{'map_file'} = $maps_files[$#maps_files];
-+$_[1]->{'file'} = $maps_files[$#maps_files];
- $_[1]->{'line'} = @$lref - 1;
- $_[1]->{'number'} = scalar(@{$maps_cache{$_[0]}});
- push(@{$maps_cache{$_[0]}}, $_[1]);
diff --git a/app-admin/webmin/files/webmin-1.230-ldap-useradmin.patch b/app-admin/webmin/files/webmin-1.230-ldap-useradmin.patch
deleted file mode 100644
index bc7562db4720..000000000000
--- a/app-admin/webmin/files/webmin-1.230-ldap-useradmin.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naurp webmin-1.230.orig/ldap-useradmin/save_user.cgi webmin-1.230/ldap-useradmin/save_user.cgi
---- webmin-1.230.orig/ldap-useradmin/save_user.cgi	2005-09-19 05:32:05.000000000 -0700
-+++ webmin-1.230/ldap-useradmin/save_user.cgi	2005-09-21 16:54:26.000000000 -0700
-@@ -301,7 +301,7 @@ else {
- 		$shadow = &shadow_fields();
- 
- 		# Add to the ldap database
--		@classes = ( "posixAccount", "shadowAccount" );
-+		@classes = ( "posixAccount", "shadowAccount", "person" );
- 
- 		push(@classes, split(/\s+/, $config{'other_class'}));
- 		push(@classes, $samba_class) if ($in{'samba'});
-@@ -718,8 +718,8 @@ if ($config{'given'}) {
- 		if ($lastname && &in_schema($schema, "sn"));
- 	}
- else {
--	#push(@props, "sn", $in{'real'})
--	#	if (&in_schema($schema, "sn"));
-+	push(@props, "sn", $in{'real'})
-+		if (&in_schema($schema, "sn"));
- 	}
- if (&in_schema($schema, "gecos")) {
- 	push(@props, "gecos", $in{'real'});
diff --git a/app-admin/webmin/files/webmin-1.300-postfix.patch b/app-admin/webmin/files/webmin-1.300-postfix.patch
deleted file mode 100644
index 15384d689012..000000000000
--- a/app-admin/webmin/files/webmin-1.300-postfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naurp webmin-1.300.orig/postfix/postfix-lib.pl webmin-1.300/postfix/postfix-lib.pl
---- webmin-1.300.orig/postfix/postfix-lib.pl	2006-09-14 15:21:43.000000000 -0700
-+++ webmin-1.300/postfix/postfix-lib.pl	2006-10-16 11:55:45.000000000 -0700
-@@ -682,15 +682,15 @@ sub create_mapping
- {
- &get_maps($_[0], $_[2]);	# force cache init
- my @maps_files = $_[2] ? @{$_[2]} : &get_maps_files(&get_real_value($_[0]));
--local $lref = &read_file_lines($maps_files[0]);
-+local $lref = &read_file_lines($maps_files[$#maps_files]);
- $_[1]->{'line'} = scalar(@$lref);
- push(@$lref, &make_table_comment($_[1]->{'cmt'}));
- push(@$lref, "$_[1]->{'name'}\t$_[1]->{'value'}");
- $_[1]->{'eline'} = scalar(@$lref)-1;
- &flush_file_lines();
- 
--$_[1]->{'map_file'} = $maps_files[0];
--$_[1]->{'file'} = $maps_files[0];
-+$_[1]->{'map_file'} = $maps_files[$#maps_files];
-+$_[1]->{'file'} = $maps_files[$#maps_files];
- $_[1]->{'number'} = scalar(@{$maps_cache{$_[0]}});
- push(@{$maps_cache{$_[0]}}, $_[1]);
- }
diff --git a/app-admin/webmin/webmin-1.350.ebuild b/app-admin/webmin/webmin-1.350.ebuild
deleted file mode 100644
index 6ee04bfbddc1..000000000000
--- a/app-admin/webmin/webmin-1.350.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.350.ebuild,v 1.13 2008/04/14 20:03:38 jer Exp $
-
-inherit eutils pam
-
-VM_V="3.23"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-			http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-# ~mips removed because of broken deps. Bug #86085
-KEYWORDS="alpha ~amd64 arm ~hppa ppc ~ppc64 s390 sh sparc x86"
-IUSE="apache2 pam postgres ssl webmin-minimal"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	ssl? ( dev-perl/Net-SSLeay )
-	postgres? ( dev-perl/DBD-Pg )
-	pam? ( dev-perl/Authen-PAM )
-	dev-perl/XML-Generator
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# in webmin-minimal apache2 are not present
-	if ! use webmin-minimal ; then
-		# Bug #50810, #51943
-		if use apache2; then
-			epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
-		fi
-
-		# Correct ldapness
-		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
-
-		# Postfix should modify the last entry of the maps file
-		epatch "${FILESDIR}"/${PN}-1.300-postfix.patch
-
-		mv ${WORKDIR}/virtual-server-${VM_V}.gpl.wbm ${T}/vs.tar
-		tar -xf ${T}/vs.tar
-
-		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch "${FILESDIR}"/virtual-server-3.23-nocgibin.patch
-
-		# Verify Postgres usernames
-		epatch "${FILESDIR}"/virtual-server-3.23-pgsql.patch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
-}
-
-src_install() {
-	# Bug #97212
-	addpredict /var/lib/rpm
-
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /var
-
-	cp -rp * ${D}/usr/libexec/webmin
-
-	# in webmin-minimal openslp is not present
-	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
-		cp ${D}/usr/libexec/webmin/openslp/config \
-			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	fi
-
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-
-	newpamd "${FILESDIR}"/webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	# Fix ownership
-	chown -R root:0 ${D}
-
-	dodir /etc/webmin
-	dodir /var/log/webmin
-
-	config_dir=${D}/etc/webmin
-	var_dir=${D}/var/log/webmin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:/:g"
-
-	# Cleanup from the config script
-	rm -rf ${D}/var/log/webmin
-	keepdir /var/log/webmin/
-
-	# Get rid of this crap...
-	rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
-	rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
-}
-
-pkg_postinst() {
-	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-	crypt=${crypt//\\/\\\\}
-	crypt=${crypt//\//\\\/}
-	sed -i -e "s/root:XXX/root:${crypt}/" "${ROOT}/etc/webmin/miniserv.users"
-
-	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
-	use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
-	use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
-}
diff --git a/app-admin/webmin/webmin-1.400.ebuild b/app-admin/webmin/webmin-1.400.ebuild
deleted file mode 100644
index 45438369100a..000000000000
--- a/app-admin/webmin/webmin-1.400.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.400.ebuild,v 1.11 2008/04/14 20:03:38 jer Exp $
-
-inherit eutils pam
-
-VM_V="3.23"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-			http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-# ~mips removed because of broken deps. Bug #86085
-KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ppc ~ppc64 s390 sh sparc x86"
-IUSE="apache2 pam postgres ssl webmin-minimal"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	ssl? ( dev-perl/Net-SSLeay )
-	postgres? ( dev-perl/DBD-Pg )
-	pam? ( dev-perl/Authen-PAM )
-	dev-perl/XML-Generator
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# in webmin-minimal apache2 are not present
-	if ! use webmin-minimal ; then
-		# Bug #50810, #51943
-		if use apache2; then
-			epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
-		fi
-
-		# Correct ldapness
-		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
-
-		mv "${WORKDIR}"/virtual-server-${VM_V}.gpl.wbm "${T}"/vs.tar
-		tar -xf "${T}"/vs.tar
-
-		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch "${FILESDIR}"/virtual-server-3.23-nocgibin.patch
-
-		# Verify Postgres usernames
-		epatch "${FILESDIR}"/virtual-server-3.23-pgsql.patch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
-}
-
-src_install() {
-	# Bug #97212
-	addpredict /var/lib/rpm
-
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /var
-
-	cp -rp * "${D}"/usr/libexec/webmin
-
-	# in webmin-minimal openslp is not present
-	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
-		cp "${D}"/usr/libexec/webmin/openslp/config \
-			"${D}"/usr/libexec/webmin/openslp/config-gentoo-linux
-	fi
-
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-
-	newpamd "${FILESDIR}"/webmin-pam webmin
-	echo gentoo > "${D}"/usr/libexec/webmin/install-type
-
-	# Fix ownership
-	chown -R root:0 "${D}"
-
-	dodir /etc/webmin
-	dodir /var/log/webmin
-
-	config_dir="${D}"/etc/webmin
-	var_dir="${D}"/var/log/webmin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/webmin/setup.sh > "${T}"/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/webmin.pid:" "${D}"/etc/webmin/miniserv.conf
-	find "${D}"/etc/webmin -type f | xargs sed -i -e "s:${D}:/:g"
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/webmin
-	keepdir /var/log/webmin/
-
-	# Get rid of this crap...
-	rm -rf "${D}"/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
-	rm -f "${D}"/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
-}
-
-pkg_postinst() {
-	local crypt=$(grep "^root:" "${ROOT}"/etc/shadow | cut -f 2 -d :)
-	crypt=${crypt//\\/\\\\}
-	crypt=${crypt//\//\\\/}
-	sed -i -e "s/root:XXX/root:${crypt}/" "${ROOT}/etc/webmin/miniserv.users"
-
-	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
-	use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
-	use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
-}