bug #3897

7 files changed, 53 insertions, 53 deletions

diff --git a/sys-apps/modutils/ChangeLog b/sys-apps/modutils/ChangeLog
index 4c3850a15572..a0fa6e78390a 100644
--- a/sys-apps/modutils/ChangeLog
+++ b/sys-apps/modutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/modutils
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.2 2002/05/06 17:24:53 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.3 2002/06/20 19:30:29 azarah Exp $
+
+*modutils-2.4.16-r1 (20 Jun 2002)
+
+  20 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Resolve bug #3897.
 
 *modutils-2.4.16 (6 May 2002)
 
diff --git a/sys-apps/modutils/files/digest-modutils-2.4.12 b/sys-apps/modutils/files/digest-modutils-2.4.12
deleted file mode 100644
index 50e7bf203fe7..000000000000
--- a/sys-apps/modutils/files/digest-modutils-2.4.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91d4ca52693e14430ff9ee6bd26fc32d modutils-2.4.12.tar.bz2 214172
diff --git a/sys-apps/modutils/files/digest-modutils-2.4.16-r1 b/sys-apps/modutils/files/digest-modutils-2.4.16-r1
new file mode 100644
index 000000000000..c7a5a574eb23
--- /dev/null
+++ b/sys-apps/modutils/files/digest-modutils-2.4.16-r1
@@ -0,0 +1 @@
+MD5 0d62dc888736007a183c795b1b063c92 modutils-2.4.16.tar.bz2 216009
diff --git a/sys-apps/modutils/files/digest-modutils-2.4.9 b/sys-apps/modutils/files/digest-modutils-2.4.9
deleted file mode 100644
index e65947dd7984..000000000000
--- a/sys-apps/modutils/files/digest-modutils-2.4.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e0278084b5e4984253b1056e80ad9035 modutils-2.4.9.tar.bz2 218432
diff --git a/sys-apps/modutils/modutils-2.4.12.ebuild b/sys-apps/modutils/modutils-2.4.12.ebuild
deleted file mode 100644
index 5f1a327358f6..000000000000
--- a/sys-apps/modutils/modutils-2.4.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.12.ebuild,v 1.1 2001/11/30 19:52:01 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard kernel module utilities"
-SRC_URI="http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/${P}.tar.bz2"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --prefix=/ --mandir=/usr/share/man --host=${CHOST} --disable-strip || 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.16-r1.ebuild b/sys-apps/modutils/modutils-2.4.16-r1.ebuild
new file mode 100644
index 000000000000..b86a5db16c7f
--- /dev/null
+++ b/sys-apps/modutils/modutils-2.4.16-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: System Team <system@gentoo.org>
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.16-r1.ebuild,v 1.1 2002/06/20 19:30:29 azarah Exp $
+
+S=${WORKDIR}/${P}
+SLOT="0"
+DESCRIPTION="Standard kernel module utilities"
+SRC_URI="http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/${P}.tar.bz2"
+
+DEPEND="virtual/glibc
+	zlib? ( sys-libs/zlib )"
+
+src_compile() {
+	myconf=""
+	# see bug #3897 ... we need insmod static, as libz.so is in /usr/lib
+	use zlib && myconf="${myconf} --enable-zlib --enable-insmod-static" \
+	         || 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.9.ebuild b/sys-apps/modutils/modutils-2.4.9.ebuild
deleted file mode 100644
index 39b631e2671f..000000000000
--- a/sys-apps/modutils/modutils-2.4.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.9.ebuild,v 1.1 2001/09/30 20:44:20 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard kernel module utilities"
-SRC_URI="http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/${P}.tar.bz2"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --prefix=/ --mandir=/usr/share/man --host=${CHOST} --disable-strip || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D} mandir=${D}/usr/share/man install || die
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
-}
-
-
-
-