stopped udev-postmount message from showing unless it should, bug 492574

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 17 insertions, 23 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 7fdd36aa72b5..5185bf25294b 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.97 2014/03/28 18:28:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.98 2014/03/28 19:06:38 axs Exp $
+
+  28 Mar 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> eudev-1.5.3-r1.ebuild,
+  eudev-9999.ebuild:
+  stopped udev-postmount message from showing unless it should, bug 492574
 
   28 Mar 2014; Michał Górny <mgorny@gentoo.org> eudev-1.3.ebuild,
   eudev-1.4-r1.ebuild, eudev-1.5.3-r1.ebuild, eudev-1.5.3.ebuild,
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index a05cf467c9a5..00b985e9ec5e 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -11,27 +11,15 @@ DIST eudev-1.4.tar.gz 1712371 SHA256 66da90fdd228444b7ac1868d36f1c0fe52476b966e7
 DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506db5483e3d2e88f725396c57b SHA512 c00f34d76d76ebd5c2862310a2ba3d7bf2f8d348a96e0120ed02aa9014857df736e3a2280a4478e50f2537cabc9082b8f5f5e57ef7b3cf925fae6dc3a4688ddb WHIRLPOOL b3fc943f6c3eaeba92aed72dee417738a840f4176182e08f7564a1fd34baa3cf2a52787ac8e936f74f6c13b7896eb929a2f83cf087b8b09e5b8c7d7858471dd5
 EBUILD eudev-1.3.ebuild 7914 SHA256 f57d07aba9f1a7bc84a0b76ac688761ceb2632c4b930d3fb98d808e121efeeec SHA512 865c91af87f2b3c91c0963a5c6bc1da6f6b9b3e519b5dea6a3170fe5f4d4f5dc44a5c84d19f05383f802a91dc249c65650c2051014d73fe86c7eedcc7b9695da WHIRLPOOL ac0c66c725665c4958f1ec34602f4ecc347cc5130d4ec3640b5098e3ffa28c44f72fa359a507e7b7a292b71901bbf0ca3dcb01b2aef491d2e76daec51b192219
 EBUILD eudev-1.4-r1.ebuild 7926 SHA256 dc5527b9ec52225551440eecb22951a4297b234c3b9e0903697f3c142773d8ec SHA512 797ff003314fd1c7488443f8207bae905ba92f0220fa470f23abf0dac50324935e855df9cc384d27aaf420cf69b59c64b0fff36bd6c42b2f4c164fc4780cad57 WHIRLPOOL e112de4793a9fe7084df9f10ab2084466bbbd13c7493ddfc2d2b802b0bbf5853fb176c7ba9e727b4b55c91dd5809096b9de6611c68d8b7fc87811bdd6e0d7da1
-EBUILD eudev-1.5.3-r1.ebuild 7981 SHA256 a9b4280301e257b02c2b8a6cd5558d12bc3dbbafa6b5fbc71c5dbdd8b20f015c SHA512 3c939d0605ab9c24dc48fe908b4b50b7072cb50c8baae3deb5807be96964ec4f94187518f121d45aa533a5c70eaacf6787c25f9a583eedfa9d0929f75a4b3491 WHIRLPOOL bedfc0f26cd899e47995c22e686f099fdcc1c002c093f12c0bbcbc4bbc00d6ed59cd7e147fea92cd39af3927c79124aa72257ac0fd6d6b8e759f22cde5993411
+EBUILD eudev-1.5.3-r1.ebuild 8091 SHA256 35e64218d3275566babc71f170aa84e5c86298ece815ba179e039cf0b3ac9f07 SHA512 7f872d0eb0e3f1a383435c7ef4dd34db56aad4353e19866c6c0c7047f946e371b37b8a9b356b1f99efe2d17c1344a8347499eda5e34ef648266e9bdb637e48d2 WHIRLPOOL 80063625997b052e585de8345d671b5e623b1c2448cba30e3018635c647c96333dbab8d1d2d940070d01d5970371dce2df3ff9a379ca5d2904382069c8e0e882
 EBUILD eudev-1.5.3.ebuild 7925 SHA256 1815a64d8c7423e1b55bc1d4ed86f1c8d3c7e043370d567d19380b1af19d3d0a SHA512 c6c9bb9beab7a24b5e1ae6409fa4d4c355efade9d3964761f7a65aeac40b913996e32f644b68ab2d254ce7980f17304392595f6864647ce33f9f3f35d48a63fc WHIRLPOOL f2ef7d595214dc2de2408631602696e7a098e5d05d2f5f6286cce0140077829ad67b40cf806f46d263cb5bbc830d8d4f70ff6261934075e4fb3dd5ebb63b2bec
-EBUILD eudev-9999.ebuild 7978 SHA256 810866719024ffa1c91b8a3836c826e7035994354db8dbc9852c74daf5a7fc30 SHA512 fb7200c3da70971eee991cfff8a19415f11be4888c40f98b07873637e17cca1d7973f988bbe3a24c9e162b34ab50b907c1d18b20fae597e28bbeec181cfff93e WHIRLPOOL 609e4840a665765540957a942ddbb7868664e2eec0f667698b30a6deaed9283cac0128965ac38e0ad464222157963c8a80c5efb884178c7823d40d046b01b398
-MISC ChangeLog 14847 SHA256 839aef067ca1b4f58d34dcc2087487f754e19ba97d256d6368aa47c985678757 SHA512 b0e065b5987a030fe59b76a9fae9998544e722aa84d8f54ed12cfe8e6a1fce372ea9b222893e4510f8e481ef3f817bf02f01d0cc5a89765b781b0d776d2c32a3 WHIRLPOOL a37e400dff3f263aa3661ae37d4fecba63ed34eb087e8fd7189d8b1acdd24da979b0fa1a0886239f41f6467a8e39dd7d129bd9a25e7b41ca9f424480b19c102f
+EBUILD eudev-9999.ebuild 8088 SHA256 053aae282e8e903a86415d89ffc552e424acc9dfb614d89a8e3e8c2c8cad7bce SHA512 df64612a05c6b23a643e3035459bfec44074a8d3e6dfd69ccef0e5c2ea0817334451f9131d116c3653438719f20739d76fc344cd60b59cc36b66a39ce94b24fa WHIRLPOOL e6ffcdd2b22bbc1fe0b026f864d700015dd60694337d00ab7160fb55463ce52b558bf91d2aad8e249036b3c4a2eb0cc8b7936c830275c16cf9d991bcef4a67ef
+MISC ChangeLog 15021 SHA256 b63bca881ed73307f584b82c66eee85d7031e4edc0b1f507a83899690e47c562 SHA512 26bd8440ccbac3aefc9661e79154475e0e7ab092079eedbd20d4cfda499f5aaa3c89f49183d7604fab870264de37ef565467cfbe43303991848171ff10947287 WHIRLPOOL 9c9a4fbc0b0ba8ae9eae43f7dfaba31da6e046acbca8357dca9e117452a92a7043b1240ea4e52d7f12f408b727eb7d19817d5d2c3c1b161816e08f26f29453a4
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTNb9aXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVDYP/i4YnDVPXmqKvikh1nWHO8e4
-fvNc4VzHlM+RjfZFcN54k8LcPyrymn86H9P42FhV/B1eLP9v6hKZ74o24EggqP59
-50TlqtHWOUVtBZnt6FcWx1DkVmhQw5CN48yZAMq0/76GGpsLuNU31VtalwE2Kv/z
-MOQmWdedbHWfKKmDS7L9p0YuF0EKr4dbJbxrsoxgqIWOzWeKa81Qny0JnhujO3YY
-40zd3EtwWumj/yhLIX1VYneqQWGDNcBBPbIl543xk9ypsE+HXR01HZeGhTVwo8WP
-eyvwvHSi8+udkj4JF0iCGob3a1EqXlJ2cNG2pgE/sTJCWppnb27OeLvw35HKM1eR
-n9c930G0uDphyo1VO795HGSrUzsk7Ee+IGbTM5RWWwSMZJRKdFfh2Bx66Q6PUjdo
-hMcdxMcmK2pVWqi8aVAbmYNLkUuHgMhpn8A+U56fxOFcfWflXIqbYdn5BOrlKHDH
-LEz8Y4m4CIbTIQBFK5adPtD8/s90Rw9kB56U6KRoLwWfynqiAlZHr3iVNzL3w9gR
-E05ria5oSaYL0BXRcg6au5nDwvQqfe0tXwlHObkMi9VGng/vmVWNfGVlGSPlE/lu
-UcWwmwOsmFcvORXeLsNb0oQ3wDuGGkOmzQrnoh6hPpg1dDkRW+thYtUyHzhSH6CF
-DWaSK0Y5oFYZSt/wy0QT
-=0sOT
+iF4EAREIAAYFAlM1yFMACgkQ2ugaI38ACPDJbQD9H6340kHnBqfwlepGQVsoLpDC
+AVldgr7m3ZQ5GmcNNG4A/1HljmiWeNCrXq2I02mOHIyJUrZl4muEcwzLluFejjJL
+=i1ct
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.5.3-r1.ebuild b/sys-fs/eudev/eudev-1.5.3-r1.ebuild
index 3aa83e7358ad..33dabeaca491 100644
--- a/sys-fs/eudev/eudev-1.5.3-r1.ebuild
+++ b/sys-fs/eudev/eudev-1.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.5.3-r1.ebuild,v 1.2 2014/03/28 18:28:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.5.3-r1.ebuild,v 1.3 2014/03/28 19:06:38 axs Exp $
 
 EAPI="5"
 
@@ -268,7 +268,8 @@ pkg_postinst()
 	ewarn "upgrade go into effect:"
 	ewarn "\t/etc/init.d/udev --nodeps restart"
 
-	if use rule-generator && use openrc; then
+	if use rule-generator && use openrc && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
 		ewarn
 		ewarn "Please add the udev-postmount init script to your default runlevel"
 		ewarn "to ensure the legacy rule-generator functionality works as reliably"
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 7843c09354df..b57228497f3d 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.45 2014/03/28 18:28:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.46 2014/03/28 19:06:38 axs Exp $
 
 EAPI="5"
 
@@ -268,7 +268,8 @@ pkg_postinst()
 	ewarn "upgrade go into effect:"
 	ewarn "\t/etc/init.d/udev --nodeps restart"
 
-	if use rule-generator && use openrc; then
+	if use rule-generator && use openrc && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
 		ewarn
 		ewarn "Please add the udev-postmount init script to your default runlevel"
 		ewarn "to ensure the legacy rule-generator functionality works as reliably"