The ifrename utility is now in /sbin/, not /usr/sbin/, bug #96654.

(Portage version: 2.0.51.22-r2)

5 files changed, 110 insertions, 11 deletions

diff --git a/sys-apps/hotplug/ChangeLog b/sys-apps/hotplug/ChangeLog
index 5aeca640845a..58fd5a26d87f 100644
--- a/sys-apps/hotplug/ChangeLog
+++ b/sys-apps/hotplug/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hotplug
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.64 2005/02/05 17:20:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.65 2005/07/19 18:34:28 brix Exp $
+
+*hotplug-20040923-r1 (19 Jul 2005)
+
+  19 Jul 2005; <brix@gentoo.org> +files/hotplug-ifrename.patch,
+  +hotplug-20040923-r1.ebuild:
+  The ifrename utility is now in /sbin/, not /usr/sbin/, bug #96654.
 
   05 Feb 2005; Markus Rothe <corsair@gentoo.org> hotplug-20040923.ebuild:
   Stable on ppc64
diff --git a/sys-apps/hotplug/Manifest b/sys-apps/hotplug/Manifest
index 3072b4edc5e9..4d53ed41698b 100644
--- a/sys-apps/hotplug/Manifest
+++ b/sys-apps/hotplug/Manifest
@@ -1,22 +1,25 @@
-MD5 18ee5c1bf4e4a540c74d9fdca41e384f ChangeLog 10382
+MD5 202a004e172f89f30aced13cc1ee5295 hotplug-20040401.ebuild 1519
 MD5 aeb339e3069f34450fae45734f9db531 hotplug-20030805-r2.ebuild 1881
-MD5 b14f7777f9ac962ce85e6b0ad0a473ec hotplug-20030805-r3.ebuild 1921
+MD5 3090ae95c340e913c9c10dbf241f09d5 hotplug-20040923.ebuild 2220
 MD5 6479120b47a2391964265eae353dc3af hotplug-20040105.ebuild 1718
-MD5 202a004e172f89f30aced13cc1ee5295 hotplug-20040401.ebuild 1519
 MD5 8ea3943b3d17011f1307236a2d03c89b hotplug-20040920.ebuild 1838
-MD5 3090ae95c340e913c9c10dbf241f09d5 hotplug-20040923.ebuild 2220
+MD5 513dde0139a4478dce11854b25722a53 ChangeLog 10583
+MD5 772d4ad4904b743ef0bc7aff1e35aed7 hotplug-20040923-r1.ebuild 2157
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r2 151
-MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r3 151
+MD5 b14f7777f9ac962ce85e6b0ad0a473ec hotplug-20030805-r3.ebuild 1921
 MD5 f9303a2467242ed310370ddcd63414b6 files/digest-hotplug-20040105 151
 MD5 5be3a96d844a1f0db96e2268b94f6094 files/digest-hotplug-20040401 69
 MD5 6038bb8c3af43a0e6f0aa876e4307df6 files/digest-hotplug-20040920 69
 MD5 8cecfadba72f89724706c45119b15e49 files/digest-hotplug-20040923 69
+MD5 8cecfadba72f89724706c45119b15e49 files/digest-hotplug-20040923-r1 69
+MD5 9c876c8880bba306cbf8892253ada03e files/hotplug.rc.empty 1076
+MD5 9f13f3363b85caac03bfb623c652b4fa files/kernel-26-fix.patch 816
+MD5 d41d8cd98f00b204e9800998ecf8427e files/isapnp.rc.empty 0
+MD5 1bd9ddb0959318fe56dec239c8265fb1 files/usb.confd 291
+MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r2 151
+MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r3 151
 MD5 d8a0d8878d8904a779bda401d86268b1 files/firmware.agent 1188
 MD5 7c4681458effb34f299cbc4b9245098c files/hotplug.functions.patch 522
 MD5 13767799826493eb3260822359b35a18 files/hotplug.rc 1017
-MD5 9c876c8880bba306cbf8892253ada03e files/hotplug.rc.empty 1076
-MD5 d41d8cd98f00b204e9800998ecf8427e files/isapnp.rc.empty 0
-MD5 9f13f3363b85caac03bfb623c652b4fa files/kernel-26-fix.patch 816
+MD5 26bdc7a660920610447194535ff8b341 files/hotplug-ifrename.patch 837
 MD5 92547b2263d5423d874565504d2324f7 files/usb.agent.diff 886
-MD5 1bd9ddb0959318fe56dec239c8265fb1 files/usb.confd 291
diff --git a/sys-apps/hotplug/files/digest-hotplug-20040923-r1 b/sys-apps/hotplug/files/digest-hotplug-20040923-r1
new file mode 100644
index 000000000000..9910c869236c
--- /dev/null
+++ b/sys-apps/hotplug/files/digest-hotplug-20040923-r1
@@ -0,0 +1 @@
+MD5 1542af9cbe1053cfde9421007f702cf2 hotplug-2004_09_23.tar.gz 44802
diff --git a/sys-apps/hotplug/files/hotplug-ifrename.patch b/sys-apps/hotplug/files/hotplug-ifrename.patch
new file mode 100644
index 000000000000..969874e1d07f
--- /dev/null
+++ b/sys-apps/hotplug/files/hotplug-ifrename.patch
@@ -0,0 +1,15 @@
+diff -urp hotplug-2004_09_23/etc/hotplug/net.agent hotplug-2004_09_23-ifrename/etc/hotplug/net.agent
+--- hotplug-2004_09_23/etc/hotplug/net.agent	2004-09-21 01:02:34.000000000 +0200
++++ hotplug-2004_09_23-ifrename/etc/hotplug/net.agent	2005-07-19 20:12:15.000000000 +0200
+@@ -53,9 +53,9 @@ add|register)
+ 	    # This needs to be done before ifup otherwise ifup will get
+ 	    # confused by the name changed and because iface need to be
+ 	    # down to change its name.
+-	    if [ -x /usr/sbin/ifrename ] && [ -r /etc/iftab ]; then
++	    if [ -x /sbin/ifrename ] && [ -r /etc/iftab ]; then
+ 		debug_mesg invoke ifrename for $INTERFACE
+-		NEWNAME=`/usr/sbin/ifrename -i $INTERFACE`
++		NEWNAME=`/sbin/ifrename -i $INTERFACE`
+ 		if [ -n "$NEWNAME" ]; then
+ 		    debug_mesg iface $INTERFACE is remapped to $NEWNAME
+ 		    INTERFACE=$NEWNAME
diff --git a/sys-apps/hotplug/hotplug-20040923-r1.ebuild b/sys-apps/hotplug/hotplug-20040923-r1.ebuild
new file mode 100644
index 000000000000..f1a725a0b9a7
--- /dev/null
+++ b/sys-apps/hotplug/hotplug-20040923-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923-r1.ebuild,v 1.1 2005/07/19 18:34:28 brix 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 mips ppc ppc64 s390 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}
+
+	# patches go here if needed...
+	epatch ${FILESDIR}/${PN}-ifrename.patch
+}
+
+src_install() {
+	into /
+	doman *.8
+	dodoc README README.modules ChangeLog
+
+	cd ${S}/etc/hotplug
+	insinto /etc/hotplug
+	doins blacklist hotplug.functions *map
+
+	exeinto /etc/hotplug
+	doexe *.agent *.rc *.permissions
+	# 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
+
+	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 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."
+}