From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- app-emulation/virtualbox/Manifest | 6 +++--- .../files/virtualbox-detect-usb-fix.patch | 24 ---------------------- .../virtualbox/files/virtualbox-vboxusb_tmpfilesd | 1 + app-emulation/virtualbox/virtualbox-5.1.32.ebuild | 7 +++++-- app-emulation/virtualbox/virtualbox-5.2.6.ebuild | 7 +++++-- 5 files changed, 14 insertions(+), 31 deletions(-) delete mode 100644 app-emulation/virtualbox/files/virtualbox-detect-usb-fix.patch create mode 100644 app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd (limited to 'app-emulation/virtualbox') diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index 110f4912207e..8473c344c175 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -5,13 +5,13 @@ AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b AUX virtualbox-5.1.4-paxmark-bldprogs.patch 2642 BLAKE2B f8c25139dc58f6f2a9def4c3535457013a8f9ab9065d23ab858daede5d32b90a6387a0daab1fa39fad706f809799ba58405c2994c902d224cbf07118fe1af5b9 SHA512 40971ee2a2453cd830b118ee2d1d05468beec60b5c15fc36b2a01c30a454823bfc666149671f03ccbfd82abe1041e50c7d36d670da506cfb9b9faab9edcc83ee -AUX virtualbox-detect-usb-fix.patch 852 BLAKE2B eeb9c8cbb3c4a9b4bca264a4915e015ebc7768d199ee7dd2f3d316226f967c56bfcba9c58d0911cfa95e68541be3ba394868c8ff714c6f6ca915821b23b3d02e SHA512 e03a32f398a2adf231393a18be1345fe50a1932e20e69ec3ab62977ab6b920c79622e4d6b26604f60e13a5604d919a5b6f757083bff370b8d12c71f6bab1a7b4 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c +AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171 DIST VirtualBox-5.1.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138 DIST VirtualBox-5.2.6.tar.bz2 118530572 BLAKE2B 19d32a9252e9594a4c09828bc2bc739c46daf409745c01f764fb54bc17faa667081a27534ac11666cbf1b417057cb99a416faa42e3986ce4d2c08378e7e7240c SHA512 ed6f801c055e9b8e152118a1ebfecdc15c310fac2b007ea3cd4a404d17cbbbc83782a3baa76b979c72b9399616844291576846d820f8aefb7c4b4ec2eaf36482 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2 DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b -EBUILD virtualbox-5.1.32.ebuild 13833 BLAKE2B 843b58959bed9188c41e07d1803e0bb544951d68f55fa33dd581de20a83aeecbfdb11f7114e8b9a8d7dfb620869d1bfdf01be34ea743043803e1a1cd03ffb57d SHA512 7d82de2232678045015a16b72faea3db334506b67542dffa2df0da35dca2d1cbb1543d61eb3ec3b90f136860f0d886fac08d8514535cc074db528a0fd805ef21 -EBUILD virtualbox-5.2.6.ebuild 13823 BLAKE2B 6319e252b6f6682db8c5780e8e9df7d9ee34ec894741795ab0d33615ba0b6e04e8cb519aedf40f6f72e057a59a6ca4160ca46eeeb991bc6ba85f5397fe3ee1b5 SHA512 f8e68510edaf4fe3db317a32fbc9456a6cf24ec93ec547da46acefc15f94c28c20c23247cd7b89ba69e1c47de020555d090fbed7edfe0de7ce337b7321b960b3 +EBUILD virtualbox-5.1.32.ebuild 13927 BLAKE2B cdadc8c398f855ce9773e445c564dea60b3c88e299fd32499ce701419362ee7baa295cec9c29fa20eedb887e975d7e586e833c1cb65a5f0b3570e8a2664eafa8 SHA512 c8885403b6f3ea6eb8385efa4fcd995d9cdf4292c61b0e1edb6e65c82d4399468f2fe7b64d6a24068018f5a9b66c7c36a092a43382494ed132a6bf160e0f60d7 +EBUILD virtualbox-5.2.6.ebuild 13917 BLAKE2B db1e9a47350e95ff6e088760074d31e792a7044d17d083e7afbe48f2820a3946de7c829adb30598ae140033eed8141aee9f1f143b4c96da52d28b9027f055edb SHA512 8893fcd7272a1acab01620b07bf8bdc50f750cf8cfcd092ad2d2ef156fb46d1ec4e12986cbb1d7b5ecf07a0ee376c662f61dd103ca8feaf6b84467e3784e50a9 MISC metadata.xml 886 BLAKE2B b8d7691c820ac4d8b0aa2033037a9229ebf68ba005b5c870e6d14dee4fbb9b5c0992904223caeb869fc265d48c57cd7f486d628cc4018cc018e8e32999175df3 SHA512 954d38fbbf08cce200af437ee3a0167bd39b4554c53b93d8f8961ac16e21a173fe4c4271fa8bf0ce2e354437c066e0ab4133131b03dac6ffcc2c92564584d081 diff --git a/app-emulation/virtualbox/files/virtualbox-detect-usb-fix.patch b/app-emulation/virtualbox/files/virtualbox-detect-usb-fix.patch deleted file mode 100644 index bbb28943c129..000000000000 --- a/app-emulation/virtualbox/files/virtualbox-detect-usb-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -Patch by Maciej S. Szmigiero to make the script work even if no USB device was -plugged in before virtualbox got started. - -https://bugs.gentoo.org/639352 - ---- a/src/VBox/Installer/linux/VBoxCreateUSBNode.sh -+++ b/src/VBox/Installer/linux/VBoxCreateUSBNode.sh -@@ -32,13 +32,13 @@ - devpath="`printf "/dev/vboxusb/%.3d/%.3d" $bus $device`" - case "$do_remove" in - 0) -+ case "$group" in "") group="vboxusers";; esac -+ mkdir /dev/vboxusb -m 0750 2>/dev/null -+ chown root:$group /dev/vboxusb 2>/dev/null - if test -n "$class" -a "$class" -eq "$usb_class_hub" - then - exit 0 - fi -- case "$group" in "") group="vboxusers";; esac -- mkdir /dev/vboxusb -m 0750 2>/dev/null -- chown root:$group /dev/vboxusb 2>/dev/null - mkdir "$devdir" -m 0750 2>/dev/null - chown root:$group "$devdir" 2>/dev/null - mknod "$devpath" c $1 $2 -m 0660 2>/dev/null diff --git a/app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd b/app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd new file mode 100644 index 000000000000..39378536a8b2 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd @@ -0,0 +1 @@ +d /dev/vboxusb 0750 root vboxusers diff --git a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild index 08304b19cae9..e45e584a3a8f 100644 --- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils +inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" @@ -193,7 +193,6 @@ src_prepare() { fi eapply "${WORKDIR}/patches" - eapply "${FILESDIR}/${PN}-detect-usb-fix.patch" eapply_user } @@ -416,6 +415,8 @@ src_install() { if use doc ; then dodoc UserManual.pdf fi + + newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf } pkg_postinst() { @@ -426,6 +427,8 @@ pkg_postinst() { && udevadm trigger --subsystem-match=usb fi + tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf + if ! use headless && use qt5 ; then elog "To launch VirtualBox just type: \"virtualbox\"." fi diff --git a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild index 7133045118bf..e40976f0165e 100644 --- a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils +inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" @@ -193,7 +193,6 @@ src_prepare() { fi eapply "${WORKDIR}/patches" - eapply "${FILESDIR}/${PN}-detect-usb-fix.patch" eapply_user } @@ -416,6 +415,8 @@ src_install() { if use doc ; then dodoc UserManual.pdf fi + + newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf } pkg_postinst() { @@ -426,6 +427,8 @@ pkg_postinst() { && udevadm trigger --subsystem-match=usb fi + tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf + if ! use headless && use qt5 ; then elog "To launch VirtualBox just type: \"virtualbox\"." fi -- cgit v1.2.3