10 files changed, 91 insertions, 22 deletions
diff --git a/sys-apps/hotplug/ChangeLog b/sys-apps/hotplug/ChangeLog
index 9592b4ca94b5..a436ca3eaef8 100644
--- a/sys-apps/hotplug/ChangeLog
+++ b/sys-apps/hotplug/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hotplug
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.27 2003/12/22 04:12:36 drobbins Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.28 2004/01/06 00:19:49 azarah Exp $
+
+*hotplug-20040105 (06 Jan 2004)
+
+  06 Jan 2004; Martin Schlemmer <azarah@gentoo.org> hotplug-20040105.ebuild:
+  Update version.  Add extra 2.6 patch from Mans Rullgard <mru@kth.se>.
+  Fix copyright date.
 
   18 Dec 2003; Guy Martin <gmsoft@gentoo.org> hotplug-20030805-r2.ebuild:
   Marked stable on hppa.
diff --git a/sys-apps/hotplug/Manifest b/sys-apps/hotplug/Manifest
index 8fdadbb9f3a8..e33c60fc374e 100644
--- a/sys-apps/hotplug/Manifest
+++ b/sys-apps/hotplug/Manifest
@@ -1,12 +1,12 @@
-MD5 dbc0a1e284337e1bce85ecec7e8f8be0 hotplug-20030805-r2.ebuild 1893
-MD5 8adbe30df2fad3fcdc443742156ddce5 hotplug-20030501-r2.ebuild 1517
-MD5 7a1aeede667851d810bae3f744bac241 ChangeLog 4854
-MD5 c5742abca9a441044fd53e26c65e9827 hotplug-20030805-r3.ebuild 1936
-MD5 5ab9b61479b8fafefcaca30dbdbb314d hotplug-20020826-r2.ebuild 1563
-MD5 11629d0d5e7635673f5de7e4d6fb341c hotplug-20040105.ebuild 1732
-MD5 b2727f7bdfca2e4987d2d65063533e98 hotplug-20030805-r1.ebuild 1753
+MD5 ca6a585180e42807fd40091deffc0b86 hotplug-20030805-r2.ebuild 1893
+MD5 b0a484d63057d74095ddeb36f7700ce6 hotplug-20030501-r2.ebuild 1515
+MD5 24e111ad334ec4d8b750cc3dcb3bad83 ChangeLog 5057
+MD5 c19724206ceef29bb1cf7081331e91f9 hotplug-20030805-r3.ebuild 1934
+MD5 20c3f8b015678d0bf9d6463fef97dcd7 hotplug-20020826-r2.ebuild 1561
+MD5 486dcc17bf944e740cf61d74ddb0357c hotplug-20040105.ebuild 1730
+MD5 142551df35a25e246e6076cdcc893a35 hotplug-20030805-r1.ebuild 1751
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 95eed4ffc6aac22db5d1030f2d528e2e hotplug-20030805.ebuild 1530
+MD5 b61243d1f02f2395c3fdffd1a7a036e5 hotplug-20030805.ebuild 1529
 MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r1 151
 MD5 f9303a2467242ed310370ddcd63414b6 files/digest-hotplug-20040105 151
 MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805 151
diff --git a/sys-apps/hotplug/files/digest-hotplug-20040105 b/sys-apps/hotplug/files/digest-hotplug-20040105
new file mode 100644
index 000000000000..3c55b9c697c6
--- /dev/null
+++ b/sys-apps/hotplug/files/digest-hotplug-20040105
@@ -0,0 +1,2 @@
+MD5 58bae0e59fb68af96a33f46be25ac3b3 hotplug-2004_01_05.tar.gz 54916
+MD5 1a9428f38efb770d7f773ffad6d813d9 hotplug-20040105-gentoo-patches.tar.bz2 2859
diff --git a/sys-apps/hotplug/hotplug-20020826-r2.ebuild b/sys-apps/hotplug/hotplug-20020826-r2.ebuild
index 33ec68d36717..f99b7f92f6e2 100644
--- a/sys-apps/hotplug/hotplug-20020826-r2.ebuild
+++ b/sys-apps/hotplug/hotplug-20020826-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020826-r2.ebuild,v 1.5 2003/09/07 00:45:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020826-r2.ebuild,v 1.6 2004/01/06 00:19:49 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hotplug/hotplug-20030501-r2.ebuild b/sys-apps/hotplug/hotplug-20030501-r2.ebuild
index 9813504b6447..3d872de4ac92 100644
--- a/sys-apps/hotplug/hotplug-20030501-r2.ebuild
+++ b/sys-apps/hotplug/hotplug-20030501-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030501-r2.ebuild,v 1.6 2003/09/07 00:45:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030501-r2.ebuild,v 1.7 2004/01/06 00:19:49 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hotplug/hotplug-20030805-r1.ebuild b/sys-apps/hotplug/hotplug-20030805-r1.ebuild
index d3738d23fad2..8b89518948b2 100644
--- a/sys-apps/hotplug/hotplug-20030805-r1.ebuild
+++ b/sys-apps/hotplug/hotplug-20030805-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r1.ebuild,v 1.1 2003/09/24 20:07:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r1.ebuild,v 1.2 2004/01/06 00:19:49 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hotplug/hotplug-20030805-r2.ebuild b/sys-apps/hotplug/hotplug-20030805-r2.ebuild
index 92c0299405db..7c0f36f86c73 100644
--- a/sys-apps/hotplug/hotplug-20030805-r2.ebuild
+++ b/sys-apps/hotplug/hotplug-20030805-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r2.ebuild,v 1.3 2003/12/18 22:50:47 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r2.ebuild,v 1.4 2004/01/06 00:19:49 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hotplug/hotplug-20030805-r3.ebuild b/sys-apps/hotplug/hotplug-20030805-r3.ebuild
index c583a54fe2f6..4a8feef1b402 100644
--- a/sys-apps/hotplug/hotplug-20030805-r3.ebuild
+++ b/sys-apps/hotplug/hotplug-20030805-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r3.ebuild,v 1.1 2003/12/22 04:12:36 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r3.ebuild,v 1.2 2004/01/06 00:19:49 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hotplug/hotplug-20030805.ebuild b/sys-apps/hotplug/hotplug-20030805.ebuild
index bb63b797b691..3b30a61d668d 100644
--- a/sys-apps/hotplug/hotplug-20030805.ebuild
+++ b/sys-apps/hotplug/hotplug-20030805.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805.ebuild,v 1.1 2003/09/14 07:00:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805.ebuild,v 1.2 2004/01/06 00:19:49 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hotplug/hotplug-20040105.ebuild b/sys-apps/hotplug/hotplug-20040105.ebuild
new file mode 100644
index 000000000000..5ec911fd0ed1
--- /dev/null
+++ b/sys-apps/hotplug/hotplug-20040105.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040105.ebuild,v 1.1 2004/01/06 00:19:49 azarah 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://sourceforge/linux-hotplug/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patches.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc ~hppa ~sparc ~alpha ~mips ~arm"
+
+# hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
+DEPEND=">=sys-apps/pciutils-2.1.9 >=sys-apps/usbutils-0.9"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/hotplug-patches
+
+	EPATCH_OPTS="${EPATCH_OPTS} ${S}/etc/hotplug/usb.agent" \
+	epatch ${FILESDIR}/usb.agent.diff
+	epatch ${FILESDIR}/kernel-26-fix.patch || die
+}
+
+src_install() {
+	into /
+	dosbin sbin/hotplug
+	doman *.8
+	dodoc README ChangeLog
+
+	cd ${S}/etc/hotplug
+	insinto /etc/hotplug
+	doins blacklist hotplug.functions usb.distmap usb.handmap usb.usermap
+	exeinto /etc/hotplug
+	doexe *.agent *.rc ${FILESDIR}/firmware.agent
+	dodir /usr/lib/hotplug/firmware
+	dodir /etc/hotplug/usb /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 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"
+}
+