Fixed installation of udev files (bug #430424)

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 45 insertions, 34 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index c00ba16062bc..50bf6925ba3d 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.143 2012/11/10 21:08:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.144 2012/12/04 09:40:13 polynomial-c Exp $
+
+  04 Dec 2012; Lars Wendler <polynomial-c@gentoo.org>
+  files/10-virtualbox.rules, virtualbox-bin-4.2.2.ebuild,
+  virtualbox-bin-4.2.4.ebuild:
+  Fixed installation of udev files (bug #430424).
 
 *virtualbox-bin-4.2.4 (10 Nov 2012)
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index aa8e1685134c..4d9a0ffa5e5f 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 10-virtualbox.rules 576 SHA256 9fe8aaa16b42e6730a2ebd6cf0fbc9ad0db0f45e06e554cc4ae06b4dfc0045e1 SHA512 e3df0f2dc7530f32f9d6ae4fdb5f354ec1eadcfe3028709b3434ce1f0eb2fb2ad56df680890c02ecb6f18aba2d408f58a1a22b74a2eb20b24a262247a0b875ec WHIRLPOOL 3c067b317fec749e174614173f0840a8ecb285ffa1c4d72869b5baca5759bbef58cfa767cb844cc09a9b578baaf7c9e0bfea99e7b9e0b4cd4b87f675ee68fba1
+AUX 10-virtualbox.rules 576 SHA256 12d1900c59fc92db58d6c32d15130d5b909853e4bc8205898439fd0510d15050 SHA512 12128375244e0fb090674e5a11cc70178f3c6208040830c009284addb91db7dc0a2d3cbd5d1056944782e936a63b0bcef03be0135683646c41d540413805f0ba WHIRLPOOL 489b5221a143f2f5f84f9695d1d3679b75e86b90502706a248e7f20b812709100a86713ca36a5266aae397a588876643f68084b1fdc872f9587571c6b07daaa5
 AUX vboxwebsrv-confd 687 SHA256 6c2a0f9c44476e37dffff75e71ce8a35901d6d881d696ab64c038c2d01bfa6d5 SHA512 403017478c473776b1763ba59cacbd1a52f473bd3ffa98d46d35cb9856c8ce22a1f99f822bcc4beef7eef7ef69db755f9cdf14480ecc884618b2098a5b365767 WHIRLPOOL e6ec83ec63e6835bfbb2e826133b69cc9f2ed9e2918962dbec52ffd900e4eab70c7fab8b5d59254a2c2ddf9bb9422afd0df989e72972b28c09dd646ab0546aed
 AUX vboxwebsrv-initd 801 SHA256 a533b2fa736565f94bcd6f512d69e368057b1f03468c40e7bebdc2642726444e SHA512 62e2ac4c226f90cfec2282b54b6ba49f6e9d0507481c1237cbb25d4d90fbc0cb5a774c04587af596721db1a9af518a43e71c6a817771118bcdc499ae9c639282 WHIRLPOOL 6eab384f09194b48a88510ce4ea35b2acb017ce0d3741f6754e88f7fe99cce2cdb6a2f79c3ab394338f2bc4f1035e786a629d3916043b50d37d920cd810991fb
 AUX virtualbox-bin-3-wrapper 2931 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac WHIRLPOOL b7d7e454cd5642e59bdf973bbfb7f7d52597b32b440630ec4ba08b8b89f91e4e5296a723429e1c9c5c72e6760264d0477e1232559631e54c85c98351cf170db5
@@ -20,24 +20,24 @@ DIST VirtualBoxSDK-4.1.22-80657.zip 8805310 SHA256 89f221ae08863342e7a8da3186135
 DIST VirtualBoxSDK-4.2.2-81494.zip 9714925 SHA256 694fe0bef149e4f0802d2415f914e77e49f897b69316d608f4d7c4ef62acfbb9 SHA512 169982667582534cf160d6049ca8bd9a0f62b1c33c2e4037747eedafecd999218084fb85d8d4af3fca00b8126eb64a6b845e3d5590cd0ab24e0dfbd394ff6e53 WHIRLPOOL 96673147e0a9fa35ded2c84a6e36f1884ac91584824daef0b90f1b137db115cc0dce9837ae15aa5d8a1f6b424db1fc1f24cbf99c25fb55fc68714e64a1519f7f
 DIST VirtualBoxSDK-4.2.4-81684.zip 9715854 SHA256 eb42fd92692746094a03e5bd468e1a87670f3d6806b8d645ecb3d78d2cb80e7e SHA512 e777fdd95bccd23abbd2abcb53bb7fd70221fa82ac875493e87430e3a549f374846de84dbba30874cfbc0021604ff440faec897e3a7415707d3a633ae88e7f52 WHIRLPOOL 1f8eec48ee0c67e3d36352a5e1259dd273b240374b5b5514149dae675c320218d21142195c23e6329edfc44f5d0e413abf4d402591a95dae9fbac731e8234c5f
 EBUILD virtualbox-bin-4.1.22.ebuild 10200 SHA256 a7808430e91ab565a61b13aadd2825881f40c18c67f53a76c7599b7558e76c80 SHA512 b5de9ceab5b3451634614b34407bfed707249369213cb326885713f7749df97c9ee3f8daa0775b4ccdc12c9b8fdf99e8957d215a4c87088c2f83c617e1df61aa WHIRLPOOL f741b990a049a72ed94250e413c2b82a17078b3876601d9525c22186407c624aff41e1de5ded1e7a7cfa918223e4eb1d3010ab79ac2cd46554cc735c89ded21d
-EBUILD virtualbox-bin-4.2.2.ebuild 10263 SHA256 3b34acd8abb972a60e4bead16c1295b3d545dd65831a88ead9c210702f169deb SHA512 b801096a719d90810d92a2de0d789df195abe0fe7c48bbd5da93ce63a01a638cd12c3746e09f1ec21e403f16db5be1221d0295b97310270ebf3fbf9e544e8f8e WHIRLPOOL bc89d3a999ac53b2b6468983c7fcf8fadfa7de14b8ace6a3df13a5b01b66d61f1e8929d10c5a166fd52dda8fcd0ef924be276a4c74516ab000e5674a1fea59f1
-EBUILD virtualbox-bin-4.2.4.ebuild 10268 SHA256 b1bed1a2b038792f1b0820fb1674dd6bbd81291e01c1ecf8810dac0829628065 SHA512 f4cd865e64b665b91a7bd0590ab6a05fdae8684338b00fce383aed0c8ab9986d7712a773c67cccd0fa679d211d39613f113efb667c51fbf7c1e493458eeb2e5a WHIRLPOOL b1d68325e2b1d91c80b747199c9d9ea227fdbdfca4e13b23ab4029406106fb76a2053fa7b603056b663d61d7799ff03cc08375ec0c92ff238bd2c29a591bc50b
-MISC ChangeLog 27769 SHA256 9a7cc6f69e4b97ca406b3cb0df10f1f6e43533282aa52913991bba35cd7fe9dd SHA512 84e985c0446ddb897a2ed24ec9704ca03b4593863c93bfb3ee59383cc989c5f59b32248e42af1a6fdefd5c1f7ff182dda10fa91d120e4906b192a183c5f44504 WHIRLPOOL fddb6b91907fab674470cf0f194b2744f3201ecd5aeaccbe8c61c304948cacd6a2b2ccb99248958fad4ffc903f7385c4cf9a00e3a9f46f4f517f284d76b44d08
+EBUILD virtualbox-bin-4.2.2.ebuild 10411 SHA256 b744f1e9a41cd65853d196571f14af10b1809bf242d773783f2908c745d48df9 SHA512 c2693c56326d4a1b510619e1adbd014bb633f25b386b85a65ca8c93a76b62d290676f7c087d3a3d6b650c310d788fa56c8881758e627cab876f8613d7192b515 WHIRLPOOL 73995a0480ffefe940449ec29ec1efdefeabd569238f98bfb94430aecaf0e14105f5e243c09954f92b6e204b0ac3a3e2c39b09ef9f09a29bef36794612c95ac1
+EBUILD virtualbox-bin-4.2.4.ebuild 10411 SHA256 83c31663aa631f862f0c1446a469b497e879a417e02b5f7b099bf6aa0832b14c SHA512 13617c2bcee29db31c0c631c7a894ac641a05150607f78b20f4df7636ca09dab14d4a758625e9ab97d17935c9dcd612b60fcadac899e6e157770bcdcfc537842 WHIRLPOOL 8e930b50286981fca788dbd2707b8c6d25da641cccf1f233c571cc57aab07f140a6a321d31ad6fbe174d832524a4017d135f4264b777b5839a5ab704cc6a5f8b
+MISC ChangeLog 27963 SHA256 1cc5d476311832cf207afb06b935fd2a9d9da61adbd95aae0585df0c28b44014 SHA512 ff7d1b25c2654eef4d5d6dcb52f7e253c864730688dfd4eaefcb71c12e7feb2356cb3aa010fbd52600856b2da437359f121848ba4b4046162d8e12bedd6c7a2c WHIRLPOOL 7437258162d41a9266faa75256304fbc3854f671dde08a913b9305a6ca9d4d9c6fc496d42cce0314ff881aaa538af3c098da010528b31aff3b7d7ea070e45504
 MISC metadata.xml 755 SHA256 bc86ac6086292fc36509d35b59b7872a70f0874ce07de68d26910450603b7ae2 SHA512 e7ec4edcf66f0263a18ce4a2c825ca11f75e4a08318ecacd29dd40305b241fdf703c0f1ab4702e97accb963c28d7657e7a32ffe5b7a29652b6b06fd77ec6beff WHIRLPOOL 019268a60ae2ca01a2e0c4c3bb86504a755f68b9fa7b4884da316d16f625cc0bfaa9fdd4b7f05578c4491870cbf621a11aea4075d6bfa69f7a542097ddc14e08
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQnsJXAAoJEPiazRVxLXTFwMgQAIgdTXaD/gK35gMfc47xdB+D
-AAimyBq09WSEK3TuzPaPHGJCRMNcIZns712tSvAJLSS9j2PxfiZK7Y8kFrlhOMMs
-mrsTBI8B6y9o74LSE0Tn5oTIjIF6W0Lr2KTXm/862JEx397UyE87hR678phz8xWM
-D3drCkfwQaB17ZrpoaZ6blhk2+1g+6QPtkxjLnCCVsy51M8dkT19XL9lUyor9GD0
-U+CqtaAw8K8cQZg/C+Yi2xWWrRpNz3koZDsagCbj9UQ7BjaKGW1fT4z/OV7uhNGl
-mfN79XZaiRHfOa5HpckebFAxvYxCxvYMmEj7Y5xU3F+sNwPjdAR1gjtvFfcGoNY7
-KbAoMYnoyCkhRV/bFmYs7JyQQhvWaWKEXcc6izZsXrXyLZbLZ0Bi8F5LdvqV+KMs
-HPiFKMRvkd9GKE0TXiLy/NfY8/V6H9QW/ASG9JunmZ3Gfc2q8oCepMe17ypih8M9
-vMLiJBsqwWF7lzp4OPR3J7XgCah2vTJNV8NqsFvJNti16VQBZYTMwZ8E/zbtKME0
-f3vxSl5wOh0fKNetLzV1tlm5yE6XD40NIWzaUcUzzIDqmG0Sz+uFBECtL2tr7xAg
-cx6MqYJEXqpPWFhV1znxyJOkEbo2CpW2SI12M7L3Aw/1U4Z1ZRQX4z1Dh+RcwUgB
-uVZqILFKJB+dl1NF6gwW
-=dljb
+iQIcBAEBCAAGBQJQvcT+AAoJEPiazRVxLXTFksoP/jVA866r4/mgUAXEwWjmizHo
+JEoURDrSvaXw7bUG9Cy44tywtRkWgzEwbFH4FKE3eQl8Q1OY7PwfefpVVWcAUsgx
+MhidSNkwgwzM+8Pht3LnXdOvvRo8IlYVzP4lwDoO16EO/mqDJn049T39zYCbjcdY
+72CFfqOuNjQ+pYIyCtGmuCV5SbhlcUcRAN4NGRUC2jKou9IP6iNremvYtSPS/VkR
+/vJNDjklIZSd0SUFmBo0rVmJYKUUn/gPpbPDLoWChvRuJIZXNbFtDA+5+pDOTJ49
+czINjOCCYZcqd0saDD/IhybvFkTH6wVWtb+0mWcH8PgeT0fAh7l5RAfUNe4H0ojZ
+VRbDkBqqPlU5/FxXHBmNvloHTaO0MpLdRDyLfnot4jpoo8NqtWmqzZl4vTLgbk3P
+gveUg2PHtGuzSm7wwSveXywMMH+lQp42brM6sjoHAeoF1yweMarTQg5lghfPlYfg
+JiEu+lS0D4KkcnBvUaG4KjiIbBxZA1bvvn7M0gf5UVf7AVgmph3EZ7LYyFQ4E92+
+OY9zI4EUmYZ3J1pfcNVmSFtvx7/9KZkulMopVxOiBcp7bMZblAF29yPViYvhKvXp
+Ko+677A4MeIGrJ5ZaNiR5AI+TDI9CIlpZ7cqgtaJJPPj6TZ+BIx6nPktNBhm5GAr
+bQl/rOWedT+ffPINkN3Y
+=1oyt
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-bin/files/10-virtualbox.rules b/app-emulation/virtualbox-bin/files/10-virtualbox.rules
index 8efff249f8fc..014c164a37f5 100644
--- a/app-emulation/virtualbox-bin/files/10-virtualbox.rules
+++ b/app-emulation/virtualbox-bin/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-bin/virtualbox-bin-4.2.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild
index 23fca6d11ea0..73c45ede2bec 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.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/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.1 2012/10/24 04:41:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.2 2012/12/04 09:40:13 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/beta/BETA}
 MY_PV=${MY_PV/rc/RC}
@@ -307,11 +307,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.2.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild
index 7103010e75b7..b2217d8a768e 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.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/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.1 2012/11/10 21:08:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.2 2012/12/04 09:40:13 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/beta/BETA}
 MY_PV=${MY_PV/rc/RC}
@@ -307,11 +307,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() {