gentoo resync : 29.12.2022

6 files changed, 21 insertions, 9 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 042d701316c4..d0f932855b44 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -6,12 +6,13 @@ AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d87760215
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
 AUX virtualbox-6.1.26-configure-include-qt5-path.patch 717 BLAKE2B d6d9f1b0d30602e18b245e25bf1c5e2f4a33e308956fa946f913cf054173aa337708923ef92355f171f5b53a1b1ed58089f1a5146d8cd40a049fdfef874c5194 SHA512 bd07544302db16c291c21ef548455590079307fac2e11c3508019a6fb38a47db6a130c4ba265f9f47dead82d1684226542f21ff2da889ece51cba4b0744d109c
+AUX virtualbox-6.1.34-python3.10.patch 686 BLAKE2B 708c4b70c50024dbbd200bdd2af51600ee1cf4abf74fc15fe8cb340f77a58d7714315d887370893a21b10e3c20eb2ee97503558da6df0cb53ec083f32b0456a3 SHA512 58910df546ea27e4f568823a0d4c44d98c1833678dd7b47de4593e7b481f428123358dcdeb9ae5cab803d0167359f0e31e611f8359a1b59beeb71d1bce4f1004
 AUX virtualbox-6.1.34-vboxr0.patch 1565 BLAKE2B ec47a42b7574def3ac3ca482db14cca96af855652b0ff11e4ef49cbc7ea2bec4e134b57e18df85b07d8a8f3efcd1d0fa69380cf32bf544781c6e14437f124a11 SHA512 3feb258993509e2bd3c13130fb227883960e6e3b3e14d146d04cb222c7323689902fcf581ff207ef70a985eaced02e303a6d93e55261db499f5c54eb3e007f57
-AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
+AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.32.tar.bz2 165758238 BLAKE2B 24873d7cc8bd306ea3552fe75379fbe7be767c85406042344eb047ed31184c3357aea07dda5e15c275f5036ae63106ef1d2e6524b143bc645a6b5ba0016f1391 SHA512 8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e
 DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B d3c8f7d3d6f408e4c4275c2b2815e92819c871359501ec4fa7212bf7cdc852613e2e4703d8650371097a5bc805efa04ea75bb03ab83d24a869a677555f6e22d5 SHA512 46d63a9fd9df76af654af59fab5cf555858bc2c4b5dc34e2378d85ae784e6380b6def4aab06909a9b5e114a7297269f90cfb2c3d8d6529b423d703afbad18c64
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-6.1.32-r1.ebuild 14607 BLAKE2B 864c1c66961c1b04296580e87e62ec5d18f556f71857d120ebb6db5ce4d33005ab9769f698a902b6fb1028702ae686380337aed2500dedbd5ec3dabec8ea82ca SHA512 a65ad608a408c1ba38f0ae11f91167f0376c0777483f0bd4dc882e2da9144f2ac48f6a4f225eb8bb67bb369df5be38ffaa694e4e0a028bccaf26f7c92e6df887
-EBUILD virtualbox-6.1.34.ebuild 13646 BLAKE2B 8879284631fd6d1be7ef6d6983f0f4532ca3020c5540aaebdf1ee387f4c61e7544a19c276eaa2fc8c09ed1465b87c6322470cd6d9381b67254d833b1b98958b7 SHA512 1634355bfd07cf067ca44c7a995f6d701b464cf8ebfdaa0872c182a38afe703fbc8189fed012e09093b3165a3df6959715febe2c9424d7a9b3105cf43178ccf3
-MISC metadata.xml 774 BLAKE2B 5052aaa17c815e63ef8cd450e09f220a71e8a59df1ab79ad7dd713780dd0c62ae5bc453012b35d8e37a7b0dc9b1287c3a8119f0324c4a5e8ba6211b20f5350e7 SHA512 2b0515ae0e5a280dc40b6ecdaaa9165f90b6e276e01323896509b9a2ecc01a34d4e2542788ba3166d56a242c8ed65ef1f2df6e2de62b95d11700d28036f616fa
+EBUILD virtualbox-6.1.32-r2.ebuild 14607 BLAKE2B 864c1c66961c1b04296580e87e62ec5d18f556f71857d120ebb6db5ce4d33005ab9769f698a902b6fb1028702ae686380337aed2500dedbd5ec3dabec8ea82ca SHA512 a65ad608a408c1ba38f0ae11f91167f0376c0777483f0bd4dc882e2da9144f2ac48f6a4f225eb8bb67bb369df5be38ffaa694e4e0a028bccaf26f7c92e6df887
+EBUILD virtualbox-6.1.34-r1.ebuild 13699 BLAKE2B 01a96acd3f1e734536372baa60f0adca25d0153e5c7dc986ac51fa1bbd67a4e3e6fbf71a0b5865a5ab92f236e598c86dd4755c72e1a83ee95a44f714d6e0c877 SHA512 d647990d450c92d8eba46250e7a9f058c1f887fd0b0bc9b6223197973561a60bbef6f7e8133352baae034ae4014040bd325747644bc2eec286e56f71363ccab3
+MISC metadata.xml 685 BLAKE2B e277707b89a7b08922f18461e551e875ee9d4dd6a6159aa38cb3840ab242360b93e0724efe7fad0ab685d9ec4e119ec606d72cfac5b0417de7c01cc45c97be22 SHA512 9d9a2a3467a39b21475d8728e218878614a700ee8c98cb6554ca4ca2913812ef5c6740737e8716a76a6fbc13d0d42b04339ea27e7c2ea1a346387c9df139a783
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.34-python3.10.patch b/app-emulation/virtualbox/files/virtualbox-6.1.34-python3.10.patch
new file mode 100644
index 000000000000..eacc77a7f5bc
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.34-python3.10.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/852152
+
+--- VirtualBox-6.1.34/configure
++++ VirtualBox-6.1.34/configure
+@@ -2027,7 +2027,7 @@
+ }
+ EOF
+   found=
+-  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m"
++  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m"
+   for p in $PYTHONDIR; do
+     for d in $SUPPYTHONLIBS; do
+       for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
diff --git a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
index af8090dd09af..57b15cc93eba 100644
--- a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
+++ b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
@@ -60,7 +60,7 @@ WARNING: The character device /dev/vboxdrv does not exist.
 EOF
 fi
 
-SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
+SERVER_PID=$(ps -U ${LOGNAME:-$USER} | grep VBoxSVC | awk '{ print $1 }')
 if [ -z "$SERVER_PID" ]; then
     # Server not running yet/anymore, cleanup socket path.
     # See IPC_GetDefaultSocketPath()!
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 3b96b5b36a19..fd43e4e7234a 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
   <flag name="dtrace">Install dtrace Extension Pack</flag>
   <flag name="headless">Build without any graphic frontend</flag>
diff --git a/app-emulation/virtualbox/virtualbox-6.1.32-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
index 96494cca02e5..96494cca02e5 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.32-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
diff --git a/app-emulation/virtualbox/virtualbox-6.1.34.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r1.ebuild
index ffef67a75eb1..3857ced6663f 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.34.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r1.ebuild
@@ -131,6 +131,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}/${P}-vboxr0.patch"
+	"${FILESDIR}/${PN}-6.1.34-python3.10.patch" #852152
 )
 
 pkg_pretend() {