Start blocking modutils.

14 files changed, 29 insertions, 707 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index b392caf3db81..db6fbdade518 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.66 2004/06/24 22:17:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.67 2004/09/02 13:27:04 vapier Exp $
+
+  02 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  module-init-tools-3.0-r1.ebuild, module-init-tools-3.0-r2.ebuild,
+  module-init-tools-3.0.ebuild:
+  Start blocking modutils.
 
   04 Jun 2004; Aron Griffis <agriffis@gentoo.org>
   module-init-tools-3.0-r2.ebuild:
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index 1a908c3f04bc..238fb75aedf8 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b1a08c298e75a52ec09642becd11a74d ChangeLog 13310
+MD5 12981a8d9c469212112f6e51960006ba ChangeLog 13486
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 90809a0a84eb628e610e588f664083b5 module-init-tools-3.0_pre5.ebuild 4513
-MD5 55926dfc8d7a03f4b66793c18710f71c module-init-tools-3.0.ebuild 4652
-MD5 3443b55116bf202acd87a29fc3ad5119 module-init-tools-3.0-r1.ebuild 4676
-MD5 47cb551fba61fde7ad6c07693f78ed2c module-init-tools-3.0-r2.ebuild 4976
-MD5 1f55c2fa1fdddead76e271c753a63bec module-init-tools-3.0_pre9.ebuild 4680
-MD5 f74d33c161297126b64f552b6f3e211e module-init-tools-0.9.15_pre4.ebuild 4511
-MD5 bde19f555eb9a1a0a0f0b184c17bc528 module-init-tools-3.0_pre10.ebuild 4521
-MD5 4b22ce79fdc8ce1efad2ac57c7f1fe34 files/digest-module-init-tools-3.0_pre5 147
+MD5 f0f2eb7f73361774923f599307aa151f module-init-tools-3.0.ebuild 4668
+MD5 af2d546ff83fed54622d02878d9d0e26 module-init-tools-3.0-r1.ebuild 4692
+MD5 819b0094570fc7400ddc4dc3c06ed46b module-init-tools-3.0-r2.ebuild 4995
 MD5 83210e779956a7d7b917a6fb8202dd4b files/digest-module-init-tools-3.0 142
 MD5 83210e779956a7d7b917a6fb8202dd4b files/digest-module-init-tools-3.0-r1 142
 MD5 83210e779956a7d7b917a6fb8202dd4b files/digest-module-init-tools-3.0-r2 142
-MD5 aefb12b59f79db8ea8f5cb17983e0d96 files/digest-module-init-tools-3.0_pre9 147
-MD5 3094756336026a6697bd37484bf68fb1 files/digest-module-init-tools-0.9.15_pre4 150
-MD5 dad38206451c8832f56fc4fb5fe98845 files/module-init-tools-3.0_pre9-properly-handle-alias_off.patch 377
-MD5 f493caa88d59d74b3dac1f7ae71e93d2 files/digest-module-init-tools-3.0_pre10 148
 MD5 d179298a960a2576683689fe19818c8b files/generate-modprobe-assume-kernel.patch 3767
 MD5 07aa415fd57ac42cd0c11527edc9782d files/module-init-tools-0.9.15-legacy-modext-support.patch 481
 MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch 382
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBBmmyHTu7gpaalycRAuK5AKCF8vHQu3FUitP6GDsvSORVLegn3ACgw5ZK
-XRU96ds61IZ9UIsS0TWBWhI=
-=Chkb
+iD8DBQFBNx+4HTu7gpaalycRAp2OAJ4pg7fgQ1PqfRLXMlQNJNDrSkUEkQCfQHW2
+8S5AkBssIlAds81sYPNi9ZA=
+=YEAv
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre4 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre4
deleted file mode 100644
index 790dd6c33784..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 926ab7ad26ea3d991885d37f124427ea module-init-tools-0.9.15-pre4.tar.bz2 118107
-MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre10 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre10
deleted file mode 100644
index d4b6401b9e22..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3e4bdcd2fa7277fa4d3788983a8e2b9c module-init-tools-3.0-pre10.tar.bz2 120835
-MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre5 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre5
deleted file mode 100644
index eb82b7b8580f..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 29dd79a3bb86390487c7453ac77cd999 module-init-tools-3.0-pre5.tar.bz2 120141
-MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre9 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre9
deleted file mode 100644
index 68b12cc84b21..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e05007a2170ae4f838fe1c9a9241c230 module-init-tools-3.0-pre9.tar.bz2 120819
-MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135
diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.0_pre9-properly-handle-alias_off.patch b/sys-apps/module-init-tools/files/module-init-tools-3.0_pre9-properly-handle-alias_off.patch
deleted file mode 100644
index 9cda7b9227a9..000000000000
--- a/sys-apps/module-init-tools/files/module-init-tools-3.0_pre9-properly-handle-alias_off.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 1/generate-modprobe.conf	2004-02-02 00:05:39.000000000 +0200
-+++ 2/generate-modprobe.conf	2004-02-01 18:10:42.000000000 +0200
-@@ -145,7 +145,7 @@
- 	;;
- 
-     alias)
--	if [ x"$REST" = xoff -o x"$REST" = xnull ]; then
-+	if [ x"${REST// /}" = xoff -o x"$REST" = xnull ]; then
- 	    INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE"
- 	    eval install_$MODNAME=\"/bin/true\"
- 	else
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre4.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.15_pre4.ebuild
deleted file mode 100644
index 7962b9ce71cc..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre4.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2004 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-0.9.15_pre4.ebuild,v 1.14 2004/07/13 21:55:26 agriffis 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 ia64 ppc64 hppa"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/libc
-	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
-	export WANT_AUTOMAKE=1.6
-	automake --add-missing
-}
-
-src_compile() {
-
-	# If running mips64, we need updated configure data
-	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} || die "econf failed"
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		${myconf} || die "econf failed"
-
-	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
-}
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild
index 81e7dc1c2509..a1fde6a2e659 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 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.0-r1.ebuild,v 1.4 2004/07/13 21:55:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild,v 1.5 2004/09/02 13:27:04 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
 
 inherit flag-o-matic eutils gnuconfig
 
@@ -11,18 +10,19 @@ MYP="${P/_pre/-pre}"
 S="${WORKDIR}/${MYP}"
 MODUTILS_PV="2.4.26"
 DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
 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 ~ia64 ~arm ~ppc64 ~hppa ~s390"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~ia64 ~arm ~ppc64 ~hppa ~s390"
+IUSE=""
 
 DEPEND="virtual/libc
-	sys-libs/zlib"
-
+	sys-libs/zlib
+	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
index 389aa9237add..98cb3bb308de 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.0-r2.ebuild,v 1.7 2004/07/27 14:41:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild,v 1.8 2004/09/02 13:27:04 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 
@@ -21,7 +21,8 @@ KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
 IUSE=""
 
 DEPEND="virtual/libc
-	sys-libs/zlib"
+	sys-libs/zlib
+	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0.ebuild
index b16a1e8badf2..a1e52d230159 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 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.0.ebuild,v 1.11 2004/07/13 21:55:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0.ebuild,v 1.12 2004/09/02 13:27:04 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
 
 inherit flag-o-matic eutils gnuconfig
 
@@ -11,18 +10,19 @@ MYP="${P/_pre/-pre}"
 S="${WORKDIR}/${MYP}"
 MODUTILS_PV="2.4.26"
 DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
 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 ~ia64 arm ppc64 hppa s390"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 amd64 ppc sparc ~alpha mips ~ia64 arm ppc64 hppa s390"
+IUSE=""
 
 DEPEND="virtual/libc
-	sys-libs/zlib"
-
+	sys-libs/zlib
+	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0_pre10.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0_pre10.ebuild
deleted file mode 100644
index 22659c1d3983..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.0_pre10.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2004 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.0_pre10.ebuild,v 1.9 2004/07/13 21:55:26 agriffis 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 ~ia64 ~ppc64 ~hppa s390"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/libc
-	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
-	export WANT_AUTOMAKE=1.6
-	automake --add-missing
-}
-
-src_compile() {
-
-	# If running mips64, we need updated configure data
-	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} || die "econf failed"
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		${myconf} || die "econf failed"
-
-	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
-}
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0_pre5.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0_pre5.ebuild
deleted file mode 100644
index 773706e69012..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.0_pre5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2004 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.0_pre5.ebuild,v 1.7 2004/07/13 21:55:26 agriffis 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 ~ia64 ppc64 hppa"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/libc
-	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
-	export WANT_AUTOMAKE=1.6
-	automake --add-missing
-}
-
-src_compile() {
-
-	# If running mips64, we need updated configure data
-	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} || die "econf failed"
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		${myconf} || die "econf failed"
-
-	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
-}
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0_pre9.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0_pre9.ebuild
deleted file mode 100644
index 7aa35a86ebab..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.0_pre9.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2004 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.0_pre9.ebuild,v 1.7 2004/07/13 21:55:26 agriffis 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 ~ia64 ~ppc64 ~hppa"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/libc
-	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
-
-	# Handle cases where generate-modprobe.conf do not detect an alias
-	# set to 'off' due to trailing space
-	epatch ${FILESDIR}/${P}-properly-handle-alias_off.patch
-
-	cd ${S}
-	rm -f missing
-	export WANT_AUTOMAKE=1.6
-	automake --add-missing
-}
-
-src_compile() {
-
-	# If running mips64, we need updated configure data
-	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} || die "econf failed"
-
-	emake || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		${myconf} || die "econf failed"
-
-	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
-}