new release, and no more init script (use coldplug for that)

5 files changed, 113 insertions, 3 deletions

diff --git a/sys-apps/hotplug/ChangeLog b/sys-apps/hotplug/ChangeLog
index 8a15c215f4fa..49607eef207f 100644
--- a/sys-apps/hotplug/ChangeLog
+++ b/sys-apps/hotplug/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-apps/hotplug
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.47 2004/09/03 21:03:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.48 2004/09/21 00:13:46 gregkh Exp $
+
+*hotplug-20040920 (20 Sep 2004)
+
+  20 Sep 2004; Greg Kroah-Hartman <gregkh@gentoo.org> +files/hotplug.rc.empty,
+  +hotplug-20040920.ebuild:
+  Oh yeah, /etc/init.d/hotplug doesn't do anything anymore.
+  Use the coldplug package for loading modules at boot time
+  based on the devices in your system.
+
+*hotplug-20040920 (20 Sep 2004)
+
+  20 Sep 2004; Greg Kroah-Hartman <gregkh@gentoo.org> +files/hotplug.rc.empty,
+  +hotplug-20040920.ebuild:
+  new upstream release.  Fixes lots of Gentoo reported bugs.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   hotplug-20040401.ebuild:
diff --git a/sys-apps/hotplug/Manifest b/sys-apps/hotplug/Manifest
index 7cd2b4f27f04..0a4a9697df7f 100644
--- a/sys-apps/hotplug/Manifest
+++ b/sys-apps/hotplug/Manifest
@@ -1,16 +1,20 @@
 MD5 a671e67bd93b01df1aec1c7f1ebfdfb0 ChangeLog 7748
+MD5 836caede5d96b85932e350c658db5dc5 hotplug-20040401-r1.ebuild 1522
+MD5 1a7bfaa4eb94449ee808a34dc7ff0405 hotplug-20040920.ebuild 1825
+MD5 34941ac9da8e298070b69145a9aefe52 hotplug-20040401.ebuild 1520
 MD5 1f70c719d6a669a311cdc1d8fe804866 hotplug-20030805-r2.ebuild 1882
 MD5 74aabd09369956f95593d208d6b38adb hotplug-20030805-r3.ebuild 1922
 MD5 fe6609fa5c00549e997a01bb0b2d487c hotplug-20040105.ebuild 1719
-MD5 34941ac9da8e298070b69145a9aefe52 hotplug-20040401.ebuild 1520
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
+MD5 3a535a6008f1fe760157105a86822510 files/hotplug.rc.empty 648
+MD5 6038bb8c3af43a0e6f0aa876e4307df6 files/digest-hotplug-20040920 69
 MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r2 151
 MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r3 151
 MD5 f9303a2467242ed310370ddcd63414b6 files/digest-hotplug-20040105 151
-MD5 5be3a96d844a1f0db96e2268b94f6094 files/digest-hotplug-20040401 69
 MD5 d8a0d8878d8904a779bda401d86268b1 files/firmware.agent 1188
 MD5 7c4681458effb34f299cbc4b9245098c files/hotplug.functions.patch 522
 MD5 9e8f03a1ff1b97ad47b38b337d13064f files/hotplug.rc 836
 MD5 9f13f3363b85caac03bfb623c652b4fa files/kernel-26-fix.patch 816
 MD5 92547b2263d5423d874565504d2324f7 files/usb.agent.diff 886
 MD5 1bd9ddb0959318fe56dec239c8265fb1 files/usb.confd 291
+MD5 5be3a96d844a1f0db96e2268b94f6094 files/digest-hotplug-20040401 69
diff --git a/sys-apps/hotplug/files/digest-hotplug-20040920 b/sys-apps/hotplug/files/digest-hotplug-20040920
new file mode 100644
index 000000000000..cb37cae939a6
--- /dev/null
+++ b/sys-apps/hotplug/files/digest-hotplug-20040920
@@ -0,0 +1 @@
+MD5 9e6b06dfa3b91f051b55e1483adb5a68 hotplug-2004_09_20.tar.gz 44398
diff --git a/sys-apps/hotplug/files/hotplug.rc.empty b/sys-apps/hotplug/files/hotplug.rc.empty
new file mode 100644
index 000000000000..451e641a0b65
--- /dev/null
+++ b/sys-apps/hotplug/files/hotplug.rc.empty
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/files/hotplug.rc.empty,v 1.1 2004/09/21 00:13:47 gregkh Exp $
+
+#
+# nothing here anymore. Please use the coldplug package if you really want to
+# load modules for devices that are discovered by your kernel before init runs.
+#
+# However, please realize that if you have any problems, the developers
+# recommend just using the modules.autoload functionality to handle this in a
+# much simpler manner.
+#
+# Comments, flames, and fine beer should be directed at gregkh@gentoo.org
+#
+
+depend() {
+	need modules
+}
+
+start () {
+	# just verify that people build their kernel with hotplug support.
+	if [ ! -f /proc/sys/kernel/hotplug ] ; then
+		eerror "CONFIG_HOTPLUG not enabled for this kernel!"
+		return 1
+	fi
+}
diff --git a/sys-apps/hotplug/hotplug-20040920.ebuild b/sys-apps/hotplug/hotplug-20040920.ebuild
new file mode 100644
index 000000000000..0b54bdcf6f75
--- /dev/null
+++ b/sys-apps/hotplug/hotplug-20040920.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040920.ebuild,v 1.1 2004/09/21 00:13:46 gregkh Exp $
+
+inherit eutils
+
+# source maintainers named it hotplug-YYYY_MM_DD instead of hotplug-YYYYMMDD
+MY_P=${PN}-${PV:0:4}_${PV:4:2}_${PV:6:2}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="USB and PCI hotplug scripts"
+HOMEPAGE="http://linux-hotplug.sourceforge.net"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+IUSE=""
+
+# hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
+DEPEND=">=sys-apps/pciutils-2.1.9
+	>=sys-apps/usbutils-0.9
+	sys-apps/hotplug-base"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patches go here if needed...
+}
+
+src_install() {
+	into /
+	doman *.8
+	dodoc README README.modules ChangeLog
+
+	cd ${S}/etc/hotplug
+	insinto /etc/hotplug
+	doins blacklist hotplug.functions usb.distmap usb.handmap usb.usermap
+	exeinto /etc/hotplug
+	doexe *.agent *.rc *.permissions
+	dodir /usr/lib/hotplug/firmware
+	dodir /etc/hotplug/usb
+	dodir /etc/hotplug/pci
+	cd ${S}/etc/hotplug.d/default
+	exeinto /etc/hotplug.d/default
+	doexe default.hotplug
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/hotplug.rc.empty hotplug
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/usb.confd usb
+	dodir /var/run/usb
+}
+
+pkg_postinst() {
+	ewarn "WARNING: The fxload program was spliced off this package"
+	ewarn "WARNING: emerge fxload if you need it"
+	ewarn ""
+	ewarn "WARNING: The hotplug init script is now gone (dead and burried.)"
+	ewarn "WARNING: If you want to load modules for hardware that was already"
+	ewarn "WARNING: discovered at boot time, like the old hotplug init script"
+	ewarn "WARNING: did, then emerge the coolplug package."
+}