New ebuild and fix for hotplug startup

7 files changed, 140 insertions, 7 deletions

diff --git a/sys-apps/hotplug/ChangeLog b/sys-apps/hotplug/ChangeLog
index 4a77c915a32c..17b4fada9ee3 100644
--- a/sys-apps/hotplug/ChangeLog
+++ b/sys-apps/hotplug/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/hotplug
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.1 2002/02/25 02:13:12 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.2 2002/05/11 01:20:23 wmertens Exp $
+
+*hotplug-200200401 (5 May 2002)
+
+  11 May 2002; Wout Mertens <wmertens@gentoo.org> hotplug-20020401.ebuild :
+
+  New version
+
+  11 May 2002; Wout Mertens <wmertens@gentoo.org> files/hotplug.rc :
+
+  Fixed error condition detection
 
 *hotplug-20020114 (24 Feb 2002)
 
diff --git a/sys-apps/hotplug/files/digest-hotplug-20020401 b/sys-apps/hotplug/files/digest-hotplug-20020401
new file mode 100644
index 000000000000..d02541276722
--- /dev/null
+++ b/sys-apps/hotplug/files/digest-hotplug-20020401
@@ -0,0 +1 @@
+MD5 50792a87d2eea046616d815e03d1af6b hotplug-2002_04_01.tar.gz 36984
diff --git a/sys-apps/hotplug/files/hotplug-20020401-pci.rc-gentoo.diff b/sys-apps/hotplug/files/hotplug-20020401-pci.rc-gentoo.diff
new file mode 100644
index 000000000000..f65ef2449dff
--- /dev/null
+++ b/sys-apps/hotplug/files/hotplug-20020401-pci.rc-gentoo.diff
@@ -0,0 +1,39 @@
+--- pci.rc.orig	Fri May 10 18:31:51 2002
++++ pci.rc	Fri May 10 19:02:00 2002
+@@ -9,27 +9,14 @@
+ 
+ cd /etc/hotplug
+ 
+-# source function library
+-if [ -f /etc/init.d/functions ]; then
+-	. /etc/init.d/functions
+-elif [ -f /etc/rc.d/init.d/functions ]; then
+-	. /etc/rc.d/init.d/functions
+-fi
+-
+ . hotplug.functions
+ 
+-
+-# # override any of the defaults?
+-# if [ -f /etc/sysconfig/pci ]; then
+-#     . /etc/sysconfig/pci
+-# fi
+-
+ pci_boot_events ()
+ {
+     LISTER=`type -p pcimodules`
+     if [ "$LISTER" = "" -o ! -f /proc/bus/pci/devices -o ! -x pci.agent ]; then
+ 	    echo $"** can't synthesize pci hotplug events"
+-	    return
++	    return 1
+     fi
+ 
+     # make sure the pci agent will run
+@@ -61,7 +48,6 @@
+ 	pci_boot_events
+         ;;
+   stop)
+-	echo $"pci stop -- ignored"
+         ;;
+   status)
+ 	echo $"PCI Status for kernel: "  `uname -srm`
diff --git a/sys-apps/hotplug/files/hotplug-20020401-usb.rc-gentoo.diff b/sys-apps/hotplug/files/hotplug-20020401-usb.rc-gentoo.diff
new file mode 100644
index 000000000000..149c1dbcc97d
--- /dev/null
+++ b/sys-apps/hotplug/files/hotplug-20020401-usb.rc-gentoo.diff
@@ -0,0 +1,29 @@
+--- usb.rc.orig	Fri May 10 18:32:00 2002
++++ usb.rc	Fri May 10 19:01:14 2002
+@@ -17,23 +17,16 @@
+ # EHCI/OHCI/UHCI/..., hid, input, keybdev; and likely mousedev) so the
+ # system console can't be removed by accident.
+ 
++# Adapted for gentoo by wmertens
+ 
+ PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ 
+ STATIC_MODULE_LIST=
+ X11_USBMICE_HACK=false
+ 
+-# source function library
+-if [ -f /etc/init.d/functions ]; then
+-	. /etc/init.d/functions
+-elif [ -f /etc/rc.d/init.d/functions ]; then
+-	. /etc/rc.d/init.d/functions
+-fi
+-
+-
+ # override any of the defaults above?
+-if [ -f /etc/sysconfig/usb ]; then
+-    . /etc/sysconfig/usb
++if [ -f /etc/conf.d/usb ]; then
++    . /etc/conf.d/usb
+ fi
+ 
+ 
diff --git a/sys-apps/hotplug/files/hotplug.rc b/sys-apps/hotplug/files/hotplug.rc
index 54ef65fec47c..21295a2789a9 100644
--- a/sys-apps/hotplug/files/hotplug.rc
+++ b/sys-apps/hotplug/files/hotplug.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/files/hotplug.rc,v 1.2 2002/02/25 23:02:14 woodchip Exp $
+# /space/gentoo/cvsroot/gentoo-x86/sys-apps/hotplug/files/hotplug.rc,v 1.2 2002/02/25 23:02:14 woodchip Exp
 
 depend() {
 	need modules
@@ -9,7 +9,7 @@ depend() {
 
 checkconfig() {
 	if [ ! -d /etc/hotplug ] ; then
-		eerror "USB Hotplug requires scripts & configs in /etc/hotplug !"
+		eerror "Hotplug requires scripts & configs in /etc/hotplug !"
 		return 1
 	fi
 }
@@ -17,12 +17,12 @@ checkconfig() {
 start() {
 	local error
 	checkconfig || return 1
-	ebegin "Starting USB Hotplug"
+	ebegin "Starting USB and PCI hotplugging"
 	for RC in /etc/hotplug/*.rc
 	do
 		$RC start
 		error=$?
-		if [ error ] ; then
+		if [ $error -ne 0 ] ; then
 			eend ${error} "hotplug script $RC failed at start"
 			return 1
 		fi
@@ -32,12 +32,12 @@ start() {
 
 stop() {
 	local error
-	ebegin "Stopping USB Hotplug "
+	ebegin "Stopping USB and PCI hotplugging"
 	for RC in /etc/hotplug/*.rc
 	do
 		$RC stop
 		error=$?
-		if [ error ] ; then
+		if [ $error -ne 0 ] ; then
 			eend ${error} "hot plug script $RC failed at stop"
 			return 1
 		fi
diff --git a/sys-apps/hotplug/files/usb.conf b/sys-apps/hotplug/files/usb.conf
new file mode 100644
index 000000000000..a7b4e0be0e48
--- /dev/null
+++ b/sys-apps/hotplug/files/usb.conf
@@ -0,0 +1,7 @@
+# If you have a USB mouse, you probably want to enable the following,
+# and change your XFree86 configuration so that it uses /dev/input/mice
+# as the mouse input device
+#X11_USBMICE_HACK=true
+
+# Put any modules here that you want to be loaded by the USB hotplug system
+#STATIC_MODULE_LIST=
diff --git a/sys-apps/hotplug/hotplug-20020401.ebuild b/sys-apps/hotplug/hotplug-20020401.ebuild
new file mode 100644
index 000000000000..d68a1a04c0f4
--- /dev/null
+++ b/sys-apps/hotplug/hotplug-20020401.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020401.ebuild,v 1.1 2002/05/11 01:20:24 wmertens Exp $
+
+# source maintainers named it hotplug-YYYY_MM_DD instead of hotplug-YYYYMMDD
+OLDP="$P"
+P=`echo $P|sed 's/-\(....\)\(..\)\(..\)/-\1_\2_\3/'`
+S=${WORKDIR}/${P}
+DESCRIPTION="USB and PCI hotplug scripts"
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/linux-hotplug/${P}.tar.gz"
+HOMEPAGE="http://linux-hotplug.sourceforge.net"
+
+# hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
+DEPEND="virtual/glibc
+        >=sys-apps/pciutils-2.1.9
+        >=sys-apps/usbutils-0.9"
+
+src_unpack () {
+	unpack ${A}
+
+	cd ${S}/etc/hotplug
+	patch -p0 < ${FILESDIR}/${OLDP}-pci.rc-gentoo.diff
+	patch -p0 < ${FILESDIR}/${OLDP}-usb.rc-gentoo.diff
+}
+
+src_install () {
+	into /
+	dosbin sbin/hotplug
+	doman *.8
+	dodoc README ChangeLog
+
+	cd ${S}/etc/hotplug
+	insinto /etc/hotplug
+	doins *
+	exeinto /etc/hotplug
+	doexe *.agent *.rc
+	dodir /etc/hotplug/usb /etc/hotplug/pci
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/hotplug.rc hotplug
+	
+	insinto /etc/conf.d
+	newins ${FILESDIR}/usb.conf usb
+
+	echo WARNING: The fxload program was spliced off this package.
+	echo WARNING: emerge fxload if you need it.
+}