Clean up some seemingly unused middle versions, leaving many around however for backwards compability

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

9 files changed, 11 insertions, 631 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index e32d760bb777..b4b75458e5c1 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.186 2012/11/24 21:07:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.187 2012/11/24 21:14:02 ssuominen Exp $
+
+  24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -module-init-tools-3.5.ebuild, -module-init-tools-3.8.ebuild,
+  -module-init-tools-3.9.ebuild, -module-init-tools-3.11.ebuild,
+  -module-init-tools-3.12.ebuild, -module-init-tools-3.16.ebuild,
+  -module-init-tools-3.16-r1.ebuild:
+  old
 
   24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   module-init-tools-3.16-r2.ebuild:
diff --git a/sys-apps/module-init-tools/module-init-tools-3.11.ebuild b/sys-apps/module-init-tools/module-init-tools-3.11.ebuild
deleted file mode 100644
index e9756aaf8630..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.11.ebuild
+++ /dev/null
@@ -1,57 +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.ebuild,v 1.5 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
-	mirror://gentoo/${P}-man.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() {
-	mkdir build && cd build #290207
-	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
-}
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
index c34000201e26..d656a9677436 100644
--- 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
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.12 2011/06/28 04:39:05 vapier Exp $
+# $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
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static"
 RESTRICT="test"
 
diff --git a/sys-apps/module-init-tools/module-init-tools-3.12.ebuild b/sys-apps/module-init-tools/module-init-tools-3.12.ebuild
deleted file mode 100644
index bc12504306a3..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.12.ebuild
+++ /dev/null
@@ -1,88 +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.12.ebuild,v 1.3 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}"
-	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() {
-	./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 || die
-}
-
-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.16-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild
deleted file mode 100644
index 4da550bda60f..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild
+++ /dev/null
@@ -1,101 +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.16-r1.ebuild,v 1.8 2012/02/04 00:33:38 williamh 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
-	mirror://gentoo/${P}-man.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"
-RDEPEND="${DEPEND}
-	!<sys-apps/baselayout-2.0.1
-	!sys-apps/kmod
-	!sys-apps/modutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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.16.ebuild b/sys-apps/module-init-tools/module-init-tools-3.16.ebuild
deleted file mode 100644
index 95c832b698d0..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.16.ebuild
+++ /dev/null
@@ -1,101 +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.16.ebuild,v 1.3 2011/06/17 02:25:00 jer 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"
-
-COMMON_DEPEND="sys-libs/zlib"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-utils"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-apps/baselayout-2.0.1
-	!sys-apps/modutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -rf tests/build # punt precompiled objects
-}
-
-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.5.ebuild b/sys-apps/module-init-tools/module-init-tools-3.5.ebuild
deleted file mode 100644
index 6092e0e767aa..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.5.ebuild
+++ /dev/null
@@ -1,164 +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.5.ebuild,v 1.10 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 )"
-
-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
-
-	# 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
-}
diff --git a/sys-apps/module-init-tools/module-init-tools-3.8.ebuild b/sys-apps/module-init-tools/module-init-tools-3.8.ebuild
deleted file mode 100644
index bacd605e1e07..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.8.ebuild
+++ /dev/null
@@ -1,62 +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.8.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
-
-	# dont bother building insmod.static
-	sed -i \
-		-e 's: insmod.static$(EXEEXT)::' \
-		Makefile.in
-
-	touch *.5 *.8 # dont regen manpages
-}
-
-src_compile() {
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		--enable-zlib-dynamic \
-		|| die "econf failed"
-	emake || die "emake module-init-tools failed"
-}
-
-src_test() {
-	./tests/runtests || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	dosym modprobe.conf.5 /usr/share/man/man5/modprobe.d.5
-
-	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.9.ebuild b/sys-apps/module-init-tools/module-init-tools-3.9.ebuild
deleted file mode 100644
index 73312add9ee3..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.9.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.9.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
-}