Fixed malformed udev rules file (bug #451018)

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)

3 files changed, 31 insertions, 16 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 807ecc358b5a..557bd4423514 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/virtualbox-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.145 2012/12/22 12:25:14 polynomial-c Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.146 2013/01/10 08:28:50 polynomial-c Exp $
+
+*virtualbox-bin-4.1.24-r1 (09 Jan 2013)
+*virtualbox-bin-4.1.22-r1 (09 Jan 2013)
+
+  09 Jan 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-bin-4.1.22.ebuild, +virtualbox-bin-4.1.22-r1.ebuild,
+  -virtualbox-bin-4.1.24.ebuild, +virtualbox-bin-4.1.24-r1.ebuild:
+  Fixed malformed udev rules file. Thanks to C W Rose for reporting this in bug
+  #451018.
 
 *virtualbox-bin-4.2.6 (21 Dec 2012)
 *virtualbox-bin-4.1.24 (21 Dec 2012)
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.22.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.22-r1.ebuild
index 53bd1efa1fd1..7d42e455cec3 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.22.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.22-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.22.ebuild,v 1.3 2012/09/17 20:12:44 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.22-r1.ebuild,v 1.1 2013/01/10 08:28:50 polynomial-c Exp $
 
 EAPI=2
 
-inherit eutils unpacker fdo-mime gnome2 pax-utils
+inherit eutils unpacker fdo-mime gnome2 pax-utils udev
 
 MY_PV=${PV}-80657
 SDK_PV=${MY_PV}
@@ -305,11 +305,14 @@ src_install() {
 	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
 	doenvd "${T}/90virtualbox"
 
-	insinto /lib/udev/rules.d
+	local udevdir="$(udev_get_udevdir)"
+	insinto ${udevdir}/rules.d
 	doins "${FILESDIR}"/10-virtualbox.rules
-	# move udev scripts into /lib/udev (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
 }
 
 pkg_postinst() {
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24-r1.ebuild
index 652786c467fc..71bdc179e34b 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24.ebuild,v 1.1 2012/12/22 12:25:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.24-r1.ebuild,v 1.1 2013/01/10 08:28:50 polynomial-c Exp $
 
 EAPI=2
 
-inherit eutils unpacker fdo-mime gnome2 pax-utils
+inherit eutils unpacker fdo-mime gnome2 pax-utils udev
 
 MY_PV=${PV}-82872
 SDK_PV=${MY_PV}
@@ -305,11 +305,14 @@ src_install() {
 	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
 	doenvd "${T}/90virtualbox"
 
-	insinto /lib/udev/rules.d
+	local udevdir="$(udev_get_udevdir)"
+	insinto ${udevdir}/rules.d
 	doins "${FILESDIR}"/10-virtualbox.rules
-	# move udev scripts into /lib/udev (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
 }
 
 pkg_postinst() {