Use virtual/udev instead of sys-fs/udev wrt #444398

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 40 insertions, 22 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index f2c5574fe5bf..e10607d0b793 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.51 2012/11/29 05:19:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.52 2012/12/03 02:03:03 ssuominen Exp $
+
+  03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> zfs-0.6.0_rc10-r2.ebuild,
+  zfs-0.6.0_rc11-r1.ebuild, zfs-0.6.0_rc12-r1.ebuild, zfs-9999.ebuild:
+  Use virtual/udev instead of sys-fs/udev wrt #444398
 
 *zfs-0.6.0_rc10-r2 (29 Nov 2012)
 *zfs-0.6.0_rc11-r1 (29 Nov 2012)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index f6f9837bb861..a861c3f8ed70 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,12 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515ea7ca3c1a401f831 SHA512 e7ccb7179c4c455c496daab192099d7553674b9505801e25a2ea8c67a1b4de15d68ac99b2c3347c1f3454f88ede7694f08da61c5d061f0577bb1594ca4a90f12 WHIRLPOOL 79dfdc9c80a707f6bb39bea51ec451c16b821886ce3e84c73a249313d991cf8019f0647b0fe439754fc1ad08cb294bf4c245955fdc4af30286a8afd61dba21ba
 AUX linuxrc 225 SHA256 69c5f407ae20a5e3000dc6389f8c75ee97e11c353489a00cb619134b103bf538 SHA512 b8f311a9ac9008d4f3b30bb2b7ac0144aec6029245ddb50a32fe0b485c9df96db23569d30de502d31d944588513107e6144b535249b704b90b586a2593dd5200 WHIRLPOOL 9de672c9b2a44fa5daab5c48d988465797a1b6fdb5431366969a0172e733b4933bac6ca256977331862e9410c474431b26cf50658fbac1d9b3282e65bf3f83e2
 AUX zfs-shutdown 1452 SHA256 bc65bf8f0432fd0267020ae5a049046d6f0e0fc953e1757a942b52f8024dfcc1 SHA512 9c87dddc65826f1072764deb57d162ee5a813f0f38feb0e1ce424dedd8e776e97387cea0805ad3671778493b7787841175167c2154f8796cb642abd436063550 WHIRLPOOL 54c7e98b2d96222250800c15b6aaf581b034661e4d1d32166f8352dce8cae2d958344949e9b6740f061dc5c158e55858a21dc97f8f35f59a2b9fcc0390120c71
 DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
 DIST zfs-0.6.0-rc11.tar.gz 2099538 SHA256 4701f9d32d3475650068d0c07b968f0de443103d73db315b4f328c296cd6a073 SHA512 4bd2fc3cd5eb89f64b7b92a16e416edb245b0a9b90b5e1aa3bd1560c7d568322de03fdb40ede2d8417b0b642bbf70a1e804d51e4537babbfa9c767271b701138 WHIRLPOOL c56034028fd7c21f516ceb268cc25eeedd129a2a7cb8c1615f43982a86bb4400e80ab74159c4fc5d24a79610e2c0935f54cbc33c447751f29cecec882bfef89e
 DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c1501f0159c80a1b1ff961b6f137d6 SHA512 55f0d9ea9f085d78a4929250949449ec4329a71c00ecd6fe76322716b64dc1152d93a23bb8b18e4ba7e1fbd6110b170366763f730c1e5006998aee3870e3635e WHIRLPOOL ea8fbe2edb2e0029affed261916d10ef350129c496b71064d34749b805d83c1531d886a55802839bb4226e298719f708f6816ee5411626b431b1d506bbf10232
-EBUILD zfs-0.6.0_rc10-r2.ebuild 2552 SHA256 f0464b71dbf385bf0fade40c74f799649779a95d66208b2ae2daef089e463715 SHA512 259dd93385a2533898075545b9d16f35d6f612ffb0f0552c789cedb6a817cf34a9e6064223f6ab8a672535cb239e4b63ecf802274bbd47d6658ac0133d99ef62 WHIRLPOOL 4a40cef10dc348e05531409bcc8f2482c8d184a32520d968a8e449d7899f78163e3b2b9758580916e9b0fb5f202a7f89f1164ecbb01884da128548494230ae85
-EBUILD zfs-0.6.0_rc11-r1.ebuild 2552 SHA256 a004ffdf610f0f61ed1011d1075805d6893e3369d45e4cb69aabafde20075587 SHA512 35c02505fde4af3c388565e7f6e8574af30d893ba0f9959e3b6083add7b0f9d706fe81cc10bfc5c8752098763c656544ee7d64264b81e70d3004b96f6fb95c15 WHIRLPOOL aa699120bd0522e1f3672d922c2819e22ed77fa7b2be15ba4ca8f3a5163bf4b8e236d733ad6c39ebc0c53357e334ec1862317f9f7c616eeeac450bd0177a924e
-EBUILD zfs-0.6.0_rc12-r1.ebuild 2552 SHA256 4cbc47405e696a73b006c5a386d9367cc8075cb244882fb2c6d8dd8b30b187bc SHA512 7c637db052a39525c2820fba83aafe61a4c4babb66acd67cd10797c38df5e97bb4a4d8bf6bf6976b124a13cbf206e14a8dc12dd6acf3b411ded398bd940a6893 WHIRLPOOL e2e49503abd21aa80a5de690279eb96268ee5d45dc4ee7c048f9eaeaad4a73fc3e3b5e7497de7345513e251fb02d061975d1aeddd890aaeb9c5e4ce5f190e295
-EBUILD zfs-9999.ebuild 2544 SHA256 57f43d9cd944ebcba355b59b087554f418bfeab91af7ab23a22476e9936241d6 SHA512 b53bb77e2a0af86bf09adaf789431ddaabc6b9359e9581db6848912c7ab0f84d7872140127c3b01dbf5bf60eb07ae3543ee71923a549dc415f0a593b466eeb50 WHIRLPOOL 7ea93a6d1bc8a7a3ee285825d98d07b56540545d255c124d8efe2cd1304432d716271d07bacc5947b45be4004991e688e58329b6989467e526cdb58f04bda9f7
-MISC ChangeLog 9445 SHA256 2cdc30a4e983265a813d2f25116ad31cc86c58421fa24ed30551f7f8d2318416 SHA512 ba3c1a834b7ded323785484e77692cc1f52d35c26d5147b3f699725c1be2407dfe1e7b7e1e6eca288c3a705e4f1fc21701bfa85ded1d3e54b13e61ebe70d850d WHIRLPOOL 1c494919998a7529a650da0a850ab7fb4424136e02e8146fc3a3e5ab37a4769564def2c11b0c9e3d3769505a5714c54646fe37e941fc94c1352f42601a58ab8f
+EBUILD zfs-0.6.0_rc10-r2.ebuild 2536 SHA256 e8209abe6ee924893caf05d91ecc763e549d641d6fadfed5655605ed42650289 SHA512 9c4ef1493820a09756539418adf78a83f7357719b2ac2f781850991455ee8d61d2571dbd5aa2bc9447202d758a99de5a6cef35bdc383ecd81d4f0670a34d865b WHIRLPOOL 6e0ad0283c1b5cca4f26edf34edb853460967a2c0f4a569e2a3772808f7310ec0183f31f479a0578265a8223749129e89e8cab5338f849e7478665742be99b6a
+EBUILD zfs-0.6.0_rc11-r1.ebuild 2536 SHA256 ba705d0a8800d0fa55e0bc0d79b50aaf392bb573d3d46c5572a67efb07d41a69 SHA512 35db2625eb7b6052da43ad2ac66eb0b68883e2c215f2fa69dae0e811781de09ca12f9f35a712660d24150d1382f69229aa3a9f746f580fe9aefc937d31af7ef6 WHIRLPOOL 7f8916a6584ba7438282486af066e48e4222ee2867aecb8389b4fbd79e38adbe5c61edeb65b717d4207db86702c0f43296ff0d18e7521aaa90d1a81b8b9a502e
+EBUILD zfs-0.6.0_rc12-r1.ebuild 2536 SHA256 737ecfc9869a1ab1c9b653cc15feba5f81cb95bb8c433108f74cb43d95794fec SHA512 750e0f57a2664ee077e2f8b794adc60c4347b605cfdbe53ffa8210b19c4849d276d67467889fc026e6077577d74cd0b0e69e5c81ee9c5e433af8221c2e11e27d WHIRLPOOL 68cc05dd53f8b58b36879d045d4faebcf39f0339e394dc5bca3e89777ba136b9e9339524b3fcf486f840f8e1a84bf771c33f655f8ad30211d436accb14814434
+EBUILD zfs-9999.ebuild 2528 SHA256 fe33d29e7e10a27fa9d326daf070e211da2f5b4a6446b8027ebd70ab91f22fdd SHA512 30f4d76f13e5d323a4f7ebe3f126ce962a7f827924e8319bdfeb81d982b67aa219de7ce4d6f2028ed26916bb1d8c05a6ed4e8b02a90cfe44b932b48e02437b74 WHIRLPOOL 193012ae7ec570c3b14b75f57cde145d54974ac53aefb16d7f3a2c72a8eb776cd082f78cffa93713e93b9d1587f8c1a842f9ba9379992f10390b15cae48a3da0
+MISC ChangeLog 9656 SHA256 a93a7d745bb2e025c8ada99866fe7a2f2ae379e3d5e5b18e6f9dd18dec604170 SHA512 f67654c743bb429eb57f5cdc5ace1a3b976d59b40e2f14c9f4cacaddde1175fc08ae290b02824e91466d2effc96cc42077543c4d7bcbd8aae917bbedcec15093 WHIRLPOOL 28e1f8843dd512853324eb3d989693efbcc4c2c23172590c7e4b1d4beeab2cdb7aa019fe9692cbc92ce0f76472bd4971286438bfcef8dfff4ac19582a8297854
 MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQvAhZAAoJEEdUh39IaPFNFp4H/208If7yK/NXpOLWq1/RIFx2
++Fzx3aK4PmwpveWWPlFtbyQwd77UriDvmemjJV1J3NLHExyUNq2VFsI2HMgwu/we
+nKfO/JnDB6MIRGgz+h/3jXhipevvAl6npMqdRD3a+767/WC7IG/WsTYCLfyUR3As
+XVdAyU936/EfEekPJ+730JbFJ6o66RY95S3LKdwb8Wr1yS5TA9SeaMdCrdIyvMyd
+Oek6jK2FFLT0n1F3vKmrY+9LFEx0bt64VZQKfcDaJfURMNhz5D3CfaIH57voESzh
+961fmucy3Lo3yMNIxYt3Xv+nxl8MsVwIJnQl2294N9ChHk95AM9/weX/EwUds4A=
+=+FSf
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild b/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild
index d2b03867be50..ab71dc45953b 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc10-r2.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/zfs/zfs-0.6.0_rc10-r2.ebuild,v 1.1 2012/11/29 05:19:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild,v 1.2 2012/12/03 02:03:03 ssuominen Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ AT_M4DIR="config"
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-2
@@ -41,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 	!=sys-apps/grep-2.13*
 	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
 	!sys-fs/zfs-fuse
-	!prefix? ( sys-fs/udev )
+	!prefix? ( virtual/udev )
 	test-suite? (
 		sys-apps/gawk
 		sys-apps/util-linux
@@ -75,7 +75,7 @@ src_configure() {
 		--with-config=user
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+		--with-udevdir="$(udev_get_udevdir)"
 	)
 	autotools-utils_src_configure
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild
index 2bd803e46d22..1c7630cfcc68 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc11-r1.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/zfs/zfs-0.6.0_rc11-r1.ebuild,v 1.1 2012/11/29 05:19:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild,v 1.2 2012/12/03 02:03:03 ssuominen Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ AT_M4DIR="config"
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-2
@@ -41,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 	!=sys-apps/grep-2.13*
 	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
 	!sys-fs/zfs-fuse
-	!prefix? ( sys-fs/udev )
+	!prefix? ( virtual/udev )
 	test-suite? (
 		sys-apps/gawk
 		sys-apps/util-linux
@@ -75,7 +75,7 @@ src_configure() {
 		--with-config=user
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+		--with-udevdir="$(udev_get_udevdir)"
 	)
 	autotools-utils_src_configure
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild
index c8f43abbd3ed..e6518c866817 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc12-r1.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/zfs/zfs-0.6.0_rc12-r1.ebuild,v 1.1 2012/11/29 05:19:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild,v 1.2 2012/12/03 02:03:03 ssuominen Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ AT_M4DIR="config"
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-2
@@ -41,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 	!=sys-apps/grep-2.13*
 	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
 	!sys-fs/zfs-fuse
-	!prefix? ( sys-fs/udev )
+	!prefix? ( virtual/udev )
 	test-suite? (
 		sys-apps/gawk
 		sys-apps/util-linux
@@ -75,7 +75,7 @@ src_configure() {
 		--with-config=user
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+		--with-udevdir="$(udev_get_udevdir)"
 	)
 	autotools-utils_src_configure
 }
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 165d3daab502..fdc762b92763 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-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/zfs/zfs-9999.ebuild,v 1.38 2012/08/31 18:07:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.39 2012/12/03 02:03:03 ssuominen Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ AT_M4DIR="config"
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-2
@@ -41,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 	!=sys-apps/grep-2.13*
 	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
 	!sys-fs/zfs-fuse
-	!prefix? ( sys-fs/udev )
+	!prefix? ( virtual/udev )
 	test-suite? (
 		sys-apps/gawk
 		sys-apps/util-linux
@@ -75,7 +75,7 @@ src_configure() {
 		--with-config=user
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+		--with-udevdir="$(udev_get_udevdir)"
 	)
 	autotools-utils_src_configure
 }