Fixed udevdir in rules file (bug #442742)

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 24 insertions, 8 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index c2bae6adef8a..fae12b41b15a 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.135 2012/11/10 21:10:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.136 2012/11/12 18:19:52 polynomial-c Exp $
+
+*virtualbox-4.2.4-r1 (12 Nov 2012)
+*virtualbox-4.2.2-r1 (12 Nov 2012)
+
+  12 Nov 2012; Lars Wendler <polynomial-c@gentoo.org>
+  files/10-virtualbox.rules, -virtualbox-4.2.2.ebuild,
+  +virtualbox-4.2.2-r1.ebuild, -virtualbox-4.2.4.ebuild,
+  +virtualbox-4.2.4-r1.ebuild:
+  Fixed udevdir in rules file. Thanks to Cesar Garcia who reported this in bug
+  #442742.
 
 *virtualbox-4.2.4 (10 Nov 2012)
 
diff --git a/app-emulation/virtualbox/files/10-virtualbox.rules b/app-emulation/virtualbox/files/10-virtualbox.rules
index 8efff249f8fc..014c164a37f5 100644
--- a/app-emulation/virtualbox/files/10-virtualbox.rules
+++ b/app-emulation/virtualbox/files/10-virtualbox.rules
@@ -1,7 +1,7 @@
 # create second tree of USB devices according to
 # http://www.virtualbox.org/ticket/7759#comment:5
 
-SUBSYSTEM=="usb_device", ACTION!="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb_device", ACTION!="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/app-emulation/virtualbox/virtualbox-4.2.2.ebuild b/app-emulation/virtualbox/virtualbox-4.2.2-r1.ebuild
index 44e0ed9ad89d..6235eb1fdcf9 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.2-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/app-emulation/virtualbox/virtualbox-4.2.2.ebuild,v 1.2 2012/11/10 21:10:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.2-r1.ebuild,v 1.1 2012/11/12 18:19:52 polynomial-c Exp $
 
 EAPI=4
 
@@ -176,7 +176,9 @@ src_prepare() {
 	epatch "${WORKDIR}/patches"
 
 	# missing files in 4.2.2 tarball
-	cp ${DISTDIR}/{qt_fa_IR.ts,VirtualBox_fa_IR.ts} ${S}/src/VBox/Frontends/VirtualBox/nls/ || die "Failed to add missing files"
+	cp "${DISTDIR}"/{qt_fa_IR.ts,VirtualBox_fa_IR.ts} \
+		"${S}"/src/VBox/Frontends/VirtualBox/nls/ \
+			|| die "Failed to add missing files"
 }
 
 src_configure() {
@@ -331,6 +333,8 @@ src_install() {
 	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
 	insinto ${udevdir}/rules.d
 	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
 
 	insinto /usr/share/${PN}
 	if ! use headless && use qt4 ; then
diff --git a/app-emulation/virtualbox/virtualbox-4.2.4.ebuild b/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild
index 3649f6e8278f..2614a669ad32 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.4-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/app-emulation/virtualbox/virtualbox-4.2.4.ebuild,v 1.1 2012/11/10 21:10:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.4-r1.ebuild,v 1.1 2012/11/12 18:19:52 polynomial-c Exp $
 
 EAPI=4
 
@@ -326,6 +326,8 @@ src_install() {
 	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
 	insinto ${udevdir}/rules.d
 	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
 
 	insinto /usr/share/${PN}
 	if ! use headless && use qt4 ; then