app-emulation/virtualbox : version bump

9 files changed, 15 insertions, 89 deletions

diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.10.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.18.ebuild
index c58a2482..c58a2482 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.10.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.18.ebuild
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index d111e235..3dd3cd20 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,3 +1,3 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.10-122088.tar.gz 19482093 BLAKE2B ca02e9226b774340ecd31688f296304d7c963f20177d523058a1a2997cc287c59fc6e4df8bcc5024ec55cc7b79b1319f61bc9f3697cdb9c4c36423a77221cb82 SHA512 90e9d1c0235d14df9a305fa48102528b839c266abe18f97dcb945729cb9a0136cbf0686b69b82fcc76508cf7674c5b5dcb6563319af9ca0c294218802eaa9173
-DIST VirtualBox-5.2.10-122088-Linux_amd64.run 88544723 BLAKE2B b460f2eb04854773a2cc908eed3e01bf3245f0273c94bb4a7a69b11b2e1506a8a4db81649e13ce94fa3771540cadf597f3c2d957fc873213ef734e6b4e1d932d SHA512 244dcb2c875d4d0bf37552a478074b052268973954e4ba81e2a82ebc8ffe40da74de484032a37f21291574a997ee67dd4057f75eef4d7ac77c4e0f0d7cfa12ce
-DIST VirtualBoxSDK-5.2.10-122088.zip 10152815 BLAKE2B af856ffaeca244b2bfd14ef89ca10b4d607386c77aad3e8e0ce7a40291f6a74dfd12f3b33671d07a151e4bc75bbb05699a9845a3ae5ca7c16f4e1d3c49edcf9d SHA512 0e153b7b05fdc4ce18cf4dc7c110b0b9f05536df17f92b61417af9b497cdec5c2ad3ecd341bbdc43969d811b28f12dcdaaecd72bc5c33842cc1fdde25376c725
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.18-124319.tar.gz 19592275 BLAKE2B 7be65024837e46073049d3d751df00b50bf2d5d81faef3ba2a869429800d999f473b570bfe75201d07347e751893d280f7238a076a172ad2046b64c151b675ba SHA512 fa4bf8202f4d5f86cf4a04aaf6e77ce2f86ccde126d5543846793a021fc1e861f35d256432d762aebd38fc6cd0fa0bfe2a4def76334f468de316fe925d2fe414
+DIST VirtualBox-5.2.18-124319-Linux_amd64.run 88780242 BLAKE2B a07e5bfcc2e988a4e499a974d97ed36cad9a95055d2df3aab8def3cbf19da4658411465d973935c86bd1642047e16a16041eb6f9da0f85183e86d5022208332a SHA512 f280ca01e4e9cd20bcd88479548b10931558052bcf45e96ba9dd70f9ca81036509c5391fac4ce1635b1d2597a10093979bd58017612d34a56b7df20a59a30b74
+DIST VirtualBoxSDK-5.2.18-124319.zip 10153509 BLAKE2B fc937cfe4c6bb1ad6416fc975b7f8c31604fc78fe4da59596054831a8f5e47b7e2c39ad855f3ae0f45b3aa3a527bc6ad9b559901aefbd2f188c04fc3f8342188 SHA512 fefac8821e0ba83d130fad1dffa5f1d49c063d39694028005f655b8dd4f93bb8ab9697cdd2ea03c9cbc1d977f01da92ca6e6aa571497171a1d414ece239db680
diff --git a/app-emulation/virtualbox/virtualbox-5.2.10.122088.ebuild b/app-emulation/virtualbox/virtualbox-5.2.18.124319.ebuild
index b5c8b3f1..f5aa810e 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.10.122088.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.18.124319.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
+inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
 
-MAIN_PV="$(get_version_component_range 1-3)"
+MAIN_PV="$(ver_cut 1-3)"
 if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
 	MY_PV="${MY_PV/beta/BETA}"
 	MY_PV="${MY_PV/rc/RC}"
 else
 	MY_PV="${MAIN_PV}"
 fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_BUILD_ID="$(ver_cut 4)"
 VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
 MY_P="VirtualBox-${VBOX_PV}-Linux"
 # needed as sometimes the extpack gets another build ID
@@ -205,7 +205,7 @@ src_install() {
 	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
 		fowners root:vboxusers /opt/VirtualBox/${each}
 		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
 	done
 	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
 	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
@@ -217,7 +217,7 @@ src_install() {
 		for each in VBox{SDL,Headless} VirtualBox; do
 			fowners root:vboxusers /opt/VirtualBox/${each}
 			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
+			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
 		done
 
 		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
@@ -226,7 +226,7 @@ src_install() {
 		# Hardened build: Mark selected binaries set-user-ID-on-execution
 		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
 		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
 	fi
 
 	exeinto /opt/VirtualBox
@@ -247,9 +247,9 @@ src_install() {
 	insinto ${udevdir}/rules.d
 	doins "${FILESDIR}"/10-virtualbox.rules
 	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
 	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
 	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
 }
 
diff --git a/sys-kernel/virtualbox-guest-dkms/Manifest b/sys-kernel/virtualbox-guest-dkms/Manifest
deleted file mode 100644
index a785fa95..00000000
--- a/sys-kernel/virtualbox-guest-dkms/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST virtualbox-guest-dkms-5.2.10-1-x86_64.pkg.tar.xz 595940 BLAKE2B 0b718b0c2f4694ce25f7ec34d48b5de48a86debc0ea6b7cb17520e6b28736700546001a3725dca6065ed2693cad12a631b6427376a9ac01a70d6ca3be8fd59cb SHA512 286e98891bf41a73dd80bdc97059988dbdf8914209c93590c03a8b17c8e59d38a58c6c4ec36ee948dd9bafd111d3e3ff971ff1b59e4c121aaf73f66d92a4d0a9
diff --git a/sys-kernel/virtualbox-guest-dkms/files/dkms.conf b/sys-kernel/virtualbox-guest-dkms/files/dkms.conf
deleted file mode 100644
index d0086137..00000000
--- a/sys-kernel/virtualbox-guest-dkms/files/dkms.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-## @file
-# Linux DKMS config script for the VirtualBox guest kernel modules
-#
-
-#
-# Copyright (C) 2006-2015 Oracle Corporation
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-PACKAGE_NAME="virtualbox-guest-dkms"
-PACKAGE_VERSION=5.2.10
-AUTOINSTALL=yes
-
-MAKE[0]="make KVERSION=$kernelver"
-CLEAN="make clean"
-
-BUILT_MODULE_NAME[0]="vboxguest"
-BUILT_MODULE_LOCATION[0]="vboxguest"
-DEST_MODULE_LOCATION[0]="/extra/dkms"
-
-BUILT_MODULE_NAME[1]="vboxsf"
-BUILT_MODULE_LOCATION[1]="vboxsf"
-DEST_MODULE_LOCATION[1]="/extra/dkms"
diff --git a/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.10.ebuild b/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.10.ebuild
deleted file mode 100644
index 6580ca58..00000000
--- a/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Kernel Modules (guest) source for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://mirror.archlinux.ro/archlinux/community/os/x86_64/${P}-1-x86_64.pkg.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/usr/src/vboxguest-${PV}_OSE
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dodir usr/src/${P}
-	insinto usr/src/${P}
-	doins -r ${S}/*
-	# delete shipped dkms.conf
-	rm -rf ${ED}usr/src/${P}/dkms.conf
-	# inject our dkms.conf
-	doins ${FILESDIR}/dkms.conf
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/virtualbox-modules-dkms/Manifest b/sys-kernel/virtualbox-modules-dkms/Manifest
index 39ba9a12..a85ec2b1 100644
--- a/sys-kernel/virtualbox-modules-dkms/Manifest
+++ b/sys-kernel/virtualbox-modules-dkms/Manifest
@@ -1 +1 @@
-DIST vbox-kernel-module-src-5.2.10.tar.xz 637080 BLAKE2B 303fd6191247df0560f161b12665b95f372de1a18755b937f7af8fecab6669337ccaf22f635219080953795cb9bc4c80bc21a8273e28b5cf8ba3ba9cf930e2cd SHA512 56e837f19a63856dbd57379dd78bf46b90ddeb3a60df9d18a46a6480c7021040b7674599fd0b48a9c3db241756539bfaa88becf6e42acf8725e2bc89e3879773
+DIST vbox-kernel-module-src-5.2.18.tar.xz 638008 BLAKE2B 8ad08362e81365956bace1f6591ddd5f8201f3464df6f3f378c6c1b88f8a58eb823646f5c36f8c5efbdcd9941ec8eb46b604b356a39bf44af50b0ee9e5a6914a SHA512 0ba280b111725f6e77544e29db4dfbc8c418d928fd03db0a5d747703513147bc3b7ff7fcfa544298414ec97e95c99f9408c1fe2349d652552a652b6518898401
diff --git a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
index 5213868f..bd06aed3 100644
--- a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
+++ b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="virtualbox-modules-dkms"
-PACKAGE_VERSION="5.2.10"
+PACKAGE_VERSION="5.2.18"
 AUTOINSTALL="yes"
 
 MAKE[0]="make KVERSION=$kernelver"
diff --git a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.10.ebuild b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.18.ebuild
index 5bc67058..5bc67058 100644
--- a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.10.ebuild
+++ b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.18.ebuild