[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/

[Lars Wendler]

commit:     c5dcc2bba8b62bc560f5029a0dbd1610c2801ace
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 19:13:20 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 19:13:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dcc2bb

app-emulation/virtualbox: New patchset without hardened patch.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-emulation/virtualbox/Manifest                 |  1 +
 app-emulation/virtualbox/virtualbox-5.1.24.ebuild | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app-emulation/virtualbox/Manifest 
b/app-emulation/virtualbox/Manifest
index 7284339bd9c..58ba0e33546 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -6,3 +6,4 @@ DIST VirtualBox-5.1.24.tar.bz2 116135442 SHA256 
ee2db169a322bf0db3c3b6d8b84aa392
 DIST virtualbox-5.0.16-patches-01.tar.xz 4024 SHA256 
200eb980a12323a61d0fa6dbf61ed64ee1e2bb5e18e16eabdf8668d8fd8be3e4 SHA512 
4eed117253754abee9088d4c320b4a6f0b3e1c8313b98f354cb727001156fe68d553a677073d40b921437f4cc073420866d1533aad4e61a79607d8360abbfd4a
 WHIRLPOOL 
ab40851873d55ae873ca8ff88670a17476c0d502116f4abda7b766064a2daa71929eb69b4b68c64c3d2d0762134fe85d07044bdedde4bf15924520a604972aaa
 DIST virtualbox-5.0.32-patches-01.tar.xz 4400 SHA256 
e5bf5b5b391b3402172b5a30952da50affacaeaf40a75df0430ad623fcd8ed6f SHA512 
5df0ecb4f9190375edc62d231aacd381c36a1697cc33df48b2f2d68a05ca1c855d127e466eda62030736dbcee76f5c67a519a2f42b72eacaf7ed65a8cf991e8a
 WHIRLPOOL 
4c11787951848aadacc0772df5a46ce8d54445e0120901be280f493d4cc6333e986d0376f33ac0217dbb23758240c025028ea1d21c360fc2840c8e3003a0ff62
 DIST virtualbox-5.1.18-patches-01.tar.xz 4512 SHA256 
1aa525a8230f77abc672e61bea76af9ddfbb8f22acf21ef382b7a0a88de92764 SHA512 
f1c88dd9b7fbafb9764df0a88dc5615aa78a01408d0a14c0dae33e3a53bd75c191c0181934848e17f5fd77784f9e01bf44b444f1485fc302cb1538c2e8ddac95
 WHIRLPOOL 
c11adda0297cc18f0ac614a3492c411413bf640090c9cdb4c5382c4da0391734c479d92c2933e46e0dc8ccf59e155ce35e72182abcb5015a7e03ec33d51c1ab0
+DIST virtualbox-5.1.24-patches-01.tar.xz 2708 SHA256 
8ea5e08da07d555a4868abf6f4d689c2f6695bdb773010a01915fcc6c354f361 SHA512 
0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d
 WHIRLPOOL 
5a1af78c2767608d2b1c2a4b262dbce038d2b6ed9d0499eb60ac1eb64fd6b832efdbafc2b85881ac67efd8794adcc3490fcbf61b74ad7ae576d52e8aff597b04

diff --git a/app-emulation/virtualbox/virtualbox-5.1.24.ebuild 
b/app-emulation/virtualbox/virtualbox-5.1.24.ebuild
index eb424e00904..cd3a220bcf6 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.24.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.24.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib 
pax-utils python-single-r1 toolchain-funcs udev
+inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils 
python-single-r1 toolchain-funcs udev xdg-utils
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
 MY_P=VirtualBox-${MY_PV}
 SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-       
https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.18-patches-01.tar.xz";
+       
https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.24-patches-01.tar.xz";
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and 
home use"
@@ -182,9 +182,9 @@ src_prepare() {
        fi
 
        # Only add nopie patch when we're on hardened
-       if ! gcc-specs-pie ; then
-               rm "${WORKDIR}"/patches/050_${PN}-*-nopie.patch || die
-       fi
+       #if ! gcc-specs-pie ; then
+       #       rm "${WORKDIR}"/patches/050_${PN}-*-nopie.patch || die
+       #fi
 
        # Only add paxmark patch when we're on pax_kernel
        if use pax_kernel ; then
@@ -410,7 +410,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       fdo-mime_desktop_database_update
+       xdg_desktop_database_update
 
        if use udev ; then
                udevadm control --reload-rules \
@@ -455,5 +455,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       fdo-mime_desktop_database_update
+       xdg_desktop_database_update
 }