Tie the upgrade related messages to the correct versions for bug #440462.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

4 files changed, 20 insertions, 12 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 21afa4409af9..85814916cc4d 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.734 2012/11/01 20:01:21 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.735 2012/11/01 20:40:19 williamh Exp $
 
   01 Nov 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
-  sync live ebuild md5 rules with 195.
+  sync live ebuild md5 for default rules with 195.
 
   01 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> udev-195.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index af49fd9089da..9b5216b92ddd 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -43,15 +43,15 @@ EBUILD udev-191.ebuild 11032 SHA256 f7a1e68b1d5d4b21e075e4f0475160e36abf478a91ee
 EBUILD udev-192.ebuild 11032 SHA256 420ffcca68b32ca0ff066509e66937ad3d2f5336e8f2a144b0b4d91efad00594 SHA512 47f40f9e048fcb593787dbee3a3b1012acc4fa4f9fedd0df1e840c6a9a813f18e45bc6f482fcf6fc1113d1d14809b142ca31362cb28dc950a08d7eda4ab991bd WHIRLPOOL 64f46e9ff83e54c6225b73f8761554ee589eb0c2d23c889e1ff9ee2611a451450b467fa66f25abf9060d8b824594786f9d5cd643289e244a56ad874bd9461294
 EBUILD udev-193.ebuild 11033 SHA256 6e3d701b54d1a7b685cc637aea3420770affe94b9d355e0fb7eb5db95d9b4ab2 SHA512 de0c107ad032dd077118b95ce9b2f82e5d85696e9446f5999fd923e43382fcc3b53797d27a2c99d2bb276265c95624d5f9e3055416fb8a08ad2b09b03dc063b8 WHIRLPOOL 9d0c6455ff66b1b5408fd53590326e23c242d7198840de2b6b6563c20b39f85993cb942ecf67501743e5d78031d489108250693e6d903fd99ab3b63f6b8a4c5d
 EBUILD udev-194.ebuild 11082 SHA256 8df89a558f8a06ca00b85002c34b5eae34bb30f06adef0c9cb02fd6a8b1e7521 SHA512 8b90291ba59e47e2bf26f59a2d7ead9c782c61c4f17b669cccb192297bf1070e72b948a8f444cb1dbfd5098ace6e52533f90d08af3a3bad0eff6f29676e981ae WHIRLPOOL 17501224f0594776619f891fbe3f84afb329fcda970bf57ae64adb96bdbfddccfa1eacf6eceebbcfae60372e2692a8511997ba72abad6134f60a4d2818156e82
-EBUILD udev-195.ebuild 11225 SHA256 10ae71337a4ba17bc6acebbcd54506323a03cd0fa9c3d9a476428d8fdb1d74a7 SHA512 84d0a12d70929c9605be65d29c73817dfab0ed85dbecfd94c24703008d902c01bda121c11b6cf0a7419996a656b7071faeed742982f8959f77e21409586a4260 WHIRLPOOL 5508b166215443be521a51a66a207fedbf6e5e759186db99a75f56edfc0efb95453e6a8aa158e73e6258d1f05c816def63bb03a92e1998ffd010e60e309cf004
-EBUILD udev-9999.ebuild 11226 SHA256 fcfe441ea34090ebd12481a411f469e3418d9feb59f7c41945575dc4e177361f SHA512 ab97712c83748cac37f08924987adb17b2adc29b92ed1edcd7d5f77b3b7a4d96fea8212cb8138c1077d8c093cbea5b935a6c04b4576fd6e8b57732d33045d0bb WHIRLPOOL 51a330e92aa683cc2f97f2f44c7a0a4679276704c470886db90bc69296d661f3f913d9602c2131c2ef930d0b7285f92800bb7bbda24638ecf41ca8b59af2fbb9
-MISC ChangeLog 42780 SHA256 82acd96843434cd4e15f814c0bf783ed1ae2c4f7bece30e35130603a5c881c20 SHA512 9479fd622ba1f3e8757ad5650a8ee4974ca8d1be76b72caa843c0ac7bff9d5adcb39907c8af3219e251c064e784fd6a8b2feabd036fdbff4742355b65d15d621 WHIRLPOOL ca9ebfe90bbe94d170c37bd716ceef9cc2d1a261adf92081f283da8029b1a0d1f7376dae8b3d4c0cd476285b2cc4383003868e7a93c86c477e50a5fee5c2c921
+EBUILD udev-195.ebuild 11382 SHA256 28246c16d441ef96d98a0824040d445ce43425a36928a87dc6b1ad66f6190d32 SHA512 7e644f9e88433871ae675aaaa8f1a9a093488cff39a2aae26cc36a263d051ebfba6fd2fe5b4106e87e84225ffdfe1abecded3189940372f99e28bcfced65fa1a WHIRLPOOL ae6fcf97d44746e3a4fc493c1803eb418e5bd93668c5657ab7eb865b93cc041c565fe8d803f0077a3c8bf2ee21b1479b23999c75679efb6a5bc5d4a74f392c6e
+EBUILD udev-9999.ebuild 11384 SHA256 e6738e5c5068d4469ae66a31ee06319f05f94768012a8bba1eb301458accd77f SHA512 0ef690e75c005b122d008c4dbbfbc70a69b9298f5e4f412a796fca212488083d066e7fb2c15100e458c0e171efc6a9491992a91ca6bd29f04ac1e9babca9e211 WHIRLPOOL f7591b1777062a4d296faaa2b07720ef483c3a48e79413852dae68aeb03a887a13e33d0d2b518f3740ca1080c2b5d72db5c365824306d8aef0d5e4e4b8ea0980
+MISC ChangeLog 42792 SHA256 13dd4ae143cd8d78211b9bfc907a217622f679b0aab04e9b836f4079639983cd SHA512 32a1705dc8a747d724fa064730031d45378c5f10d993c5737a07c64a1f7d695d1b2b90dd133c8e6df2823012cf468860077fff28d841ef5a3e41ac03d656436a WHIRLPOOL a7d61c199bda457f48fdafbf606a7d293a1cbd369fda9bb9a0559907304daa713555726619dd2c3d8be50e324030515eeb93c86eb7525458e6b7651f1489b57f
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1219 SHA256 0ae3dd9577e914a82f647c359681a278220520270fe4ae1a4dbd7ea0c0071945 SHA512 bab691cd1183391798ef4bb1997c995573a30213afdd2565fbf3f33c9dd7953a915e40a9a8a2963b47f8950e97707e0204f41847f891e99cac8ec0db067d7b57 WHIRLPOOL fb116da30e0c1fbd84ec8eda60d2677ed9972a2144138f4b3e6bddb11d2a38b117522417f3c7c445801bfe9461cb870560a4019df1c7fd36b646ee0ebf9a06a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCS1RkACgkQblQW9DDEZTghSwCgvNHZtVjvpEHVp13hwqxD61ct
-srkAnjjkmxZgcXkkXy7Ub9i/MF4RNJWO
-=n2NV
+iEYEAREIAAYFAlCS3jUACgkQblQW9DDEZTiIwwCgmj0844F9AJGvrtt73VpgR+Gk
+AuMAnAwLor5TWKnWGUETFzSDHHt10ZEb
+=13hb
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-195.ebuild b/sys-fs/udev/udev-195.ebuild
index d237864d79cd..024f6948e887 100644
--- a/sys-fs/udev/udev-195.ebuild
+++ b/sys-fs/udev/udev-195.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-195.ebuild,v 1.2 2012/11/01 06:27:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-195.ebuild,v 1.3 2012/11/01 20:40:19 williamh Exp $
 
 EAPI=4
 
@@ -346,7 +346,7 @@ pkg_postinst()
 	fi
 
 	# http://bugs.gentoo.org/440462
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 195 ]]; then
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 141 ]]; then
 		ewarn
 		ewarn "If you build an initramfs including udev, please make sure the"
 		ewarn "/usr/bin/udevadm binary gets included, Also, change your scripts to"
@@ -355,11 +355,15 @@ pkg_postinst()
 		ewarn
 		ewarn "mount options for /dev are no longer set in /etc/udev/udev.conf."
 		ewarn "Instead, /etc/fstab should be used. This matches other mount points."
+	fi
 
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 151 ]]; then
 		ewarn
 		ewarn "Rules for /dev/hd* devices have been removed."
 		ewarn "Please migrate to libata."
+	fi
 
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 189 ]]; then
 		ewarn
 		ewarn "action_modeswitch has been removed by upstream."
 		ewarn "Please use sys-apps/usb_modeswitch."
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 76c5a12c22b7..baf86bbec34d 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.117 2012/11/01 20:01:21 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.118 2012/11/01 20:40:19 williamh Exp $
 
 EAPI=4
 
@@ -346,7 +346,7 @@ pkg_postinst()
 	fi
 
 	# http://bugs.gentoo.org/440462
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 195 ]]; then
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 141 ]]; then
 		ewarn
 		ewarn "If you build an initramfs including udev, please make sure the"
 		ewarn "/usr/bin/udevadm binary gets included, Also, change your scripts to"
@@ -355,11 +355,15 @@ pkg_postinst()
 		ewarn
 		ewarn "mount options for /dev are no longer set in /etc/udev/udev.conf."
 		ewarn "Instead, /etc/fstab should be used. This matches other mount points."
+	fi
 
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 151 ]]; then
 		ewarn
 		ewarn "Rules for /dev/hd* devices have been removed."
 		ewarn "Please migrate to libata."
+	fi
 
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 189 ]]; then
 		ewarn
 		ewarn "action_modeswitch has been removed by upstream."
 		ewarn "Please use sys-apps/usb_modeswitch."