Fix udev-init-scripts dependencies per poly-c and move udevadm to /bin. If someone wants a revbump I will do so.

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

4 files changed, 23 insertions, 16 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9b025d9395b7..48ed50417f95 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.758 2013/01/13 17:58:13 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.759 2013/01/13 20:56:57 williamh Exp $
+
+  13 Jan 2013; William Hubbs <williamh@gentoo.org> udev-197-r2.ebuild,
+  udev-9999.ebuild:
+  Fix udev-init-scripts dependencies per poly-c and move udevadm to /bin. If
+  someone wants a revbump I will do so.
 
   13 Jan 2013; William Hubbs <williamh@gentoo.org> -udev-197-r1.ebuild:
   remove old version
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index dd59e3949f21..26a2daf76074 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -32,15 +32,15 @@ EBUILD udev-164-r2.ebuild 15179 SHA256 e957e7d9bb99f29a20de5f5666c19db0e645fdf70
 EBUILD udev-171-r10.ebuild 16113 SHA256 6ea7a8f6f468c011db876363559be8504ffb6e8c868587cb2e07d67cfd6e3039 SHA512 49b6ee43de09052461b094d2441c2e14f15390fc4839c56e6e58e78e2ac0f7df37e2d8b0b6934c0baf8a153822c9ec416560f7288a9c601759ec58c8e360e0b9 WHIRLPOOL 028762c4c77afa2c3a5c5359e75c92dee59b50e6b369970c5c15e5f3e3ef2bbbe68b9523e3b9218e47b61a395c420eab3a52ae68adb4457bf5b4c3f07701a70b
 EBUILD udev-171-r9.ebuild 16105 SHA256 1b21d6b2fd4af6382ab5cf3c255cb6c2b2f026ffbfbd808db8662b958de30f1b SHA512 efce00bbb87120a476fc2bfd497a460b3656024389fc2ac999dcaac8e95e2450d101038b0838d0a9f8dbc948c4b1f42e6cc3819df2857839564806f7293e5af9 WHIRLPOOL 7e73e343a7778bffdb5002fa0994a3d4e55972d230877d6501afc777717244eb81b16a50e9a28ed698b8842c8b5c44b182825ac9c551217a2401009eb31b1761
 EBUILD udev-196-r1.ebuild 10318 SHA256 59fc1cc0540202d2406c4ad2ddb3d902b17f7fd67eecf8d727901aeee1fd57b4 SHA512 e9871d9d3258867d3f62444bd471b76504affeb1738e1e2059c59d493ab6d9735f3beed3234a9a9f080e1622a23593c85cc9ec80dfe9483b23d37d6cbb46373e WHIRLPOOL 0e58f4f2e68db2667e9e4e9e31eb0e447951b975aaf5f992150e5ed8f92fff35cf9e5766c2fd812c2a9b9d08b15c97c3689181fecbbe6be89dfb4ce488dd0537
-EBUILD udev-197-r2.ebuild 10588 SHA256 d400c96e1aac6755b00a384b3ac62e23784d1050e8dc33faaccffc91da3be854 SHA512 68c4c0d8d00e567f035fdec6ea6724abbb7dff8a408783fa5351ad54597df5b9596b975c61a24b5c3c2b080f3228aa49575bbd77021a5f7f6fc1c3491f81b96b WHIRLPOOL 746838051090080b51e83c31bba3bcef0431147cb9fb1a60e2ddf6a0664035b3b8fc11ae4e7f46aff8fb5a908c80d631ffbde4e2a3fbe53d29c5e11f89d09d63
-EBUILD udev-9999.ebuild 10587 SHA256 457ea69920f558c93e53fe7b6b2702db84a7a4622a92667b10b68025d5cec634 SHA512 6795d57a7c7a64a278d03ffbb6258d484ec8e7720d71d32b5e2036305a2c68512213e2bdbfac54f7cd68f53027ca700687355b6d451f4c67ab9edd49d4c862a3 WHIRLPOOL a3eba20a2a1b38f0b01158f423e819f7ed84b8d5eae16ed9b4f95958848e505d836b8ad44ad7093ee8782e2d0efa5cd999b9d32fb4f36fc3d5606e73a745242f
-MISC ChangeLog 46518 SHA256 2661d036d052dadad3a00a8164c64cee8090e52336006cbee25b4aa5be86988d SHA512 37eef145ff3ce8325ec47961d70976da0c9126bc7067f6f4c1bd6a7b25867ae34f7f534ff38df5580d5896a5c273b385a4dfadd34b7c5a337b929bcf112af203 WHIRLPOOL 455a3cb3df068482387d74505a0e57bde171c6b876e6a0d96209538c454448206a33154b0a120df285674a571fce5fe05c75e94cbef36cfa9ecb16adbbb23c0e
+EBUILD udev-197-r2.ebuild 10611 SHA256 ff190adddd43144e31bb7cd6f60bf3d46472d214f217d07a0653bbc0bf212f46 SHA512 cad0c5590f0be1c2f00db10c1d95a3ee58f84d8154538f85988521615a5cdeec683520fe258a93e07f52464030160d823b98b31be0fdb3aeb5eea014018196c3 WHIRLPOOL c64a6c6bbbd0fc9a39f65f65d06756e3d264823b7d1d127efc64e0860c29002d2c5e5535eee891600512792b847167d13dff65c325e992f1323f6dd40f4d0bea
+EBUILD udev-9999.ebuild 10613 SHA256 216a4baef78f1227130bcf9d42c0bd4df4ad19b85c486ebc4e4c0b747eec5f5c SHA512 0b7faef2fd8313596df66a98e017c0efaff7aa8f04661b184c88f4dc9e66ccef1db0ad138696095baeeefc0cad827866a53268b92643d8c5294a6ffe9a8d0880 WHIRLPOOL 7438b2c6fe2578410d5f38cd81865ab487a3283a4bff75c6f6cf499480a8b5f1835a8d093fe72bf5eabc7ad6b7b302db03fcc6178d43cbf61d266fb8a3095297
+MISC ChangeLog 46727 SHA256 b185ebd7472cbb68ba167c744cb4d0de4dc6b067d781a6cddfcd931039351592 SHA512 696970719396089ce54c94a77029a1340c16d557d7e5c0fee5a19d97abd8ea84bb7aa61859d15b6819c7365e6e8d8296ef0b39f95941e613e49b0084a5960a99 WHIRLPOOL d0c99c9a6aa3d45e93715d241b510a64c32426ec098b5731c2d7be22a5b42ba12738f0446725240a7a4c3ad9e85de1aa3549e8879f80e0a9cd4b9b396dbe2f0c
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1281 SHA256 6315e69296f31468a999b4fbfce2e2a5ff3246d653e5f6337778fd7b068ef790 SHA512 aa5da08d7c6e2c9d20c85b46875c9a5707e173ded718bba6258c68ac2b04e43e0370b5cadac2eae06689cb2f37a7c5bc0406117f4ae519ce55d8230c5a25f5f4 WHIRLPOOL 88cc83f43ad815497b524847ed19a140c171c7a170356f9f3b38330da7ffa86f94b1758803efe2b0d412a2b9106a43fca48bca38d360abe97b909b791b756607
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDy97EACgkQblQW9DDEZTgXEQCgqXd07gOwNrR42F8Wayy8fiik
-JqIAn3EOI73XWjSOX19ID32Tw0f7yrtu
-=Rz3M
+iEYEAREIAAYFAlDzH6gACgkQblQW9DDEZTjqMQCffdbONs7pqIP9mztiF3Ymcm4l
+RdkAoJrXAXmqWsuCXtQBeRiN4yQgQ4Fh
+=7ZBm
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-197-r2.ebuild b/sys-fs/udev/udev-197-r2.ebuild
index 28543bedaee0..9e99c8188fe1 100644
--- a/sys-fs/udev/udev-197-r2.ebuild
+++ b/sys-fs/udev/udev-197-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r2.ebuild,v 1.2 2013/01/12 16:36:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r2.ebuild,v 1.3 2013/01/13 20:56:57 williamh Exp $
 
 EAPI=4
 
@@ -57,8 +57,7 @@ then
 fi
 
 RDEPEND="${COMMON_DEPEND}
-	openrc? ( >=sys-fs/udev-init-scripts-19
-		!<sys-apps/openrc-0.9.9 )
+	openrc? ( !<sys-apps/openrc-0.9.9 )
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45
 	!sys-fs/device-mapper
@@ -66,7 +65,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<sys-kernel/dracut-017-r1
 	!<sys-kernel/genkernel-3.4.25"
 
-PDEPEND=">=virtual/udev-180"
+PDEPEND=">=virtual/udev-180
+	openrc? ( >=sys-fs/udev-init-scripts-19 )"
 
 S=${WORKDIR}/systemd-${PV}
 
@@ -161,6 +161,7 @@ src_configure()
 		ac_cv_header_sys_capability_h=yes
 		DBUS_CFLAGS=' '
 		DBUS_LIBS=' '
+		--bindir=/bin
 		--docdir=/usr/share/doc/${PF}
 		--libdir=/usr/$(get_libdir)
 		--with-html-dir=/usr/share/doc/${PF}/html
@@ -300,7 +301,7 @@ src_install()
 	doins "${FILESDIR}"/40-gentoo.rules
 
 	# install udevadm symlink
-	dosym ../usr/bin/udevadm /sbin/udevadm
+	dosym ../bin/udevadm /sbin/udevadm
 }
 
 pkg_preinst()
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 5126d9b1ae98..c98a012b037c 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.129 2013/01/12 16:36:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.130 2013/01/13 20:56:57 williamh Exp $
 
 EAPI=4
 
@@ -57,8 +57,7 @@ then
 fi
 
 RDEPEND="${COMMON_DEPEND}
-	openrc? ( >=sys-fs/udev-init-scripts-19
-		!<sys-apps/openrc-0.9.9 )
+	openrc? ( !<sys-apps/openrc-0.9.9 )
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45
 	!sys-fs/device-mapper
@@ -66,7 +65,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<sys-kernel/dracut-017-r1
 	!<sys-kernel/genkernel-3.4.25"
 
-PDEPEND=">=virtual/udev-180"
+PDEPEND=">=virtual/udev-180
+openrc? ( >=sys-fs/udev-init-scripts-19 )"
 
 S=${WORKDIR}/systemd-${PV}
 
@@ -161,6 +161,7 @@ src_configure()
 		ac_cv_header_sys_capability_h=yes
 		DBUS_CFLAGS=' '
 		DBUS_LIBS=' '
+		--bindir=/bin
 		--docdir=/usr/share/doc/${PF}
 		--libdir=/usr/$(get_libdir)
 		--with-html-dir=/usr/share/doc/${PF}/html