Revision bump to add eth1394 and shpchp to blacklist. Closing bug #128962.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 95 insertions, 4 deletions

diff --git a/sys-apps/hotplug/ChangeLog b/sys-apps/hotplug/ChangeLog
index 2716c3ae0ee9..e1a854cf6b93 100644
--- a/sys-apps/hotplug/ChangeLog
+++ b/sys-apps/hotplug/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hotplug
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.66 2006/03/24 04:55:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.67 2006/04/20 00:01:53 wolf31o2 Exp $
+
+*hotplug-20040923-r2 (20 Apr 2006)
+
+  20 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +hotplug-20040923-r2.ebuild:
+  Revision bump to add eth1394 and shpchp to blacklist.  Closing bug #128962.
 
   24 Mar 2006; Robin H. Johnson <robbat2@gentoo.org>
   +files/hotplug-20040923-scsi-agent-timeout.patch,
diff --git a/sys-apps/hotplug/Manifest b/sys-apps/hotplug/Manifest
index 2874536b4722..155badd94d6b 100644
--- a/sys-apps/hotplug/Manifest
+++ b/sys-apps/hotplug/Manifest
@@ -1,6 +1,6 @@
-MD5 354af13b0f5b029710ef27d6854bf72e ChangeLog 10816
-RMD160 f64fc03e874030fad9d870f78082b475ddfbfe6e ChangeLog 10816
-SHA256 be3b5eeffb86225e9d2b14111fe48db71b2c5a533a2c14dead0800755188bc7b ChangeLog 10816
+MD5 93afbcea7945c25b783130b280775b25 ChangeLog 11017
+RMD160 36056370aab0362c4b7728fa77b023f5e5dd0b9e ChangeLog 11017
+SHA256 448a628105d692ae54f4cd5fb1025fb50a28039803e616474b1df304280f617a ChangeLog 11017
 MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r2 151
 RMD160 976b24ef65b32c3a10f7e41f6efb415a9accd649 files/digest-hotplug-20030805-r2 151
 SHA256 88fe5d7f15d0ba41e206adb49a57ed0a1fd090eaacfec6752cf493d3e77f5d35 files/digest-hotplug-20030805-r2 151
@@ -22,6 +22,9 @@ SHA256 1d62356190ab859cb2cc7ac44673468231d7f68c295935870ff2d12adf8b8c62 files/di
 MD5 8cecfadba72f89724706c45119b15e49 files/digest-hotplug-20040923-r1 69
 RMD160 e5a3fc20524b04b81b63c3ca00c9929eb6d2f8f2 files/digest-hotplug-20040923-r1 69
 SHA256 1d62356190ab859cb2cc7ac44673468231d7f68c295935870ff2d12adf8b8c62 files/digest-hotplug-20040923-r1 69
+MD5 56b398bc4344afa2e46b1b022514a970 files/digest-hotplug-20040923-r2 253
+RMD160 f18dc0d7f25a3bb6ef2316ad6f33c01157ee13e6 files/digest-hotplug-20040923-r2 253
+SHA256 3a8db6a0e631f751d8402df4da53e5665b3ba4e30da8a896fdaaa201ce2ad633 files/digest-hotplug-20040923-r2 253
 MD5 d8a0d8878d8904a779bda401d86268b1 files/firmware.agent 1188
 RMD160 b0767f92d9be81728e5d2000ebde7a019446af93 files/firmware.agent 1188
 SHA256 57f47199e5171d12a2488fde44825ca755dbacfcc974b1f07c6a0b8bf6e5fd35 files/firmware.agent 1188
@@ -70,6 +73,9 @@ SHA256 f42274c421307d11614b05e74244aebcadec95542c63f2bd2d8510a624fe60ca hotplug-
 MD5 da196a882ed9d9a362fed0b3f4a10dcc hotplug-20040923-r1.ebuild 2286
 RMD160 91a29ad2a2e4fdc6c3ffa01d75ac83f40b1c0b4d hotplug-20040923-r1.ebuild 2286
 SHA256 29aa01452dcfdd3b9eede5a461be4f6c8758c08f76bfd95f25e30e08242b0a5c hotplug-20040923-r1.ebuild 2286
+MD5 dd0221ca3c99acb455a246c28a414ce5 hotplug-20040923-r2.ebuild 2489
+RMD160 65efb510fbd3be3518c2be042b42d43e3df9fc5c hotplug-20040923-r2.ebuild 2489
+SHA256 46ab478497eec3513d21e121a84ce1b0b2f718f6e422654ebfc0c238765fad08 hotplug-20040923-r2.ebuild 2489
 MD5 3090ae95c340e913c9c10dbf241f09d5 hotplug-20040923.ebuild 2220
 RMD160 5d3148e323bdbeb420ec51053b13fb8e337db588 hotplug-20040923.ebuild 2220
 SHA256 111cf545b19cd16b4d65423a560a9045d6a9ecd30006ad5d89471f41d32676b6 hotplug-20040923.ebuild 2220
diff --git a/sys-apps/hotplug/files/digest-hotplug-20040923-r2 b/sys-apps/hotplug/files/digest-hotplug-20040923-r2
new file mode 100644
index 000000000000..f7b9b186fec6
--- /dev/null
+++ b/sys-apps/hotplug/files/digest-hotplug-20040923-r2
@@ -0,0 +1,3 @@
+MD5 1542af9cbe1053cfde9421007f702cf2 hotplug-2004_09_23.tar.gz 44802
+RMD160 2436936594271b25c2c6b24348bd4b2f80664906 hotplug-2004_09_23.tar.gz 44802
+SHA256 eb27ef3ae7be1339be29624265a23f7e637229fb7510a9973a69471a403a5930 hotplug-2004_09_23.tar.gz 44802
diff --git a/sys-apps/hotplug/hotplug-20040923-r2.ebuild b/sys-apps/hotplug/hotplug-20040923-r2.ebuild
new file mode 100644
index 000000000000..7336ec7adee6
--- /dev/null
+++ b/sys-apps/hotplug/hotplug-20040923-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923-r2.ebuild,v 1.1 2006/04/20 00:01:53 wolf31o2 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+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}"
+	epatch "${FILESDIR}"/${PN}-ifrename.patch
+	epatch "${FILESDIR}"/${P}-scsi-agent-timeout.patch
+}
+
+src_install() {
+	into /
+	doman *.8
+	dodoc README README.modules ChangeLog
+
+	cd "${S}"/etc/hotplug
+	insinto /etc/hotplug
+	# Added 2006/04/16 to resolve bug #128962
+	echo "" >> blacklist
+	echo "# Don't hotplug eth1394, bug #128962" >> blacklist
+	echo "eth1394" >> blacklist
+	echo "" >> blacklist
+	echo "shpchp" >> blacklist
+	doins blacklist hotplug.functions *map || die
+
+	exeinto /etc/hotplug
+	doexe *.agent *.rc *.permissions || die
+	# stupid isapnp.rc files...
+	newexe "${FILESDIR}"/isapnp.rc.empty isapnp.rc
+
+	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 || die
+
+	newinitd "${FILESDIR}"/hotplug.rc.empty hotplug
+	newconfd "${FILESDIR}"/usb.confd usb
+	dodir /var/run/usb
+}
+
+pkg_postinst() {
+	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 coldplug package, and add coldplug to"
+	ewarn "WARNING: a runlevel, e.g. # rc-update add coldplug boot"
+	echo
+	ewarn "WARNING: All firmware loaded by the hotplug scripts needs to be"
+	ewarn "WARNING: moved to the /lib/firmware directory, as the scripts now"
+	ewarn "WARNING: expect it to be in that location."
+	echo
+	ewarn "If you still have the file /etc/hotplug/isapnp.rc on your system,"
+	ewarn "please delete it by hand, the file /etc/hotplug/pnp.rc superseeds it."
+}