gentoo resync : 19.07.2019

3 files changed, 32 insertions, 21 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index b565f94c589c..3831e0e5d807 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -11,15 +11,15 @@ AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
-DIST VirtualBox-5.2.28.tar.bz2 118655475 BLAKE2B 4e4e75b78de3cb3b6dc2fe2c2f306487cb924bf9ca2d1b0ffc6fc349774d3fa38886d386277a32067daaabfad6e8cd58ea058a78a70d16761d76f6ebed035d16 SHA512 085cfcab82851f98c757ea109ba420335d891a99df52a811e19815b3e55a92894cfb7b6fd4a5aaf15def71811f14e21527625adf885a394144cb5f971eb57782
 DIST VirtualBox-5.2.30.tar.bz2 118462289 BLAKE2B 87126b5af657815d0fcc8aadf49a23ce613ea0998b70f988f78e9d381138c414c7c73a0bf91955481cf484f5b71081ff1bab8dabe1b41fffde877e1003477625 SHA512 6230846ceda47b8ffe942aa8427f04f193095103371b7210d30e49cd9e384b9828d6917f75ef125e63e2c1810e8aa3b7c17b72f3ede7697c55d6de9da9d3f668
-DIST VirtualBox-6.0.6.tar.bz2 155297550 BLAKE2B a886ed99da3aee7a52d8c0654c33e50ae4155077e3d5061e1888a0cb5760b12dd63fb1205b75ec04419d50261f81e56036bdba79d20b57c836f073af232c913a SHA512 eb71ca94220680ac6cba7af13eb9eef132c21e57b1b27d6bc3c564bba58b000e682d19e36b63660bfa4f4471cd0632d365659ef8c4e3e526931622901a432d1b
+DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e
+DIST VirtualBox-6.0.10.tar.bz2 154284088 BLAKE2B 6aeb2384a777bb39e7c2692c1e262914296650f1448e8db45a03b864a824d3e8b337208087fa7f4469b1ee15e39c8cdae3707f742eb229872e8cb681d118880c SHA512 96fa3c672790239163829b3c40ac0d75d717b29a7b947ec48709eb7811c5800e314a0fc90d87810e4a03da40b3a65914605f648b287314386b371489e5d974c9
 DIST VirtualBox-6.0.8.tar.bz2 155404889 BLAKE2B 3eb6ebf713c32e301db1673b22c367a89ce1ffb25d12baab6c7335389ce17e08efd744139acc4114231c4d4b69c6370b6e5d5b18ce97fe5494ca7a192fa43f7d SHA512 df18d5df2c82761b8a77e509b2873cdeaa46d11bc50ca166af1e6c30d3042b0cf5640957b1d411333f5bd5be3f03f382550f1afaecf0651d847bc88c95863d83
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
 EBUILD virtualbox-5.2.26.ebuild 13951 BLAKE2B 3df397589abd502e86e4a757905df7fc38f593521817a3fe5202fc5d82a1fad91b755d9295b9df0a68fd29ca0459c30e4c2d4ff8c1b71df42319f564d28da286 SHA512 9807666ae2ab3312903687c181b84f6a30d55eaf636794dafd2963c7d6e106802f8bfc245634f05765f2bf63f31131eb80332bb66b92c738427c980d506725c7
-EBUILD virtualbox-5.2.28-r1.ebuild 14459 BLAKE2B ab4a1c83cd9e6f0068b65d7d3f2ec1843b3b719c070fa9c0feb67120adafbebabaeb603598837df5743e39bdcbb163c1add2eb96d0e68f60b4a34f3831118940 SHA512 4eb6abc3e7d44ac46714abd89197319e638701016f132f3c814dd3878e9365f8e9db452b7fee1805d411879e091497cbc7db42b119c58a1bea104a341fbafad6
 EBUILD virtualbox-5.2.30.ebuild 14459 BLAKE2B ab4a1c83cd9e6f0068b65d7d3f2ec1843b3b719c070fa9c0feb67120adafbebabaeb603598837df5743e39bdcbb163c1add2eb96d0e68f60b4a34f3831118940 SHA512 4eb6abc3e7d44ac46714abd89197319e638701016f132f3c814dd3878e9365f8e9db452b7fee1805d411879e091497cbc7db42b119c58a1bea104a341fbafad6
-EBUILD virtualbox-6.0.6-r1.ebuild 14526 BLAKE2B 0392162bb49c29ef4aef0d58d18b9c13d6b4a7b61e29713bec7a41c70b75eafb7ccb3bf275aae00fe52e4757b8fe8766dc22b9ea167289e879f427c1dcdc01f6 SHA512 44cfa72dad3378c0817f47c3d8c6714187f2838773cd0518cd11c2e6321383a0942675eac18df37ad5e61fe70e9d309470630f06084e2276f0da57945d75fa01
+EBUILD virtualbox-5.2.32.ebuild 14459 BLAKE2B ab4a1c83cd9e6f0068b65d7d3f2ec1843b3b719c070fa9c0feb67120adafbebabaeb603598837df5743e39bdcbb163c1add2eb96d0e68f60b4a34f3831118940 SHA512 4eb6abc3e7d44ac46714abd89197319e638701016f132f3c814dd3878e9365f8e9db452b7fee1805d411879e091497cbc7db42b119c58a1bea104a341fbafad6
+EBUILD virtualbox-6.0.10-r1.ebuild 14599 BLAKE2B 7cdfa39479dd33c5176054dba777bb4a41be120841ac9fb5e791060c8d51ff4a99d6a2744e52c68d57d20d4b05a66f2845230db2ea6fc5129c4f0031394d5f93 SHA512 a382c5b452a70f0c759251b8c1774101b0d44452b47d597f76c6f19523bd88915654c87f8c946c13136765c252d704a0caed6de03ffff9635f3fe45efad5811f
 EBUILD virtualbox-6.0.8.ebuild 14526 BLAKE2B 0392162bb49c29ef4aef0d58d18b9c13d6b4a7b61e29713bec7a41c70b75eafb7ccb3bf275aae00fe52e4757b8fe8766dc22b9ea167289e879f427c1dcdc01f6 SHA512 44cfa72dad3378c0817f47c3d8c6714187f2838773cd0518cd11c2e6321383a0942675eac18df37ad5e61fe70e9d309470630f06084e2276f0da57945d75fa01
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-5.2.28-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.2.32.ebuild
index 05f95844d592..05f95844d592 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.28-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.32.ebuild
diff --git a/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.0.10-r1.ebuild
index 627195b1a4d6..74183d635e13 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
@@ -21,7 +21,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
-RDEPEND="!app-emulation/virtualbox-bin
+CDEPEND="
+	!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
 	dev-libs/libIDL
 	>=dev-libs/libxslt-1.1.19
@@ -54,15 +55,26 @@ RDEPEND="!app-emulation/virtualbox-bin
 	lvm? ( sys-fs/lvm2 )
 	opus? ( media-libs/opus )
 	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+DEPEND="
+	${CDEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}
+"
+BDEPEND="
 	>=dev-util/kbuild-0.1.9998.3127
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
 	sys-libs/libcap
 	sys-power/iasl
 	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	doc? (
 		app-text/docbook-sgml-dtd:4.4
 		dev-texlive/texlive-basic
@@ -72,16 +84,13 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-fontsextra
 	)
-	!headless? ( x11-libs/libXinerama )
 	java? ( >=virtual/jdk-1.6 )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${CDEPEND}
+	java? ( >=virtual/jre-1.6 )
+"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so
@@ -431,13 +440,15 @@ src_install() {
 		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
 		|| die
 
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
 	if use vnc ; then
-		insinto ${vbox_inst_path}/ExtensionPacks
+		insinto ${extensions_dir}
 		doins -r ExtensionPacks/VNC
 	fi
 
 	if use dtrace ; then
-		insinto ${vbox_inst_path}/ExtensionPacks
+		insinto ${extensions_dir}
 		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
 	fi