Bump to 3.2-pre7

Package-Manager: portage-2.0.51.22-r1

4 files changed, 218 insertions, 17 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index 04f891139561..810e28e053bc 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.81 2005/05/12 22:12:34 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.82 2005/06/27 16:19:25 agriffis Exp $
+
+*module-init-tools-3.2_pre7 (27 Jun 2005)
+
+  27 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  +module-init-tools-3.2_pre7.ebuild:
+  Bump to 3.2-pre7
 
   12 May 2005; <solar@gentoo.org> module-init-tools-3.2_pre4.ebuild:
   - fix typo in patch, only 3.1 exists.. add die statements around file i/o
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index 63888509655d..d7e619eac0fd 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -2,29 +2,29 @@
 Hash: SHA1
 
 MD5 57249cf9ed51532cef87b39e52871a41 module-init-tools-3.1-r1.ebuild 5858
-MD5 b6bd2eeaa8d346070e89e015b16599b2 module-init-tools-3.2_pre4.ebuild 5872
-MD5 187b1843b513986bf51359562552db9f module-init-tools-3.1.ebuild 5711
-MD5 ac1d76870d8cac1c51aa4e22dafb99a1 ChangeLog 15900
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 b6bd2eeaa8d346070e89e015b16599b2 module-init-tools-3.2_pre4.ebuild 5872
+MD5 b8a35eea769e441d653a203d33529355 ChangeLog 16054
 MD5 099e39f6a82945bf0cc3a7b1c8ebf86a module-init-tools-3.0-r2.ebuild 5468
+MD5 187b1843b513986bf51359562552db9f module-init-tools-3.1.ebuild 5711
+MD5 13c27d94d9e914dfb41ba205c85d3f8c module-init-tools-3.2_pre7.ebuild 5875
+MD5 469d7fc1f915c60585afc8d895b1668a files/digest-module-init-tools-3.0-r2 142
 MD5 d179298a960a2576683689fe19818c8b files/generate-modprobe-assume-kernel.patch 3767
-MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch 382
+MD5 0562a7a338175d0b6100ef7958b0ef5e files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3766
 MD5 2da5de5fa7c26cdef6a84788452653e6 files/modutils-2.4.27-gcc4.patch 6052
+MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch 382
 MD5 f53ef74fbefb9e4deab2c92d5c24d2d9 files/digest-module-init-tools-3.2_pre4 147
-MD5 813f2779e10e8f29d9e1d58dda93a5e3 files/digest-module-init-tools-3.1 142
-MD5 0562a7a338175d0b6100ef7958b0ef5e files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3766
-MD5 34f20e2837caff74cef9cca766e1e0c4 files/3.1-modprobe.d.5.bz2 2288
-MD5 469d7fc1f915c60585afc8d895b1668a files/digest-module-init-tools-3.0-r2 142
-MD5 813f2779e10e8f29d9e1d58dda93a5e3 files/digest-module-init-tools-3.1-r1 142
 MD5 97fd0899fb54b236e35bdd1bd5fae336 files/modutils-2.4.27-PATH_MAX.patch 309
-MD5 d5504b6d6ed1ef697275b3a48a1e49e7 files/modutils-2.4.27-gcc34.patch 231
+MD5 95f5372a9e15db429a6db167289d7d6e files/digest-module-init-tools-3.2_pre7 147
 MD5 07aa415fd57ac42cd0c11527edc9782d files/module-init-tools-0.9.15-legacy-modext-support.patch 481
+MD5 813f2779e10e8f29d9e1d58dda93a5e3 files/digest-module-init-tools-3.1-r1 142
+MD5 d5504b6d6ed1ef697275b3a48a1e49e7 files/modutils-2.4.27-gcc34.patch 231
+MD5 34f20e2837caff74cef9cca766e1e0c4 files/3.1-modprobe.d.5.bz2 2288
+MD5 813f2779e10e8f29d9e1d58dda93a5e3 files/digest-module-init-tools-3.1 142
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iQCVAwUBQoPUYZ4WFLgrx1GWAQIRlQQAlj2BiKL6FOFuYO097t8mgfxHcuONnEiu
-zA/WKDPTJxNNuquCSg+IGrosXtuPnaxobViFq7BgE6+4OHCZMS6dJGuA2okcVa7H
-rgBYqhow76Qzmqw2eds7pIwEvUJbFJte9QyvjbpnGS0eoPT6lDgMaF1/HN7FiYeR
-AS7rNxxtQc4=
-=DtgA
+iD8DBQFCwCcsBXaUFmZvwyMRAlxkAKDX7dnhKFVb7ykZzf53Trsvn1uJqQCgn0Zz
+fQzqbRerwqsSrgDkJNUx1Vw=
+=z/lK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.2_pre7 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.2_pre7
new file mode 100644
index 000000000000..d4743db71ac4
--- /dev/null
+++ b/sys-apps/module-init-tools/files/digest-module-init-tools-3.2_pre7
@@ -0,0 +1,2 @@
+MD5 90eec11f7afa255a7202432fa0d8a39d module-init-tools-3.2-pre7.tar.bz2 163764
+MD5 bac989c74ed10f3bf86177fc5b4b89b6 modutils-2.4.27.tar.bz2 234963
diff --git a/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild
new file mode 100644
index 000000000000..0b97d8da6fcd
--- /dev/null
+++ b/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2005 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.2_pre7.ebuild,v 1.1 2005/06/27 16:19:25 agriffis Exp $
+
+inherit flag-o-matic eutils gnuconfig toolchain-funcs
+
+MYP="${P/_pre/-pre}"
+S="${WORKDIR}/${MYP}"
+MODUTILS_PV="2.4.27"
+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"
+#	!no-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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+#IUSE="no-old-linux"
+
+DEPEND="virtual/libc
+	sys-libs/zlib
+	!virtual/modutils"
+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)
+#	if ! use no-old-linux ; then
+		cd ${WORKDIR}/modutils-${MODUTILS_PV}
+		epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
+		epatch ${FILESDIR}/modutils-2.4.27-PATH_MAX.patch
+		epatch ${FILESDIR}/modutils-2.4.27-gcc34.patch
+		epatch ${FILESDIR}/modutils-2.4.27-gcc4.patch
+#	fi
+
+	# Support legacy .o modules
+	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.15-legacy-modext-support.patch
+
+	# 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.
+	cd ${S}; epatch ${FILESDIR}/${PN}-3.1_generate-modprobe-assume-kernel.patch
+
+	cd ${S}
+	# make sure we don't try to regen the manpages
+	cp ${FILESDIR}/3.1-modprobe.d.5.bz2 modprobe.d.5.bz2 || die
+	bunzip2 modprobe.d.5.bz2 || die
+	touch *.5
+
+	rm -f missing
+	export WANT_AUTOMAKE=1.6
+	automake --add-missing
+
+	cd ${S}
+	gnuconfig_update
+#	if ! use no-old-linux ; then
+		cp config.{guess,sub} ${WORKDIR}/modutils-${MODUTILS_PV}/
+#	fi
+}
+
+src_compile() {
+	export BUILDCC="$(tc-getBUILD_CC)"
+
+#	if ! use no-old-linux ; then
+		einfo "Building modutils..."
+		cd ${WORKDIR}/modutils-${MODUTILS_PV}
+		econf \
+			--disable-strip \
+			--prefix=/ \
+			--enable-insmod-static \
+			--disable-zlib \
+			|| die "econf failed"
+		local mymake=""
+		[ "${ARCH}" = "hppa" ] && mymake="ARCH=hppa"
+		emake ${mymake} || die "emake modutils failed"
+#	fi
+
+	einfo "Building module-init-tools..."
+	cd ${S}
+	econf \
+		--prefix=/ \
+		--enable-zlib \
+		|| die "econf failed"
+
+	# Our zlib.so is in /lib vs /usr/lib so it's safe to link with.
+	# this also fixes text relocations that were showing up in this pkg
+	emake LDADD="-lz" || die "emake module-init-tools failed"
+}
+
+src_install() {
+#	if ! use no-old-linux ; then
+		local mymake=""
+		[ "${ARCH}" = "hppa" ] && mymake="ARCH=hppa"
+		cd ${WORKDIR}/modutils-${MODUTILS_PV}
+		einstall prefix="${D}" ${mymake}
+
+		docinto modutils-${MODUTILS_PV}
+		dodoc 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 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
+#	fi
+
+	cd ${S}
+	einstall prefix=${D}
+
+	# Install compat symlink
+	dosym ../bin/lsmod /sbin/lsmod
+	#use no-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
+	# 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 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
+}