Remove redundent 10-udev.hotplug symlink. Noticed by Walt <wa1ter@myrealbox.com>.

Package-Manager: portage-2.1.1_pre3-r1

3 files changed, 23 insertions, 17 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index b5da2e1680e3..bd5d2de4f5be 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.207 2006/07/17 08:36:43 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.208 2006/07/19 17:13:39 azarah Exp $
+
+  19 Jul 2006; Martin Schlemmer <azarah@gentoo.org> udev-096-r1.ebuild:
+  Remove redundent 10-udev.hotplug symlink. Noticed by Walt
+  <wa1ter@myrealbox.com>.
 
 *udev-096-r1 (17 Jul 2006)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 3556c0b32f76..8cb15657cefc 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -287,18 +287,18 @@ EBUILD udev-094.ebuild 9801 RMD160 5ab88ac3e905955bbe07a1906de72c6c8e32821f SHA1
 MD5 d35ce48bccd8ace599349522e66de23d udev-094.ebuild 9801
 RMD160 5ab88ac3e905955bbe07a1906de72c6c8e32821f udev-094.ebuild 9801
 SHA256 3e3a0697372448ad89edc405b754d3afec97429b274a481a58e45aa025fabb87 udev-094.ebuild 9801
-EBUILD udev-096-r1.ebuild 10322 RMD160 183018912ae7bb2664f488d5c66cfaf8288315b9 SHA1 66e7a207b9d0975238e702d69dba567363fcf148 SHA256 ec497ba26b3db2aa307d0f23ff7bdfc5290f7a16ea21098e6782be303389438c
-MD5 e1046cf7ef1bfe655d95a57a9f717e37 udev-096-r1.ebuild 10322
-RMD160 183018912ae7bb2664f488d5c66cfaf8288315b9 udev-096-r1.ebuild 10322
-SHA256 ec497ba26b3db2aa307d0f23ff7bdfc5290f7a16ea21098e6782be303389438c udev-096-r1.ebuild 10322
+EBUILD udev-096-r1.ebuild 10367 RMD160 db6e12d63017be087b72fa624c9d7c7bc9adf02d SHA1 5aceac8541f1f9bc9d73e9fa82863a4de51b92cd SHA256 8fc5a7acc2767a82ad0234cd9d8548c6e867d87672825eec42b02d7918bfae6f
+MD5 0fd83c9654bd023368b23094b9fc98fd udev-096-r1.ebuild 10367
+RMD160 db6e12d63017be087b72fa624c9d7c7bc9adf02d udev-096-r1.ebuild 10367
+SHA256 8fc5a7acc2767a82ad0234cd9d8548c6e867d87672825eec42b02d7918bfae6f udev-096-r1.ebuild 10367
 EBUILD udev-096.ebuild 10307 RMD160 7dc41653172abfdaa5586d132abc0a94fb847111 SHA1 11302b105fed6a5dea33b1b4a15d18c2cfdcc4c8 SHA256 e9d18a4e46f7cc6c2b42cf177456091a8c0d8c9956b84286fa9ec7a83120ae66
 MD5 a8874c0b3e034a179db407819bea9cc6 udev-096.ebuild 10307
 RMD160 7dc41653172abfdaa5586d132abc0a94fb847111 udev-096.ebuild 10307
 SHA256 e9d18a4e46f7cc6c2b42cf177456091a8c0d8c9956b84286fa9ec7a83120ae66 udev-096.ebuild 10307
-MISC ChangeLog 37461 RMD160 5d82fb5660728d86e53534fdedc444da6ec8607b SHA1 11028d9c56739713b61b94d97585e1c6bb7aef11 SHA256 159a73761bb72bec0b1a95787e952269a3341e84c4269d75e5728814c145e928
-MD5 f4711952f60b1e7c54e3a88b921b1b9c ChangeLog 37461
-RMD160 5d82fb5660728d86e53534fdedc444da6ec8607b ChangeLog 37461
-SHA256 159a73761bb72bec0b1a95787e952269a3341e84c4269d75e5728814c145e928 ChangeLog 37461
+MISC ChangeLog 37620 RMD160 3f26dbd3b4913c5e81f97d956cbff8030531d56c SHA1 7700c6f83f2dd21ced602748d1c6448190e1a821 SHA256 f9f142c36ac6cc001983dbc785d29221d1c0a29bdbf80fa271bab4aaee79fab7
+MD5 0b1d487e32773c2513a5d158b834fedd ChangeLog 37620
+RMD160 3f26dbd3b4913c5e81f97d956cbff8030531d56c ChangeLog 37620
+SHA256 f9f142c36ac6cc001983dbc785d29221d1c0a29bdbf80fa271bab4aaee79fab7 ChangeLog 37620
 MISC metadata.xml 260 RMD160 f1b0916156eade656b558b7507109b69ed78d394 SHA1 3e34c50d52c32d6524b8de2d553e62a40798c043 SHA256 31722725c8bf774ad90600f7a3f50f2ca76c1396aad6888ce1cc08ce981b1552
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 RMD160 f1b0916156eade656b558b7507109b69ed78d394 metadata.xml 260
@@ -399,7 +399,7 @@ SHA256 fdb17aa32ce5f0da94e52fabc03d2ae82db45cbfae2edb4cdc0c51023a5beee6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEu0yj1ZcsMnZjRyIRAlQPAKCK71FuwOzHtdqh0w8K4sNo2/F5eQCfRsuG
-au3N5yVT69sKNEWM/+5Niho=
-=Pq8D
+iD8DBQFEvmjY1ZcsMnZjRyIRAh0bAJ9Bl6BQb+UCPMCAcSW8PJQEzfZTlwCfUBju
+nW/U9GcBgr5jXAoqoofHpTk=
+=VnhR
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-096-r1.ebuild b/sys-fs/udev/udev-096-r1.ebuild
index 7ab4a4367582..27d5c4ee3aec 100644
--- a/sys-fs/udev/udev-096-r1.ebuild
+++ b/sys-fs/udev/udev-096-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-096-r1.ebuild,v 1.1 2006/07/17 08:36:43 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-096-r1.ebuild,v 1.2 2006/07/19 17:13:39 azarah Exp $
 
 inherit eutils flag-o-matic
 
@@ -144,10 +144,6 @@ src_install() {
 	insinto /etc
 	doins extras/scsi_id/scsi_id.config
 
-	# set up symlinks in /etc/hotplug.d/default
-	dodir /etc/hotplug.d/default
-	dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug
-
 	# set up the /etc/dev.d directory tree
 	dodir /etc/dev.d/default
 	dodir /etc/dev.d/net
@@ -196,6 +192,12 @@ pkg_preinst() {
 		rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
 	fi
 
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/10-udev.hotplug
+	fi
+
 	# is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind)
 	coldplug_stale=""
 	if [ -f "${ROOT}/etc/init.d/coldplug" ]