commit: dabf9d111cfd01fb8040de8e73ee1d97fa8d9833
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 15:32:44 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 15:40:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabf9d11
app-emulation/virtualbox: Use new patchset
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-emulation/virtualbox/Manifest | 1 +
app-emulation/virtualbox/virtualbox-6.1.0_rc1.ebuild | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-emulation/virtualbox/Manifest
b/app-emulation/virtualbox/Manifest
index 3910c5bab61..9d254284852 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -6,3 +6,4 @@ DIST VirtualBox-6.1.0_RC1.tar.bz2 164649631 BLAKE2B
c27e7d5e7d6a3bbc44767b07b6bb
DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B
c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c
SHA512
85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
DIST virtualbox-5.2.34-patches-01.tar.xz 2960 BLAKE2B
e62ab64939e9251a715b3b54b479bc51315acf561ce3d542a4b1358cefb2158353a046003cb0a62e78015f01b626719afb39590090662dd58bfc587bd63cb994
SHA512
25f402c0f96ac25c4d1afdf5d9fff60292caabd2af032a7e2f3e1f70e85bb24f03bbe3625b8bdb7618f77d2890e4c0b9fa7ade2eed590f6658361cca3db4a4b9
DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B
a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d
SHA512
954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
+DIST virtualbox-6.1.0_rc1-patches-01.tar.xz 2152 BLAKE2B
5ca1aa008d0a4bd2d8ff4e8b02e506f2bdd68d41b1ae6a733362925b12a82e4f26b4040817800342c69be8e1eec73477d1731e05eb677d09948ed59881be190c
SHA512
31f5b77cc86e7fe83e08df956639f50b9936aeab32d98d8f8800c4fa762245a7e6784189409006f82f8ed4bbdadbad7249e2663063448f3f0b0e157acfba6c42
diff --git a/app-emulation/virtualbox/virtualbox-6.1.0_rc1.ebuild
b/app-emulation/virtualbox/virtualbox-6.1.0_rc1.ebuild
index a45cf5704f3..3845fd83fd9 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.0_rc1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.0_rc1.ebuild
@@ -13,7 +13,7 @@ MY_P=VirtualBox-${MY_PV}
DESCRIPTION="Family of powerful x86 virtualization products for enterprise and
home use"
HOMEPAGE="https://www.virtualbox.org/";
SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-
https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.0_beta2-patches-01.tar.xz";
+
https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.0_rc1-patches-01.tar.xz";
LICENSE="GPL-2 dtrace? ( CDDL )"
SLOT="0"
@@ -166,7 +166,7 @@ src_prepare() {
# Replace pointless GCC version check with something less stupid.
# This is needed for the qt5 version check.
- sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ;
cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
+ sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ;
cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-i configure || die
# Disable things unused or split into separate ebuilds
@@ -206,7 +206,6 @@ src_prepare() {
eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
fi
- rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die
eapply "${WORKDIR}/patches"
eapply_user
