old

(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

17 files changed, 17 insertions, 1244 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index b4b75458e5c1..459264bbe742 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-apps/module-init-tools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.187 2012/11/24 21:14:02 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.188 2013/01/19 23:29:12 ssuominen Exp $
+
+  19 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/modutils-2.4.27-alias.patch, -files/modutils-2.4.27-build.patch,
+  -files/modutils-2.4.27-flex.patch, -files/modutils-2.4.27-gcc.patch,
+  -files/modutils-2.4.27-hppa.patch,
+  -files/modutils-2.4.27-no-nested-function.patch,
+  -files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch,
+  -files/module-init-tools-3.2.2-handle-dupliate-aliases.patch,
+  -files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch,
+  -module-init-tools-3.6-r1.ebuild,
+  -files/module-init-tools-3.6-hidden-dirs.patch,
+  -files/module-init-tools-3.6-skip-sys-check.patch,
+  -module-init-tools-3.10.ebuild, -module-init-tools-3.11.1.ebuild,
+  -module-init-tools-3.12-r1.ebuild, -module-init-tools-3.13.ebuild:
+  old
 
   24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   -module-init-tools-3.5.ebuild, -module-init-tools-3.8.ebuild,
diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch b/sys-apps/module-init-tools/files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch
deleted file mode 100644
index 19cfd26d4110..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- generate-modprobe.conf
-+++ generate-modprobe.conf
-@@ -1,20 +1,35 @@
- #! /bin/sh -e
- 
- # Naive shell script to translate modules.conf + defaults to modprobe.conf
- # Normal caveats apply, as with any machine translation.
--if [ $# -gt 2 ] || [ x"$1" = x--help ]; then
--    echo "Usage: $0 [--stdin] [modprobe.conf]"
--    echo "   Converts your current modules setup to modprobe.conf."
--    echo "   Don't trust it too much."
--    echo " Version 0.1"
--    exit 1
--fi
-+#
-+# Updated 07 May 2004 by Aron Griffis <agriffis@gentoo.org> to support
-+# --assume-kernel option for Gentoo LiveCD building.  See
-+# http://bugs.gentoo.org/49927
- 
-+# Parse command-line
- STDIN=
--if [ "$1" = "--stdin" ]; then
--  STDIN=1
--  shift
--fi
-+KV=`uname -r`
-+while [ -n "$1" ] ; do
-+    case "$1" in
-+	--assume-kernel=*)
-+	    KV=${1#*=}
-+	    ;;
-+	--stdin)
-+	    STDIN=1
-+	    ;;
-+	--*)
-+	    echo "Usage: $0 [--stdin] [--assume-kernel=n.n.n] [modprobe.conf]"
-+	    echo "   Converts your current modules setup to modprobe.conf."
-+	    echo "   Don't trust it too much."
-+	    echo " Version 0.1"
-+	    exit 1
-+	    ;;
-+	*)
-+	    break;;
-+    esac
-+    shift
-+done
- 
- # Set up output if specified.
- if [ $# -eq 1 ]; then exec > $1; fi
-@@ -221,7 +234,7 @@
- 	($0 $MODULE)
- 	;;
-     # Ignore default lines which are not required any more.
--    "path[boot]=/lib/modules/boot"|"path[toplevel]=/lib/modules/`uname -r`"|"path[toplevel]=/lib/modules/2.4"|"path[kernel]=/lib/modules/kernel"|"path[fs]=/lib/modules/fs"|"path[net]=/lib/modules/net"|"path[scsi]=/lib/modules/scsi"|"path[block]=/lib/modules/block"|"path[cdrom]=/lib/modules/cdrom"|"path[ipv4]=/lib/modules/ipv4"|"path[ipv6]=/lib/modules/ipv6"|"path[sound]=/lib/modules/sound"|"path[fc4]=/lib/modules/fc4"|"path[video]=/lib/modules/video"|"path[misc]=/lib/modules/misc"|"path[pcmcia]=/lib/modules/pcmcia"|"path[atm]=/lib/modules/atm"|"path[usb]=/lib/modules/usb"|"path[ide]=/lib/modules/ide"|"path[ieee1394]=/lib/modules/ieee1394"|"path[mtd]=/lib/modules/mtd"|"generic_stringfile=/lib/modules/`uname -r`/modules.generic_string"|"pcimapfile=/lib/modules/`uname -r`/modules.pcimap"|"isapnpmapfile=/lib/modules/`uname -r`/modules.isapnpmap"|"usbmapfile=/lib/modules/`uname -r`/modules.usbmap"|"parportmapfile=/lib/modules/`uname -r`/modules.parportmap"|"ieee1394mapfile=/lib/modules/`uname -r`/modules.ieee1394map"|"pnpbiosmapfile=/lib/modules/`uname -r`/modules.pnpbiosmap"|"depfile=/lib/modules/`uname -r`/modules.dep"|"persistdir=/var/lib/modules/persist")
-+    "path[boot]=/lib/modules/boot"|"path[toplevel]=/lib/modules/$KV"|"path[toplevel]=/lib/modules/2.4"|"path[kernel]=/lib/modules/kernel"|"path[fs]=/lib/modules/fs"|"path[net]=/lib/modules/net"|"path[scsi]=/lib/modules/scsi"|"path[block]=/lib/modules/block"|"path[cdrom]=/lib/modules/cdrom"|"path[ipv4]=/lib/modules/ipv4"|"path[ipv6]=/lib/modules/ipv6"|"path[sound]=/lib/modules/sound"|"path[fc4]=/lib/modules/fc4"|"path[video]=/lib/modules/video"|"path[misc]=/lib/modules/misc"|"path[pcmcia]=/lib/modules/pcmcia"|"path[atm]=/lib/modules/atm"|"path[usb]=/lib/modules/usb"|"path[ide]=/lib/modules/ide"|"path[ieee1394]=/lib/modules/ieee1394"|"path[mtd]=/lib/modules/mtd"|"generic_stringfile=/lib/modules/$KV/modules.generic_string"|"pcimapfile=/lib/modules/$KV/modules.pcimap"|"isapnpmapfile=/lib/modules/$KV/modules.isapnpmap"|"usbmapfile=/lib/modules/$KV/modules.usbmap"|"parportmapfile=/lib/modules/$KV/modules.parportmap"|"ieee1394mapfile=/lib/modules/$KV/modules.ieee1394map"|"pnpbiosmapfile=/lib/modules/$KV/modules.pnpbiosmap"|"depfile=/lib/modules/$KV/modules.dep"|"persistdir=/var/lib/modules/persist")
- 	;;
- 
-     # Ignore prune lines unless they end in .o or .ko, which would
diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.2.2-handle-dupliate-aliases.patch b/sys-apps/module-init-tools/files/module-init-tools-3.2.2-handle-dupliate-aliases.patch
deleted file mode 100644
index e119ce6bee8e..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-3.2.2-handle-dupliate-aliases.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-http://bugs.gentoo.org/149426
-
-keep from blowing up when people have duplicate aliases ... the grep
-ends up including new lines and with certain formed comments, hits an
-infinite loop ...
-
-for example, the following inputs illustrates the problem:
-----------------------------------------------
-# Old nvidia support ...
-alias char-major-195 NVdriver
-alias /dev/nvidiactl char-major-195
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-#   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
-#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
-#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3
-----------------------------------------------
-alias a b
-alias b a
-----------------------------------------------
-
-fixes from Martin Väth
-
---- generate-modprobe.conf
-+++ generate-modprobe.conf
-@@ -65,19 +65,29 @@
- # Resolve (possibly recursive) alias: args filename alias
- resolve_alias()
- {
--    RA_RESOLVE=`grep "^alias[ 	][ 	]*$2[ 	]" -- $1 | awk '{ print $3 }'`
-+    if [ 0$3 -gt 99 ]; then
-+	echo "Infinite recursion detected; aborting after $3 tries (alias '$2')" 1>&2
-+	return 1
-+    fi
-+
-+    _RA_RESOLVE=`grep "^alias[ 	][ 	]*$2[ 	]" -- $1 | awk '{ print $3 }'`
-+    RA_RESOLVE=`echo "$_RA_RESOLVE" | head -n 1`
-+    if [ x"$_RA_RESOLVE" != x"$RA_RESOLVE" ]; then
-+	echo "Invalid dupliate alias found for '$2' (results: `echo $_RA_RESOLVE`)" 1>&2
-+	return 1
-+    fi
-     if [ x"$RA_RESOLVE" = x ]; then
- 	echo $2
- 	return
-     fi
-     # Recurse.
--    (resolve_alias $1 "$RA_RESOLVE")
-+    (resolve_alias $1 "$RA_RESOLVE" $(($3 + 1)))
- }
- 
- # Parse alias: args filename modulename aliasto.
- parse_alias()
- {
--    PA_ALIAS=`resolve_alias $1 $3`
-+    PA_ALIAS=`resolve_alias $1 $3` || exit 1
-     NAME=`echo $2|sed -e 's/\(block\|char\)-major-\([0-9]\+\)$/\1-major-\2-*/'`
- 
-     echo "alias $NAME $PA_ALIAS"
-@@ -180,7 +190,8 @@
- 	    parse_options $MODULE `grab_noninstall_options $REST`
- 	    INSTALL_OPTIONS=`grab_install_options $REST`
- 	    INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE"
--	    eval install_$MODNAME=\"/sbin/modprobe $INSTALL_OPTIONS --ignore-install `resolve_alias $MODPROBECONF $MODULE`\"
-+	    INSTALL_ALIAS=`resolve_alias $MODPROBECONF "$MODULE"` || exit 1
-+	    eval install_$MODNAME=\"/sbin/modprobe $INSTALL_OPTIONS --ignore-install $INSTALL_ALIAS\"
- 	    ;;
- 	*)
- 	    parse_options $MODULE "$REST"
diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch b/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch
deleted file mode 100644
index ed217bdc3cb3..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Abort generate-modprobe.conf if modprobe fails, bug #68689.
-
---- module-init-tools-3.2-pre7/generate-modprobe.conf	2005-07-15 11:21:54.000000000 +0200
-+++ module-init-tools-3.2-pre7.az/generate-modprobe.conf	2005-07-15 11:24:33.000000000 +0200
-@@ -35,22 +35,28 @@
- MODPROBECONF=`mktemp /tmp/modprobe.XXXXXX || tempfile || echo /tmp/modprobe.$$`
- trap "rm -f $MODPROBECONF" 0
- 
-+modprobe_abort()
-+{
-+    echo Failed to to run modprobe.  Giving up. 1>&2
-+    exit 1
-+}
-+
- if [ x"$TESTING_MODPROBE_CONF" != x ]; then
-     cp $TESTING_MODPROBE_CONF $MODPROBECONF
- elif [ "$STDIN" = "1" ]; then
-     cat > $MODPROBECONF
- elif [ -x /sbin/modprobe.old ]; then
-     # In sbin.
--    /sbin/modprobe.old -c > $MODPROBECONF
-+    /sbin/modprobe.old -c > $MODPROBECONF || modprobe_abort
- elif modprobe.old -c >/dev/null 2>&1; then
-     # Somewhere in path.
--    modprobe.old -c > $MODPROBECONF
-+    modprobe.old -c > $MODPROBECONF || modprobe_abort
- elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then
-     # Running /sbin/modprobe gives old version.
--    /sbin/modprobe -c > $MODPROBECONF
-+    /sbin/modprobe -c > $MODPROBECONF || modprobe_abort
- elif modprobe -V 2>/dev/null | grep -q 'modprobe version'; then
-     # Running modprobe gives old version.
--    modprobe -c > $MODPROBECONF
-+    modprobe -c > $MODPROBECONF || modprobe_abort
- else
-     echo Cannot find old version of modprobe.  Giving up. 2>&1
-     exit 1
diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.6-hidden-dirs.patch b/sys-apps/module-init-tools/files/module-init-tools-3.6-hidden-dirs.patch
deleted file mode 100644
index 9d215bc12e9f..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-3.6-hidden-dirs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/245271
-
---- a/modprobe.c
-+++ b/modprobe.c
-@@ -1289,6 +1289,12 @@
- 	DIR *dir;
- 	int ret = 0;
- 
-+	/* Ignore hidden dirs.  This allows people to maintain things with
-+	 * SCMs like .svn/ or .git/ or ...
-+	 */
-+	if (filename[0] == '.')
-+		return 1;
-+
- 	/* Reiser4 has file/directory duality: treat it as both. */
- 	dir = opendir(filename);
- 	if (dir) {
diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.6-skip-sys-check.patch b/sys-apps/module-init-tools/files/module-init-tools-3.6-skip-sys-check.patch
deleted file mode 100644
index e965e25b48ff..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-3.6-skip-sys-check.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://bugs.gentoo.org/258442
-
-From 1a55ee5297b883ea4b43cdf74ad890873ebe966c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 13 Feb 2009 02:21:10 -0500
-Subject: [PATCH] modprobe: remove pointless /sys requirement
-
-When modprobe was converted from parsing /proc to parsing /sys, it was not
-a straight conversion.  Instead, a "sanity" check was added early on where
-modprobe would simply abort doing anything useful if /sys isn't mounted.
-Unfortunately, this makes modprobe fairly unusable.  Considering the
-kernel itself can invoke modprobe before userspace gets a chance to start
-the init process (and actually mount /sys), we end up with a chicken and
-egg issue.  Which gets even worse when the kernel keeps running modprobe
-over and over and the boot output fills up with:
-modprobe: FATAL: /sys is not mounted.
-modprobe: FATAL: /sys is not mounted.
-modprobe: FATAL: /sys is not mounted.
-modprobe: FATAL: /sys is not mounted.
-modprobe: FATAL: /sys is not mounted.
-modprobe: FATAL: /sys is not mounted.
-
-Since modprobe itself is already written to handle the case where it
-cannot figure out whether a given module is loaded (and so was able to run
-perfectly fine without /proc being mounted), the check is wholly useless.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- modprobe.c |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/modprobe.c b/modprobe.c
-index 022004c..110204b 100644
---- a/modprobe.c
-+++ b/modprobe.c
-@@ -1522,11 +1522,6 @@ static void handle_module(const char *modname,
- 			  const char *cmdline_opts,
- 			  int flags)
- {
--	struct stat finfo;
--
--	if (stat("/sys/module", &finfo) < 0)
--		fatal("/sys is not mounted.\n");
--
- 	if (list_empty(todo_list)) {
- 		const char *command;
- 
--- 
-1.6.1.3
-
diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch
deleted file mode 100644
index 1fefffb62f85..000000000000
--- a/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Taken from Debian.
-
-Update misc alias cruft.
-
---- util/alias.h
-+++ util/alias.h
-@@ -52,7 +52,11 @@
- 	"binfmt--310 binfmt_java",
- 
- 	"block-major-1 rd",
-+#if defined(__s390__) || defined(__s390x__) || defined(__ia64__) || defined(__powerpc__)
-+	"block-major-2 off",
-+#else
- 	"block-major-2 floppy",
-+#endif
- 	"block-major-3 ide-probe-mod",
- 	"block-major-7 loop",
- 	"block-major-8 sd_mod",
-@@ -107,6 +111,7 @@
- 					/* /dev/sunmouse Sun mouse */
- 					/* /dev/beep Fancy beep device */
- 					/* /dev/modreq Kernel module load request */
-+	"char-major-10-116 snd",	
- 	"char-major-10-130 wdt",	/* /dev/watchdog Watchdog timer port */
- 	"char-major-10-131 wdt",	/* /dev/temperature Machine internal temperature */
- 					/* /dev/hwtrap Hardware fault trap */
-@@ -116,7 +121,11 @@
- 	"char-major-10-144 nvram",	/* from Tigran Aivazian <tigran@sco.COM> */
- 	"char-major-10-157 applicom",	/* from David Woodhouse <dwmw2@infradead.org> */
- 	"char-major-10-175 agpgart",    /* /dev/agpgart GART AGP mapping access */
-+	"char-major-10-181 toshiba",	
-+	"char-major-10-183 hw_random",	
- 	"char-major-10-184 microcode",	/* Tigran Aivazian <tigran@veritas.com> */
-+	"char-major-10-187 irnet",	
-+	"char-major-10-189 ussp",	
- 	"char-major-10-200 tun",	/* Universal TUN/TAP device driver */
- 	"char-major-10-250 hci_vhci",
- 
-@@ -179,6 +203,11 @@
- 	/* next two from <dairiki@matthews.dairiki.org>  Thanks! */
- 	"net-pf-17 af_packet",
- 	"net-pf-19 off",	/* acorn econet */
-+	"net-pf-20 atm",
-+	"net-pf-23 irda",
-+	"net-pf-24 pppoe",
-+	"net-pf-25 wanrouter",
-+	"net-pf-26 llc",
- 	
- 	"net-pf-31 bluez",
- 
-@@ -199,6 +228,10 @@
- 	"bt-proto-2 sco",
- 	"bt-proto-3 rfcomm",
- 	"bt-proto-4 bnep",
-+	"bt-proto-5 cmtp",
-+	"bt-proto-6 hidp",
-+	"bt-proto-7 avdtp",
-+
- 
- 	"plip0 plip",
- 	"plip1 plip",
-@@ -228,6 +261,7 @@
- 	"ppp-compress-21 bsd_comp",
- 	"ppp-compress-24 ppp_deflate",
- 	"ppp-compress-26 ppp_deflate",
-+        "ppp ppp_async", /* for 2.4 */
- 
- #ifndef __sparc__
- 	"parport_lowlevel parport_pc",
-@@ -271,9 +305,6 @@
-  */
- char *above[] =
- {
--	"hid keybdev mousedev",
--	"usbmouse hid",
--	"wacom evdev",
- 	NULL			/* marks the end of the list! */
- };
- 
-@@ -284,7 +315,6 @@
-  */
- char *below[] =
- {
--	"ov518_decomp ov511",
- 	NULL			/* marks the end of the list! */
- };
diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-build.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-build.patch
deleted file mode 100644
index 00cc103257f7..000000000000
--- a/sys-apps/module-init-tools/files/modutils-2.4.27-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://bugs.gentoo.org/154281
-
---- util/Makefile.in
-+++ util/Makefile.in
-@@ -42,7 +42,7 @@
- install-bin: all
- 
- dep depend .depend: $(OBJS:.o=.c)
--	$(CC) -M $(CFLAGS) $(DEFS) $^ > .depend
-+	$(CC) -M $(CPPFLAGS) $(DEFS) $^ > .depend
- 
- ifeq (.depend,$(wildcard .depend))
- include .depend
---- obj/Makefile.in
-+++ obj/Makefile.in
-@@ -78,7 +78,7 @@
- install-bin: all
- 
- dep depend .depend: $(LIBOBJ_SRCS)
--	$(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
-+	$(CC) -M $(CPPFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
- 
- ifeq (.depend,$(wildcard .depend))
- include .depend
---- insmod/Makefile.in.orig	2006-11-06 16:10:44.000000000 -0500
-+++ insmod/Makefile.in	2006-11-06 16:10:53.000000000 -0500
-@@ -146,7 +146,7 @@
- 	rm -f Makefile
- 
- dep depend .depend: $(addsuffix .c, $(PROGS))
--	$(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
-+	$(CC) -M $(CPPFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
- 
- ifeq (.depend,$(wildcard .depend))
- include .depend
diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-flex.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-flex.patch
deleted file mode 100644
index c07e929b8b42..000000000000
--- a/sys-apps/module-init-tools/files/modutils-2.4.27-flex.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Taken from Debian.
-
-Build with newer flex versions.
-
---- modutils-2.4.27.0.orig/genksyms/lex.l
-+++ modutils-2.4.27.0/genksyms/lex.l
-@@ -130,6 +130,7 @@
- 
-   static int suppress_type_lookup, dont_want_brace_phrase;
-   static struct string_list *next_node;
-+  static int next_token = 0;
- 
-   int token, count = 0;
-   struct string_list *cur_node;
-@@ -144,7 +145,12 @@
-     }
- 
- repeat:
--  token = yylex1();
-+  if (next_token != 0) {
-+    token = next_token;
-+    next_token = 0;
-+  }
-+  else
-+    token = yylex1();
- 
-   if (token == 0)
-     return 0;
-@@ -425,7 +431,7 @@
- 	    {
- 	      /* Put back the token we just read so's we can find it again
- 		 after registering the expression.  */
--	      unput(token);
-+	      next_token = token;
- 
- 	      lexstate = ST_NORMAL;
- 	      token = EXPRESSION_PHRASE;
diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-gcc.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-gcc.patch
deleted file mode 100644
index 5193c82e36d9..000000000000
--- a/sys-apps/module-init-tools/files/modutils-2.4.27-gcc.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-Fix building with newer gcc versions.
-
-Most changes taken from Debian.
-
---- obj/obj_ia64.c
-+++ obj/obj_ia64.c
-@@ -127,6 +127,7 @@
- 	return (*(bundle + 1) >> 23) & 0x1ffffffffff;
- 
-     default:
-+	;
-     }
-     return (-1);
- }
---- depmod/depmod.c
-+++ depmod/depmod.c
-@@ -1133,7 +1133,7 @@
- 
- 		for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
- 			if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
--				((char *)ksym->name) += 8;
-+				ksym->name = ((char *)ksym->name) + 8;
- 			assert(n_syms < MAX_MAP_SYM);
- 			symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0);
- 		}
-@@ -1265,7 +1265,7 @@
- 				 * error.  Use the error() routine but do not count
- 				 * any errors.  Remove in 2.5.
- 				 */
--				int save_errors = errors;
-+				int save_errors = error_count;
- 				if (!quiet && nberr == 0)
- 					error("*** Unresolved symbols in %s",
- 					      ptmod->name);
-@@ -1274,7 +1274,7 @@
- 				nberr++;
- 				if (flag_unresolved_error)
- 					ret = 1;
--				errors = save_errors;
-+				error_count = save_errors;
- 			}
- 		}
- 		verbose("%s\n", ptmod->name + skipchars);
-@@ -1675,6 +1675,6 @@
- #else
- int main(int argc, char **argv)
- {
--	return depmod_main(argc, argv) || errors;
-+	return depmod_main(argc, argv) || error_count;
- }
- #endif	/* defined(COMMON_3264) && defined(ONLY_32) */
---- genksyms/genksyms.c
-+++ genksyms/genksyms.c
-@@ -45,7 +45,7 @@
- int flag_debug, flag_dump_defs, flag_warnings;
- int checksum_version = 1, kernel_version = version(2,0,0);
- 
--static int errors;
-+static int num_errors;
- static int nsyms;
- 
- static struct symbol *expansion_trail;
-@@ -458,7 +458,7 @@
-       va_end(args);
-       putc('\n', stderr);
- 
--      errors++;
-+      num_errors++;
-     }
- }
- 
-@@ -476,7 +476,7 @@
-       va_end(args);
-       putc('\n', stderr);
- 
--      errors++;
-+      num_errors++;
-     }
- }
- 
-@@ -597,5 +597,5 @@
- 	      nsyms, HASH_BUCKETS, (double)nsyms / (double)HASH_BUCKETS);
-     }
- 
--  return errors != 0;
-+  return num_errors != 0;
- }
---- include/util.h
-+++ include/util.h
-@@ -39,8 +39,8 @@
- extern int xftw(const char *directory, xftw_func_t);
- 
- /* Error logging */
--extern int log;
--extern int errors;
-+extern int logging;
-+extern int error_count;
- extern const char *error_file;
- 
- extern int flag_verbose;
---- insmod/insmod.c
-+++ insmod/insmod.c
-@@ -275,7 +275,7 @@
- 		if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
- 			gplonly_seen = 1;
- 			if (gpl)
--				((char *)s->name) += 8;
-+				s->name = ((char *)s->name) + 8;
- 			else
- 				continue;
- 		}
-@@ -1679,7 +1679,7 @@
- 	error_file = "insmod";
- 
- 	/* To handle repeated calls from combined modprobe */
--	errors = optind = 0;
-+	error_count = optind = 0;
- 
- 	/* Process the command line.  */
- 	while ((o = getopt_long(argc, argv, "fhkLmnpqrsSvVxXyYNe:o:O:P:R:",
-@@ -2064,7 +2064,7 @@
- 		goto out;
- 	/**** No symbols or sections to be changed after kallsyms above ***/
- 
--	if (errors)
-+	if (error_count)
- 		goto out;
- 
- 	/* If we were just checking, we made it.  */
-@@ -2123,10 +2123,10 @@
- 		test_read.m.read_start = m_addr + sizeof(struct module);
- 		test_read.m.read_end = test_read.m.read_start + sizeof(test_read.data);
- 		if (sys_init_module(m_name, (struct module *) &test_read)) {
--			int old_errors = errors;
-+			int old_errors = error_count;
- 			error("has persistent data but the kernel is too old to support it."
- 				"  Expect errors during rmmod as well");
--			errors = old_errors;
-+			error_count = old_errors;
- 		}
- 	}
- 
-@@ -2152,7 +2152,7 @@
- #else
- 	init_module(m_name, f, m_size, blob_name, noload, flag_load_map);
- #endif
--	if (errors) {
-+	if (error_count) {
- 		if (!noload)
- 			delete_module(m_name);
- 		goto out;
---- insmod/kallsyms.c
-+++ insmod/kallsyms.c
-@@ -80,7 +80,7 @@
-     error_file = "kallsyms";
- 
-     /* To handle repeated calls from combined modprobe */
--    errors = optind = 0;
-+    error_count = optind = 0;
- 
-     /* Process the command line.  */
-     while ((c = getopt_long(argc, argv, "Vh",
---- insmod/modprobe.c
-+++ insmod/modprobe.c
-@@ -1023,7 +1023,7 @@
- 		if (quiet)
- 			my_argv[my_argc++] = "-q";
- 
--		if (log)
-+		if (logging)
- 			my_argv[my_argc++] = "-s";
- 
- 		if (insmod_opt) {
---- insmod/rmmod.c
-+++ insmod/rmmod.c
-@@ -261,9 +261,9 @@
- 	read_parm.m.read_start = mp->sym->value;
- 	read_parm.m.read_end = read_parm.m.read_start + datasize;
- 	if (sys_init_module(module, (struct module *) &read_parm)) {
--		int old_errors = errors;
-+		int old_errors = error_count;
- 		error("has persistent data but the kernel is too old to support it.");
--		errors = old_errors;
-+		error_count = old_errors;
- 		return(0);
- 	}
- 
---- util/logger.c
-+++ util/logger.c
-@@ -31,10 +31,10 @@
- 
- /*======================================================================*/
- 
--int log;
-+int logging;
- static int silent;
- 
--int errors;
-+int error_count;
- const char *error_file;
- const char *program_name;
- 
-@@ -75,7 +75,7 @@
- 
- 	if (silent)
- 		;
--	else if (log) {
-+	else if (logging) {
- 		char buf[2*PATH_MAX];
- 		int n;
- 
-@@ -100,7 +100,7 @@
- 		putc('\n', stderr);
- 	}
- 
--	errors++;
-+	error_count++;
- }
- 
- void lprintf(const char *fmt,...)
-@@ -108,7 +108,7 @@
- 	va_list args;
- 
- 	if (silent);
--	else if (log) {
-+	else if (logging) {
- 		char buf[2*PATH_MAX];
- 		va_start(args, fmt);
- 		vsnprintf(buf, sizeof(buf), fmt, args);
-@@ -132,5 +132,5 @@
- #ifdef STOREMSG
- 	atexit(dumpmsg);
- #endif
--	log = 1;
-+	logging = 1;
- }
---- obj/obj_kallsyms.c
-+++ obj/obj_kallsyms.c
-@@ -200,8 +200,8 @@
- 
-     /* Initial contents, header + one entry per input section.  No strings. */
-     osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
--    a_hdr = (struct kallsyms_header *) osec->contents =
--    	xmalloc(osec->header.sh_size);
-+    osec->contents = xmalloc(osec->header.sh_size);
-+    a_hdr = (struct kallsyms_header *) osec->contents;
-     memset(osec->contents, 0, osec->header.sh_size);
-     a_hdr->size = sizeof(*a_hdr);
-     a_hdr->sections = loaded;
-@@ -275,8 +275,8 @@
- 	a_hdr->symbol_off +
- 	a_hdr->symbols*a_hdr->symbol_size +
- 	strings_size - strings_left;
--    a_hdr = (struct kallsyms_header *) osec->contents =
--	xrealloc(a_hdr, a_hdr->total_size);
-+    osec->contents = xrealloc(a_hdr, a_hdr->total_size);
-+    a_hdr = (struct kallsyms_header *) osec->contents;
-     p = (char *)a_hdr + a_hdr->symbol_off;
-     memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
-     free(symbols);
---- obj/obj_ppc.c
-+++ obj/obj_ppc.c
-@@ -25,6 +25,7 @@
- #include <obj.h>
- #include <util.h>
- #include <assert.h>
-+#include <stdlib.h>
- 
- 
- /*======================================================================*/
-@@ -255,7 +256,8 @@
-   archdata_sec->header.sh_size = 0;
-   sec = obj_find_section(f, "__ftr_fixup");
-   if (sec) {
--    ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
-+    archdata_sec->contents = xmalloc(sizeof(*ad));
-+    ad = (struct archdata *) (archdata_sec->contents);
-     memset(ad, 0, sizeof(*ad));
-     archdata_sec->header.sh_size = sizeof(*ad);
-     ad->__start___ftr_fixup = sec->header.sh_addr;
---- obj/obj_mips.c
-+++ obj/obj_mips.c
-@@ -244,7 +244,8 @@
-   archdata_sec->header.sh_size = 0;
-   sec = obj_find_section(f, "__dbe_table");
-   if (sec) {
--    ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
-+    archdata_sec->contents = xmalloc(sizeof(*ad));
-+    ad = (struct archdata *) (archdata_sec->contents);
-     memset(ad, 0, sizeof(*ad));
-     archdata_sec->header.sh_size = sizeof(*ad);
-     ad->__start___dbe_table = sec->header.sh_addr;
diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-hppa.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-hppa.patch
deleted file mode 100644
index 30168d3dae12..000000000000
--- a/sys-apps/module-init-tools/files/modutils-2.4.27-hppa.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix support for hppa1.0-unknown-linux-gnu / hppa1.1-unknown-linux-gnu
-
---- modutils-2.4.27/configure
-+++ modutils-2.4.27/configure
-@@ -31,6 +31,7 @@
-   powerpc)   ARCH=ppc   ;;
-   powerpc64) ARCH=ppc64 ;;
-   hppa2*)    ARCH=hppa64 ;;
-+  hppa*)     ARCH=hppa  ;;
-   *)         ARCH=$host_cpu ;;
- esac
- 
diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-no-nested-function.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-no-nested-function.patch
deleted file mode 100644
index 7af4599c7154..000000000000
--- a/sys-apps/module-init-tools/files/modutils-2.4.27-no-nested-function.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Patch by the PaX team to get rid of executable stacks.
-
---- modutils/insmod/insmod.c
-+++ modutils/insmod/insmod.c
-@@ -366,18 +366,21 @@ static void hide_special_symbols(struct 
- 			sym->info = ELFW(ST_INFO) (STB_LOCAL, ELFW(ST_TYPE) (sym->info));
- }
- 
-+static struct obj_file *load_map_file;
-+
-+static int load_map_cmp(const void *a, const void *b) {
-+	struct obj_symbol **as = (struct obj_symbol **) a;
-+	struct obj_symbol **bs = (struct obj_symbol **) b;
-+	unsigned long aa = obj_symbol_final_value(load_map_file, *as);
-+	unsigned long ba = obj_symbol_final_value(load_map_file, *bs);
-+	return aa < ba ? -1 : aa > ba ? 1 : 0;
-+}
-+
- static void print_load_map(struct obj_file *f)
- {
- 	struct obj_symbol *sym;
- 	struct obj_symbol **all, **p;
- 	struct obj_section *sec;
--	int load_map_cmp(const void *a, const void *b) {
--		struct obj_symbol **as = (struct obj_symbol **) a;
--		struct obj_symbol **bs = (struct obj_symbol **) b;
--		unsigned long aa = obj_symbol_final_value(f, *as);
--		unsigned long ba = obj_symbol_final_value(f, *bs);
--		 return aa < ba ? -1 : aa > ba ? 1 : 0;
--	}
- 	int i, nsyms, *loaded;
- 
- 	/* Report on the section layout.  */
-@@ -425,7 +428,9 @@ static void print_load_map(struct obj_fi
- 				*p++ = sym;
- 
- 	/* Sort them by final value.  */
-+	load_map_file = f;
- 	qsort(all, nsyms, sizeof(struct obj_file *), load_map_cmp);
-+	load_map_file = NULL;
- 
- 	/* And list them.  */
- 	lprintf("\nSymbols:");
diff --git a/sys-apps/module-init-tools/module-init-tools-3.10.ebuild b/sys-apps/module-init-tools/module-init-tools-3.10.ebuild
deleted file mode 100644
index 8876cc3d5af9..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.10.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.10.ebuild,v 1.3 2011/04/24 21:28:11 ulm Exp $
-
-inherit eutils
-
-DESCRIPTION="tools for managing linux kernel modules"
-HOMEPAGE="http://modules.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib
-	>=sys-apps/baselayout-2.0.1
-	!sys-apps/modutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.2.2-handle-dupliate-aliases.patch #149426
-	touch *.5 *.8 # dont regen manpages
-}
-
-src_compile() {
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		--enable-zlib-dynamic \
-		--disable-static-utils
-	emake || die "emake module-init-tools failed"
-}
-
-src_test() {
-	./tests/runtests || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	into /
-	newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die
-	doman "${FILESDIR}"/update-modules.8
-}
-
-pkg_postinst() {
-	# cheat to keep users happy
-	if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
-		sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
-	fi
-}
diff --git a/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild
deleted file mode 100644
index f8fba7a9d91f..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v 1.6 2011/04/24 21:28:11 ulm Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="tools for managing linux kernel modules"
-HOMEPAGE="http://modules.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static"
-
-DEPEND="sys-libs/zlib
-	>=sys-apps/baselayout-2.0.1
-	!sys-apps/modutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.2.2-handle-dupliate-aliases.patch #149426
-	touch *.5 *.8 # dont regen manpages
-}
-
-src_compile() {
-	mkdir build && cd build #290207
-	use static && append-ldflags -static
-	ECONF_SOURCE=.. \
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		--enable-zlib-dynamic \
-		--disable-static-utils
-	emake || die "emake module-init-tools failed"
-}
-
-src_test() {
-	./tests/runtests || die
-}
-
-src_install() {
-	emake -C build install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	into /
-	newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die
-	doman "${FILESDIR}"/update-modules.8
-}
-
-pkg_postinst() {
-	# cheat to keep users happy
-	if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
-		sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
-	fi
-
-	# For files that were upgraded but not renamed via their ebuild to
-	# have a proper .conf extension, rename them so etc-update tools can
-	# take care of things. #274942
-	local i f cfg
-	eshopts_push -s nullglob
-	for f in "${ROOT}"etc/modprobe.d/* ; do
-		# The .conf files need no upgrading unless a non-.conf exists,
-		# so skip this until later ...
-		[[ ${f} == *.conf ]] && continue
-		# If a .conf doesn't exist, then a package needs updating, or
-		# the user created it, or it's orphaned.  Either way, we don't
-		# really know, so leave it alone.
-		[[ ! -f ${f}.conf ]] && continue
-
-		i=0
-		while :; do
-			cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}")
-			[[ ! -e ${cfg} ]] && break
-			((i++))
-		done
-		elog "Updating ${f}; please run 'etc-update'"
-		mv "${f}.conf" "${cfg}"
-		mv "${f}" "${f}.conf"
-	done
-	# Whine about any non-.conf files that are left
-	for f in "${ROOT}"etc/modprobe.d/* ; do
-		[[ ${f} == *.conf ]] && continue
-		ewarn "The '${f}' file needs to be upgraded to end with a '.conf'."
-		ewarn "Either upgrade the package that owns it, or manually rename it."
-	done
-	eshopts_pop
-}
diff --git a/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild
deleted file mode 100644
index d656a9677436..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild,v 1.13 2012/11/24 21:14:02 ssuominen Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="tools for managing linux kernel modules"
-HOMEPAGE="http://modules.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static"
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib
-	>=sys-apps/baselayout-2.0.1
-	!sys-apps/modutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -rf tests/build # punt precompiled objects
-	touch *.5 *.8 # dont regen manpages
-}
-
-src_compile() {
-	mkdir build && cd build #290207
-	use static && append-ldflags -static
-	ECONF_SOURCE=.. \
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		--enable-zlib-dynamic \
-		--disable-static-utils
-	emake || die
-}
-
-src_test() {
-	# this manually runs configure and stuff, so ignore it
-	./tests/runtests -v || die
-}
-
-src_install() {
-	emake -C build install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	into /
-	newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die
-	doman "${FILESDIR}"/update-modules.8 || die
-
-	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
-	install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd \$CMDLINE_OPTS
-	install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd \$CMDLINE_OPTS
-	EOF
-
-	insinto /etc/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf || die #260139
-}
-
-pkg_postinst() {
-	# cheat to keep users happy
-	if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
-		sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
-	fi
-
-	# For files that were upgraded but not renamed via their ebuild to
-	# have a proper .conf extension, rename them so etc-update tools can
-	# take care of things. #274942
-	local i f cfg
-	eshopts_push -s nullglob
-	for f in "${ROOT}"etc/modprobe.d/* ; do
-		# The .conf files need no upgrading unless a non-.conf exists,
-		# so skip this until later ...
-		[[ ${f} == *.conf ]] && continue
-		# If a .conf doesn't exist, then a package needs updating, or
-		# the user created it, or it's orphaned.  Either way, we don't
-		# really know, so leave it alone.
-		[[ ! -f ${f}.conf ]] && continue
-
-		i=0
-		while :; do
-			cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}")
-			[[ ! -e ${cfg} ]] && break
-			((i++))
-		done
-		elog "Updating ${f}; please run 'etc-update'"
-		mv "${f}.conf" "${cfg}"
-		mv "${f}" "${f}.conf"
-	done
-	# Whine about any non-.conf files that are left
-	for f in "${ROOT}"etc/modprobe.d/* ; do
-		[[ ${f} == *.conf ]] && continue
-		ewarn "The '${f}' file needs to be upgraded to end with a '.conf'."
-		ewarn "Either upgrade the package that owns it, or manually rename it."
-	done
-	eshopts_pop
-}
diff --git a/sys-apps/module-init-tools/module-init-tools-3.13.ebuild b/sys-apps/module-init-tools/module-init-tools-3.13.ebuild
deleted file mode 100644
index b86bc7633928..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.13.ebuild,v 1.1 2011/06/01 15:00:31 vapier Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="tools for managing linux kernel modules"
-HOMEPAGE="http://modules.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static"
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib
-	!<sys-apps/baselayout-2.0.1
-	!sys-apps/modutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -rf tests/build # punt precompiled objects
-	touch *.5 *.8 # dont regen manpages
-}
-
-src_compile() {
-	mkdir build && cd build #290207
-	use static && append-ldflags -static
-	ECONF_SOURCE=.. \
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		--enable-zlib-dynamic \
-		--disable-static-utils
-	emake || die
-}
-
-src_test() {
-	# this manually runs configure and stuff, so ignore it
-	./tests/runtests -v || die
-}
-
-src_install() {
-	emake -C build install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	into /
-	newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die
-	doman "${FILESDIR}"/update-modules.8 || die
-
-	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
-	install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd \$CMDLINE_OPTS
-	install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd \$CMDLINE_OPTS
-	EOF
-
-	insinto /etc/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf || die #260139
-}
-
-pkg_postinst() {
-	# cheat to keep users happy
-	if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
-		sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
-	fi
-
-	# For files that were upgraded but not renamed via their ebuild to
-	# have a proper .conf extension, rename them so etc-update tools can
-	# take care of things. #274942
-	local i f cfg
-	eshopts_push -s nullglob
-	for f in "${ROOT}"etc/modprobe.d/* ; do
-		# The .conf files need no upgrading unless a non-.conf exists,
-		# so skip this until later ...
-		[[ ${f} == *.conf ]] && continue
-		# If a .conf doesn't exist, then a package needs updating, or
-		# the user created it, or it's orphaned.  Either way, we don't
-		# really know, so leave it alone.
-		[[ ! -f ${f}.conf ]] && continue
-
-		i=0
-		while :; do
-			cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}")
-			[[ ! -e ${cfg} ]] && break
-			((i++))
-		done
-		elog "Updating ${f}; please run 'etc-update'"
-		mv "${f}.conf" "${cfg}"
-		mv "${f}" "${f}.conf"
-	done
-	# Whine about any non-.conf files that are left
-	for f in "${ROOT}"etc/modprobe.d/* ; do
-		[[ ${f} == *.conf ]] && continue
-		ewarn "The '${f}' file needs to be upgraded to end with a '.conf'."
-		ewarn "Either upgrade the package that owns it, or manually rename it."
-	done
-	eshopts_pop
-}
diff --git a/sys-apps/module-init-tools/module-init-tools-3.6-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.6-r1.ebuild
deleted file mode 100644
index 7c1add578fe2..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.6-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.6-r1.ebuild,v 1.3 2011/04/24 21:28:11 ulm Exp $
-
-inherit flag-o-matic eutils toolchain-funcs fixheadtails
-
-MODUTILS_PV="2.4.27"
-
-MY_P="${P/_pre/-pre}"
-DESCRIPTION="tools for managing linux kernel modules"
-HOMEPAGE="http://modules.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${MY_P}.tar.bz2
-	old-linux? ( mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2 )
-	mirror://gentoo/${MY_P}-man.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="old-linux"
-# The test code runs `make clean && configure` and screws up src_compile()
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib
-	>=sys-apps/baselayout-1.12.7-r2
-	!sys-apps/modutils"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	# Patches for old modutils
-	if use old-linux ; then
-		cd "${WORKDIR}"/modutils-${MODUTILS_PV}
-		epatch "${FILESDIR}"/modutils-2.4.27-alias.patch
-		epatch "${FILESDIR}"/modutils-2.4.27-gcc.patch
-		epatch "${FILESDIR}"/modutils-2.4.27-flex.patch
-		epatch "${FILESDIR}"/modutils-2.4.27-no-nested-function.patch
-		epatch "${FILESDIR}"/modutils-2.4.27-hppa.patch
-		epatch "${FILESDIR}"/modutils-2.4.27-build.patch #154281
-	fi
-
-	# Fixes for new module-init-tools
-	cd "${S}"
-	ht_fix_file tests/test-depmod/10badcommand.sh
-	# Test fails due since it needs to write to /lib/modules so disable it
-	rm -f tests/test-depmod/01backcompat.sh
-
-	# Fix bug 49926: This patch allows generate-modprobe.conf to
-	# accept the --assume-kernel=x.x.x option for generating livecds.
-	# This is a companion to a patch in baselayout-1.9.0 which allows
-	# the same flag to modules-update.
-	epatch "${FILESDIR}"/${PN}-3.1_generate-modprobe-assume-kernel.patch
-
-	# Abort if we fail to run modprobe, bug #68689
-	epatch "${FILESDIR}"/${PN}-3.2_pre7-abort-on-modprobe-failure.patch
-	epatch "${FILESDIR}"/${PN}-3.2.2-handle-dupliate-aliases.patch #149426
-	epatch "${FILESDIR}"/${PN}-3.6-hidden-dirs.patch #245271
-	epatch "${FILESDIR}"/${P}-skip-sys-check.patch #258442
-
-	# make sure we link dynamically with zlib; our zlib.so is in /lib vs
-	# /usr/lib so it's safe to link with.  fixes ugly textrels as well.
-	sed -i \
-		-e 's:-Wl,-Bstatic -lz -Wl,-Bdynamic:-lz:' \
-		configure || die
-
-	# make sure we don't try to regen the manpages
-	touch *.5 *.8
-}
-
-src_compile() {
-	# Configure script uses BUILDCFLAGS for cross-compiles but this
-	# defaults to CFLAGS which can be bad mojo
-	export BUILDCFLAGS=-pipe
-	export BUILDCC=$(tc-getBUILD_CC)
-
-	if use old-linux ; then
-		einfo "Building modutils ..."
-		cd "${WORKDIR}"/modutils-${MODUTILS_PV}
-		econf \
-			--disable-strip \
-			--prefix=/ \
-			--enable-insmod-static \
-			--disable-zlib \
-			|| die "econf failed"
-		emake || die "emake modutils failed"
-
-		einfo "Building module-init-tools ..."
-		cd "${S}"
-	fi
-
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		|| die "econf failed"
-	emake || die "emake module-init-tools failed"
-}
-
-modutils_src_install() {
-	cd "${WORKDIR}"/modutils-${MODUTILS_PV}
-	einstall prefix="${D}" || die
-	docinto modutils-${MODUTILS_PV}
-	dodoc CREDITS ChangeLog NEWS README TODO
-
-	# remove man pages provided by the man-pages package now #124127
-	rm -r "${D}"/usr/share/man/man2
-
-	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 f
-	for f in lsmod modprobe rmmod depmod insmod insmod.static 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
-	# Fix the ksyms links #35601
-	for f in ksyms kallsyms ; do
-		dosym insmod.old /sbin/${f}
-		dosym insmod.static.old /sbin/${f}.static
-	done
-}
-
-src_install() {
-	use old-linux && modutils_src_install
-
-	cd "${S}"
-	emake install DESTDIR="${D}" || die
-	dosym modprobe.conf.5 /usr/share/man/man5/modprobe.d.5
-
-	# Install compat symlink
-	dosym ../bin/lsmod /sbin/lsmod
-	use old-linux && 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 || die
-	newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die
-	doman "${FILESDIR}"/update-modules.8
-
-	doman *.[1-8]
-	docinto /
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	# cheat to keep users happy
-	if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
-		sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
-	fi
-}