Start blocking module-init-tools.

16 files changed, 37 insertions, 250 deletions

diff --git a/sys-apps/modutils/ChangeLog b/sys-apps/modutils/ChangeLog
index 1f9e9474f634..012ad2827589 100644
--- a/sys-apps/modutils/ChangeLog
+++ b/sys-apps/modutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/modutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.42 2004/08/24 23:37:47 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.43 2004/09/02 13:20:56 vapier Exp $
+
+  02 Sep 2004; Mike Frysinger <vapier@gentoo.org> modutils-2.4.23.ebuild,
+  modutils-2.4.24.ebuild, modutils-2.4.25.ebuild, modutils-2.4.26.ebuild,
+  modutils-2.4.27.ebuild:
+  Start blocking module-init-tools.
 
 *modutils-2.4.27 (25 Aug 2004)
 
diff --git a/sys-apps/modutils/files/digest-modutils-2.4.16-r2 b/sys-apps/modutils/files/digest-modutils-2.4.16-r2
deleted file mode 100644
index c7a5a574eb23..000000000000
--- a/sys-apps/modutils/files/digest-modutils-2.4.16-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d62dc888736007a183c795b1b063c92 modutils-2.4.16.tar.bz2 216009
diff --git a/sys-apps/modutils/files/digest-modutils-2.4.16-r3 b/sys-apps/modutils/files/digest-modutils-2.4.16-r3
deleted file mode 100644
index c7a5a574eb23..000000000000
--- a/sys-apps/modutils/files/digest-modutils-2.4.16-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d62dc888736007a183c795b1b063c92 modutils-2.4.16.tar.bz2 216009
diff --git a/sys-apps/modutils/files/digest-modutils-2.4.19 b/sys-apps/modutils/files/digest-modutils-2.4.19
deleted file mode 100644
index 463264594a89..000000000000
--- a/sys-apps/modutils/files/digest-modutils-2.4.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7987ee972c2cf7f0141a73631b4dddf modutils-2.4.19.tar.bz2 218002
diff --git a/sys-apps/modutils/files/digest-modutils-2.4.20 b/sys-apps/modutils/files/digest-modutils-2.4.20
deleted file mode 100644
index 1d0ec2845db1..000000000000
--- a/sys-apps/modutils/files/digest-modutils-2.4.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f6287821194e49b77ac9c662a4f2ddd7 modutils-2.4.20.tar.bz2 217724
diff --git a/sys-apps/modutils/files/digest-modutils-2.4.22 b/sys-apps/modutils/files/digest-modutils-2.4.22
deleted file mode 100644
index e63ad0bbb764..000000000000
--- a/sys-apps/modutils/files/digest-modutils-2.4.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457
diff --git a/sys-apps/modutils/modutils-2.4.16-r2.ebuild b/sys-apps/modutils/modutils-2.4.16-r2.ebuild
deleted file mode 100644
index 413b614063cd..000000000000
--- a/sys-apps/modutils/modutils-2.4.16-r2.ebuild
+++ /dev/null
@@ -1,49 +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/modutils/modutils-2.4.16-r2.ebuild,v 1.22 2004/07/15 01:59:40 agriffis Exp $
-
-SLOT="0"
-DESCRIPTION="Standard kernel module utilities"
-SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-KEYWORDS="x86 -amd64 ppc sparc "
-IUSE=""
-LICENSE="GPL-2"
-DEPEND="virtual/libc"
-#	zlib? ( sys-libs/zlib )"
-
-src_compile() {
-	myconf=""
-	# see bug #3897 ... we need insmod static, as libz.so is in /usr/lib
-	#
-	# Final resolution ... dont make it link against zlib, as the static
-	# version do not want to autoload modules :(
-#	use zlib && myconf="${myconf} --enable-zlib --enable-insmod-static" \
-#	         || myconf="${myconf} --disable-zlib"
-	myconf="${myconf} --disable-zlib"
-
-	./configure --prefix=/ \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--disable-strip \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D} \
-		mandir=${D}/usr/share/man \
-		install || die
-
-	# we want insmod static if using zlib, as libz is in /usr/lib/, so
-	# move all the *.static to the normal names
-#	if use zlib ; then
-#		mv ${D}/sbin/insmod.static ${D}/sbin/insmod
-		# rest are symlinks pointing to "/sbin/insmod.static", so
-		# nuke them
-#		rm -f ${D}/sbin/*.static
-#	fi
-
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-}
diff --git a/sys-apps/modutils/modutils-2.4.16-r3.ebuild b/sys-apps/modutils/modutils-2.4.16-r3.ebuild
deleted file mode 100644
index 5e02ec04c94e..000000000000
--- a/sys-apps/modutils/modutils-2.4.16-r3.ebuild
+++ /dev/null
@@ -1,41 +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/modutils/modutils-2.4.16-r3.ebuild,v 1.21 2004/07/15 01:59:40 agriffis Exp $
-
-SLOT="0"
-DESCRIPTION="Standard kernel module utilities"
-SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-KEYWORDS="x86 -amd64 ppc sparc "
-IUSE=""
-LICENSE="GPL-2"
-DEPEND="virtual/libc"
-#	zlib? ( sys-libs/zlib )"
-
-src_compile() {
-	myconf=""
-	# see bug #3897 ... we need insmod static, as libz.so is in /usr/lib
-	#
-	# Final resolution ... dont make it link against zlib, as the static
-	# version do not want to autoload modules :(
-#	use zlib && myconf="${myconf} --enable-zlib --enable-insmod-static" \
-#	         || myconf="${myconf} --disable-zlib"
-	myconf="${myconf} --disable-zlib"
-
-	./configure --prefix=/ \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--disable-strip \
-		--enable-insmod-static \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D} \
-		mandir=${D}/usr/share/man \
-		install || die
-
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-}
diff --git a/sys-apps/modutils/modutils-2.4.19.ebuild b/sys-apps/modutils/modutils-2.4.19.ebuild
deleted file mode 100644
index 64d854a6adb7..000000000000
--- a/sys-apps/modutils/modutils-2.4.19.ebuild
+++ /dev/null
@@ -1,38 +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/modutils/modutils-2.4.19.ebuild,v 1.20 2004/07/15 01:59:40 agriffis Exp $
-
-SLOT="0"
-DESCRIPTION="Standard kernel module utilities"
-SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-KEYWORDS="x86 -amd64 ppc sparc alpha mips"
-IUSE=""
-LICENSE="GPL-2"
-DEPEND="virtual/libc"
-
-src_compile() {
-	myconf=""
-	# see bug #3897 ... we need insmod static, as libz.so is in /usr/lib
-	#
-	# Final resolution ... dont make it link against zlib, as the static
-	# version do not want to autoload modules :(
-	myconf="${myconf} --disable-zlib"
-
-	./configure --prefix=/ \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--disable-strip \
-		--enable-insmod-static \
-		${myconf} || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make prefix=${D} \
-		mandir=${D}/usr/share/man \
-		install || die "make install failed"
-
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-}
diff --git a/sys-apps/modutils/modutils-2.4.20.ebuild b/sys-apps/modutils/modutils-2.4.20.ebuild
deleted file mode 100644
index 6130f0667d98..000000000000
--- a/sys-apps/modutils/modutils-2.4.20.ebuild
+++ /dev/null
@@ -1,37 +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/modutils/modutils-2.4.20.ebuild,v 1.14 2004/07/15 01:59:40 agriffis Exp $
-
-SLOT="0"
-DESCRIPTION="Standard kernel module utilities"
-SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-
-KEYWORDS="x86 -amd64 ~ppc ~sparc ~alpha"
-IUSE=""
-LICENSE="GPL-2"
-DEPEND="virtual/libc"
-
-src_compile() {
-	myconf=""
-	# see bug #3897 ... we need insmod static, as libz.so is in /usr/lib
-	#
-	# Final resolution ... dont make it link against zlib, as the static
-	# version do not want to autoload modules :(
-	myconf="${myconf} --disable-zlib"
-
-	econf \
-		--prefix=/ \
-		--disable-strip \
-		--enable-insmod-static \
-		${myconf} || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall \
-		prefix=${D} || die "make install failed"
-
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-}
diff --git a/sys-apps/modutils/modutils-2.4.22.ebuild b/sys-apps/modutils/modutils-2.4.22.ebuild
deleted file mode 100644
index 2477c433a807..000000000000
--- a/sys-apps/modutils/modutils-2.4.22.ebuild
+++ /dev/null
@@ -1,57 +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/modutils/modutils-2.4.22.ebuild,v 1.18 2004/07/15 01:59:40 agriffis Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Standard kernel module utilities"
-SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-
-KEYWORDS="x86 -amd64 ppc sparc alpha hppa "
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-
-	filter-flags -fPIC
-
-	myconf=""
-	# see bug #3897 ... we need insmod static, as libz.so is in /usr/lib
-	#
-	# Final resolution ... dont make it link against zlib, as the static
-	# version do not want to autoload modules :(
-	myconf="${myconf} --disable-zlib"
-
-	econf \
-		--prefix=/ \
-		--disable-strip \
-		--enable-insmod-static \
-		${myconf} || die "./configure failed"
-	if [ ${ARCH} = "hppa" ]
-	then
-		mymake="ARCH=hppa"
-	fi
-
-	emake ${mymake} || die "emake failed"
-}
-
-src_install() {
-	if [ ${ARCH} = "hppa" ]
-	then
-		mymake="ARCH=hppa"
-	fi
-	einstall prefix="${D}" ${mymake} || die "make install failed"
-
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you get problems after update related to missing"
-	einfo "\"keybdev\" module, please recompile your kernel."
-	echo
-}
diff --git a/sys-apps/modutils/modutils-2.4.23.ebuild b/sys-apps/modutils/modutils-2.4.23.ebuild
index 09a91fc80d1b..aab78b842e88 100644
--- a/sys-apps/modutils/modutils-2.4.23.ebuild
+++ b/sys-apps/modutils/modutils-2.4.23.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.23.ebuild,v 1.13 2004/07/15 01:59:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.23.ebuild,v 1.14 2004/09/02 13:20:56 vapier Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="Standard kernel module utilities"
-SRC_URI="mirror://kernel/linux/utils/kernel/modutils/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
+SRC_URI="mirror://kernel/linux/utils/kernel/modutils/v2.4/${P}.tar.bz2"
 
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 -amd64 ~ppc ~sparc ~alpha ~hppa ~mips"
 IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
 
-DEPEND="virtual/libc"
+DEPEND="virtual/libc
+	!virtual/modutils"
+PROVIDE="virtual/modutils"
 
 src_compile() {
-
 	filter-flags -fPIC
 
 	myconf=""
diff --git a/sys-apps/modutils/modutils-2.4.24.ebuild b/sys-apps/modutils/modutils-2.4.24.ebuild
index 03c33fc26609..dca913a8e55a 100644
--- a/sys-apps/modutils/modutils-2.4.24.ebuild
+++ b/sys-apps/modutils/modutils-2.4.24.ebuild
@@ -1,17 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.24.ebuild,v 1.16 2004/06/30 21:22:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.24.ebuild,v 1.17 2004/09/02 13:20:56 vapier Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="Standard kernel module utilities"
-SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
+SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 -amd64 ppc sparc ~alpha hppa ~mips"
 IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND="virtual/libc"
+
+DEPEND="virtual/libc
+	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
@@ -49,5 +52,5 @@ src_install() {
 	fi
 	einstall prefix="${D}" ${mymake} || die "make install failed"
 
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
+	dodoc CREDITS ChangeLog NEWS README TODO
 }
diff --git a/sys-apps/modutils/modutils-2.4.25.ebuild b/sys-apps/modutils/modutils-2.4.25.ebuild
index ef916ccfbb58..ad5537e2b447 100644
--- a/sys-apps/modutils/modutils-2.4.25.ebuild
+++ b/sys-apps/modutils/modutils-2.4.25.ebuild
@@ -1,17 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.25.ebuild,v 1.24 2004/06/30 21:22:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.25.ebuild,v 1.25 2004/09/02 13:20:56 vapier Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="Standard kernel module utilities"
-SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
+SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 -amd64 ppc sparc alpha hppa mips ia64"
 IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND="virtual/libc"
+
+DEPEND="virtual/libc
+	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
@@ -50,5 +53,5 @@ src_install() {
 	fi
 	einstall prefix="${D}" ${mymake} || die "make install failed"
 
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
+	dodoc CREDITS ChangeLog NEWS README TODO
 }
diff --git a/sys-apps/modutils/modutils-2.4.26.ebuild b/sys-apps/modutils/modutils-2.4.26.ebuild
index abb73b592ba1..be6127bf751e 100644
--- a/sys-apps/modutils/modutils-2.4.26.ebuild
+++ b/sys-apps/modutils/modutils-2.4.26.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/modutils/modutils-2.4.26.ebuild,v 1.12 2004/08/19 02:36:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.26.ebuild,v 1.13 2004/09/02 13:20:56 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~x86 ppc ~sparc ~mips alpha ~hppa -amd64 ia64 ppc64 s390"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND="virtual/libc
+	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
diff --git a/sys-apps/modutils/modutils-2.4.27.ebuild b/sys-apps/modutils/modutils-2.4.27.ebuild
index eb633ca77d32..dcc34170a9f0 100644
--- a/sys-apps/modutils/modutils-2.4.27.ebuild
+++ b/sys-apps/modutils/modutils-2.4.27.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/modutils/modutils-2.4.27.ebuild,v 1.1 2004/08/24 23:37:47 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27.ebuild,v 1.2 2004/09/02 13:20:56 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa -amd64 ~ia64 ~ppc64 ~s390"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND="virtual/libc
+	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {