Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir() version.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 15 insertions, 10 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 5ac5464e65b8..598f24269a24 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.127 2014/07/27 11:36:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.128 2014/07/30 19:27:43 ssuominen Exp $
+
+  30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> vzctl-4.5.1.ebuild,
+  vzctl-4.6.1.ebuild, vzctl-4.7.2.ebuild:
+  Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir()
+  version.
 
   26 Jul 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> vzctl-4.6.1.ebuild:
   x86 stable wrt bug #507276
diff --git a/sys-cluster/vzctl/vzctl-4.5.1.ebuild b/sys-cluster/vzctl/vzctl-4.5.1.ebuild
index d7cf0e5cefcd..edbe3b76c92f 100644
--- a/sys-cluster/vzctl/vzctl-4.5.1.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.5.1.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-cluster/vzctl/vzctl-4.5.1.ebuild,v 1.4 2014/06/08 17:20:20 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.5.1.ebuild,v 1.5 2014/07/30 19:27:43 ssuominen Exp $
 
 EAPI="5"
 
@@ -38,7 +38,7 @@ src_prepare() {
 	# Set default OSTEMPLATE on gentoo
 	sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed'
 	# Set proper udev directory
-	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
+	sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
 }
 
 src_configure() {
@@ -55,7 +55,7 @@ src_configure() {
 
 src_install() {
 
-	emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo
+	emake DESTDIR="${D}" udevdir="$(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.6.1.ebuild b/sys-cluster/vzctl/vzctl-4.6.1.ebuild
index 584c71fd1fab..5ed8c38c99bf 100644
--- a/sys-cluster/vzctl/vzctl-4.6.1.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.6.1.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-cluster/vzctl/vzctl-4.6.1.ebuild,v 1.3 2014/07/27 11:36:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.6.1.ebuild,v 1.4 2014/07/30 19:27:43 ssuominen Exp $
 
 EAPI="5"
 
@@ -40,7 +40,7 @@ src_prepare() {
 	# Set default OSTEMPLATE on gentoo
 	sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed'
 	# Set proper udev directory
-	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
+	sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
 }
 
 src_configure() {
@@ -55,7 +55,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo
+	emake DESTDIR="${D}" udevdir="$(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.7.2.ebuild b/sys-cluster/vzctl/vzctl-4.7.2.ebuild
index ebcd32cb507c..fb3987014016 100644
--- a/sys-cluster/vzctl/vzctl-4.7.2.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.7.2.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-cluster/vzctl/vzctl-4.7.2.ebuild,v 1.2 2014/05/08 07:55:12 civil Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.7.2.ebuild,v 1.3 2014/07/30 19:27:43 ssuominen Exp $
 
 EAPI="5"
 
@@ -40,7 +40,7 @@ src_prepare() {
 	# Set default OSTEMPLATE on gentoo
 	sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed'
 	# Set proper udev directory
-	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
+	sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
 }
 
 src_configure() {
@@ -55,7 +55,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo
+	emake DESTDIR="${D}" udevdir="$(get_udevdir)"/rules.d install install-gentoo
 
 	# install the bash-completion script into the right location
 	rm -rf "${ED}"/etc/bash_completion.d