gentoo auto-resync : 30:09:2023 - 11:39:43

3 files changed, 35 insertions, 19 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index a6f2d01bcaa2..1348683672bc 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -11,6 +11,7 @@ AUX virtualbox-6.1.44-fix-libxml2.patch 1115 BLAKE2B bdcbd6ef7e4812065ad1aa47c3a
 AUX virtualbox-7.0.0-fix-compilation-clang.patch 1638 BLAKE2B 2c1c021a5b95ffdbd46982249c3a60e97d79db17994491c3c1774d7fc889d5b5a0da974d05859e21772b6f265bf1009ad3f13d19a5d264c7f8b4b2bacd6a9bdb SHA512 9c83dfb1550463fc9ddce68dd0648b12721ad1f9fa92fac2e7234ac8149fc5a1a5698a759d1352fc8003d737ce987fbc476ed9a9b350490cf52e42e1a08444dd
 AUX virtualbox-7.0.10-fix-binutils-hardened.patch 1170 BLAKE2B 1e1dfdbb9f22da1da0dacf386e95757654138653ab85a5fda3106af66484f56f0e1bd286182e66c3b32c28d7643f80f5d1063105a84cb1b502544ae7eb7e0730 SHA512 341a0966d4e884c716a8f296128bb3ef12dab91285bacd3f4a49615ea6beb9b928a33fd5eeeb2c10dac62ed6cfef8e95278b5621f6bd90dca6a30c4e6b625b02
 AUX virtualbox-7.0.10-python.patch 871 BLAKE2B 3f01becc0d369805dd373a691eafd3cd9ee40b4e8db95aa285fb07e314f1489a163c8f4e7cd494834f9adde21f80ad668a5b3f4166c67cd150ce3a029e980b0c SHA512 0ee7b8f44d8c2e1e4b35c2edbc4c5a12b9fa165133975eac83e7cbdc127d273a1f20b6720b97a33912489d5d64c41b7429bde60c01264e31a1e7995707bdbaea
+AUX virtualbox-7.0.11-configure-include-qt6-path.patch 641 BLAKE2B a66abdac95e1acfea23a1010d8ef1ecba04b2e122887dd4a298e0462d96dd3c771f529ca82c321a0677828ff4e27344adb5905686253d5689d2214301ceed6f0 SHA512 c3f468263df48b1cdbc2b80541891a18c77783a99314efb01fabf09adad2a58dc21e1d59801df2b02246cf196a798ad72139ce0b203d00e171c6611e23f0e867
 AUX virtualbox-7.0.6-fix-libxml2.patch 15849 BLAKE2B 2a12ab133aeed3295fd9c1281a3a2f56526468a11f2b2426d3a3f8e3d912130b3eeaa21d6c537ff916e7c91499bb97ef8c3c8e11baea2866ad35e93cc3cf636f SHA512 042a4dbee2a5b665240cdd2af4bd5d88fe0da717f562afa1c7c89df634bc0c31a7bb38c34d0b928a4d38db13693a647db61f1c5ae963172b3fb6f83bd9441d3b
 AUX virtualbox-7.0.6-gcc-13.patch 579 BLAKE2B 50d629cafe1aff45ed08d712ab730555f2093336f28be38246c54a60ccbefab880b4b5a548b45e151c583749d347a26dc43fc5fef4e8c400c7bad424c9fa366a SHA512 34b5543c62044d530ee5927b367301f39d465d6177cfa2023578ff572d8e62eef2c5a06e1ec8d274fc582c017232b3603f668a1c09ec7774620e83245cdf90ba
 AUX virtualbox-7.0.8-disable-rebuild-iPxeBiosBin.patch 843 BLAKE2B bd7fef7afc725a247e9c84999786c27398ee9bdc4dd6f62f153202ab2f281ca8fb8445aa369aa1270a00acc6ba7f709f4d7923eea1acf02779827ba9ae2c2fa9 SHA512 d79b5be03417fbbf90634da5c63ac8975a950f559e42ed97a556edce28ada4d592b1807e89145e58caea1648486916bf0b7bf96e0843bad1cc3cace9048a3a4b
@@ -21,12 +22,11 @@ AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553
 DIST VirtualBox-6.1.46.tar.bz2 166045588 BLAKE2B 041fad30d7cbe524cfd5c865b225c00df7715a6648ed0d8f7ee3ca4be0d0dabcb324c676ba2ea78288cde89ed8e5412fae75e31bb49f623de2acddb8f10d6ee1 SHA512 695ca4d41ff10d0581e4cffe4a0ec80e0fe380f4c7d5d51ee4d21aeb61646c26edd60301e541894e71c3323e2d7207e23299938c18ee45631afd1e0851946e77
 DIST VirtualBox-7.0.10.tar.bz2 175450841 BLAKE2B 49eaa14f716f021f1ecec1ad48a2aa8a3a758cbd9b03cf30d65ddcf5aba11842b0ea8bc2c4d477084a4cea318dc302a4ed426ec9f675a1fe675c5f18c48796c7 SHA512 2870d39385f66557281edf1368db68cd69d6a9bebc30d52511929462d0ac210cec49dd8531a280c6facff22ba6e4808477fbf3d09abf998d863a007fc7f2c3bd
 DIST virtualbox-help-7.0.10.tar.xz 3941196 BLAKE2B fa6667e0cf12e2e05b896a7d9d7e1f78d43bb4618f35b3c81f5ccf5f227d1181b0c8fb1f6dc02a8619550b193a73d4094c5d3f0d43514392f9ed563085068789 SHA512 fab2dff812a438f3e78dbace24741d91b317bbbc7362f082a18f3871e3c6fd8af7744cf1b3fd3b82cf5135e03d521de05a7a5bc98ec19aacfa1b4e5392e60f30
-DIST virtualbox-help-7.0.8.tar.xz 3941816 BLAKE2B f1c82ccc8a0d4e99f2302a7024a551e7e4a70348b193cf0c3a3b2917a717451c74d652555cadb278f6e27c47dac88a8121acfe9425bc0f5b82b5101475f384b3 SHA512 7483c4321492effb5b4329d48b363d8d2b3aaa248c0259cd06569497090aa438c39e94d6a5da4f511202f424e596f66e7580e37ffa5da66661fd0fadcd99c5ef
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.10_pre20230615.tar.bz2 2253 BLAKE2B 27b422acc2ae85c4324d6f4471db80c9f680b1c4a00223c38b9e3fb31709b05163a1bd53408cffeabdef295e856aa8b01b86e0fecf5d80ace376ea1bd4fc9504 SHA512 c2177f46048f09b6be9ac2c35b43d74f67350b052411cc64adf6c0b3d284055eef79f960f1384a3aaeee7d25f8c19ea8f936ee2623a2251d1d28f85ed3469c22
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
 EBUILD virtualbox-6.1.46.ebuild 18887 BLAKE2B aed99c4c6f459b4f05e70f21f8e4a83d423bd18f49cb4b3776fd4352c49980a1addbc4388676bb5e9f6821943227f869b1c32b3e253e36be095f34de769bc91c SHA512 ddf75c7aeaaaa640703625aaaa803e6ae96857aaf6cb31fe8e0ed7f722c6403d7230836fdfa6a929b08e465f5665b1f76e79ac9c2d332c9f6796637fbf27fe6b
 EBUILD virtualbox-7.0.10-r1.ebuild 21462 BLAKE2B 558fb97bcdcfb8fbe6346931f50275f34b18f13087a87d7a7d453c4d46e1c128479847570a2db121f3e1b861c53015cb349ae41e11ed6fa5e1f44e7f82c9b38c SHA512 a52d6cdf654e6aea0f2a5927833820a959689c6b09c1d36ddd991fe9637f55d3d96a8b600bf56def390fb39333e5d3fee80453ab9f8c8961daf9df7a36c821ff
 EBUILD virtualbox-7.0.10.ebuild 20658 BLAKE2B c59f66e1c81d6f522b738aaf3d1f50192cc1e992c08c5eb60a654664325088e97d70db867cb61aa0c6bcc046d8a79f4db7731ca861c5cc84983cb144c3515f77 SHA512 cb1293093cdcab9d9d51602b624cd46d122974e4314a20da021d33175a4a27d2434052c2baffce2780b15a109acdb90989ead907ba2828e0ecfc38a244f27e8c
-EBUILD virtualbox-9999.ebuild 22091 BLAKE2B 6be241a4c494c238becbef6e2ea9d07d6e4cff45603ca818641b55e523610af2ba4004f5ad3c2f06c5dc7160f2a14144097e8b2b515bcc02149b6439ecd6e34b SHA512 3e7880917632224dc2f77e7b764f497fc385e9a88c0e1d7e3abc90f6eda82d59d1305f06146977cdec2451188b96f27a9b7fbc420897a7ecc66c7a7da83999b0
+EBUILD virtualbox-9999.ebuild 22108 BLAKE2B 8926329c1c0c414196851216070c0565ccfbae44f4a5f6f11171fcda8a31ab583d1040c1ba13a91175484e1c8c06f31c5d32f9f4e07c2935dbc5a4b7992ca5af SHA512 029caa34ba207d7fdb9ce9e8eff29503cbbad4d5d0824bb37cd0a8008602aad44dc01144abadb7a01ce534594248d91b7857ece7d30bd222fafde2819b7b82db
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.11-configure-include-qt6-path.patch b/app-emulation/virtualbox/files/virtualbox-7.0.11-configure-include-qt6-path.patch
new file mode 100644
index 000000000000..a9345ae78141
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-7.0.11-configure-include-qt6-path.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 5d653d97..f6953d88 100755
+--- a/configure
++++ b/configure
+@@ -1695,6 +1695,8 @@ EOF
+         else
+           # Strip .../QtCore as we add components ourself:
+           INCQT6=`echo "$INCQT6"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'`
++          # Strip .../QtGui as we add components ourself:
++          INCQT6=`echo "$INCQT6"|$KBUILD_SED 's|\([^ ]*\)/QtGui|\1|g; s| $||g'`
+           # store only the first path, remove all other paths
+           # most likely pkg-config gave us -I/usr/include/qt6 -I/usr/include/qt6/QtCore
+           INCQT6=`echo "$INCQT6"|$KBUILD_SED 's|\([^ ]*\) .*|\1|'`
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 9048fa58d8a6..3700fe5adca3 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 # This compiles the latest svn version.
 # It also compiles the kernel modules.  Does not depend on virtualbox-modules.
 # It is not meant to be used, might be very unstable.
-# Upstream seem to have added support for python 3.12; I haven't checked it yet.
+# Upstream seem to have added support for python 3.12, but it crashes.
 #
 # USE=doc does not work for now.
 #
@@ -30,7 +30,7 @@ inherit desktop edo flag-o-matic java-pkg-opt-2 linux-mod-r1 multilib optfeature
 	python-single-r1 subversion tmpfiles toolchain-funcs udev xdg
 
 MY_PN="VirtualBox"
-BASE_PV=7.0.8
+BASE_PV=7.0.10
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
@@ -51,6 +51,7 @@ unset WATCOM #856769
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	acct-group/vboxusers
+	app-arch/xz-utils
 	dev-libs/libtpms
 	dev-libs/libxml2
 	dev-libs/openssl:0=
@@ -60,17 +61,12 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	dbus? ( sys-apps/dbus )
 	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
+		dev-qt/qtbase:6[widgets]
+		dev-qt/qt5compat:6
+		dev-qt/qtscxml:6
+		dev-qt/qttools:6[assistant]
 		x11-libs/libX11
 		x11-libs/libXt
-		opengl? ( dev-qt/qtopengl:5 )
 	)
 	lvm? ( sys-fs/lvm2 )
 	opengl? (
@@ -83,7 +79,6 @@ COMMON_DEPEND="
 	sdl? (
 		media-libs/libsdl2[X,video]
 		x11-libs/libX11
-		x11-libs/libXcursor
 		x11-libs/libXt
 	)
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
@@ -104,6 +99,7 @@ DEPEND="
 	${COMMON_DEPEND}
 	>=dev-libs/libxslt-1.1.19
 	virtual/libcrypt:=
+	x11-libs/libXt
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	gui? (
 		x11-base/xorg-proto
@@ -123,7 +119,10 @@ DEPEND="
 		x11-libs/libXrandr
 		virtual/glu
 	)
-	sdl? ( x11-libs/libXinerama )
+	sdl? (
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+	)
 	pulseaudio? ( media-libs/libpulse )
 	udev? ( >=virtual/udev-171 )
 "
@@ -134,7 +133,6 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
-	app-arch/makeself
 	>=app-arch/tar-1.34-r2
 	>=dev-lang/yasm-0.6.2
 	dev-libs/libIDL
@@ -156,8 +154,8 @@ BDEPEND="
 		dev-texlive/texlive-fontsextra
 		dev-qt/qthelp:5
 	)
-	gui? ( dev-qt/linguist-tools:5 )
-	nls? ( dev-qt/linguist-tools:5 )
+	gui? ( dev-qt/qttools:6[linguist] )
+	nls? ( dev-qt/qttools:6[linguist] )
 	java? ( virtual/jdk:1.8 )
 "
 
@@ -199,7 +197,7 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+	"${FILESDIR}"/${PN}-7.0.11-configure-include-qt6-path.patch # bug #805365
 
 	# This patch is needed to avoid automagic detection based on a hardcoded
 	# list of Pythons in configure. It's necessary but not sufficient
@@ -214,6 +212,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.9-python.patch
 	"${FILESDIR}"/${PN}-7.0.6-gcc-13.patch
 	"${FILESDIR}"/${PN}-7.0.8-mtune-keep-size.patch
+	# 913109
+	"${FILESDIR}"/${PN}-7.0.10-fix-binutils-hardened.patch
 
 	# Downloaded patchset
 	"${WORKDIR}"/virtualbox-patches-7.0.10_pre20230615/patches
@@ -316,6 +316,9 @@ src_prepare() {
 		append-cxxflags $(test-flags-CXX -mno-$i)
 	done
 
+	# bug #908814
+	filter-lto
+
 	# bug #843437
 	cat >> LocalConfig.kmk <<-EOF || die
 		CXXFLAGS=${CXXFLAGS}