virtualize udev by using udev.eclass to determine udevdir

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

3 files changed, 11 insertions, 13 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 3dc03afb6c41..ed281b59e9a6 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.328 2012/11/06 23:17:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.329 2012/12/11 16:31:40 axs Exp $
+
+  11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> alsa-utils-1.0.26.ebuild,
+  alsa-utils-1.0.26-r1.ebuild:
+  virtualize udev by using udev.eclass to determine udevdir
 
 *alsa-utils-1.0.26-r1 (06 Nov 2012)
 
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.26-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.26-r1.ebuild
index b286b517222e..1ee974246d76 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.26-r1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.26-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.26-r1.ebuild,v 1.1 2012/11/06 23:17:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.26-r1.ebuild,v 1.2 2012/12/11 16:31:40 axs Exp $
 
 EAPI=4
-inherit eutils systemd toolchain-funcs
+inherit eutils systemd udev toolchain-funcs
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -38,16 +38,13 @@ src_configure() {
 	local myconf
 	use doc || myconf='--disable-xmlto'
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	econf \
 		$(use_enable libsamplerate alsaloop) \
 		$(use_enable nls) \
 		$(use_enable ncurses alsamixer) \
 		$(use_enable !minimal alsaconf) \
 		"$(systemd_with_unitdir)" \
-		--with-udev-rules-dir="${udevdir}"/rules.d \
+		--with-udev-rules-dir="$(udev_get_udevdir)"/rules.d \
 		${myconf}
 }
 
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.26.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.26.ebuild
index ce31c46d49f0..6b5309fe4d12 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.26.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.26.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.26.ebuild,v 1.1 2012/09/09 09:10:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.26.ebuild,v 1.2 2012/12/11 16:31:40 axs Exp $
 
 EAPI=4
-inherit eutils systemd toolchain-funcs
+inherit eutils systemd udev toolchain-funcs
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -36,14 +36,11 @@ src_configure() {
 	local myconf
 	use doc || myconf='--disable-xmlto'
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	econf \
 		$(use_enable nls) \
 		$(use_enable !minimal alsaconf) \
 		"$(systemd_with_unitdir)" \
-		--with-udev-rules-dir="${udevdir}"/rules.d \
+		--with-udev-rules-dir="$(udev_get_udevdir)"/rules.d \
 		${myconf}
 }