cleanup

14 files changed, 3 insertions, 869 deletions

diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index 686187a6679c..d55ae5f95a11 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,25 +1,13 @@
 MD5 31f07c9e84f376f092c397d67ab76a40 module-init-tools-0.9.13_pre2.ebuild 4783
 MD5 f02156f662ecf97335489ce4caa4ac7e ChangeLog 8022
-MD5 47cb67d84db45b1b445ae858ebb3ce55 module-init-tools-0.9.11-r3.ebuild 4486
 MD5 4ec80fa310511e8c58ccae31f4a77032 module-init-tools-0.9.14.ebuild 4550
-MD5 27920bbc87dda8233d709713d08a4812 module-init-tools-0.9.11a.ebuild 4492
-MD5 65c2f68b7db9e9ea73049a092f5a801a module-init-tools-0.9.12-r1.ebuild 4875
-MD5 491ef3d4f67206c4403231be9767e1e0 module-init-tools-0.9.10-r5.ebuild 4698
-MD5 619069c4bc4e71e56d2fdffdca409f65 module-init-tools-0.9.12.ebuild 4491
-MD5 4df8ab0d7f4afe4d13b11732b8eb5508 files/module-init-tools-0.9.10-fix-recursion.patch 1986
+MD5 408c20ce506f56efa06690f9ebcad895 module-init-tools-0.9.12-r1.ebuild 4872
 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 cef78844d070f59100d7f47b62ecf5d8 files/digest-module-init-tools-0.9.10-r5 144
 MD5 ba1718dd25f5cbfac19958b1763691d9 files/module-init-tools-0.9.7-export-gpl.patch 592
-MD5 37cda221ca368a67d8a9fd8e6814f62c files/digest-module-init-tools-0.9.12 145
 MD5 37cda221ca368a67d8a9fd8e6814f62c files/digest-module-init-tools-0.9.12-r1 145
-MD5 8fa0146b2762a25ceb1784a898ff3bc8 files/digest-module-init-tools-0.9.11-r3 144
-MD5 3bdd37447e200b986159c090991bd6be files/module-init-tools-0.9.10-no-stdout-on-log.patch 787
 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 28295a2b93ba19ae91062a0078c078f6 files/module-init-tools-0.9.10-be-quiet-for-devfsd.patch 3327
-MD5 71d2757ca730209482fea3cb89648a27 files/digest-module-init-tools-0.9.11a 407
 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 37092cae20ec7562f89aea0205bda5c0 files/module-init-tools-0.9.10-use-modprobe_conf.patch 431
 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.10-r5 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r5
deleted file mode 100644
index 06ecbad3d4d4..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f8a88214e06d102a2044af3b95256f2a module-init-tools-0.9.10.tar.bz2 99143
-MD5 16170af2981db98367c6f140a1534668 modutils-2.4.24.tar.bz2 220279
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11-r3 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11-r3
deleted file mode 100644
index bff888302de5..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6a6e738f2e545692f58f724253b4b628 module-init-tools-0.9.11.tar.bz2 99987
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11a b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11a
deleted file mode 100644
index b4bb887cdcec..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11a
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 060ce311606657915548168939e965b4 /files/modutils-2.4.22-no-above-below.patch 382
-MD5 45ebc93263c86224eb12c3f2c71d9275 /files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch 4208
-MD5 a26c14af428e0efbe46296271a65b078 /module-init-tools-0.9.11a.ebuild 4562
-MD5 d1e519e808d6c6b288ca25a6f03b78ba module-init-tools-0.9.11a.tar.bz2 110524
-MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12
deleted file mode 100644
index da7deba7e67b..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12
+++ /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/module-init-tools-0.9.10-be-quiet-for-devfsd.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-be-quiet-for-devfsd.patch
deleted file mode 100644
index 36ca968d2226..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-be-quiet-for-devfsd.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- module-init-tools-0.9.10/modprobe.c.orig	2003-03-15 06:51:14.000000000 +0200
-+++ module-init-tools-0.9.10/modprobe.c	2003-03-15 07:57:58.000000000 +0200
-@@ -50,6 +50,8 @@
- 
- /* 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)
- {
-@@ -68,6 +70,9 @@
- 	va_list arglist;
- 	int len;
- 
-+	if (quiet)
-+		return;
-+
- 	va_start(arglist, fmt);
- 	len = strlen(prefix) + getlen(fmt, arglist) + 1;
- 	buf = malloc(len);
-@@ -85,7 +90,7 @@
- 
- #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)
- {
-@@ -1161,10 +1166,6 @@
- 		if (0 == strcmp(getenv("MODPROBE_VERBOSE"), "1"))
- 			verbose = 1;
- 
--	/* Check MODPROBE_CONFIG */
--	if ((getenv("MODPROBE_CONFIG")) && (NULL == config))
--		config = NOFAIL(strdup(getenv("MODPROBE_CONFIG")));
--
- 	/* Check MODPROBE_QUIET */
- 	if ((getenv("MODPROBE_QUIET")) && (0 != fail_if_already))
- 		if (0 == strcmp(getenv("MODPROBE_QUIET"), "1"))
-@@ -1175,6 +1176,18 @@
- 		if (0 == strcmp(getenv("MODPROBE_LOG"), "1"))
- 			log = 1;
- 
-+	/* If no logging, and we have 'MODPROBE_CONFIG=/etc/modprobe.devfs', then
-+	 * be totally quiet.  Note that this catches recursive calls, so it should
-+	 * not be a first call to modprobe, and we should check it *before* we
-+	 * check MODPROBE_CONFIG ... */
-+	if ((!log) && (!config) && (getenv("MODPROBE_CONFIG")))
-+		if (0 == strcmp(getenv("MODPROBE_CONFIG"), "/etc/modprobe.devfs"))
-+			quiet = 1;
-+
-+	/* Check MODPROBE_CONFIG */
-+	if ((getenv("MODPROBE_CONFIG")) && (NULL == config))
-+		config = NOFAIL(strdup(getenv("MODPROBE_CONFIG")));
-+
- 	/* If logging was requested, do not output to stdout */
- 	if (log) {
- 		openlog("modprobe", 0, LOG_DAEMON);
-@@ -1226,6 +1239,35 @@
- 		}
- 	}
- 
-+	/* Another 'not so horrible' hack to have absolutely no output if we
-+	 * have no logging enabled, and our config file is /etc/modprobe.devfs
-+	 *
-+	 * 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 # 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) &&
-+		(strncmp(argv[optind], "/dev/", 5) == 0) &&
-+		((config) && (0 == strcmp(config, "/etc/modprobe.devfs"))))
-+		quiet = 1;
-+
-+
- 	/* -r only allows certain restricted options */
- 	if (remove) {
- 		if (strcmp(optstring, "") != 0)
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch
deleted file mode 100644
index 66f46409f8e2..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- module-init-tools-0.9.10/modprobe.c.orig	2003-03-10 19:34:08.000000000 +0200
-+++ module-init-tools-0.9.10/modprobe.c	2003-03-10 19:33:29.000000000 +0200
-@@ -1095,12 +1095,14 @@
- 	while ((opt = getopt_long(argc, argv, "vVC:o:rknqsclt:aif", options, NULL)) != -1){
- 		switch (opt) {
- 		case 'v':
-+			setenv("MODPROBE_VERBOSE", "1", 1);
- 			verbose = 1;
- 			break;
- 		case 'V':
- 			puts(PACKAGE " version " VERSION);
- 			exit(0);
- 		case 'C':
-+			setenv("MODPROBE_CONFIG", optarg, 1);
- 			config = optarg;
- 			break;
- 		case 'o':
-@@ -1129,9 +1131,11 @@
- 			break;
- 		case 'q':
- 			/* FIXME: should do more than this. */
-+			setenv("MODPROBE_QUIET", "1", 1);
- 			fail_if_already = 0;
- 			break;
- 		case 's':
-+			setenv("MODPROBE_LOG", "1", 1);
- 			log = 1;
- 			break;
- 		case 'i':
-@@ -1152,6 +1156,25 @@
- 		}
- 	}
- 
-+	/* Check MODPROBE_VERBOSE */
-+	if ((getenv("MODPROBE_VERBOSE")) && (1 != verbose))
-+		if (0 == strcmp(getenv("MODPROBE_VERBOSE"), "1"))
-+			verbose = 1;
-+
-+	/* Check MODPROBE_CONFIG */
-+	if ((getenv("MODPROBE_CONFIG")) && (NULL == config))
-+		config = NOFAIL(strdup(getenv("MODPROBE_CONFIG")));
-+
-+	/* Check MODPROBE_QUIET */
-+	if ((getenv("MODPROBE_QUIET")) && (0 != fail_if_already))
-+		if (0 == strcmp(getenv("MODPROBE_QUIET"), "1"))
-+			fail_if_already = 0;
-+
-+	/* Check MODPROBE_LOG */
-+	if ((getenv("MODPROBE_LOG")) && (1 != log))
-+		if (0 == strcmp(getenv("MODPROBE_LOG"), "1"))
-+			log = 1;
-+
- 	/* If stderr not open, go to syslog */
- 	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
- 		openlog("modprobe", LOG_CONS, LOG_DAEMON);
-@@ -1190,8 +1213,10 @@
- 	if (config && !dump_only && strncmp(argv[optind], "/dev/", 5) == 0) {
- 		if (strcmp("/etc/modules.conf", config) == 0)
- 			config = NULL;
--		else if (strcmp("/etc/modules.devfs", config) == 0)
-+		else if (strcmp("/etc/modules.devfs", config) == 0) {
- 			config = "/etc/modprobe.devfs";
-+			setenv("MODPROBE_CONFIG", "/etc/modprobe.devfs", 1);
-+		}
- 	}
- 
- 	/* -r only allows certain restricted options */
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch
deleted file mode 100644
index 00889672d638..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- module-init-tools-0.9.10/modprobe.c.orig	2003-03-10 20:19:33.000000000 +0200
-+++ module-init-tools-0.9.10/modprobe.c	2003-03-10 21:39:57.000000000 +0200
-@@ -1175,11 +1175,18 @@
- 		if (0 == strcmp(getenv("MODPROBE_LOG"), "1"))
- 			log = 1;
- 
--	/* If stderr not open, go to syslog */
--	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
--		openlog("modprobe", LOG_CONS, LOG_DAEMON);
-+	/* If logging was requested, do not output to stdout */
-+	if (log) {
-+		openlog("modprobe", 0, LOG_DAEMON);
- 		log = 1;
- 	}
-+	
-+	/* If stderr not open and logging was not requested, go to syslog */
-+	if (!log)
-+		if (fstat(STDERR_FILENO, &statbuf) != 0) {
-+			openlog("modprobe", LOG_CONS, LOG_DAEMON);
-+			log = 1;
-+		}
- 
- 	if (argc < optind + 1 && !dump_only && !list_only)
- 		print_usage(argv[0]);
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch
deleted file mode 100644
index 5e3f9f245db9..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- generate-modprobe.conf.orig	2003-03-10 19:59:48.000000000 +0200
-+++ generate-modprobe.conf	2003-03-10 20:00:38.000000000 +0200
-@@ -18,6 +18,9 @@
- 
- if [ x"$TESTING_MODPROBE_CONF" != x ]; then
-     cp $TESTING_MODPROBE_CONF $MODPROBECONF
-+elif [ -x /sbin/modprobe.conf ]; then
-+	# In sbin.
-+	/sbin/modprobe.conf -c > $MODPROBECONF
- elif [ -x /sbin/modprobe.old ]; then
-     # In sbin.
-     /sbin/modprobe.old -c > $MODPROBECONF
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild
deleted file mode 100644
index e52942c720dd..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2003 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.10-r5.ebuild,v 1.5 2003/09/07 01:10:02 msterret Exp $
-
-# This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
-
-inherit flag-o-matic
-inherit eutils
-
-# Note to Azarah:
-#
-# Hi Azarah :) That "above" and "below" stuff messes up 2.4 modutils too,
-# but for different reasons. So I am removing all the weird hacks to keep
-# "above" and "below" since they are no longer necessary.
-#
-# <drobbins@gentoo.org> (24 March 2003)
-
-MYP="${P/_pre1/-pre}"
-S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.24"
-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/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"
-RDEPEND=">=sys-apps/devfsd-1.3.25-r1"
-PROVIDE="virtual/modutils"
-
-pkg_setup() {
-	check_KV
-
-	if [ ! -f /lib/modules/${KV}/modules.dep ]
-	then
-		eerror "Please compile and install a kernel first!"
-		die "Please compile and install a kernel first!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Fix recursive calls to modprobe not honoring -s, -q, -v and -C
-	epatch ${FILESDIR}/${P}-fix-recursion.patch
-	# Never output to stdout if logging was requested
-	epatch ${FILESDIR}/${P}-no-stdout-on-log.patch
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
-	cd ${S}
-
-	# If we call modprobe with '-C /dev/modules.conf' and the "module name"
-	# starts with '/dev', modprobe from modutils-2.4.22 do not print any
-	# errors:
-	#
-	#   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 # 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 #
-	epatch ${FILESDIR}/${P}-be-quiet-for-devfsd.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
-	for f in lsmod modprobe rmmod depmod insmod; do
-		if [ -L ${D}/sbin/${f} ]; then
-			ln -sf `ls -l ${D}/sbin/${f} | \
-				sed 's/.* -> //'`.old ${D}/sbin/${f};
-		fi;
-		mv ${D}/sbin/${f} ${D}/sbin/${f}.old;
-	done
-	einstall prefix=${D}
-	# 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
-
-	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.11-r3.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.11-r3.ebuild
deleted file mode 100644
index eb44b35ca341..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.11-r3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2003 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.11-r3.ebuild,v 1.4 2003/09/07 01:10:06 msterret 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/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}/${P}-be-quiet-for-devfsd.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.11a.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.11a.ebuild
deleted file mode 100644
index 6517db9bc8c4..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.11a.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2003 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.11a.ebuild,v 1.4 2003/09/07 01:10:06 msterret 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/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
-}
-
-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.12-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild
index 5babff044c0a..b0f181a6d6e7 100644
--- 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.5 2003/09/07 01:10:06 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild,v 1.6 2003/09/15 21:48:44 azarah Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -16,7 +16,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${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"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha mips ~arm"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.12.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.12.ebuild
deleted file mode 100644
index 95d5ed875768..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.12.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.4 2003/09/07 01:10:06 msterret 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/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
-}
-
-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
-}
-