Update version.

4 files changed, 168 insertions, 3 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index 0c1afd8323a8..41e88a607f7f 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.38 2003/10/10 18:39:44 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.39 2003/10/18 12:54:38 azarah Exp $
+
+*module-init-tools-0.9.15_pre2 (18 Oct 2003)
+
+  18 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-0.9.15_pre2.ebuild:
+  Update version.
 
   10 Oct 2003; Alexander Gabert <pappy@gentoo.org> :
   filter-flags -fPIC will introduce -yet_exec for hardened-gcc
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index 2c7c7ba97610..ee983414030d 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,9 +1,9 @@
 MD5 45e1e804448b6be2c8ab49a7bb7f9f76 module-init-tools-0.9.13_pre2.ebuild 4727
-MD5 3df6d8911a7e779926011d0874265a40 ChangeLog 8944
+MD5 052e86b555dc909a9ab1eaa4864ca5b4 ChangeLog 9102
 MD5 7c7bc0686633525168414a46cc48ac56 module-init-tools-0.9.14.ebuild 4620
 MD5 3d429ef95481c4593ffc66dac26fbb13 module-init-tools-0.9.12-r1.ebuild 4818
 MD5 84fd34c0fab48ffc68a7ab6cad0b1d7f module-init-tools-0.9.15_pre1.ebuild 4344
-MD5 84fd34c0fab48ffc68a7ab6cad0b1d7f module-init-tools-0.9.15_pre2.ebuild 4344
+MD5 446316512d95e73db34992801c47fef5 module-init-tools-0.9.15_pre2.ebuild 4345
 MD5 45ebc93263c86224eb12c3f2c71d9275 files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch 4208
 MD5 06447c844280435b8a96e8b21f5b0a59 files/module-init-tools-0.9.12-includes-should-override.patch 524
 MD5 6cd7fbd67d72ab12cec430aa0e81d184 files/digest-module-init-tools-0.9.15_pre2 150
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre2 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre2
new file mode 100644
index 000000000000..73ab5fbd3b2f
--- /dev/null
+++ b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.15_pre2
@@ -0,0 +1,2 @@
+MD5 958088946d2b80d338cb82b94a394eca module-init-tools-0.9.15-pre2.tar.bz2 116601
+MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre2.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.15_pre2.ebuild
new file mode 100644
index 000000000000..6f1dbaaf8e5b
--- /dev/null
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.15_pre2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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_pre2.ebuild,v 1.1 2003/10/18 12:54:38 azarah Exp $
+
+# This ebuild includes backwards compatability for stable 2.4 kernels
+IUSE=""
+
+inherit flag-o-matic
+inherit eutils
+
+MYP="${P/_pre/-pre}"
+S="${WORKDIR}/${MYP}"
+MODUTILS_PV="2.4.25"
+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 ~arm ~ia64"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/glibc"
+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
+	automake --add-missing
+}
+
+src_compile() {
+	local myconf=
+
+	filter-flags -fPIC
+
+	einfo "Building modutils..."
+	cd ${WORKDIR}/modutils-${MODUTILS_PV}
+
+	econf \
+		--disable-strip \
+		--prefix=/ \
+		--disable-insmod-static \
+		--disable-zlib \
+		${myconf}
+
+	emake || die "emake modutils failed"
+	einfo "Building module-init-tools..."
+	cd ${S}
+
+	econf \
+		--prefix=/ \
+		${myconf}
+
+	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"
+			ln -snf $runme ${D}/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
+}
+