cleanup.

18 files changed, 0 insertions, 1328 deletions

diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index 6132bd92b201..9d826da83f77 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,25 +1,8 @@
-MD5 48c50136cbb97ac10bab45bdae440367 module-init-tools-0.9.15_pre3.ebuild 4461
-MD5 e7498d0d86aa59d1c8dd030e2179c750 module-init-tools-0.9.13_pre2.ebuild 4728
 MD5 3e7717f7a7f748d33f5e48ff6903b230 ChangeLog 10146
 MD5 38b704a286623cb836079a3b5a484eff module-init-tools-3.0_pre5.ebuild 4469
-MD5 37b13e637493884e16fe2488cfb37b8c module-init-tools-0.9.14.ebuild 4620
-MD5 37f6f26e92d282a4eb40879380073b5b module-init-tools-0.9.12-r1.ebuild 4820
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 8b2beab65a9197c4f9e2e370f3987266 module-init-tools-0.9.15_pre4.ebuild 4472
-MD5 ff547b3448cab1496dfd9870f98acb00 module-init-tools-0.9.15_pre1.ebuild 4344
-MD5 de52ca2de9574ccee78e04b64111ccf3 module-init-tools-0.9.15_pre2.ebuild 4431
-MD5 45ebc93263c86224eb12c3f2c71d9275 files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch 4208
-MD5 06447c844280435b8a96e8b21f5b0a59 files/module-init-tools-0.9.12-includes-should-override.patch 524
-MD5 6cd7fbd67d72ab12cec430aa0e81d184 files/digest-module-init-tools-0.9.15_pre2 150
 MD5 4b22ce79fdc8ce1efad2ac57c7f1fe34 files/digest-module-init-tools-3.0_pre5 147
-MD5 2a0239688bdd0600c9137bb6f0af7e5d files/digest-module-init-tools-0.9.15_pre1 150
-MD5 ba1718dd25f5cbfac19958b1763691d9 files/module-init-tools-0.9.7-export-gpl.patch 592
 MD5 07aa415fd57ac42cd0c11527edc9782d files/module-init-tools-0.9.15-legacy-modext-support.patch 481
 MD5 3094756336026a6697bd37484bf68fb1 files/digest-module-init-tools-0.9.15_pre4 150
-MD5 37cda221ca368a67d8a9fd8e6814f62c files/digest-module-init-tools-0.9.12-r1 145
-MD5 86e20b45d2b65159d422d225468ef960 files/module-init-tools-0.9.13-quiet-on-devfsd-probe-aliases.patch 3490
 MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch 382
-MD5 4aef40f6b8eadb2215abb6af5755a599 files/digest-module-init-tools-0.9.15_pre3 150
-MD5 ca8384a14b3fd5fbba4c3649cbac0a0e files/module-init-tools-0.9.14-be-quiet-for-devfsd.patch 1986
-MD5 d35ab1ebe300cc5521be75eff43f9649 files/digest-module-init-tools-0.9.13_pre2 150
-MD5 840e77089ccac7492ceb215d14b95fb7 files/digest-module-init-tools-0.9.14 145
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1
deleted file mode 100644
index da7deba7e67b..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d61517a904d005fd83c954dd7fe49f27 module-init-tools-0.9.12.tar.bz2 112896
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.13_pre2 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.13_pre2
deleted file mode 100644
index f31bba2b01dd..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.13_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 22df9ab7a027718a3cd3fca37c280dd6 module-init-tools-0.9.13-pre2.tar.bz2 113419
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.14 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.14
deleted file mode 100644
index 8bf829852565..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b97a2c6226934fade702bd79c5211cab module-init-tools-0.9.14.tar.bz2 115751
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre1
deleted file mode 100644
index 23e15232bebf..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d2d8d12a0358d4073a2f44453a677eda module-init-tools-0.9.15-pre1.tar.bz2 116472
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre2 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre2
deleted file mode 100644
index 73ab5fbd3b2f..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 958088946d2b80d338cb82b94a394eca module-init-tools-0.9.15-pre2.tar.bz2 116601
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre3 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre3
deleted file mode 100644
index a4baef4e3ed1..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aa41bdfe2a09f0cce2c70c603a8cd2db module-init-tools-0.9.15-pre3.tar.bz2 116911
-MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch
deleted file mode 100644
index 2c93619a11e3..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- module-init-tools-0.9.11-pre/modprobe.c.orig	2003-03-16 22:32:46.000000000 +0200
-+++ module-init-tools-0.9.11-pre/modprobe.c	2003-03-18 03:43:52.000000000 +0200
-@@ -52,6 +52,8 @@ struct module {
- 
- /* Do we use syslog or stderr for messages? */
- static int log;
-+/* Should we be totally quiet? */
-+static int quiet = 0;
- 
- static int getlen(const char *fmt, va_list ap)
- {
-@@ -70,6 +72,9 @@ static void message(const char *prefix, 
- 	va_list arglist;
- 	int len;
- 
-+	if (quiet)
-+		return;
-+
- 	va_start(arglist, fmt);
- 	len = strlen(prefix) + getlen(fmt, arglist) + 1;
- 	buf = malloc(len);
-@@ -87,7 +92,7 @@ static void message(const char *prefix, 
- 
- #define warn(fmt, ...) message("WARNING: ", fmt , ## __VA_ARGS__)
- #define fatal(fmt, ...) \
--	do { message("FATAL: ", fmt , ## __VA_ARGS__); exit(1); } while(0)
-+	do { message("FATAL: ", fmt , ## __VA_ARGS__);  if (quiet) exit(0); else exit(1); } while(0)
- 
- static void grammar(const char *cmd, const char *filename, unsigned int line)
- {
-@@ -1093,6 +1098,7 @@ static struct option options[] = { { "ve
- 				   { "showconfig", 0, NULL, 'c' },
- 				   { "autoclean", 0, NULL, 'k' },
- 				   { "quiet", 0, NULL, 'q' },
-+				   { "really-quiet", 0, NULL, 'Q' },
- 				   { "show", 0, NULL, 'n' },
- 				   { "dry-run", 0, NULL, 'n' },
- 				   { "syslog", 0, NULL, 's' },
-@@ -1108,6 +1114,7 @@ static struct option options[] = { { "ve
- 				   { NULL, 0, NULL, 0 } };
- 
- #define DEFAULT_CONFIG "/etc/modprobe.conf"
-+#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs"
- 
- int main(int argc, char *argv[])
- {
-@@ -1146,7 +1153,7 @@ int main(int argc, char *argv[])
- 		try_old_version("modprobe", argv);
- 
- 	uname(&buf);
--	while ((opt = getopt_long(argc, argv, "vVC:o:rknqsclt:aif", options, NULL)) != -1){
-+	while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aif", options, NULL)) != -1){
- 		switch (opt) {
- 		case 'v':
- 			add_to_env_var("-v");
-@@ -1193,6 +1200,10 @@ int main(int argc, char *argv[])
- 			add_to_env_var("-q");
- 			fail_if_already = 0;
- 			break;
-+		case 'Q':
-+			add_to_env_var("-Q");
-+			quiet = 1;
-+			break;
- 		case 's':
- 			add_to_env_var("-s");
- 			log = 1;
-@@ -1215,8 +1226,51 @@ int main(int argc, char *argv[])
- 		}
- 	}
- 
-+	/* A hack to have absolutely no output if:
-+	 *
-+	 *   1) we have no logging enabled
-+	 * 
-+	 *   2) our config file is /etc/modprobe.devfs or /etc/modules.devfs
-+	 *   
-+	 *   3) with the module name starting with '/dev/'.
-+	 *
-+	 * Rasionale:  This is what modprobe from modutils-2.4.22 does:
-+	 *
-+	 *   gateway root # modprobe /dev/sd1   
-+	 *   modprobe: Can't locate module /dev/sd1
-+	 *   gateway root # modprobe -C /etc/modules.conf /dev/sd1
-+	 *   modprobe: Can't locate module /dev/sd1
-+	 *   gateway root # modprobe -C /etc/modules.devfs /dev/sd1
-+	 *   gateway root #
-+	 *   
-+	 *   gateway root # modprobe foo     
-+	 *   modprobe: Can't locate module foo
-+	 *   gateway root # modprobe -C /etc/modules.conf foo     
-+	 *   modprobe: Can't locate module foo
-+	 *   gateway root # modprobe -C /etc/modules.devfs foo     
-+	 *   modprobe: Can't locate module foo
-+	 *   gateway root #
-+	 *   
-+	 *   gateway root # modprobe -C /etc/modules.devfs /dev/sd1 && echo yes
-+	 *   yes
-+	 *   gateway root # modprobe -C /etc/modules.devfs foo && echo yes
-+	 *   modprobe: Can't locate module foo
-+	 *   gateway root # 
-+	 *   
-+	 */
-+	if (!log && !quiet && !dump_only && config) {
-+		if (strncmp(argv[optind], "/dev/", 5) == 0
-+				/* Handle recursive calls */
-+			&& ((strcmp(MODPROBE_DEVFSD_CONF, config) == 0)
-+				/* devfsd calls modprobe with '-C /etc/modules.devfs' */
-+				|| (strcmp("/etc/modules.devfs", config) == 0))) {
-+			add_to_env_var("-Q");
-+			quiet = 1;
-+		}
-+	}
-+
- 	/* If stderr not open, go to syslog */
--	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
-+	if (log || (!quiet && fstat(STDERR_FILENO, &statbuf) != 0)) {
- 		openlog("modprobe", LOG_CONS, LOG_DAEMON);
- 		log = 1;
- 	}
-@@ -1253,7 +1307,7 @@ int main(int argc, char *argv[])
- 		if (strcmp("/etc/modules.conf", config) == 0)
- 			config = NULL;
- 		else if (strcmp("/etc/modules.devfs", config) == 0)
--			config = "/etc/modprobe.devfs";
-+			config = MODPROBE_DEVFSD_CONF;
- 	}
- 
- 	/* -r only allows certain restricted options */
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch
deleted file mode 100644
index 44947b306bec..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- module-init-tools-0.9.12/modprobe.c.orig	2003-07-12 20:00:52.000000000 +0200
-+++ module-init-tools-0.9.12/modprobe.c	2003-07-12 20:28:04.000000000 +0200
-@@ -1015,7 +1015,9 @@ static char *read_config(const char *fil
- 				newresult = read_config(newfilename, 1, name,
- 							dump_only, removing,
- 							options, commands);
--				if (!result)
-+				/* Files included override aliases, etc that was
-+				 * already set ... */
-+				if (newresult)
- 					result = newresult;
- 			}
- 		} else if (strcmp(cmd, "options") == 0) {
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.13-quiet-on-devfsd-probe-aliases.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.13-quiet-on-devfsd-probe-aliases.patch
deleted file mode 100644
index 8a6848cd8a8d..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.13-quiet-on-devfsd-probe-aliases.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -urpN module-init-tools-0.9.13-pre2/modprobe.c module-init-tools-0.9.13-pre2.devfsd/modprobe.c
---- module-init-tools-0.9.13-pre2/modprobe.c	2003-07-16 09:32:49.000000000 +0200
-+++ module-init-tools-0.9.13-pre2.devfsd/modprobe.c	2003-08-10 20:55:15.281473776 +0200
-@@ -52,6 +52,8 @@ struct module {
- 
- /* Do we use syslog or stderr for messages? */
- static int log;
-+/* Should we be totally quiet? */
-+static int quiet = 0;
- 
- static int getlen(const char *fmt, va_list ap)
- {
-@@ -70,6 +72,9 @@ static void message(const char *prefix, 
- 	va_list arglist;
- 	int len;
- 
-+	if (quiet)
-+		return;
-+
- 	va_start(arglist, fmt);
- 	len = strlen(prefix) + getlen(fmt, arglist) + 1;
- 	buf = malloc(len);
-@@ -87,7 +92,7 @@ static void message(const char *prefix, 
- 
- #define warn(fmt, ...) message("WARNING: ", fmt , ## __VA_ARGS__)
- #define fatal(fmt, ...) \
--	do { message("FATAL: ", fmt , ## __VA_ARGS__); exit(1); } while(0)
-+	do { message("FATAL: ", fmt , ## __VA_ARGS__);  if (quiet) exit(0); else exit(1); } while(0)
- 
- static void grammar(const char *cmd, const char *filename, unsigned int line)
- {
-@@ -1098,6 +1103,7 @@ static struct option options[] = { { "ve
- 				   { "showconfig", 0, NULL, 'c' },
- 				   { "autoclean", 0, NULL, 'k' },
- 				   { "quiet", 0, NULL, 'q' },
-+				   { "really-quiet", 0, NULL, 'Q' },
- 				   { "show", 0, NULL, 'n' },
- 				   { "dry-run", 0, NULL, 'n' },
- 				   { "syslog", 0, NULL, 's' },
-@@ -1114,6 +1120,7 @@ static struct option options[] = { { "ve
- 				   { NULL, 0, NULL, 0 } };
- 
- #define DEFAULT_CONFIG "/etc/modprobe.conf"
-+#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs"
- 
- int main(int argc, char *argv[])
- {
-@@ -1153,7 +1160,7 @@ int main(int argc, char *argv[])
- 		try_old_version("modprobe", argv);
- 
- 	uname(&buf);
--	while ((opt = getopt_long(argc, argv, "vVC:o:rknqsclt:aif", options, NULL)) != -1){
-+	while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aif", options, NULL)) != -1){
- 		switch (opt) {
- 		case 'v':
- 			add_to_env_var("-v");
-@@ -1206,6 +1213,10 @@ int main(int argc, char *argv[])
- 			add_to_env_var("-q");
- 			fail_if_already = 0;
- 			break;
-+		case 'Q':
-+			add_to_env_var("-Q");
-+			quiet = 1;
-+			break;
- 		case 's':
- 			add_to_env_var("-s");
- 			log = 1;
-@@ -1266,7 +1277,7 @@ int main(int argc, char *argv[])
- 		if (strcmp("/etc/modules.conf", config) == 0)
- 			config = NULL;
- 		else if (strcmp("/etc/modules.devfs", config) == 0)
--			config = "/etc/modprobe.devfs";
-+			config = MODPROBE_DEVFSD_CONF;
- 	}
- 
- 	/* -r only allows certain restricted options */
-@@ -1303,6 +1314,25 @@ int main(int argc, char *argv[])
- 			      argv[optind], 0,
- 			      remove, &modoptions, &commands);
- 
-+	/* We want absolutely no output and return 0 if:
-+	 *
-+	 *   1) our config file is /etc/modprobe.devfs or /etc/modules.devfs
-+	 *
-+	 *   2) the module name starting with '/dev/'
-+	 *
-+	 *   3) we are trying to probe an existing alias.
-+	 *
-+	 * This is to mimic behaviour from modutils so that we do fill the logs
-+	 * with errors if devfsd tries to probe aliases in modprobe.devfs */
-+	if (!quiet && !dump_only && config
-+		&& modname) { /* Are we trying to probe an alias? */
-+		if (strncmp(argv[optind], "/dev/", 5) == 0
-+			&& (strcmp(MODPROBE_DEVFSD_CONF, config) == 0)) {
-+			add_to_env_var("-Q");
-+			quiet = 1;
-+		}
-+	}
-+
- 	/* No luck?  Try symbol names, if starts with symbol:. */
- 	if (!modname && strncmp(argv[optind], "symbol:", strlen("symbol:")==0))
- 		modname = read_config(symfilename, 0, argv[optind], 0,
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.14-be-quiet-for-devfsd.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.14-be-quiet-for-devfsd.patch
deleted file mode 100644
index 93d0aae9a30d..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.14-be-quiet-for-devfsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- module-init-tools-0.9.14/modprobe.c.orig	2003-09-15 22:41:32.252740832 +0200
-+++ module-init-tools-0.9.14/modprobe.c	2003-09-15 23:10:44.895298664 +0200
-@@ -1148,6 +1148,7 @@ int main(int argc, char *argv[])
- 	int strip_vermagic = 0;
- 	int strip_modversion = 0;
- 	int ignore_proc = 0;
-+	int set_config_file = 0;
- 	enum noexists_response noexists = NOEXISTS_ERROR;
- 	enum exists_response exists = EXISTS_ERROR;
- 	unsigned int i, num_modules;
-@@ -1184,8 +1185,12 @@ int main(int argc, char *argv[])
- 			buf.release[sizeof(buf.release)-1] = '\0';
- 			break;
- 		case 'C':
-+			/* We should not add this to the environment if we might
-+			 * still change it below (hack for old modutils compatibility)
- 			add_to_env_var("-C");
- 			add_to_env_var(optarg);
-+			*/
-+			set_config_file = 1;
- 			config = optarg;
- 			break;
- 		case 'D':
-@@ -1294,16 +1299,27 @@ int main(int argc, char *argv[])
- 	   modprobe with -C /etc/modules.conf or /etc/modules.devfs,
- 	   to work.  FIXME. */
- 	/* Modern devfsd or variants should use -Q explicitly in 2.6. */
--	if (config && !dump_only && strncmp(argv[optind], "/dev/", 5) == 0) {
--		if (strcmp("/etc/modules.conf", config) == 0) {
--			quiet = 1;
--			config = NULL;
--		} else if (strcmp("/etc/modules.devfs", config) == 0) {
--			config = MODPROBE_DEVFSD_CONF;
-+	if (!quiet && config && !dump_only && strncmp(argv[optind], "/dev/", 5) == 0) {
-+		if (strcmp("/etc/modules.conf", config) == 0
-+			|| strcmp("/etc/modules.devfs", config) == 0
-+			|| strcmp(MODPROBE_DEVFSD_CONF, config) == 0) {
-+			add_to_env_var("-Q");
- 			quiet = 1;
-+
-+			if (strcmp("/etc/modules.conf", config) == 0)
-+				config = NULL;
-+			else
-+				config = MODPROBE_DEVFSD_CONF;
- 		}
- 	}
- 
-+	if (set_config_file && !dump_only) {
-+		/* Ok, now add the config file to the MODPROBE_OPTIONS
-+		 * environment variable */
-+		add_to_env_var("-C");
-+		add_to_env_var(config);
-+	}
-+
- 	if (dump_only) {
- 		struct module_command *commands = NULL;
- 		struct module_options *modoptions = NULL;
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-export-gpl.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.7-export-gpl.patch
deleted file mode 100644
index 5387e0c6d6cb..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-export-gpl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- module-init-tools-0.9.7/moduleops_core.c.chmou	2002-12-26 07:04:42.000000000 +0100
-+++ module-init-tools-0.9.7/moduleops_core.c	2003-01-14 21:24:17.000000000 +0100
-@@ -30,6 +30,9 @@
- 	ksyms = PERBIT(load_section)(module->mmap, "__ksymtab", &size);
- 	for (i = 0; i < size / sizeof(struct PERBIT(kernel_symbol)); i++)
- 		add_symbol(ksyms[i].name, module);
-+ 	ksyms = PERBIT(load_section)(module->mmap, "__gpl_ksymtab", &size);
-+ 	for (i = 0; i < size / sizeof(struct PERBIT(kernel_symbol)); i++)
-+	  add_symbol(ksyms[i].name, module);
- }
- 
- /* Calculate the dependencies for this module */
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild
deleted file mode 100644
index 191b2ab797f9..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild,v 1.10 2004/01/07 17:21:29 azarah Exp $
-
-# This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
-
-inherit flag-o-matic
-inherit eutils
-
-MYP="${P/_pre1/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.25"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-	mirror://kernel/linux/kernel/people/rusty/modules/old/${MYP}.tar.bz2
-	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha mips ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-PROVIDE="virtual/modutils"
-
-src_unpack() {
-	unpack ${A}
-
-	# With the b0rked modutils, "modprobe hid" does work. But if something
-	# (like hotplug) tries to auto-load hid (because another module needs it,
-	# via the kernel module auto-loader) and keybdev.o or mousedev.o don't
-	# exist, then the "above" clause fails and the hid module never gets
-	# loaded, and then things like USB will fail.  Thus we remove it all
-	# together.
-	#
-	# <drobbins@gentoo.org> (26 Mar 2003)
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
-
-	# A hack to have absolutely no output if:
-	#
-	#   1) we have no logging enabled
-	#
-	#   2) our config file is /etc/modprobe.devfs or /etc/modules.devfs
-	#
-	#   3) with the module name starting with '/dev/'.
-	#
-	# Rasionale:  This is what modprobe from modutils does.
-	#
-	# <azarah@gentoo.org> (17 Mar 2003)
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.11-be-quiet-for-devfsd.patch
-
-	# Module options/aliases already accuired, should be replaced by
-	# newer if they are aquired from a file 'included' after the original
-	# options/aliases ...
-	#
-	# <azarah@gentoo.org> (12 July 2003)
-	epatch ${FILESDIR}/${P}-includes-should-override.patch
-}
-
-src_compile() {
-	local myconf=
-
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--enable-insmod-static \
-		--disable-zlib \
-		${myconf}
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-
-	docinto modutils-${MODUTILS_PV}
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4; new versions will execve() the .old version if
-	# a 2.4 kernel is running...
-	# This code was borrowed from the module-init-tools Makefile
-	local runme
-	local f
-	for f in lsmod modprobe rmmod depmod insmod modinfo
-	do
-		if [ -L ${D}/sbin/${f} ]
-		then
-			einfo "Moving symlink $f to ${f}.old"
-			#runme = the target of the symlink with a .old tagged on.
-			runme=`ls -l ${D}/sbin/${f} | sed 's/.* -> //'`.old
-			[ ! -e ${D}/sbin/${runme} ] || einfo "${D}/sbin/${runme} not found"
-			ln -snf $runme ${D}/sbin/${f} || die
-		elif [ -e ${D}/sbin/${f} ]
-		then
-			einfo "Moving executable $f to ${f}.old"
-		fi
-		mv -f ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-	# Move the man pages as well.  We only do this for the man pages of the
-	# tools that module-init-tools will replace.
-	for f in ${D}/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8
-	do
-		mv -f ${f} ${f%\.*}.old.${f##*\.}
-	done
-
-	einstall prefix=${D}
-
-	# Install compat symlink
-	dosym ../bin/lsmod /sbin/lsmod
-	dosym ../sbin/insmod.old /bin/lsmod.old
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-	# Create the new modprobe.conf
-	dodir /etc
-	rm -f ${D}/etc/modprobe.conf
-	if [ ! -f ${ROOT}/etc/modprobe.devfs ]
-	then
-		# Support file for the devfs hack .. needed else modprobe borks.
-		# Baselayout-1.8.6.3 or there abouts will have a modules-update that
-		# will correctly generate /etc/modprobe.devfs ....
-		echo "### This file is automatically generated by modules-update" \
-			> ${D}/etc/modprobe.devfs
-	else
-		# This is dynamic, so we do not want this in the package ...
-		rm -f ${D}/etc/modprobe.devfs
-	fi
-
-	doman *.[1-8]
-	docinto /
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Updating config files..."
-		if [ -x /sbin/modules-update ]
-		then
-			/sbin/modules-update
-		elif [ -x /sbin/update-modules ]
-		then
-			/sbin/update-modules
-		elif [ -x /usr/sbin/update-modules ]
-		then
-			/usr/sbin/update-modules
-		fi
-	fi
-}
-
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.13_pre2.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.13_pre2.ebuild
deleted file mode 100644
index 317914391c81..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.13_pre2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.13_pre2.ebuild,v 1.7 2004/01/07 17:21:29 azarah Exp $
-
-# This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
-
-inherit flag-o-matic
-inherit eutils
-
-MYP="${P/_pre/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.25"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-	mirror://kernel/linux/kernel/people/rusty/modules/old/${MYP}.tar.bz2
-	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha mips ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-PROVIDE="virtual/modutils"
-
-src_unpack() {
-	unpack ${A}
-
-	# With the b0rked modutils, "modprobe hid" does work. But if something
-	# (like hotplug) tries to auto-load hid (because another module needs it,
-	# via the kernel module auto-loader) and keybdev.o or mousedev.o don't
-	# exist, then the "above" clause fails and the hid module never gets
-	# loaded, and then things like USB will fail.  Thus we remove it all
-	# together.
-	#
-	# <drobbins@gentoo.org> (26 Mar 2003)
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
-
-	# Export GPL symbols - from MDK.
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.7-export-gpl.patch
-
-	# A hack to have absolutely no output if:
-	#
-	#   1) our config file is /etc/modprobe.devfs or /etc/modules.devfs
-	#
-	#   2) the module name starting with '/dev/'
-	#
-	#   3) we are trying to probe an existing alias.
-	#
-	# Rasionale:  This is what modprobe from modutils does.
-	#
-	# <azarah@gentoo.org> (17 Mar 2003)
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.13-quiet-on-devfsd-probe-aliases.patch
-
-	cd ${S}
-	rm -f missing
-	automake --add-missing
-}
-
-src_compile() {
-	local myconf=
-
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--disable-insmod-static \
-		--disable-zlib \
-		${myconf}
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-
-	docinto modutils-${MODUTILS_PV}
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4; new versions will execve() the .old version if
-	# a 2.4 kernel is running...
-	# This code was borrowed from the module-init-tools Makefile
-	local runme=
-	local f=
-	for f in lsmod modprobe rmmod depmod insmod modinfo
-	do
-		if [ -L ${D}/sbin/${f} ]
-		then
-			einfo "Moving symlink $f to ${f}.old"
-			#runme = the target of the symlink with a .old tagged on.
-			runme=`ls -l ${D}/sbin/${f} | sed 's/.* -> //'`.old
-			[ ! -e ${D}/sbin/${runme} ] || einfo "${D}/sbin/${runme} not found"
-			ln -snf $runme ${D}/sbin/${f} || die
-		elif [ -e ${D}/sbin/${f} ]
-		then
-			einfo "Moving executable $f to ${f}.old"
-		fi
-		mv -f ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-	# Move the man pages as well.  We only do this for the man pages of the
-	# tools that module-init-tools will replace.
-	for f in ${D}/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8
-	do
-		mv -f ${f} ${f%\.*}.old.${f##*\.}
-	done
-
-	einstall prefix=${D}
-
-	# Install compat symlink
-	dosym ../bin/lsmod /sbin/lsmod
-	dosym ../sbin/insmod.old /bin/lsmod.old
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-	# Create the new modprobe.conf
-	dodir /etc
-	rm -f ${D}/etc/modprobe.conf
-	if [ ! -f ${ROOT}/etc/modprobe.devfs ]
-	then
-		# Support file for the devfs hack .. needed else modprobe borks.
-		# Baselayout-1.8.6.3 or there abouts will have a modules-update that
-		# will correctly generate /etc/modprobe.devfs ....
-		echo "### This file is automatically generated by modules-update" \
-			> ${D}/etc/modprobe.devfs
-	else
-		# This is dynamic, so we do not want this in the package ...
-		rm -f ${D}/etc/modprobe.devfs
-	fi
-
-	doman *.[1-8]
-	docinto /
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Updating config files..."
-		if [ -x /sbin/modules-update ]
-		then
-			/sbin/modules-update
-		elif [ -x /sbin/update-modules ]
-		then
-			/sbin/update-modules
-		elif [ -x /usr/sbin/update-modules ]
-		then
-			/usr/sbin/update-modules
-		fi
-	fi
-}
-
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.14.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.14.ebuild
deleted file mode 100644
index cda57879928d..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.14.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.14.ebuild,v 1.3 2004/01/07 17:21:29 azarah Exp $
-
-# This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
-
-inherit flag-o-matic
-inherit eutils
-
-MYP="${P/_pre/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.25"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-	mirror://kernel/linux/kernel/people/rusty/modules/old/${MYP}.tar.bz2
-	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha mips ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-PROVIDE="virtual/modutils"
-
-src_unpack() {
-	unpack ${A}
-
-	# With the b0rked modutils, "modprobe hid" does work. But if something
-	# (like hotplug) tries to auto-load hid (because another module needs it,
-	# via the kernel module auto-loader) and keybdev.o or mousedev.o don't
-	# exist, then the "above" clause fails and the hid module never gets
-	# loaded, and then things like USB will fail.  Thus we remove it all
-	# together.
-	#
-	# <drobbins@gentoo.org> (26 Mar 2003)
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
-
-	# A hack to have absolutely no output if:
-	#
-	#   1) our config file is /etc/modprobe.devfs or /etc/modules.devfs
-	#
-	#   2) the module name starting with '/dev/'
-	#
-	#   3) we are trying to probe an existing alias.
-	#
-	# Rasionale:  This is what modprobe from modutils does.
-	#
-	# <azarah@gentoo.org> (17 Mar 2003)
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.14-be-quiet-for-devfsd.patch
-
-	cd ${S}
-	rm -f missing
-	automake --add-missing
-}
-
-src_compile() {
-	local myconf=
-
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--disable-insmod-static \
-		--disable-zlib \
-		${myconf}
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-
-	docinto modutils-${MODUTILS_PV}
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4; new versions will execve() the .old version if
-	# a 2.4 kernel is running...
-	# This code was borrowed from the module-init-tools Makefile
-	local runme=
-	local f=
-	for f in lsmod modprobe rmmod depmod insmod modinfo
-	do
-		if [ -L ${D}/sbin/${f} ]
-		then
-			einfo "Moving symlink $f to ${f}.old"
-			#runme = the target of the symlink with a .old tagged on.
-			runme=`ls -l ${D}/sbin/${f} | sed 's/.* -> //'`.old
-			[ ! -e ${D}/sbin/${runme} ] || einfo "${D}/sbin/${runme} not found"
-			ln -snf $runme ${D}/sbin/${f} || die
-		elif [ -e ${D}/sbin/${f} ]
-		then
-			einfo "Moving executable $f to ${f}.old"
-		fi
-		mv -f ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-	# Move the man pages as well.  We only do this for the man pages of the
-	# tools that module-init-tools will replace.
-	for f in ${D}/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8
-	do
-		mv -f ${f} ${f%\.*}.old.${f##*\.}
-	done
-
-	einstall prefix=${D}
-
-	# Install compat symlink
-	dosym ../bin/lsmod /sbin/lsmod
-	dosym ../sbin/insmod.old /bin/lsmod.old
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-	# Create the new modprobe.conf
-	dodir /etc
-	rm -f ${D}/etc/modprobe.conf
-	if [ ! -f ${ROOT}/etc/modprobe.devfs ]
-	then
-		# Support file for the devfs hack .. needed else modprobe borks.
-		# Baselayout-1.8.6.3 or there abouts will have a modules-update that
-		# will correctly generate /etc/modprobe.devfs ....
-		echo "### This file is automatically generated by modules-update" \
-			> ${D}/etc/modprobe.devfs
-	else
-		# This is dynamic, so we do not want this in the package ...
-		rm -f ${D}/etc/modprobe.devfs
-	fi
-
-	doman *.[1-8]
-	docinto /
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Updating config files..."
-		if [ -x /sbin/modules-update ]
-		then
-			/sbin/modules-update
-		elif [ -x /sbin/update-modules ]
-		then
-			/sbin/update-modules
-		elif [ -x /usr/sbin/update-modules ]
-		then
-			/usr/sbin/update-modules
-		fi
-	fi
-}
-
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre1.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.15_pre1.ebuild
deleted file mode 100644
index 367085994175..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.15_pre1.ebuild,v 1.4 2004/01/07 17:21:29 azarah Exp $
-
-# This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
-
-inherit flag-o-matic
-inherit eutils
-
-MYP="${P/_pre/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.25"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-	mirror://kernel/linux/kernel/people/rusty/modules/old/${MYP}.tar.bz2
-	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha mips ~arm ia64"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-PROVIDE="virtual/modutils"
-
-src_unpack() {
-	unpack ${A}
-
-	# With the b0rked modutils, "modprobe hid" does work. But if something
-	# (like hotplug) tries to auto-load hid (because another module needs it,
-	# via the kernel module auto-loader) and keybdev.o or mousedev.o don't
-	# exist, then the "above" clause fails and the hid module never gets
-	# loaded, and then things like USB will fail.  Thus we remove it all
-	# together.
-	#
-	# <drobbins@gentoo.org> (26 Mar 2003)
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
-
-	# Support legacy .o modules
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.15-legacy-modext-support.patch
-
-	cd ${S}
-	rm -f missing
-	automake --add-missing
-}
-
-src_compile() {
-	local myconf=
-
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--disable-insmod-static \
-		--disable-zlib \
-		${myconf}
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-
-	docinto modutils-${MODUTILS_PV}
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4; new versions will execve() the .old version if
-	# a 2.4 kernel is running...
-	# This code was borrowed from the module-init-tools Makefile
-	local runme=
-	local f=
-	for f in lsmod modprobe rmmod depmod insmod modinfo
-	do
-		if [ -L ${D}/sbin/${f} ]
-		then
-			einfo "Moving symlink $f to ${f}.old"
-			#runme = the target of the symlink with a .old tagged on.
-			runme=`ls -l ${D}/sbin/${f} | sed 's/.* -> //'`.old
-			[ ! -e ${D}/sbin/${runme} ] || einfo "${D}/sbin/${runme} not found"
-			ln -snf $runme ${D}/sbin/${f} || die
-		elif [ -e ${D}/sbin/${f} ]
-		then
-			einfo "Moving executable $f to ${f}.old"
-		fi
-		mv -f ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-	# Move the man pages as well.  We only do this for the man pages of the
-	# tools that module-init-tools will replace.
-	for f in ${D}/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8
-	do
-		mv -f ${f} ${f%\.*}.old.${f##*\.}
-	done
-
-	einstall prefix=${D}
-
-	# Install compat symlink
-	dosym ../bin/lsmod /sbin/lsmod
-	dosym ../sbin/insmod.old /bin/lsmod.old
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-	# Create the new modprobe.conf
-	dodir /etc
-	rm -f ${D}/etc/modprobe.conf
-	if [ ! -f ${ROOT}/etc/modprobe.devfs ]
-	then
-		# Support file for the devfs hack .. needed else modprobe borks.
-		# Baselayout-1.8.6.3 or there abouts will have a modules-update that
-		# will correctly generate /etc/modprobe.devfs ....
-		echo "### This file is automatically generated by modules-update" \
-			> ${D}/etc/modprobe.devfs
-	else
-		# This is dynamic, so we do not want this in the package ...
-		rm -f ${D}/etc/modprobe.devfs
-	fi
-
-	doman *.[1-8]
-	docinto /
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Updating config files..."
-		if [ -x /sbin/modules-update ]
-		then
-			/sbin/modules-update
-		elif [ -x /sbin/update-modules ]
-		then
-			/sbin/update-modules
-		elif [ -x /usr/sbin/update-modules ]
-		then
-			/usr/sbin/update-modules
-		fi
-	fi
-}
-
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre2.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.15_pre2.ebuild
deleted file mode 100644
index 75969b811946..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.15_pre2.ebuild,v 1.4 2004/01/07 17:21:29 azarah Exp $
-
-# This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
-
-inherit flag-o-matic eutils gnuconfig
-
-MYP="${P/_pre/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.25"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-	mirror://kernel/linux/kernel/people/rusty/modules/old/${MYP}.tar.bz2
-	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="~x86 ~amd64 ppc ~sparc ~alpha mips ~arm ~ia64"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-PROVIDE="virtual/modutils"
-
-src_unpack() {
-	unpack ${A}
-
-	# With the b0rked modutils, "modprobe hid" does work. But if something
-	# (like hotplug) tries to auto-load hid (because another module needs it,
-	# via the kernel module auto-loader) and keybdev.o or mousedev.o don't
-	# exist, then the "above" clause fails and the hid module never gets
-	# loaded, and then things like USB will fail.  Thus we remove it all
-	# together.
-	#
-	# <drobbins@gentoo.org> (26 Mar 2003)
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
-
-	# Support legacy .o modules
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.15-legacy-modext-support.patch
-
-	cd ${S}
-	rm -f missing
-	automake --add-missing
-}
-
-src_compile() {
-
-	# If running mips64, we need updated configure data
-	use mips && gnuconfig_update
-
-	local myconf=
-
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--disable-insmod-static \
-		--disable-zlib \
-		${myconf}
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-
-	docinto modutils-${MODUTILS_PV}
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4; new versions will execve() the .old version if
-	# a 2.4 kernel is running...
-	# This code was borrowed from the module-init-tools Makefile
-	local runme=
-	local f=
-	for f in lsmod modprobe rmmod depmod insmod modinfo
-	do
-		if [ -L ${D}/sbin/${f} ]
-		then
-			einfo "Moving symlink $f to ${f}.old"
-			#runme = the target of the symlink with a .old tagged on.
-			runme=`ls -l ${D}/sbin/${f} | sed 's/.* -> //'`.old
-			[ ! -e ${D}/sbin/${runme} ] || einfo "${D}/sbin/${runme} not found"
-			ln -snf $runme ${D}/sbin/${f} || die
-		elif [ -e ${D}/sbin/${f} ]
-		then
-			einfo "Moving executable $f to ${f}.old"
-		fi
-		mv -f ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-	# Move the man pages as well.  We only do this for the man pages of the
-	# tools that module-init-tools will replace.
-	for f in ${D}/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8
-	do
-		mv -f ${f} ${f%\.*}.old.${f##*\.}
-	done
-
-	einstall prefix=${D}
-
-	# Install compat symlink
-	dosym ../bin/lsmod /sbin/lsmod
-	dosym ../sbin/insmod.old /bin/lsmod.old
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-	# Create the new modprobe.conf
-	dodir /etc
-	rm -f ${D}/etc/modprobe.conf
-	if [ ! -f ${ROOT}/etc/modprobe.devfs ]
-	then
-		# Support file for the devfs hack .. needed else modprobe borks.
-		# Baselayout-1.8.6.3 or there abouts will have a modules-update that
-		# will correctly generate /etc/modprobe.devfs ....
-		echo "### This file is automatically generated by modules-update" \
-			> ${D}/etc/modprobe.devfs
-	else
-		# This is dynamic, so we do not want this in the package ...
-		rm -f ${D}/etc/modprobe.devfs
-	fi
-
-	doman *.[1-8]
-	docinto /
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Updating config files..."
-		if [ -x /sbin/modules-update ]
-		then
-			/sbin/modules-update
-		elif [ -x /sbin/update-modules ]
-		then
-			/sbin/update-modules
-		elif [ -x /usr/sbin/update-modules ]
-		then
-			/usr/sbin/update-modules
-		fi
-	fi
-}
-
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre3.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.15_pre3.ebuild
deleted file mode 100644
index 0b5621fbabdb..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.15_pre3.ebuild,v 1.4 2004/01/07 17:21:29 azarah Exp $
-
-# This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
-
-inherit flag-o-matic eutils gnuconfig
-
-MYP="${P/_pre/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.26"
-DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
-SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
-	mirror://kernel/linux/kernel/people/rusty/modules/old/${MYP}.tar.bz2
-	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
-
-KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha ~mips ~arm ~ia64"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc
-	sys-libs/zlib"
-
-PROVIDE="virtual/modutils"
-
-src_unpack() {
-	unpack ${A}
-
-	# With the b0rked modutils, "modprobe hid" does work. But if something
-	# (like hotplug) tries to auto-load hid (because another module needs it,
-	# via the kernel module auto-loader) and keybdev.o or mousedev.o don't
-	# exist, then the "above" clause fails and the hid module never gets
-	# loaded, and then things like USB will fail.  Thus we remove it all
-	# together.
-	#
-	# <drobbins@gentoo.org> (26 Mar 2003)
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
-
-	# Support legacy .o modules
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.15-legacy-modext-support.patch
-
-	cd ${S}
-	rm -f missing
-	automake --add-missing
-}
-
-src_compile() {
-
-	# If running mips64, we need updated configure data
-	use mips && gnuconfig_update
-
-	local myconf=
-
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--disable-insmod-static \
-		--disable-zlib \
-		${myconf}
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		${myconf}
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}"
-
-	docinto modutils-${MODUTILS_PV}
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-
-	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4; new versions will execve() the .old version if
-	# a 2.4 kernel is running...
-	# This code was borrowed from the module-init-tools Makefile
-	local runme=
-	local f=
-	for f in lsmod modprobe rmmod depmod insmod modinfo
-	do
-		if [ -L ${D}/sbin/${f} ]
-		then
-			einfo "Moving symlink $f to ${f}.old"
-			#runme = the target of the symlink with a .old tagged on.
-			runme="`ls -l ${D}/sbin/${f} | sed 's/.* -> //'`.old"
-			[ ! -e ${D}/sbin/${runme} ] || einfo "${D}/sbin/${runme} not found"
-			dosym $runme /sbin/${f} || die
-		elif [ -e ${D}/sbin/${f} ]
-		then
-			einfo "Moving executable $f to ${f}.old"
-		fi
-		mv -f ${D}/sbin/${f} ${D}/sbin/${f}.old
-	done
-	# Move the man pages as well.  We only do this for the man pages of the
-	# tools that module-init-tools will replace.
-	for f in ${D}/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8
-	do
-		mv -f ${f} ${f%\.*}.old.${f##*\.}
-	done
-
-	einstall prefix=${D}
-
-	# Install compat symlink
-	dosym ../bin/lsmod /sbin/lsmod
-	dosym ../sbin/insmod.old /bin/lsmod.old
-	# Install the modules.conf2modprobe.conf tool, so we can update
-	# modprobe.conf.
-	into /
-	dosbin ${S}/generate-modprobe.conf
-	# Create the new modprobe.conf
-	dodir /etc
-	rm -f ${D}/etc/modprobe.conf
-	if [ ! -f ${ROOT}/etc/modprobe.devfs ]
-	then
-		# Support file for the devfs hack .. needed else modprobe borks.
-		# Baselayout-1.8.6.3 or there abouts will have a modules-update that
-		# will correctly generate /etc/modprobe.devfs ....
-		echo "### This file is automatically generated by modules-update" \
-			> ${D}/etc/modprobe.devfs
-	else
-		# This is dynamic, so we do not want this in the package ...
-		rm -f ${D}/etc/modprobe.devfs
-	fi
-
-	doman *.[1-8]
-	docinto /
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Updating config files..."
-		if [ -x /sbin/modules-update ]
-		then
-			/sbin/modules-update
-		elif [ -x /sbin/update-modules ]
-		then
-			/sbin/update-modules
-		elif [ -x /usr/sbin/update-modules ]
-		then
-			/usr/sbin/update-modules
-		fi
-	fi
-}
-