Stop adding our services to the sysinit runlevel automatically for bug #534704

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 12 insertions, 23 deletions

diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog
index bda0670e0b34..263dc7e98059 100644
--- a/sys-fs/udev-init-scripts/ChangeLog
+++ b/sys-fs/udev-init-scripts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev-init-scripts
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.116 2015/04/25 16:40:29 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.117 2015/04/29 15:26:25 williamh Exp $
+
+  29 Apr 2015; William Hubbs <williamh@gentoo.org>
+  udev-init-scripts-9999.ebuild:
+  Stop adding our services to the sysinit runlevel automatically for bug #534704
 
   25 Apr 2015; Mike Gilbert <floppym@gentoo.org> udev-init-scripts-27.ebuild,
   udev-init-scripts-9999.ebuild:
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index 24bf53a5a93f..a86e9d8bab51 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 DIST udev-init-scripts-27.tar.bz2 3456 SHA256 1a091c361e9845861c138b505881edcb7b68fcf91708db526dff0b320243c936 SHA512 8a526d5252d54c724ad99250141d3ffddfbe6044ff9c9b9c02a4984f03ab6492a8b6a36022b93c7c06b0869b61a3c4dfa82fc47f560e927684fad636f56e4ba8 WHIRLPOOL 270a4ae1053a0303a851d6dcc5b51d2b89c5438b93f85dfb80726d11d61e950ae13e88b6063938f4ea8b49ae7167fb58211b6ce670f8d6c52212aed5da80b339
 EBUILD udev-init-scripts-27.ebuild 1920 SHA256 485aebaa48c8ddf3dc42afb564f885855627ba6cb23d992289c1c8ab061daacc SHA512 fdaaa023444e64c93ea6e01ebc682be58a985e297e2aa772c50c5f59123a9c35e15fde1556716afd5cc0bba45ab7d22db97c23e8d304ccaea0822a93f42e53fd WHIRLPOOL 1d56ff2a498bab5a979af7ad695bcb18caafdd3d75ef203764a60c41d013aeadbd822f93c2c536af9e66c9b3c6f2f441215a77cccab52dd7d76d2db78360a370
-EBUILD udev-init-scripts-9999.ebuild 2387 SHA256 0a316f9593ad7f6fdae37d76aa990a93b1ae9048e278b64765707ef2bb6313c6 SHA512 73751d94315f8a5bc72d12b0a6e9e556d859240db4ba9b4e5cf66337e8b335d69a0c6e67739a6f5af3d2e18aa948505bf2414a059fe79c3ed9d30f6a7498eb23 WHIRLPOOL 3486a20cdbd65e03e41bb17918c91884372b3c20b7f7edfe0aa287aad34b561ebe1b126e1a9e7ef8d4a1ac86eb69af36c0eb7e47a7f1dd7436633ae0a5eeec40
-MISC ChangeLog 17627 SHA256 f3db60afa6f07bb981af2a2b616b33e0488330c40521f8be97b39cf1af836f73 SHA512 20f8cdaa2e71331f367c79265bf5787a631c005f3c56f7474e1d99a99ad5aecf8548d92997991fcf8c78247b0f1141bb531e963ec385f4298c51828b3f8b8880 WHIRLPOOL d43bb43aaab7decfd7bd9ea882d9d175f49460f5cbdac0c6a4428ea8147f5b6bde2c3c24a652bdae30b33e7d591e598891db680caee1be868d40d0b0fd50d0b7
+EBUILD udev-init-scripts-9999.ebuild 1891 SHA256 b692a98567eb3608a2415fd6764a19bea28d83985c65a1e0ea8d2b279d3c52a2 SHA512 45da2ca95c07ac5b5c649bbf37fbe0a5fda2ac0f3208e68bea08d52721c0c7c7fe65c7879836ef7bf4b0c4ef57bf27b16e5e6742f06bb9f9bee20fd8f928b02f WHIRLPOOL 891763b288051dd43a1dcb71c78626e0d51eee3d3810629a3510f5e42957452a1c78424beb5dca68754bdc365cf3260a0cae0273b6431a84868517f8de3c3d7f
+MISC ChangeLog 17794 SHA256 3104ef773fe49ab2d08015fbf83f735a2a386a5b5393d043db425e86a06848e2 SHA512 659a6fb0c2fc7034a591f052734a53ae58c3a7972c1673d86ec2875131ba11ddff102127bdbc9b160eab128cd30a9a76fdb1fb336eb9e03d91828f914e474462 WHIRLPOOL 8d2aad805b5dbfc2cdc02d2181d517c1a9220430f18360d79d1cb786df17722df64e2e3b3b979f06fe658d149aff8c1a7a1561a3c0be7ddb1fa4625e36e12068
 MISC metadata.xml 206 SHA256 e8bae0ea2f16b0ad92858b68718c01ab85b5e6995a35b88c74e4ad9772b9f813 SHA512 f6558663be8014488111639a4eeadc9e691f57f2eb4f3c97d6022a50ab2659fac2df458cefed5e29a6661d59221b15332aefa00c027552a8f4bbefc3988e2a90 WHIRLPOOL b515e201c4f614326c4ee0ef0e13fd9d277e913d96265ecce11b41c9628fa38d1e34f90fab1073527e153a9e2e8929c5fee748a8e5eaf98b58fe15928c8ad457
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlU7w34ACgkQC77qH+pIQ6RwrwD+OAnAjwVuTFeOAV8eztGd6V6d
-o5igunkRfIRWsK7rTGcA/1dTY7RjVA0nAkl+HIJQK8H+tpc8eptZ5TztX602ttrZ
-=1vdi
+iEYEAREIAAYFAlVA+CgACgkQblQW9DDEZTjeZwCaA+xazI9qu/LZ6waPIO5AJD9o
+CfsAnRS2yoAkvt6Q70TCEfP175nkUOoC
+=Z5S7
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 27b6c24ea713..22ba52174de2 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.31 2015/04/25 16:40:29 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.32 2015/04/29 15:26:25 williamh Exp $
 
 EAPI=5
 
@@ -33,22 +33,7 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	# Add udev to the sysinit runlevel automatically if this is
-	# the first install of this package.
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
-		fi
-		if [[ -x ${ROOT%/}/etc/init.d/udev ]]; then
-			ln -s /etc/init.d/udev "${ROOT%/}"/etc/runlevels/sysinit/udev
-		fi
-		if [[ -x ${ROOT%/}/etc/init.d/udev-trigger ]]; then
-			ln -s /etc/init.d/udev-trigger \
-				"${ROOT%/}"/etc/runlevels/sysinit/udev-trigger
-		fi
-	fi
-
-	# Warn the user about adding udev to their sysinit runlevel
+	# Warn the user about adding udev and udev-trigger to the sysinit runlevel
 	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
 		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/udev ]]; then
 			ewarn