app-emulation/virtualbox: move more patches to patchset

Move the patches for live version to the patchset too.
Don't move the patches for 6.1 branch, because it is EOL.

Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>

8 files changed, 3 insertions, 176 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 1137ea34d61e..58ec0cc3b542 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -6,5 +6,5 @@ DIST virtualbox-help-7.0.10.tar.xz 3941196 BLAKE2B fa6667e0cf12e2e05b896a7d9d7e1
 DIST virtualbox-help-7.0.12.tar.xz 3945920 BLAKE2B 7f2201f3baf6d27d95dc9f878426e34a27c9f9e113d55348f57703b1bd4878df8c6f02492412b779896c48224fb2df224c953b425dde9c99d2b4dbfda1d80d4f SHA512 ddf429a984fe433c4bcbdf87930b3cc16075d4f4725d2e571e9bf05d820d26eb6f88dd6f2bd3992927b261377c84ac4e35a929113b3294e3b2887760fe7a0b52
 DIST virtualbox-help-7.0.14.tar.xz 3944832 BLAKE2B 95079e4da8c960c41cee799142779a6c2587e0e8af7956ca551cb5a4c0f36f313189dfe08afba83a0c32886866a7f9903b5e370008d6b3ce6283fb2288866b06 SHA512 e2f1acdd7577a93047e220300b1996d2855ddef20053c01294f8295fde0840645c41b75632d71dd2fc276219084fe4105fd057623f39375542358796425a2d03
 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.14.tar.bz2 6937 BLAKE2B da5f18efbba2a8f4701b3d29dc00784e4e80e18a18b029e5dce8c142eb4dc97637069bfc5081422064a7dc59dfacf503ebbdc3421caa96430dc53fa72988aa20 SHA512 57cc34b92e4626de5c445e34ae025da7ec0d752a60618c619a55c28bf7d6b1cc9dc81ea059b949b0f3e625568207e8084f9462faf487ca0daf2794e7f1feac36
+DIST virtualbox-patches-7.1.0_pre20240210.tar.bz2 5479 BLAKE2B 98bfc9391e756df139e0dd88ca2dd5c9f6cd9c0ce5b5e770dbe28d2e6acbfd04a26b06414c2640894bd3bbd2f10a80f6053d0c6f18d27752a05cadf773e50f19 SHA512 51b0fe68f23a73d20ec3a93b1fc8c073e0bc2bfe4e2e267de6ee6f103abc44c35bb50a96f3842a1e46049418336a3327ab291972a17b8a29b596ba9be4bdb962
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.0-fix-compilation-clang.patch b/app-emulation/virtualbox/files/virtualbox-7.0.0-fix-compilation-clang.patch
deleted file mode 100644
index c3e34f875acd..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-7.0.0-fix-compilation-clang.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-clang does not have syslimits.h, it is gcc specific
-and it is useless anyway since <limits.h> is already included
-so just remove it
-
-Cannot use PFNRT here on clang because of the exception specification
-
---- a/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceLibCWrappers.h
-+++ b/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceLibCWrappers.h
-@@ -34,8 +34,6 @@
- # include <limits.h>        /* Workaround for syslimit.h bug in gcc 4.8.3 on gentoo. */
- # ifdef RT_OS_DARWIN
- #  include <sys/syslimits.h> /* PATH_MAX */
--# elif !defined(RT_OS_SOLARIS) && !defined(RT_OS_FREEBSD)
--#  include <syslimits.h>    /* PATH_MAX */
- # endif
- # include <libgen.h>        /* basename */
- # include <unistd.h>
---- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h
-+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h
-@@ -97,7 +97,11 @@
- /** Load OpenGL library and initialize function pointers. */
- int glLdrInit(PPDMDEVINS pDevIns);
- /** Resolve an OpenGL function name. */
-+#ifdef __clang__
-+void* glLdrGetProcAddress(const char *pszSymbol);
-+#else	// !__clang__
- PFNRT glLdrGetProcAddress(const char *pszSymbol);
-+#endif	// !__clang__
- /** Get pointers to extension function. They are available on Windows only when OpenGL context is set. */
- int glLdrGetExtFunctions(PPDMDEVINS pDevIns);
- 
---- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp
-+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp
-@@ -35,6 +35,10 @@
- #include <iprt/ldr.h>
- #include <iprt/log.h>
- 
-+#ifdef __clang__
-+# define PFNRT void*
-+#endif
-+
- #ifdef RT_OS_WINDOWS
- # define OGLGETPROCADDRESS MyWinGetProcAddress
- DECLINLINE(PFNRT) MyWinGetProcAddress(const char *pszSymbol)
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.10-fix-binutils-hardened.patch b/app-emulation/virtualbox/files/virtualbox-7.0.10-fix-binutils-hardened.patch
deleted file mode 100644
index 1a5f85f89ff8..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-7.0.10-fix-binutils-hardened.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix building with sys-devel/binutils-2.41-r1[hardened]: read-only segment has dynamic relocations.
-https://bugs.gentoo.org/913109
-
---- a/src/VBox/Runtime/Makefile.kmk
-+++ b/src/VBox/Runtime/Makefile.kmk
-@@ -3238,6 +3238,7 @@
-  endif
- endif
- RuntimeR0_INCS          = include
-+RuntimeR0_LDFLAGS.linux = -z notext
- RuntimeR0_SOURCES      := \
- 	$(if $(VBOX_ONLY_VALIDATIONKIT),,../VMM/VBoxVMM.d) \
- 	common/checksum/crc32c.cpp \
---- a/src/VBox/VMM/Makefile.kmk
-+++ b/src/VBox/VMM/Makefile.kmk
-@@ -603,6 +603,8 @@
-   VMMR0_DEFS.darwin.amd64    += VBOX_WITH_NATIVE_NEM VBOX_WITH_NEM_R0
-  endif
- 
-+ VMMR0_LDFLAGS.linux += -z notext
-+
-  $(call VBOX_SET_VER_INFO_R0,VMMR0,VirtualBox VMM - ring-0 context parts) # Version info / description.
- 
-  if "$(USERNAME)" == "bird" && "$(KBUILD_TARGET)" == "win"
---- a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
-+++ b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
-@@ -258,7 +258,7 @@
-  VBoxDTraceR0_TEMPLATE = VBoxR0ExtPackDTrace
-  VBoxDTraceR0_DEFS = IN_VBOXDTRACE_R0 IN_RT_R0
-  ifeq ($(VBOX_LDR_FMT),elf)
--  VBoxDTraceR0_LDFLAGS = -e ModuleInit
-+  VBoxDTraceR0_LDFLAGS = -e ModuleInit -z notext
-  endif
-  VBoxDTraceR0_INCS = \
-  	include \
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
deleted file mode 100644
index a9345ae78141..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-7.0.11-configure-include-qt6-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/virtualbox-7.0.6-gcc-13.patch b/app-emulation/virtualbox/files/virtualbox-7.0.6-gcc-13.patch
deleted file mode 100644
index ed3a2d02fbc0..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-7.0.6-gcc-13.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add a few missing includes.
-
-Bug: https://bugs.gentoo.org/892852
-
---- a/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp
-+++ b/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp
-@@ -1,3 +1,4 @@
-+#include <cstdint>
- #include "util_matrix.h"
- 
- namespace dxvk {
-@@ -229,4 +230,4 @@
-     return os;
-   }
- 
--}
-\ No newline at end of file
-+}
---- a/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h
-+++ b/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h
-@@ -1,6 +1,7 @@
- #pragma once
- 
- #include <iostream>
-+#include <cstdint>
- 
- #include "util_bit.h"
- #include "util_math.h"
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.8-mtune-keep-size.patch b/app-emulation/virtualbox/files/virtualbox-7.0.8-mtune-keep-size.patch
deleted file mode 100644
index e37d9d6dcb94..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-7.0.8-mtune-keep-size.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Force -mtune=i386.  Random -mtune can lead to iPxeBiosBin.rom getting too
-large (larger than 56k).  This can happen because we support custom CFLAGS.
-
---- a/src/VBox/Devices/PC/ipxe/Makefile.kmk
-+++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk
-@@ -125,6 +125,7 @@
- 	-ffreestanding \
- 	-ffunction-sections \
- 	-march=i386 \
-+	-mtune=i386 \
- 	-fomit-frame-pointer \
- 	-fstrength-reduce \
- 	-falign-jumps=1 \
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.9-python.patch b/app-emulation/virtualbox/files/virtualbox-7.0.9-python.patch
deleted file mode 100644
index 73d529628cbb..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-7.0.9-python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Virtualbox 7.x will only build a lib named VBoxPython3.so, regardless of the
-actual python version used when compiling.  Remove VBoxPython3m.so, we don't
-use it.
-
-Upstream added support for pyton up to 3.12.
-
---- a/src/libs/xpcom18a4/python/Makefile.kmk
-+++ b/src/libs/xpcom18a4/python/Makefile.kmk
-@@ -704,13 +704,6 @@
-    VBoxPython3_DEFS      = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS)) Py_LIMITED_API=0x03030000
-    VBoxPython3_INCS      = $(VBoxPythonBase_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
-    VBoxPython3_LDFLAGS.darwin = -undefined dynamic_lookup
--
--   ifneq ($(KBUILD_TARGET),darwin)
--    DLLS += VBoxPython3m
--    VBoxPython3m_EXTENDS  = VBoxPythonBase_m
--    VBoxPython3m_DEFS     = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_m_DEFS)) Py_LIMITED_API=0x03030000
--    VBoxPython3m_INCS     = $(VBoxPythonBase_m_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
--   endif
-   endif
-  endif # VBOX_WITH_PYTHON_LIMITED_API
- 
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index af970a6c906c..25a390ed1bc9 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -37,7 +37,7 @@ DESCRIPTION="Family of powerful x86 virtualization products for enterprise and h
 HOMEPAGE="https://www.virtualbox.org/"
 ESVN_REPO_URI="https://www.virtualbox.org/svn/vbox/trunk"
 SRC_URI="
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.10_pre20230615.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.0_pre20240210.tar.bz2
 	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${BASE_PV}.tar.xz ) )
 "
 S="${WORKDIR}/trunk"
@@ -198,26 +198,8 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-	"${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
-	# (see the rest of the ebuild's logic for the remainder) to handle
-	# proper Python selection.
-	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-	# 865361
-	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
-
-	"${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch
-	"${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
+	"${WORKDIR}"/virtualbox-patches-7.1.0_pre20240210/patches
 )
 
 DOCS=()	# Don't install the default README file during einstalldocs