Hard depend on sys-fs/udev-init-scripts, bug #520224

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

3 files changed, 26 insertions, 23 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index f32b96afccce..9d7d1e09bb7b 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.143 2014/09/19 11:25:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.144 2014/09/19 11:38:04 blueness Exp $
+
+  19 Sep 2014; Anthony G. Basile <blueness@gentoo.org> eudev-9999.ebuild:
+  Hard depend on sys-fs/udev-init-scripts, bug #520224
 
   19 Sep 2014; Anthony G. Basile <blueness@gentoo.org> eudev-9999.ebuild:
   Userland firmware loading is no longer supported
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index fa3bf26a4f68..998a91aceb86 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -17,23 +17,23 @@ EBUILD eudev-1.3.ebuild 7871 SHA256 9747f4fce99ec962f0eacade26606350c8508e4a0274
 EBUILD eudev-1.5.3-r1.ebuild 8126 SHA256 5a50ff7a099f06d1ff7316d28acf9d68243992fea4a3ad0b48ecf2afe36d6350 SHA512 f868ef1c7f05c5ead0924a9fe2af97eaaec12701fc17b2c7de1992fd31817eb6db8fe95d6784fd10ab3d658a2abc22328b3c590526338fc07f2094731a43006d WHIRLPOOL 8990d5e7490653f79d7c9f3bd4ca156510aa6e1dd493c0de368799bb279fbdb252bc13e5161c62821ed64ed63b1d4461d49060ee44eccfa730a1c3997f9c273b
 EBUILD eudev-1.9-r1.ebuild 9213 SHA256 fa156eeb4179435d618a0cab741f1a54ba6c5dc7820639fd6e526a27ccc04976 SHA512 76efef024c024f1663e9b6bd370476264dab2759f29cd3f8b98bf518109ed2d0eb47f600d1791414a796c8bc44d57a1fe7c391fd2f1e3cc190bda5ac45e1b982 WHIRLPOOL e19a74282b537c03f1ac15c8356f62c0cf48a2c3fe2dd40d92553475336cf8b117c342080b646a1627b1bda7781ebd20bde674b1dee8ee542f89f4149fd4cb84
 EBUILD eudev-1.9-r2.ebuild 9332 SHA256 af35f58240456fd1cdc3fec7f1b9ab9ff33bf1e90a129c82a05cc64627092859 SHA512 668f679d03fb23008786b8d231c60eb3ced97ce600ded0cc4f4a766ad0421ab115c7831275b04ff1d90979df35b4780992b2dddb2b505be66d8fd5b6d87a50b3 WHIRLPOOL 427cc4b4217135ce8ce9bd3b957679e9910718ad052c4912d5a10fbe0882bc66c5b9580291e2352cb3aea08779c32ad68c0eef3e9dbd5dcd871505bb45be7140
-EBUILD eudev-9999.ebuild 9143 SHA256 0b518aff706e48b13832b75dea869d40ca330cb5adccea61874d60dc261eec99 SHA512 a2d49d4e9880cc3968d77dbe9bffcd86850a491f01871521964988eb1e3092b6f175b23da5054d1438bd9351c936387e660d6a006c950393d1c2bd2284e494c2 WHIRLPOOL aca79f96d6d4ac739b3a2579ece35796deee7aa8fd312c61716976d0172df21aba92936069f1de354ab402e00bbe3b6bac57a4deaf0481aabde41c3f0b09cb07
-MISC ChangeLog 21011 SHA256 555d1de3b0d2692575a24b4ca1ccbc95b82d08345c9f727251b1b1ee35348c56 SHA512 fe255328ff1c9a722291ff2df78ee1f6918109748c7abd23e8621e3448ec1084cd211ddcf1d07d52d3ee7b346c97ec9f6f7e2394f4df26509f55e1a2bb8518aa WHIRLPOOL f74abb18d1f33d66edbca2b7512396e3de4c33d64d902c7b935245f15a2eedb03ad80d5fea0a7a1ef228d06b7961251288326e9ac574130c3252686ce7fae37f
+EBUILD eudev-9999.ebuild 9095 SHA256 fb0f4d29c2587edac1e143c946750eb54b84fef700342930191ceec89b15e5d3 SHA512 6bb0918cffd4a203d0bba65d2f3413f57c8e021dff8c7b80272edad9483486ca6aaca97a8c715bbfc60c658c932ad3dffb72abd0c0177af227188d4addb77c70 WHIRLPOOL 4fab279533893470f407b27906f7812b63d40c96747af1341ed7bb2a4fcad0d80c617ef0672c42f46603548b5602f9cc0e7930cbd96140923a37aace878975dc
+MISC ChangeLog 21141 SHA256 1161de34ae11018665eaad82680623749d422230abd001d68c4290527a2364f0 SHA512 de0e2f54b0adea9e7307d04112c327d24ac482c4f0163af4ba29c27eff7be687c22f68491f441560087ebe8fa83e6832b5885f08e8b68a5c02fc8604d9a50ec1 WHIRLPOOL 7db4fc575e85962d37b21e11b1b5a92f31a00d1007d9a1cd063cb6fa5a8649816016a01be6bad7793586639248ca59c0abfbe12a48d9a047c71eba6e44b1f18a
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUHBNJAAoJEJOE+m71LUu6VeIQAKWaLc95L82N3T6umE6dsEFY
-PR7iqZtOJm1XAygI54EgeAjTNOE6YNReinOdhVtOxvegIOssgatZey8ICYRJ2D40
-GDsfqQ5MhgS/v+PnSKwTXcyvaCI4QsMFYPCNKbl1Alo5/b+Iy471TDhtqZrjayvq
-9jRm7fb3BF9zugiEl7h0pLstw0ADJU5rbor7Idg+K9cxrmvMqGBpMwKf15tRZ1SN
-XO8m0nuO4JIrsMCb4GI0yoAXoymabfmIYu5124JViWgIcUOjPGTho5QsUv3Wvt9l
-nLh1asrFUEQj3TagLSws5wpMed9bwLlNCWXkbZv9Cl7mVkETPquIYgdt+iSymM8r
-Jb697LJtAhXAq0zuwzRJvoX3jdHai8OkKZTy1I3Pfe8mDkCcY3v+fpRwHUGE1Zxx
-pIlDdHLiRO6G2k9teKTkwBxBda0OiY2ApAwUJ0lRFLaPLRyVECfhAeNqngClxAEC
-YcaLg4aVDomQG5h3q9i6vYQJ+bEbk4X+jFVsd9skbeIFsLq1Vh2AirIW/r621k0N
-deJkPQvj9dG7iPYw65gmrlcJmniguiFq+x2KQg3I6Ci7pjwXNAKJuGVqOhOpTrEi
-ApKI0GUNqHMr2BtglvyDPpjZYgD4IFzy1fFMyKGnCEzfM0T3JAV8X4q4DQ0bPL++
-c/y2Np9pXf0eTej7Fltp
-=mPRU
+iQIcBAEBCAAGBQJUHBZOAAoJEJOE+m71LUu6QccP/3dfqaa59R1b6JHHveklcD34
+XyUNCw2h1XNmjN9XIzHxy0NViBQHMt/6uTuyOk9EPmWRWy5kaIxerpPDN78ClBe9
+y87gr3L1qLta/HP9aboM/s4QfLa8Ijkz9vMtDn0IXcnVKfM6t2m2bu3Z4XKMha46
+klTheKJlAZ7Oxa80ULtdzNOW8DuhS7PCFvq45Z8SLrwX34bA1J1nQleiUd4dx5tA
+nbK7mesP3HbLhBglpu1GLZ1MI+ZXWO+ILeQ9FrbWeB8f1d+4xniMJYD5nVyfDAYX
+k9qNHQphvbAX6hFetwRJmEEWWh5Mvx4+ISJHzQWQMPj5+aCNVGxmEb2ogin6+TxQ
+p9/o4d+x/6teWeV08PebYUQSijUKGdZTuXrQStpl23nPZSIZse1MCfJs0c8e/Uht
+eNZuPc1vCCPdpuBHlYitYBGUIV6IUnyKito5XaW3er049reBX14PZS08NZOIaYAp
+fbhpdgoia/8N9Y1jlvoNKM7qJhH0UpZZ5Rr1or9jgJ0//C0YVOvCEUYii6y2GeFS
++biRPf3CWfAZ2YjDhMDDvwjIWmvbGd6HHhv441JRiHpq+i/eruKBxitXuH9tz/U6
+EHO0kHtBej8el/TlBytryVDnmyupSuveNyqjZNu3Y6TWuRgPh4A2I9QR/4rqMolN
+BG03UArhuyiuKPEGdZRX
+=glYC
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 65dd863e9078..7ad98c66a786 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.62 2014/09/19 11:25:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.63 2014/09/19 11:38:04 blueness Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
+IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +rule-generator selinux static-libs test"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
@@ -55,9 +55,9 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/udev
 	!sys-apps/systemd"
 
-PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
-	keymap? ( >=sys-apps/hwids-20140304[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-26 )"
+PDEPEND=">=sys-fs/udev-init-scripts-26
+	hwdb? ( >=sys-apps/hwids-20140304[udev] )
+	keymap? ( >=sys-apps/hwids-20140304[udev] )"
 
 REQUIRED_USE="keymap? ( hwdb )"
 
@@ -205,7 +205,7 @@ multilib_src_install_all() {
 	prune_libtool_files --all
 	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
 
-	use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
+	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
 
 	# drop distributed hwdb files, they override sys-apps/hwids
 	rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
@@ -261,7 +261,7 @@ pkg_postinst() {
 	ewarn "upgrade go into effect:"
 	ewarn "\t/etc/init.d/udev --nodeps restart"
 
-	if use rule-generator && use openrc && \
+	if use rule-generator && \
 	[[ -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"