gentoo resync : 28.04.2019

5 files changed, 25 insertions, 10 deletions

diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index a385ffcce0eb..8753693dcc1f 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,19 +1,20 @@
 AUX vboxclient.desktop 145 BLAKE2B c01f4c307cd965d271e19f31cab5f902126bdf49bd947329c9ffad4955665b142576438dd124bc323d540cb2f6229c722b2611d4ba405521432965d9d0bddd8f SHA512 90e2ff4b8a67120f7f3c116676c7553243a1bf3c9a76f71ef471bc556c4eee55953e6a5dde952688d4892d469149db8704a921a14755eea66b1789805fe3ca42
 AUX vboxguest-4.1.0-log-use-c99.patch 393 BLAKE2B 5363bcc98696e06d64e232043f89e4881390f43efafe8624ab23d78338e64bfee385c18a160553f17cfa36e81151d1c5d1889d31abd7caf942d7034043ab1288 SHA512 7327faccd5095706d097f2b47acfea21736291ed54ee7b605670fdfddf5f09815759dc49f9497d06e5920043e0b5b9af1b4ee0993ea13e5055641cbeedd66d6f
+AUX vboxguest-6.0.6-log-use-c99.patch 282 BLAKE2B df1d521c39ab6b3fa421f866fd83545bfea972dbbb1a952ce6aa388845175a4a3f71bc1cd34151f537994713ad1144fb0497f1383ed116357e7971f02c38ada9 SHA512 31fc13e5bb6286f80fde312aeb7917f662addc5b889ca1aeafa4f3545bece46eccface3b94df01c25a33d60302a14b3ae5b1eef87f25a4eef9a9dd4a75b3d7cb
 AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c03b77fb1a4df5279e38929c4e6e446387f30eef9fd8f32b9f877db1074c0e28f9a461ec3114e7120f636e02ce41a72a81b1e69c62e SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40
 AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
-DIST VirtualBox-5.2.24.tar.bz2 118369194 BLAKE2B 2073ec85a641ae80113d41e8363401da5afaf6ea442c2a3c537341f39e06a03a7175463605133e642988f72c4adde4f987905c08f4ba58460953af7169cb4ca0 SHA512 2de5a19ff6aff56a4f7e7b9d7d39b3e787d2ac30d448e3313e915b1cde4b2eedccab44c7a195412efb9e9a6de3c1fb3ee96bde57af93f9ef8f317ffa8b7d4410
 DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
-DIST VirtualBox-6.0.2.tar.bz2 155125777 BLAKE2B 2d902fd1963305883eebba85daa03bd17fe8a9ba20e7a6482508879068a809ee80c4a5caffeb26acd0fd4ad29f6f60cf963e1d314e4b01f137ede5b589a74cb9 SHA512 9cfc03eae073ada47c050d2a5eeefa6f724ad2094f2bc3717aa010553ab0dd5af0ed0860bf120727491c7798cdff9219e53cdc3d629f61e3cd12c55068e7401b
+DIST VirtualBox-5.2.28.tar.bz2 118655475 BLAKE2B 4e4e75b78de3cb3b6dc2fe2c2f306487cb924bf9ca2d1b0ffc6fc349774d3fa38886d386277a32067daaabfad6e8cd58ea058a78a70d16761d76f6ebed035d16 SHA512 085cfcab82851f98c757ea109ba420335d891a99df52a811e19815b3e55a92894cfb7b6fd4a5aaf15def71811f14e21527625adf885a394144cb5f971eb57782
 DIST VirtualBox-6.0.4.tar.bz2 155233564 BLAKE2B 6bc4d450e275e8aac5dc62ab05d9ba1450e13965f3eba64819315d121bd0e515319be2ad92ab429f2e598e157e89660561de69a2aac87e14792284669bcec7e8 SHA512 c2e5418bafd5d50b46e1bc70280753c2fdfbf7248d782fc398771839950fb575eaea437e9699d56f4d8c92ea4dc9ba8bed74379565dac6114f7e9c45aecc9fdb
+DIST VirtualBox-6.0.6.tar.bz2 155297550 BLAKE2B a886ed99da3aee7a52d8c0654c33e50ae4155077e3d5061e1888a0cb5760b12dd63fb1205b75ec04419d50261f81e56036bdba79d20b57c836f073af232c913a SHA512 eb71ca94220680ac6cba7af13eb9eef132c21e57b1b27d6bc3c564bba58b000e682d19e36b63660bfa4f4471cd0632d365659ef8c4e3e526931622901a432d1b
 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-guest-additions-5.2.22.ebuild 6010 BLAKE2B fdf621c8d0f93220553c81b877571144c1bb2fdf000db0a45350fbc98f0cf96b703029874459fc56cec303d7c63c2046a1225a964b58fb45c234a4a679829e11 SHA512 acda6a782e5ebc605ff37c7c814192f87f607a67fba5ac49bdab201faf7326352c4153c0f74bd4431789763641879d781631d5c52cf23c1b583d91da4c9e2ebe
-EBUILD virtualbox-guest-additions-5.2.24.ebuild 6087 BLAKE2B 8155389688f6454ffbe0f105524652570ee82cc0d36141aa5524ef1565785dad2fdd4ad4f69e4fbb888d30970849207c66f51cad34b9a57e47986c3336ade3de SHA512 6f188396d8b7d3cd758c4fc0432eac43dc100104413db144de34b3d0733f67e55ca06d011214127c5231084a31bcdaa2bf82e0758f8e7579548032a4ce924c17
-EBUILD virtualbox-guest-additions-5.2.26.ebuild 6087 BLAKE2B 8155389688f6454ffbe0f105524652570ee82cc0d36141aa5524ef1565785dad2fdd4ad4f69e4fbb888d30970849207c66f51cad34b9a57e47986c3336ade3de SHA512 6f188396d8b7d3cd758c4fc0432eac43dc100104413db144de34b3d0733f67e55ca06d011214127c5231084a31bcdaa2bf82e0758f8e7579548032a4ce924c17
-EBUILD virtualbox-guest-additions-6.0.2.ebuild 6139 BLAKE2B 4d9a0a2ada7b0f88f4b8edd46720c6c43315ec64f7a8b8e64339424cbfb2bf8b8eee457ade3c72ddf014cf7b15df970a240c7d5a896ca0d309605033dc903eb7 SHA512 93ea063d27b7a4a321b1875923d1e4749690d4fa320802abab67d908f999e8aed33f16f5092d4642a2b8a5c2f35464f85d4e1f9061eaf9df2a0a6d2809728e27
+EBUILD virtualbox-guest-additions-5.2.26.ebuild 6085 BLAKE2B d0d5cc57879f51d324fac14c0eca00f337df964e0c2fc230f76295fb23799a4d535a9e9b059b68b9ca6b26f8327deb8fed68910fb386ad1498566ada7b52fbfd SHA512 c564be880559346f2b29b635f73ff404c3f02e31ae2bae44f043053e7bf3185554e3ce8997e71869191a0126bdbe82a474c3b94584fa9bb03877e99579a8127a
+EBUILD virtualbox-guest-additions-5.2.28.ebuild 6087 BLAKE2B 8155389688f6454ffbe0f105524652570ee82cc0d36141aa5524ef1565785dad2fdd4ad4f69e4fbb888d30970849207c66f51cad34b9a57e47986c3336ade3de SHA512 6f188396d8b7d3cd758c4fc0432eac43dc100104413db144de34b3d0733f67e55ca06d011214127c5231084a31bcdaa2bf82e0758f8e7579548032a4ce924c17
 EBUILD virtualbox-guest-additions-6.0.4.ebuild 6139 BLAKE2B 4d9a0a2ada7b0f88f4b8edd46720c6c43315ec64f7a8b8e64339424cbfb2bf8b8eee457ade3c72ddf014cf7b15df970a240c7d5a896ca0d309605033dc903eb7 SHA512 93ea063d27b7a4a321b1875923d1e4749690d4fa320802abab67d908f999e8aed33f16f5092d4642a2b8a5c2f35464f85d4e1f9061eaf9df2a0a6d2809728e27
+EBUILD virtualbox-guest-additions-6.0.6.ebuild 6175 BLAKE2B 0720bf05c6e6a1cf91a2b537c08cf53c31f283966a9b09344cde108a8265ae15d16925cb01d862229472799b805eda16b86313f7e8117226f5b503ae788bdd6f SHA512 8ef9a1082f50d4a6237d0fd6e220b5a54391b09608613dc41c7f8e5758c3a8441519799fc57eeaf9545af201c3a6dac99a08c239c32227a7974707f4e584780e
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/files/vboxguest-6.0.6-log-use-c99.patch b/app-emulation/virtualbox-guest-additions/files/vboxguest-6.0.6-log-use-c99.patch
new file mode 100644
index 000000000000..baae66fb081f
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/vboxguest-6.0.6-log-use-c99.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/298988
+
+--- a/vboxguest/Makefile
++++ b/vboxguest/Makefile
+@@ -136,7 +136,7 @@
+ 	IN_MODULE \
+ 	RT_WITH_VBOX \
+ 	VBGL_VBOXGUEST \
+-	VBOX_WITH_HGCM
++	VBOX_WITH_HGCM LOG_USE_C99
+ ifeq ($(BUILD_TARGET_ARCH),amd64)
+ VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
+ endif
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild
index 5780804c8c4e..33e1e37307e5 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.24.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.28.ebuild
index 5780804c8c4e..5780804c8c4e 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.24.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.28.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild
index 1cda2a1f29f4..1d942ef517d0 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.6.ebuild
@@ -63,18 +63,19 @@ src_unpack() {
 
 	# Create and unpack a tarball with the sources of the Linux guest
 	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
+	"${S}"/src/VBox/Additions/linux/export_modules.sh \
+		"${WORKDIR}/vbox-kmod.tar.gz" &>/dev/null || die
 	unpack ./vbox-kmod.tar.gz
 
 	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
+	cd "${S}" || die
+	rm -r kBuild/bin tools || die
 }
 
 src_prepare() {
 	# PaX fixes (see bug #298988)
 	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
 	popd &>/dev/null || die
 
 	# Disable things unused or splitted into separate ebuilds