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

(Portage version: 2.1.11.33/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

4 files changed, 17 insertions, 25 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/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