use udev.eclass to get udevdir, to support virtual/udev

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

5 files changed, 31 insertions, 29 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 8f9735e211f8..811681dba5e6 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.95 2012/12/10 13:23:51 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.96 2012/12/11 18:17:36 axs Exp $
+
+  11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> vzctl-3.3-r1.ebuild,
+  vzctl-4.1.1.ebuild, vzctl-9999.ebuild:
+  use udev.eclass to get udevdir, to support virtual/udev
 
 *vzctl-4.1.1 (10 Dec 2012)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 9fb129e54561..6f42f938107e 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST vzctl-3.0.29.3.tar.bz2 421448 SHA256 1af2a6c61ee39e9f51128dd1b78b5d1adfaa12b41f74da0276c49102c262d2e7
 DIST vzctl-3.0.30.2.tar.bz2 425118 SHA256 c100914ec10db7cce6114bb8fcfdf67dd406d0547ac07ea8d2994e6ca7299635 SHA512 2487482c96666bf73e961bb2849fafb54463ccf63b44dfbb7c5e6cedc19a7d029bcb66d902d67d1709b8899f61e014d938c150dcfe7b560800710d78ac6cf8f4 WHIRLPOOL 045826e689244d8fc5b60d32a5c0f26ae713693afc3f823b7d5229477db730c25fbea69edeb41de0add55362fc607e09eeb79dedb13d5705f530ee5372bf5c45
 DIST vzctl-3.1.tar.bz2 442684 SHA256 c2b3f37df56613bdd137dbc7d144d146e7f6737bbfae9490458056c7ff8e31ca SHA512 0a49a2a67ec47542a48da6ca43f1fb46d756378cde2453d128d1a8ebcaa7f8814d2a94f0d5dfe9f3e70c72b0aca01704f367d8ffd387bb4afccc2a33b63e5347 WHIRLPOOL fb07e83c2b82d04de0ad9d9cc9f70f733cb97c367d26f8f0862f6626eb2a2e6350cad2f81f9af2fa103b91a4e35075393bbae8174fb09cb8db1e6ccafb0209b2
@@ -6,9 +9,16 @@ DIST vzctl-4.1.1.tar.bz2 470133 SHA256 d0249a9f61ec3afbca54eb34dc8743be3ff2777f7
 EBUILD vzctl-3.0.29.3.ebuild 1644 SHA256 24ac616e9ca8d26a479e908ae4f7754db26d63ef4265ff5480cb01e9b12c8714 SHA512 608c2d3ee525bf480eb93cf3abfbecd0e5e36546cdfaaefe62b541b7687f254f74a2be64a7460e8104deb1edf7463a5ea2bb49de06680c7da93a23b2ee303eea WHIRLPOOL c21d6141baa116680a7fca92a28c17abb810815de9448ec3dbc60e3830aa2ba9362a45acc4e010f111dce27e1cbf018ae94e571a8ffba8e6abf2d2ee786e974c
 EBUILD vzctl-3.0.30.2.ebuild 1616 SHA256 4ba3695d31139f2b4c2828fd6038274f5f5821e732c4f27e4bf9f2a1feb91835 SHA512 0a84524f0e6a623eed9c33b1499f64062fe4f5a45cc0aacdcf62243b6fac3f8e471f7d4bf48bef68d1edb18eb6b39c35f39cb8f1d38d40bcf26de78f65fc48de WHIRLPOOL f8f4d6e14a5b98b4a3a6a725990f71db0d416d9d6615420733d03e1e72b31c5f6dfe90f15a61c10c26330e49a92cfc0f020925a3bed7be57d13851190bc7894e
 EBUILD vzctl-3.1.ebuild 1629 SHA256 c75acf1c39a6197260e23301bdc3e90a2e3c15bd74853a2ff86652d1f8dc5ece SHA512 a12f09c174cdb18f81315f4b127242c41af787e23975fca1de2f318c3108c8982a6f8d7c7eb120b5a085ea4ad4e43f3cf57eda0eb82845a6c5b8c444db299d2f WHIRLPOOL 432d967eea2c350b2105deeee158b4c881d0f5ffe4a54525bd13b59b52dc347a3f2f30a58f6a3971dcce0a93d31915a40a7f27e5f0d0d85c38eb30354f2d02df
-EBUILD vzctl-3.3-r1.ebuild 1975 SHA256 b728beaf9578ef684471a1225650b7a72661d64b1940415432a4a78bfce6c120 SHA512 c24cf6783b1af8452bf0fbc8cef4abdec8bf82f0765a66030f6c4d1bc431faf82edf34bd9ceb5ea43f4c87c912d5557f77132cdd76f5a5ae5517379ba2f44df5 WHIRLPOOL bc1a837c9b1e06a65cf1318934ac4119368380c7f90cb304e39eb6c9bb368a6b18830c26ad0e19f7086977867ee17df468f0a81524b2933377e92c83a374bb99
+EBUILD vzctl-3.3-r1.ebuild 1773 SHA256 69323206a93e38436ee5fa1ea1dfbb073dc29a0b2f167385eaec0d723162b6d7 SHA512 82507078ab387064b86bb945053ec7a50a8754aa1cfc45e8b80bc3603dd0dce68b3b8ab46008967e2119503296f3ca61d5f3eebfbf633b60f2ab71e43bb1759e WHIRLPOOL 793641374925c844bd126895bfb0da3aceb0ad90859cb6718a0c78366af66ff3a255791535518e637e4aa2f954dc6c36b0fbe6bf28df1bf15fd11aca20618caa
 EBUILD vzctl-3.3.ebuild 1703 SHA256 cb4120c9d9a9d4caf212228454cc49b353d0209b620c86bf688aa654dcb3d053 SHA512 752d6aa1651a2656c7da16fcf2fcc662f3fd41f1e83a81b235f4de5e9d3761cf31d00bdd8abc3cacfab8084e78910afed5552edbd02549e72660822d2bac763c WHIRLPOOL e5cda5b715e915e6536323de602464480b2df4dd54a914a703a754b3cd78e78622c15e86d7bba15a05713a08646981641727c04a208c8a8ac16c468717d08cd4
-EBUILD vzctl-4.1.1.ebuild 2180 SHA256 7531b50c61b820e1ff27d333f96579f91f76d8a33e5ab3da02233c335fc02df9 SHA512 f256da795ca3db0fba5baf85c5b6a7c060db1873d070bf6156643e7156d2d949d4a4f0166448e3d64311506c3bec8e861ede6c5a6f83d762e175d2697fccf957 WHIRLPOOL a22daa800c17c958b1ac7b910b9bfd857bba61f063c47400fbe9de589aac48bd27398c6ca88109d05bc8550568bbb2eb98b8c64cd4e60bd127727611ecd76fb5
-EBUILD vzctl-9999.ebuild 1963 SHA256 49a86d4a5331a136c7d9bf13721e4c63f0ce6e6a4a1531157f114cb541c55825 SHA512 75da27b7a44aa82a6216a082afd64ff1f8918b02d8aff10f4b7c13df97d43588a8fcb9a8596f2df93fca7ce7ef329f285a435ba1255d27d8d5b1a8602cb7a1e1 WHIRLPOOL 5ff4c7db865dc43c02118c1375ed04693c8d94e87aa63febcf57ecbc9571b8a9f0f0adcfaef9d08f3dab93b9179c65461a41b1ccc9b7b4cce7a002e6409f51c0
-MISC ChangeLog 20028 SHA256 d2fb274e9fcaba708a7475d1c4187ea45d9252c0cee2e2a13f18beb23f794ad8 SHA512 6eddbd8d40b3d5abc5da5179cd63b9c22f68dc31d830e5e8622b33895fa8f0f61829833ff37f235b44f0b49ec5bd80790b81a219b5713f306282b735cd1fb873 WHIRLPOOL 74710adc354716fa9128882d090ee1609aa8da47ce39256f07c15f04fdc94072019fdc806aa426b901853ad5cf82df5f44a85cf46046cfb3565c49c236adf6b2
+EBUILD vzctl-4.1.1.ebuild 1978 SHA256 01f4cdd6a6730d07a804913940e93b9ee48ce4f06097435d7fe8e8b2532b8bde SHA512 5144dde34728afe064607501d39cd8fb66922a71f50c951d579163919c445fb61512a7cbb8c5de9242fa8d0edab20e5db5383b6cbf992749bf692100e92ec657 WHIRLPOOL f046657e70913fc3063479378e6c30fb6f09a7219478d3f5134c5e6622f2c47c2d26cb151c70d9d4d5757fac885289e78241acf1c166fd147de5ef94b0cba06b
+EBUILD vzctl-9999.ebuild 1760 SHA256 14dc7595bec5697b757c6c3f41b030a4696b97ccc99c799bea121155eed3c64e SHA512 e64cd4b7094f03b499b86981971116644c0889d92219b9da787e8d8765a46d8cdd5492acef1eafaa5117a934265a2173dae275ccb6f3112ac8ad3eccabc809ba WHIRLPOOL 265994fd9c2c79d988d88b5d6309e2f1372576000008a88f5de588f6ee9a32e3c3a5649ae90ea7980dac8eb07e0c60489c11f7c1bdbd47cd5794ad2775919e5b
+MISC ChangeLog 20193 SHA256 7a4b2166c68e0a455c4d908fb5114e842ba607e55b71b624d3dd0fa8dfb30ac4 SHA512 ede3d598666625709d74207a67e2ed47829bdb2c3b4e69aa7495eac357df30199b4936962a17d6e68c46887c076cfda4aa71462cfa4c921e0f9556adc8aaffe5 WHIRLPOOL b3a08b8a72ded59824e54497b11033dc49f6ef9a639e7d8bbae831678bd3755864685fe8c0e8025d061f090f64546592f5b9568aaf269a6106d8f6ed5bcf0b25
 MISC metadata.xml 663 SHA256 33959534b64f468d5067d847dc4366a984a7ce9c6bcf701f7cfa44c3f639aa0b SHA512 61aec027e85c81be42306a604252316e92f5e2dd8bfbbd6955c10a6df0b02ccbb54397717fd2d598070c380c712c79b4a2cbfa0ae73ef0673ab8479decda3d3b WHIRLPOOL aa36244bf8ce2dc51fa094a5a38be250d6ba97d03611f3be2495c4095f81f24e54cf539b7bb9f1301abb416f717301e48e1f6c3bf9c39ef30646305628d4cacf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDHeM4ACgkQ2ugaI38ACPBsxAD/RPJt2paGAb1TTQdyOf7CPnns
+L27i+i1mb5udodY0rjsA/3pq0LKmaqIIeXA4RIwH9vq0dYG6SdQk/GgXRmQhh8r8
+=ST3s
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/vzctl/vzctl-3.3-r1.ebuild b/sys-cluster/vzctl/vzctl-3.3-r1.ebuild
index a561671fa971..890cbb5f33f3 100644
--- a/sys-cluster/vzctl/vzctl-3.3-r1.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.3-r1.ebuild,v 1.2 2012/12/10 13:06:59 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.3-r1.ebuild,v 1.3 2012/12/11 18:17:36 axs Exp $
 
 EAPI="4"
 
-inherit bash-completion-r1 eutils toolchain-funcs
+inherit bash-completion-r1 eutils udev toolchain-funcs
 
 DESCRIPTION="OpenVZ ConTainers control utility"
 HOMEPAGE="http://openvz.org/"
@@ -29,9 +29,7 @@ src_prepare() {
 	# Set default OSTEMPLATE on gentoo added
 	sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s:/lib/udev:${udevdir}:" src/lib/dev.c || die
+	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die
 }
 
 src_configure() {
@@ -43,9 +41,7 @@ src_configure() {
 }
 
 src_install() {
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	emake DESTDIR="${D}" udevdir="${udevdir}"/rules.d install install-gentoo
+	emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo
 
 	# install the bash-completion script into the right location
 	rm -rf "${ED}"/etc/bash_completion.d
diff --git a/sys-cluster/vzctl/vzctl-4.1.1.ebuild b/sys-cluster/vzctl/vzctl-4.1.1.ebuild
index ac3ddc6c274b..048fcd1148c4 100644
--- a/sys-cluster/vzctl/vzctl-4.1.1.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.1.1.ebuild,v 1.1 2012/12/10 13:23:51 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.1.1.ebuild,v 1.2 2012/12/11 18:17:36 axs Exp $
 
 EAPI="5"
 
-inherit base bash-completion-r1 eutils toolchain-funcs
+inherit base bash-completion-r1 eutils udev toolchain-funcs
 
 DESCRIPTION="OpenVZ ConTainers control utility"
 HOMEPAGE="http://openvz.org/"
@@ -31,9 +31,7 @@ src_prepare() {
 	# Set default OSTEMPLATE on gentoo added
 	sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed'
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s:/lib/udev:${udevdir}:" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
+	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
 
 	base_src_prepare
 }
@@ -49,9 +47,7 @@ src_configure() {
 }
 
 src_install() {
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	emake DESTDIR="${D}" udevdir="${udevdir}"/rules.d install install-gentoo
+	emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo
 
 	# install the bash-completion script into the right location
 	rm -rf "${ED}"/etc/bash_completion.d
diff --git a/sys-cluster/vzctl/vzctl-9999.ebuild b/sys-cluster/vzctl/vzctl-9999.ebuild
index 1f6e19510088..587d4bbdd44b 100644
--- a/sys-cluster/vzctl/vzctl-9999.ebuild
+++ b/sys-cluster/vzctl/vzctl-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.11 2012/08/11 13:57:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.12 2012/12/11 18:17:36 axs Exp $
 
 EAPI="4"
 
-inherit bash-completion-r1 autotools git-2 toolchain-funcs
+inherit bash-completion-r1 autotools git-2 udev toolchain-funcs
 
 DESCRIPTION="OpenVZ ConTainers control utility"
 HOMEPAGE="http://openvz.org/"
@@ -29,9 +29,7 @@ src_prepare() {
 	# Set default OSTEMPLATE on gentoo
 	sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
 	eautoreconf
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s:/lib/udev:${udevdir}:" src/lib/dev.c || die
+	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die
 }
 
 src_configure() {
@@ -43,9 +41,7 @@ src_configure() {
 }
 
 src_install() {
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	emake DESTDIR="${D}" udevdir="${udevdir}"/rules.d install install-gentoo
+	emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo
 
 	# install the bash-completion script into the right location
 	rm -rf "${ED}"/etc/bash_completion.d