diff --git a/app-backup/insync/Manifest b/app-backup/insync/Manifest
index 4a1f5bec..497128e5 100644
--- a/app-backup/insync/Manifest
+++ b/app-backup/insync/Manifest
@@ -1,11 +1,11 @@
 DIST insync-1.4.9.37127-fc25.i686.rpm 85130566 BLAKE2B 6edbb629ab57a3aac1ab715a0035e7b7094f55821c83129163ac6a8fb12e3a73b540983e8c63803f21b3337a5c09197465b63162ae70662799e6fcd8e6184a0a SHA512 297c232809ab1f4a117f4d8548e00769e872e1132f6161b0b6b6f456b001c47bcb28093efd4af8131eb0b4dfbd218888039bf51b04b9775e5a1718ad768984e6
-DIST insync-3.9.4.60020-fc38.x86_64.rpm 165438033 BLAKE2B 8f6016f6241660745f5ebd3dee4fdf9b1b8f94ceaca331a52b78d31afcdc995338babfe02f9ea772880942f244684b72cd04b64c11890f9218c700f92f10b651 SHA512 31d2c79d166ed32653cf2ff4bbe0d469066026aeb52ef4bfca6da6c1cac07e1d16688dcb9ae635f65ad9757d320148de1a16b898181365c4b1867ba3b3dda7c3
+DIST insync-3.9.4.60020-fc41.x86_64.rpm 165435882 BLAKE2B 888ab743c2e4de0cb73838ca1ac408c70c897e1a36f58e54d6734469deec015d9d4996ccc2a80f05d2fc977600689ad8e739f9c6b45847b73bae0e88693b0317 SHA512 7b14010c9ce4926878ee40b9cf000b97c38861a33103c5be6622ace348e6c90edb1f83ab3b379eb4d7e135e62078bf90a7e5f94e9ef0d632528df9f4b28a8158
 DIST insync-caja-3.7.9.50368-1.noarch.rpm 12882 BLAKE2B 675abeb9119f7843f541be556c60d9b4fd4c478aa8d4c343ab4bb0cb00b286ed6c3742c19f0916e44ede8798f36fd8ced887ddf1bfa46ceeba6314b4053e9c57 SHA512 901ac54e0e8de39978e0558836fe846ee215b38d6e1f99f88b6a3f92b129aafbfe149cb75b9301556bd46f8f7c52b74067e0640abf1bfd2d1ab257b3c1c30246
 DIST insync-dolphin-3.7.9.50368-1.noarch.rpm 44319 BLAKE2B 83acaa2083ccd5808b08e0577d68a37559eba31dcc0246d1a45fc5c4bf05665c2a7911389cd85e2876adb33b0b2efced85780c7e19320a12e144c9e4bc52a4e1 SHA512 cbca893944b529b680230e33f72ce02577c27438b54cc35fc285b3d78a1694c7ced623e14ef6b40bf5ec3a592077406dc3fb5c1df2cfd277d7294de9978c3b12
 DIST insync-emblem-icons-3.4.2.40983-1.noarch.rpm 47745 BLAKE2B 5531f388f53576b8ed2a4ec1f3669274512680a21d320b220459f2e2c6fb0356d445e8e0f7afc5a794d85ba312a2a7ea2b53bb7481dde229f1fdd07cb067a0b3 SHA512 9d0c77411d133281fcefd05426da2a94c1c88172377a7e9bae31a2a697cb0f3d4a0d02282edaff1390bab8a2a60b709c331ac9007d5f620e8d83c24103b43a8e
 DIST insync-nautilus-3.8.7.50516-1.noarch.rpm 14128 BLAKE2B ce65f8cbaff5678dad94a870e4b2a54757169adb10a5cea9c2409447825152c7ebbe7e5988fe6407bf84866cb79ee6abbd8bb274f166149f3931340bbd952de3 SHA512 d5ab5f45f978b19d8ae22b34e740045c9b0bb816795deb0012a644df75d35cb1308132c68562fc57a8a5f682dbb6531f05d3f3d2b95474061591ba197ac55d5a
 DIST insync-nemo-3.7.9.50368-1.noarch.rpm 12829 BLAKE2B 33c798b1b927950561329876da7275886425d7fa46b095f2d44939109d7ab0068034c4a38c10ee7bbaca14ccf09efdff5ce34080005b35269715013cb7bfb81d SHA512 9809a46c13902a5d190c438386ad3e682332d03f6dc11ad30e74a55e49cfcf359e52a4c8f79ca21826037744c1e0e3119770629429eb2c7cea3a79a143fc898f
 DIST insync-thunar-3.7.9.50368-1.x86_64.rpm 12697 BLAKE2B fad3653c834eed9457bc8f7239a7987b86b6f5742795f61843fd8b5ef04527efb05f05f893cb02c1b9f4b0acff72e53a86521a0d23eec07ac793be4be4b1d23d SHA512 bb6364558f5f70db429da1ca499e9ad659a04eca1eeaa829a92679616bf05269f6eead4d93057bedd8103749ada47aefaa77f4d765eed9305225111e6ca620e1
-EBUILD insync-3.9.4.60020.ebuild 2807 BLAKE2B f8ebbbf1f1322003fd24d38aa28ef4d67f23c9cd633793be286660a02941c709c3a7f00ba6241ab16b96acb88aafa560071fe4f62bd8b0cf30f8145596cb7b24 SHA512 ddcafb84aaad8c7dd25c113a682c12e11e474c4839816b695614d620d57b4b349caaad0bf9c588ae51bee0a9d205c8f79deab5eab7fb041033618c26a7844fb8
+EBUILD insync-3.9.4.60020.ebuild 2829 BLAKE2B 05333bcb899f1d138d8602be403b5a0a2fbc743d7ee0c773388e0d473add4b6f207daeabde80beed2e36f88d540c40bde2ee1371acda4228c904678d9dc66757 SHA512 9b139231b297c744b064aeb2a788e06d773bd49c05188c381d5e2f1fd9db256b713ff850e3f99a2d3aab23287b3ef80832373d1789cd325c56b665abd1d37904
 MISC ChangeLog 733 BLAKE2B e94a5cdc3ddef340cf4edd8c9d07c16bfc6f549516b82be6a5fcf4b1b770c57d65287c5ec9d3f2ac365d225a8398bb1b6f1542b9ead2e10308688ef2dd6b8567 SHA512 c9c277db795e6ce397608facfd5810aaf99dfef21277ca913494118856d9234949612cc707229798e8fc8e038e9201e84477f6c632bae02bcd704d4f6eb5b8e3
 MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c
diff --git a/app-backup/insync/insync-3.9.4.60020.ebuild b/app-backup/insync/insync-3.9.4.60020.ebuild
index e0377abb..44b1a025 100644
--- a/app-backup/insync/insync-3.9.4.60020.ebuild
+++ b/app-backup/insync/insync-3.9.4.60020.ebuild
@@ -15,7 +15,7 @@ CAJAPV="3.7.9.50368"
 EMBLEMPV="3.4.2.40983"
 SRC_URI="
 	x86? ( http://s.insynchq.com/builds/insync-1.4.9.37127-fc25.i686.rpm )
-	amd64? ( https://cdn.insynchq.com/builds/linux/${PV}/insync-${PV}-fc38.x86_64.rpm
+	amd64? ( https://cdn.insynchq.com/builds/linux/${PV}/insync-${PV}-fc41.x86_64.rpm
 	https://cdn.insynchq.com/builds/linux/${NAUTILUSPV}/insync-nautilus-${NAUTILUSPV}-1.noarch.rpm
 	https://cdn.insynchq.com/builds/linux/${DOLPHINPV}/insync-dolphin-${DOLPHINPV}-1.noarch.rpm
 	https://cdn.insynchq.com/builds/linux/${THUNARPV}/insync-thunar-${THUNARPV}-1.x86_64.rpm
@@ -44,6 +44,7 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtcharts:5
 	dev-qt/qtlocation:5
 	dev-qt/qtsensors:5
+	dev-qt/qtbluetooth:5
 	sys-libs/zlib
 	|| ( sys-devel/base-gcc sys-devel/gcc )
 	media-libs/libglvnd
diff --git a/app-emulation/remotebox/Manifest b/app-emulation/remotebox/Manifest
index 2b2bbe95..67e01d86 100644
--- a/app-emulation/remotebox/Manifest
+++ b/app-emulation/remotebox/Manifest
@@ -1,2 +1,2 @@
-DIST RemoteBox-3.2.tar.bz2 1037529 BLAKE2B ac8062a71aa89b602f2a71c31266436265f6c638ac8f23e01bea3e77e3d753e075ae1e8d6af37d0b8a12b1fc9867add9b41ea610c9b282d64b0f6fe1ecad2a36 SHA512 efcf955671a6fca49dc508531a4186618a4ed2bece2ee7b8b91c8633ae1915e7d3474529b65e95f93ca1514f96542fd00d9b04d2692789fa6234890d87cb3cf0
-EBUILD remotebox-3.2.ebuild 1621 BLAKE2B 059fa7973c95cdd89ed90b77f9de35e56703cf51b1720b0f1f96898c4569791e5c70c8d0082edba57b057712f365e267998c0b8e63b6d6b54c965adaa73e446f SHA512 3cc5e24a303068f09e9f948e0fb1b947a398ca195983e429d39f8380358538ba12f6faa01ce6cf8516d3a8d061f4e4e7c82a43b8b935d6df4b08286df6f2755f
+DIST RemoteBox-3.4.tar.bz2 1066036 BLAKE2B 687e3e13b8f2177a1570e7cf9ee25b7fdd97fffe032e56f4e36e6f8b7270809c52cb63a76f3dce62bcb84dcf276b0ca1d66f0096eb8d1a6df9766c6a2cf428a4 SHA512 f82742ff7502324f010675e6086f8e9417485a040615dc246e26e4ea1360bc5a635b5b9989c6345028169509bd8bc16bbd60f482b7354ad4ee3ef81c91dbeddc
+EBUILD remotebox-3.4.ebuild 1631 BLAKE2B 153b47686338aca7289ca3fb472b305c02d6d16265c72bafd3064e7d61b14a86473aab561e3a92c28e10fd7d0ce4940080118f58f1efdc1e4a5390cd2edc850d SHA512 5d3a2b7f3eec9c949780e77e0857959906c420320181398ff52ba824f5632ed4314ddf4ba445bc080d29db88152e03e86d3b0d4585ebb2ed4bd2d2173f8fe6c6
diff --git a/app-emulation/remotebox/remotebox-3.2.ebuild b/app-emulation/remotebox/remotebox-3.4.ebuild
similarity index 91%
rename from app-emulation/remotebox/remotebox-3.2.ebuild
rename to app-emulation/remotebox/remotebox-3.4.ebuild
index 91f26069..43b9020e 100644
--- a/app-emulation/remotebox/remotebox-3.2.ebuild
+++ b/app-emulation/remotebox/remotebox-3.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-#inherit eutils
+inherit desktop
 
 DESCRIPTION="Open Source VirtualBox Client with Remote Management"
 HOMEPAGE="http://remotebox.knobgoblin.org.uk/"
@@ -36,11 +36,13 @@ src_prepare() {
 	# Change paths
 	sed -i -e "s|^\(use lib \"\).*\(\";\)$|\1/usr/share/remotebox\2|" remotebox || die
 	sed -i -e "s|^\(our \$sharedir = \"\).*\(\";\)$|\1/usr/share/remotebox\2|" remotebox || die
-	sed -i -e "s|^\(our \$docdir\)  \( = \"\).*\(\";\)$|\1\2/usr/share/doc/${P}\3|" remotebox || die
+	#sed -i -e "s|^\(our \$docdir\)  \( = \"\).*\(\";\)$|\1\2/usr/share/doc/${P}\3|" remotebox || die
 
 	# Cleanup comments
 	sed -i -e "/^# \^\^\^.*$/d" remotebox || die
 	sed -i -e "/^# \*\*\*.*$/d" remotebox || die
+
+#exit 1
 }
 
 src_install() {
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 8d227dff..6f14838f 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -19,16 +19,23 @@ DIST VirtualBox-7.0.20.tar.bz2 173300021 BLAKE2B 23a1553578c8b89c3bea65fd9a451ef
 DIST VirtualBox-7.1.0.tar.bz2 205966296 BLAKE2B 135805119d1710adbb17164d80a67f9b40fcc72d966af3b6d687b7f742a7bb487e76afc1ec45e31fe880a99a291ecdac3ee3dacdd342dbbe2dcec0eab32c8121 SHA512 d0fc27195b859fb537d57229d60a8895ced24b04c0f703c5862982de01d4787d20a3acb9cee4af29d18c56cd8c7ad846fd0eacc14af0c419e738953ca488463b
 DIST VirtualBox-7.1.2.tar.bz2 206105145 BLAKE2B 4b30f1d14625ddaed88b1a9cdac41289fef332d52e210d982ce075d652849b1cb72fee6d6e691f74378d4b8e7dd914355bcf0cd074d36249f39b099d1bba7c79 SHA512 d890f9b2e8799bcb1ed9cdaa86ef42daa261f7e9022a2e7e9df8c21f395c56e91e2d03292f22c9633ff6a0f0c5933ba3ac30af30befe87b84ffd89c07d51568f
 DIST VirtualBox-7.1.4.tar.bz2 206218796 BLAKE2B 62a4f44b4eac2e1cb2c0bace5dfabf86c41b738d81aede3de75d88159a8d76158748eaae38ee3eedbc0f79b639a875f1ef6805a8ca7c95021f475935f54d7ef9 SHA512 97654339d509447e2604db01e29f9e810f59498a378e645f412cffb67022c4e547f205e8ebdac6ae33aaa8f7bc0f289bdca2e5a04b1fa31b4a05c191d7600a9c
+DIST VirtualBox-7.1.6.tar.bz2 205786817 BLAKE2B 5328efe566217f69b665be58b19fc18f5898d634f0ee4057de93e66817dc15a2a708c71d9b323cfce752adf221dac44cbf2be0b8bfd37b2051c777fff0f4759a SHA512 16aa69eef997550e40e2759b9e0aa28b082d04de1352c62246bd8c63bb951545e5d6c6c1d930ae284c5c925eb44d504f071f545aa934bc4d94fbdb5ba74423d9
+DIST VirtualBox-7.1.6a.tar.bz2 205777317 BLAKE2B 584a53df603311bb1d49c8564bb05015426c678d58578327a73e1bb5d8ed4f0563a4edfaea13f3d41acc6902567572e67225cc9ea797b15489fb3d786d35c3f9 SHA512 fbb9487d531db6bf176e73f307ef1b65cc5263c8e5f38755cdc6bed41fe2906ffbd64076d42b8b505183d0ae054d8f6bccc522e981edd5a815e440066327cd3b
 DIST virtualbox-help-7.0.18.tar.xz 3948116 BLAKE2B 5715a7e609297387b5fccce0951c62e5969fd68adeecb869712e69f5e90daef97384bd3ff3c39de40903a1fabe7ac6d2f8ecdbb40de16abe955d40e49b962eec SHA512 ec0f915b7221bc40d02f5f1675eb0defb5506b2f2bd96c063a96a9346e1c82428ccdda8b3adac43238c451ae185ac31af4a186da17ffe091469e14e696388b3a
 DIST virtualbox-help-7.0.20.tar.xz 3949292 BLAKE2B c56f736606fdedfb59bd1f4446a457587dcbe018d1be3162d94eca780cacfa45b49ba5a9c6b25970d28e5a428904bdfd34d2f229c1e24b567fd1b1959cbdc9ea SHA512 e73e448b8aa875d0f6ae1fb398082fa7183e198191a9b509b63592b5df3a19069b805dcdc11d98da3971a14fd6670d8b0a777e5a6d6b63358f7a4f263ca8d31e
 DIST virtualbox-help-7.1.0.tar.xz 1631644 BLAKE2B 408748619d1e981b9d5b5e615baca75ff297e9b7e745751767361b7b9c74345a3db1980734439f3868c412fe28a6b687b417adc3cc148d2e2b8a9fa60e48463b SHA512 513b8474d4fbf7cdb83624dc8d344122c524d92f9f84b32784161c8e1cac8ddc2c265447621d7cd3cf105d555a044e6abf42155f413ba89d507eba7ce3b2da89
 DIST virtualbox-help-7.1.2.tar.xz 1587216 BLAKE2B 561a7ec607b61a9adf2fc5c86ad49828da4e1d3bcf8cae2771f1e498426652fc990c603128471412fd0d9f21ead004dd65006d6a8f70e4fa972c9055ffc8084a SHA512 6cd1bf849658f1abb8eb5a3d2da53d862ee0143aaff44e755f79bfb2d31977447e6546faa277dd860a0b6e1c3b72ae47479fbbec42419629e1cb2006df14194f
 DIST virtualbox-help-7.1.4.tar.xz 1586108 BLAKE2B e8219ed67b1db9a5e4d0271e25980fbcbfb8c72316dc4bd3337080c81082bb8ecad9c9317b5b9be77db1eeac42c567512a64fe86ae9bb6371dea8632e7afc9ab SHA512 185249fe2bdf2138a034c53e23eedb88cf487e1fb26a8bd623f0d75ea0d2ff4dff3484564a5b317703fb3f302ec7037cb0a49c7c3845e229fe2ac9e2c8c96af6
+DIST virtualbox-help-7.1.6.tar.xz 984060 BLAKE2B 9a330b2dae7c1d24d8754ad305681b632fc55e9b0776090fd15b93bd2c2c994a9f0b582e681db0095bd66b50ad26d0af379f6a0d2ac843b90a2640dac69be4f3 SHA512 177daa0b3e83f4c6f228e457d1b906b45a60b7bc7a3d40dfaf4048f5d65f584eab66df5f0adb8ff08e87cba5809f20075a75205997c2a79cb1f4cca02b6f919c
+DIST virtualbox-help-7.1.6a.tar.xz 984912 BLAKE2B fe30248627e61f75c6486b7ff73b68027cf9804bfc2df9d331dfbcb93571fb6816d95a35a05719a136d6540035f3bb628f6c61a8ca6ed704d10738b4017f9ad8 SHA512 528b74c170b1ab13b05df03c104f735a67f79cce4d2c03f7094a3cf481f0a832586d07137cab746eeeaae475f671c17996cd3c3acd9f72b77d24bef9a9a403e6
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 DIST virtualbox-patches-7.1.0.tar.bz2 5952 BLAKE2B cb024f36249d7d312c9d0f9231c22a9609d45de1d4c82ca36672fea703765d437d7a414d810adb5eb5f2db92018b669c3b5d0c32372c5ced90f5e13f82344ffa SHA512 c6ef54b7d60f01f5f2b89c6fd7f8b7b509bc62bca0502114cedcbaaf9643445ea413bba481dcf43fb96b5b4d94d64395965682c1ee160d889213615c9272184c
+DIST virtualbox-patches-7.1.4-r1.tar.bz2 6140 BLAKE2B dc84a0522629d06b72ff98e330e2c104e55185914238fed53d696399e43400a1c32979724c156479c3a67d2c64f7f8389d58a83242de559cf8dd89fbda0804e6 SHA512 3541ace61bd64f6ecb2f7b3aaa2383c33ae51682676eead78b267ff82d46e769117f074a534301e734408efa0e622d63e778085f06741223b35ed8caaacc003d
 EBUILD virtualbox-7.0.18-r1.ebuild 20842 BLAKE2B c80bd4f4694272cbb06eae6d317dbc64c765834856cd86f5fd323d279354346c7df9f81c86e7111951957299ff4bbcb1579477a973cab68fa88a60a25018c3d9 SHA512 68cfaac8a5ee39f435999e692bca486930dc0fe20232087a9937e4408dc067ea04b180f4b8e79e1fc10c6b80c613904d9d45921800fefa48bcfb30bc25100038
 EBUILD virtualbox-7.0.20.ebuild 20843 BLAKE2B 829f98c05686b748d529ea87f32395d645c128a72072bb44f16df701b05b0dffff94920cc47f77d68b77afd7792f879f74c0e7ae30d56ad2bc672b5c2ce136b2 SHA512 bc65c17c2c04636e7cd5ea874c8cf1eac94ef627c9f735ab0641eb0be485ec6cd80fc0e9a2df9e2e5896c989c44c2047820bc7dd199a1e26fa7d400b1ce03c35
 EBUILD virtualbox-7.1.0.ebuild 21017 BLAKE2B dc8e71674fa1dae48599bcc1bac7b33746b9f8bd694bafbd5bd6d5e7fac4337af0cbc0b94899bf944d214f6067bb6852ba5c0823694be938ca5c0b42a22aefb5 SHA512 d663e9b1c62b5829259e373de71331475e10a4fe94a08c589cda2f2cb07bf5017c80f49244220f8a8fe70c3ec53467a134042f4c2514e986ecd61be9be98bdae
 EBUILD virtualbox-7.1.2.ebuild 21017 BLAKE2B dc8e71674fa1dae48599bcc1bac7b33746b9f8bd694bafbd5bd6d5e7fac4337af0cbc0b94899bf944d214f6067bb6852ba5c0823694be938ca5c0b42a22aefb5 SHA512 d663e9b1c62b5829259e373de71331475e10a4fe94a08c589cda2f2cb07bf5017c80f49244220f8a8fe70c3ec53467a134042f4c2514e986ecd61be9be98bdae
 EBUILD virtualbox-7.1.4.ebuild 21860 BLAKE2B d3630e0214a2a7b079fbd37d28dc783d3b92f587bebaa62490b6679da69a03540442c2aa30d7cb3b191e73eadfef436583f10fba6bcea1f06fb6203b858a32fd SHA512 9b1760d7d03fc8ad470b75a8b9c22613ca62288aa21f389bb4d362d0ea7353d20d0d7c0d7d9da710493945207742bc1deeb2892d6395a050f022071fb64bc437
+EBUILD virtualbox-7.1.6.ebuild 21978 BLAKE2B b79a26c35f0e9418292513d87c8078e5fb937d0163b2e76f00d4323c8eea2babba8340e59849ee8f0e222150f9918ce4dfa07dc96e2ae07377d1e08433c8965e SHA512 dff09c3917de68c8a117e9f6c0a86819b5cc9fc2c58a529ce2f633bf50b0fa43f962583e750daf02897678abad3d10e5cd79f0e5d5febf3474be91fc8d4117ab
+EBUILD virtualbox-7.1.6a.ebuild 21875 BLAKE2B a5b5dd7c5d9d9d4042986e0da85256f00b71b65ebef9e37d88bfc6428444aa5eb702d2fc2cbdf32f52b19aede3fb1ff457fb265a120ff79710d347d8a4845277 SHA512 c3fb343c15b830554d42cac52820cbe53c157b378c18e516bbeb2ba9a87c3ceac1e860f12e2b27a0786db9acdab1e8ddbcb95dd1cee28feb517b442bc4ac1d72
 MISC metadata.xml 948 BLAKE2B c074e494d9affda91addd2355f8e71616602102b4cc151d2b45efd04754f1f92621ecd313dbe3baa44c3301f57b61e9cff780d445c2ea3d19ce3d9c8ae05213a SHA512 5338812da9334aedf08dd7a31a4a07c7bfa8232e8f0de6af9de9ac0f5585397cea16e66cb73d56632efa4cf21386782108182d803de6ff45c08082a13dc5fed9
diff --git a/app-emulation/virtualbox/virtualbox-7.1.6.ebuild b/app-emulation/virtualbox/virtualbox-7.1.6.ebuild
new file mode 100644
index 00000000..c8652875
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-7.1.6.ebuild
@@ -0,0 +1,779 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
+	python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_P=${MY_PN}-${PV}
+HELP_PV=${PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="
+	https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.4-r1.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${HELP_PV}.tar.xz ) )
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl test +udev vboxwebsrv vde +vmmraw vnc"
+RESTRICT="!test? ( test )"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	acct-group/vboxusers
+	app-arch/xz-utils
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtbase:6[widgets]
+		dev-qt/qtscxml:6
+		dev-qt/qttools:6[assistant]
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	sdl? (
+		media-libs/libsdl2[X,video]
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+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
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? (
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+	)
+	pulseaudio? ( media-libs/libpulse )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	>=app-arch/tar-1.34-r2
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-build/kbuild-0.1.9998.3592
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-doc/dita-ot-bin
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qttools:6[assistant]
+		sys-libs/nss_wrapper
+	)
+	gui? ( dev-qt/qttools:6[linguist] )
+	nls? ( dev-qt/qttools:6[linguist] )
+	java? ( virtual/jdk:1.8 )
+	python? (
+		${PYTHON_DEPS}
+		test? (
+			$(python_gen_cond_dep '
+				dev-python/pytest[${PYTHON_USEDEP}]
+			')
+		)
+	)
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk ${PYTHON_REQUIRED_USE} )
+	vboxwebsrv? ( java )
+"
+
+PATCHES=(
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-7.1.4-r1/patches
+)
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use python; then
+		mkdir test
+		cp "${FILESDIR}"/test_python.py test/
+		python_fix_shebang test/test_python.py
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# bug #916002, #488176, #925347
+	tc-ld-is-mold || tc-ld-force-bfd
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# bug #940482
+	filter-flags -fno-plt
+
+	# bug #908814
+	filter-lto
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		sed -i 's/sdl-config/sdl2-config/' configure || die
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	if tc-is-clang; then
+		# clang does not support this extension
+		eapply "${FILESDIR}"/${PN}-7.1.0-disable-rebuild-iPxeBiosBin.patch
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+
+	# file missing from this release
+	sed '/security-of-remote-vms/d' -i doc/manual/en_US/dita/UserManual.ditamap
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev !vmmraw --disable-vmmraw)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	if use python; then
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON=$(usev python 1)
+			VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+			VBOX_LIB_PYTHON=$(python_get_library_path)
+		EOF
+
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	else
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON:=
+		EOF
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	if use doc; then
+		# dita needs to write to ~/.fop and ~/.java
+		# but it ignores ${HOME} and tries to write to the real home of user portage
+		# resulting in a sandbox violation
+		# -Duser.home= does not work
+		# force using the temporary homedir with nss_wrapper
+		echo "${LOGNAME}::$(id -u):$(id -g):${USER}:${HOME}:/bin/bash" >> ~/passwd
+		echo "${LOGNAME}::$(id -g):" >> ~/group
+
+		local -x LD_PRELOAD=libnss_wrapper.so
+		local -x NSS_WRAPPER_PASSWD="${HOME}"/passwd
+		local -x NSS_WRAPPER_GROUP="${HOME}"/group
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_test() {
+	if use python; then
+		local -x VBOX_APP_HOME="${S}"/out/linux.${ARCH}/$(usex debug debug release)
+		local -x VBOX_INSTALL_PATH="${VBOX_APP_HOME}"
+		local -x VBOX_PROGRAM_PATH="${VBOX_APP_HOME}"/bin
+		local -x VBOX_SDK_PATH="${VBOX_PROGRAM_PATH}"/sdk
+		local -x PYTHONPATH="${VBOX_SDK_PATH}"/installer/python/vboxapi/src
+		einfo "VBOX_APP_HOME ${VBOX_APP_HOME}"
+		einfo "VBOX_PROGRAM_PATH ${VBOX_PROGRAM_PATH}"
+		einfo "VBOX_SDK_PATH ${VBOX_SDK_PATH}"
+		einfo "PYTHONPATH ${PYTHONPATH}"
+		LD_LIBRARY_PATH="${VBOX_PROGRAM_PATH}" epytest test/
+	fi
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	# environment variables used during SDK binding installation
+	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
+	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM 4750
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		domenu ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${PN}-help-${HELP_PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+
+		# 378871
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer/python/vboxapi/src"
+		pushd "${installer_dir}" &> /dev/null || die
+		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
+			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
+			-i vboxapi/__init__.py || die
+		# insert shebang, the files come without one
+		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
+		python_domodule vboxapi
+		popd &> /dev/null || die
+
+		# upstream added a /bin/sh stub here
+		# use /usr/bin/python3, python_doscript will take care of it
+		sed -e '1 i #! /usr/bin/python3' -i vboxshell.py
+		python_doscript vboxshell.py
+
+		# do not install the installer
+		rm -r "${installer_dir%vboxapi*}" || die
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-emulation/virtualbox/virtualbox-7.1.6a.ebuild b/app-emulation/virtualbox/virtualbox-7.1.6a.ebuild
new file mode 100644
index 00000000..b9eb3706
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-7.1.6a.ebuild
@@ -0,0 +1,776 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
+	python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_P=${MY_PN}-${PV}
+HELP_PV=${PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="
+	https://download.virtualbox.org/virtualbox/${PV%*a}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.4-r1.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${HELP_PV}.tar.xz ) )
+"
+S="${WORKDIR}/${MY_PN}-${PV%*a}"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl test +udev vboxwebsrv vde +vmmraw vnc"
+RESTRICT="!test? ( test )"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	acct-group/vboxusers
+	app-arch/xz-utils
+	~app-emulation/virtualbox-modules-${PV%*a}
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtbase:6[widgets]
+		dev-qt/qtscxml:6
+		dev-qt/qttools:6[assistant]
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	sdl? (
+		media-libs/libsdl2[X,video]
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+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
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? (
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+	)
+	pulseaudio? ( media-libs/libpulse )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	>=app-arch/tar-1.34-r2
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-build/kbuild-0.1.9998.3592
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-doc/dita-ot-bin
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qttools:6[assistant]
+		sys-libs/nss_wrapper
+	)
+	gui? ( dev-qt/qttools:6[linguist] )
+	nls? ( dev-qt/qttools:6[linguist] )
+	java? ( virtual/jdk:1.8 )
+	python? (
+		${PYTHON_DEPS}
+		test? (
+			$(python_gen_cond_dep '
+				dev-python/pytest[${PYTHON_USEDEP}]
+			')
+		)
+	)
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk ${PYTHON_REQUIRED_USE} )
+	vboxwebsrv? ( java )
+"
+
+PATCHES=(
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-7.1.4-r1/patches
+)
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use python; then
+		mkdir test
+		cp "${FILESDIR}"/test_python.py test/
+		python_fix_shebang test/test_python.py
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# bug #916002, #488176, #925347
+	tc-ld-is-mold || tc-ld-force-bfd
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# bug #940482
+	filter-flags -fno-plt
+
+	# bug #908814
+	filter-lto
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		sed -i 's/sdl-config/sdl2-config/' configure || die
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	if tc-is-clang; then
+		# clang does not support this extension
+		eapply "${FILESDIR}"/${PN}-7.1.0-disable-rebuild-iPxeBiosBin.patch
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev !vmmraw --disable-vmmraw)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	if use python; then
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON=$(usev python 1)
+			VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+			VBOX_LIB_PYTHON=$(python_get_library_path)
+		EOF
+
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	else
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON:=
+		EOF
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	if use doc; then
+		# dita needs to write to ~/.fop and ~/.java
+		# but it ignores ${HOME} and tries to write to the real home of user portage
+		# resulting in a sandbox violation
+		# -Duser.home= does not work
+		# force using the temporary homedir with nss_wrapper
+		echo "${LOGNAME}::$(id -u):$(id -g):${USER}:${HOME}:/bin/bash" >> ~/passwd
+		echo "${LOGNAME}::$(id -g):" >> ~/group
+
+		local -x LD_PRELOAD=libnss_wrapper.so
+		local -x NSS_WRAPPER_PASSWD="${HOME}"/passwd
+		local -x NSS_WRAPPER_GROUP="${HOME}"/group
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_test() {
+	if use python; then
+		local -x VBOX_APP_HOME="${S}"/out/linux.${ARCH}/$(usex debug debug release)
+		local -x VBOX_INSTALL_PATH="${VBOX_APP_HOME}"
+		local -x VBOX_PROGRAM_PATH="${VBOX_APP_HOME}"/bin
+		local -x VBOX_SDK_PATH="${VBOX_PROGRAM_PATH}"/sdk
+		local -x PYTHONPATH="${VBOX_SDK_PATH}"/installer/python/vboxapi/src
+		einfo "VBOX_APP_HOME ${VBOX_APP_HOME}"
+		einfo "VBOX_PROGRAM_PATH ${VBOX_PROGRAM_PATH}"
+		einfo "VBOX_SDK_PATH ${VBOX_SDK_PATH}"
+		einfo "PYTHONPATH ${PYTHONPATH}"
+		LD_LIBRARY_PATH="${VBOX_PROGRAM_PATH}" epytest test/
+	fi
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	# environment variables used during SDK binding installation
+	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
+	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM 4750
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		domenu ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${PN}-help-${HELP_PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+
+		# 378871
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer/python/vboxapi/src"
+		pushd "${installer_dir}" &> /dev/null || die
+		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
+			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
+			-i vboxapi/__init__.py || die
+		# insert shebang, the files come without one
+		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
+		python_domodule vboxapi
+		popd &> /dev/null || die
+
+		# upstream added a /bin/sh stub here
+		# use /usr/bin/python3, python_doscript will take care of it
+		sed -e '1 i #! /usr/bin/python3' -i vboxshell.py
+		python_doscript vboxshell.py
+
+		# do not install the installer
+		rm -r "${installer_dir%vboxapi*}" || die
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/dev-embedded/calypsi/Manifest b/dev-embedded/calypsi/Manifest
index ad3dd3d3..56b00d88 100644
--- a/dev-embedded/calypsi/Manifest
+++ b/dev-embedded/calypsi/Manifest
@@ -2,10 +2,10 @@ AUX 50calypsi-6502 27 BLAKE2B b609f33d7dc86e05c0aa5a8276e396fbf6a3dd9e52583f625c
 AUX 50calypsi-65816 28 BLAKE2B e9c9ac1da74a9fd12183fed94ed4f9618efec24da46301a8ac77d76f1e406b2420e452253628ab66cb1c5e996429d01c7d8815b251e7d2ef0fbef67c678d6346 SHA512 16fe0d087cb9ae00aa0d474800d6f7b648e30f9013af65829c7bb8bda5ca11dbb1dcc10e6d66255c4cada9bdff6b9ac0be1406f7703a063793e39aad15715986
 AUX 50calypsi-68000 28 BLAKE2B 73306e973c72f75a6ffe967228b57b419345e356684f6f0111903b7360697a5872a98d99bd0970eeaa4897b6d993e3c7fc434a8cba7344f8b84099facd4393a5 SHA512 04b41d068b9a60d3c95a6ebf3780ba8797fcc1d5bd87520cdf7115cc972258cc6d665bf9e0fabe30960d205e410ae75157bc6c12b69367a762ef22085e2f9a90
 DIST calypsi-6502-5.2.deb 55253984 BLAKE2B 3c95a2815f4fdc341fa730a0a28cb5b538e3c3551b8c79bdad4e371933b1cdbb02da668da7a539141b12a7259c6925deea9e16b628f40c52290537a2adaf60c6 SHA512 7c8ab3f78ec737d1ac18ef81e8d2af102e73d4a6259551ab5d3614536f0314e30b2d5d556951686c0859877f1319dda81fd2d2119e66d74cbbce4354bc70a8ce
-DIST calypsi-6502-5.7.1.deb 55448340 BLAKE2B 3d1470fe18e89c7870db4eb33ee0e0a93875a9aed62d810f514105190879aa0a852bc24a29c4dca1dd88c697151b91f002c0d4d836bad8046d6a11ab114977d4 SHA512 18113db3d9de81f23b6af65477a454b5b88627960fabe021c1b0525a789cc62d353978e04df9936aad6d0a7a3b714796c96a275d3dc848abd2218b29d66bc17e
+DIST calypsi-6502-5.7.1-1.x86_64.rpm 57740357 BLAKE2B 0409e8298b99a4bc95ccd7ebdcc38b671d41e9250c3418c879b79df041eaa88f1a6e845f0b3d01c836b6019981aa3888a3094fcc929d9e1766dd64c2312c45ae SHA512 d0ae9b51b1f5dc531cc59584c8a2b32660e563fe55b7a6e6a64db22e6427777b104d98ae2615df08975c23fa2a685ef46f1b26bf6bce52d06b94eeb013cd3833
 DIST calypsi-65816-5.2.deb 52919672 BLAKE2B 9d1c9cb96120089c6ce0f52c3b70daf9a6fad29928cc502fc3ee1ab88795f720cd0b5f7b54a629c648959c681222dc462ac068c0ee01667ceb270b747aec56a7 SHA512 894c9099929e4637a200640892898e1add44cf8467b32bfb2f863b358dfe867e7805c9c6c85054f42f88a0bbf40e219c64d22124a5b22f2cc7838097cc838044
-DIST calypsi-65816-5.7.1.deb 54731020 BLAKE2B 5adf23a91628eca19247128917e37265ec1cb282812217ef3671b17e4726bc54b8362fa0cd1d5cdc4920177d48c6ac14115bb2ca77ce51a68b77db9c6098fc19 SHA512 33658208a6c61a1f9867b36b3b237f44dbad0a7852eca4fb31ae4e2f13a0d0e9626e972ef24e0ad44d578c1a6bd16b54240ae4a5962fdc71bd0ebbb0f85603d0
+DIST calypsi-65816-5.7.1-1.x86_64.rpm 55750000 BLAKE2B e8201d9b7cfe0b39c972dc71750c8b7db94f09a851b2625190a0a55d1b4ed3243ed7ec2c70e6940c8668c9ad99f669fe07c246cb6bc9f388c060608443006ddb SHA512 39104bb46403f4a70ad600fa1c453c35d2107c2fc5d2e311200a49a47d967bde03211129bb7d897ba2cd851dde2afa27d13d2c9e398bb134652058796c79c7c9
 DIST calypsi-68000-5.2.deb 58521808 BLAKE2B 1595f8a18c0c1614d661a0acd0caff6605d60b1224f651288fbaa6a476cfe50bf29047668a33c7fbf03f2df80a665c2d4741bd4d60ce2191a8491c945b379c68 SHA512 b47abefa2ed87caf1805be4b9d5526689ed7156ab21253599546508d237ee57da09aab3982cc074b5f178810b0b5a8c3e2e8bcba1eb57d9fbc849627ed72869f
-DIST calypsi-68000-5.7.1.deb 59364996 BLAKE2B a9371a23ab52217e92eebda0e9a8ff29a7f680f7a076d7bf72f588d039394f1fd666217a5d4f98e0ec9055c6b87995953e01bf73ce3d6a0bd0756e429eb555fa SHA512 ca62315fea86cadff65707069e719b374cdf3b3575577131aa42a5db6f8bd142c74730e50ee39e9b0c8cbc4778986e7e3156abe0dacac278d8943db0ce37e231
+DIST calypsi-68000-5.7.1-1.x86_64.rpm 61036171 BLAKE2B 46a0052f3ee6a5e49d6d680d0b1cbf2e0f48976a2a9b5ced9d5a1f728b2c8cab6a20f99c520c0639772f03d991258999b70db6c0d073d0338b13032520970f9e SHA512 374cc8462409e68ddc5d0dfb1e10054ea8017a418cee163a3b64ca549f135da4b8daeb6eca61cbbd7a56d171237142b82e6bbf42d0930f645902f24c84b11e9d
 EBUILD calypsi-5.2.ebuild 1324 BLAKE2B 11afffc5db0946fd875091986f0187b81d324dd2f749cd5f98caeb938cc54b518b859727ed6d4ab79301e3d89b801084319a8d2ccbb04179fc5234f7fe72e230 SHA512 d32c921443ca8798c0487f71cc44efa16ed5d68cf906ea3a99ddd414c659f8a2371a7f7c5769d429743ff5d3e3c36f888a4a98fcbe6dd78e428136f144ad5cab
-EBUILD calypsi-5.7.1.ebuild 1324 BLAKE2B 11afffc5db0946fd875091986f0187b81d324dd2f749cd5f98caeb938cc54b518b859727ed6d4ab79301e3d89b801084319a8d2ccbb04179fc5234f7fe72e230 SHA512 d32c921443ca8798c0487f71cc44efa16ed5d68cf906ea3a99ddd414c659f8a2371a7f7c5769d429743ff5d3e3c36f888a4a98fcbe6dd78e428136f144ad5cab
+EBUILD calypsi-5.7.1.ebuild 1373 BLAKE2B ebfecadd60fa32948cf24465ad4fae829c56c2d455eb104ec334c4f4ff9f97aeaf43caa2697a3156d746a3e59ef150e1d1ba9a7e462b59309ad83e3a2a856a5a SHA512 4263a8980711edd9075d30dda223bdf1d8d4763941ff6699e0b2b4c55556d5714b64b9b3a5019b65f690d18b17f5ed8af5eb387f5c914a45f1a9a3907cf3f051
diff --git a/dev-embedded/calypsi/calypsi-5.7.1.ebuild b/dev-embedded/calypsi/calypsi-5.7.1.ebuild
index fdf0b12f..aee0a864 100644
--- a/dev-embedded/calypsi/calypsi-5.7.1.ebuild
+++ b/dev-embedded/calypsi/calypsi-5.7.1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-inherit unpacker
+inherit rpm
 
 DESCRIPTION="Calypsi is a series of C compiler and assembly language cross compiler tool chains. The current tool chains are aimed towards the retro and hobby communities."
 HOMEPAGE="https://www.calypsi.cc/"
 
-SRC_URI="https://github.com/hth313/Calypsi-tool-chains/releases/download/${PV}/calypsi-6502-${PV}.deb
-	https://github.com/hth313/Calypsi-tool-chains/releases/download/${PV}/calypsi-65816-${PV}.deb
-	https://github.com/hth313/Calypsi-tool-chains/releases/download/${PV}/calypsi-68000-${PV}.deb"
+SRC_URI="https://github.com/hth313/Calypsi-tool-chains/releases/download/${PV}/calypsi-6502-${PV}-1.x86_64.rpm
+	https://github.com/hth313/Calypsi-tool-chains/releases/download/${PV}/calypsi-65816-${PV}-1.x86_64.rpm
+	https://github.com/hth313/Calypsi-tool-chains/releases/download/${PV}/calypsi-68000-${PV}-1.x86_64.rpm"
 
 LICENSE="Calypsi"
 
@@ -29,9 +29,9 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}
 
 src_unpack() {
-	unpack_deb calypsi-6502-${PV}.deb
-	unpack_deb calypsi-65816-${PV}.deb
-	unpack_deb calypsi-68000-${PV}.deb
+	rpm_unpack calypsi-6502-${PV}-1.x86_64.rpm
+	rpm_unpack calypsi-65816-${PV}-1.x86_64.rpm
+	rpm_unpack calypsi-68000-${PV}-1.x86_64.rpm
 }
 
 src_install() {
diff --git a/media-video/davinci-resolve/Manifest b/media-video/davinci-resolve/Manifest
index c60e1ce9..144e9dab 100644
--- a/media-video/davinci-resolve/Manifest
+++ b/media-video/davinci-resolve/Manifest
@@ -9,6 +9,7 @@ DIST DaVinci_Resolve_18.6.5_Linux.zip 2596330483 BLAKE2B 2b9e51522bf4da6b9ce3800
 DIST DaVinci_Resolve_18.6.6_Linux.zip 2596581675 BLAKE2B d366b57810472811b2706b742ae62a7ecbd7ebad0bed73083b4e541346551fe4770583674376e791ee77e125052378236edbc356473c624fb8904fb7115605fa SHA512 c426393e5214a1523578a4d04636a70fe203318d47d23d00c26a6aabd550b6f1bdf187506b1804fb3939f950fffe4d8d9f908ed0ffaf6fd13b94fe2b97f384c6
 DIST DaVinci_Resolve_19.0b4_Linux.zip 2955282171 BLAKE2B 4e40f311789eff324ec107aa2e459af1da8a7a4548d2983935d557f408ba84d14f451bd18a6f1a7e330641a0e5b563328815858a780afd073c51794496284f3e SHA512 c60d830384ae9a085bce8c3b782aab3280a4bdf8b68d10982ad6f0c44ee071ee2a5b41424cf1c527770d9ad36ebf4154e82fb6a915ce9f4cc2c31133a4c7e4a8
 DIST DaVinci_Resolve_19.1.1_Linux.zip 3034078545 BLAKE2B f2fe3e612d857f21c5bb08d9a717ed8d8d71b35bd870f920fdb50ff06157836a58a74c2c73b92dbea6c2ded87020c2717317a9e33c7286c8a67d19b8307c4246 SHA512 29924f6a57fa5d476ec09bd88a3f037e9b69b98466ee381cf2338b3c61270c48b4de054123bb924bb96bb63a36393de7b520114d435fe4296f9e7e2212104e9d
+DIST DaVinci_Resolve_19.1.2_Linux.zip 3034084076 BLAKE2B 196cc04a3cab96bc4d0324563bec39b06ff90a024ccf71b6fd158559314c25a6ae153bdcc341c6f1dd4088427bc9ac127f422db495f1a7af85a605461ab2e9ba SHA512 c6b03bfa62adbceeb5fe827f4605e245f18ccb2b01a5cf31ba91a5aeb27aad5a16ad824491335564317cc7f8a7951336e00f074223e4e61401540d4f1b4c8f14
 DIST makeresolvedeb_1.6.0_multi.sh.tar.gz 4191 BLAKE2B ab2f09f339700ee31e011811152c6b97cc7e172698236efba0c0254cf69966c776dd222302e1da0266423f0af9c54ae426de4f5354d0d4550ae89b354f0a3d7a SHA512 02baae42c1e9d2163660b765ee6556660b337a3dfe25a60ee4bad9331d84700538ff9b339d045dd91cc0d89d1cd805e56437ae3a8d6ddf6502d0be0f0e5bc114
 DIST makeresolvedeb_1.6.4_multi.sh.tar.gz 4338 BLAKE2B f3bab11a08432e765645e314e1906c677db5b4e321a477856d4bea6439af860c4037314d2f12200a8a227c6a36b940425688d556c312d165a77f04d6c4513cde SHA512 3e11bef55bce1947422b8f204987b5aabb645121f29f416050d73b569cb04105107ffc63a88443e795fca7eca5f022401a6c575ad1ae3311158483d6691398ce
 DIST makeresolvedeb_1.7.1_multi.sh.tar.gz 4974 BLAKE2B dda1e77d88ec8c9065f4b26bc275f560ea147a3274540ae6ead10be35ce432904d4a4ef8ae69548bc88b44a628060f86cca5508477a100f1809a5f091ef0e137 SHA512 1cfcc1fc9b39dfb0424465453756c9f192d34bdfb046e4bad035bd1b516747bb04d1f2081d18d40da334a893d964e496cfab943f1262344a26926dffaf5f0a2a
@@ -20,5 +21,6 @@ EBUILD davinci-resolve-18.6.5.ebuild 2848 BLAKE2B b73ead231f3a99b514b3c757dc5640
 EBUILD davinci-resolve-18.6.6.ebuild 2948 BLAKE2B 0a229f5f4b209286a89252ffe015357bb2a997d79594d5b1fba82ee9c624d6e16b0406eafe6d26c4936d173f939e8bf273338623a20251fe7acb46ff70fbebdb SHA512 24f8417e2d3618afe1f7909ac67c5c8831ebceb6705f0ba9fead7a6b69ebaba9634548054ace527a048b37841dadfd1803140042c323a7b7afee41375445f88d
 EBUILD davinci-resolve-19.0_beta4.ebuild 2948 BLAKE2B c55d2e23c0915a80dcd2f7971e98d9153df1a3b9539a56be62c637a15aea75be5655bb229552c94beced4bf388dd2d2ee1076447267a01b1e93ebc611974d3e2 SHA512 04ed8a2f936ad8c8392bebdea34850568ce05e238b735018b3b3f37f5e19409ff338076d7152cee1dcd131b26cfe2937023466bd4dab3d1ac0bd3a6208ba2965
 EBUILD davinci-resolve-19.1.1.ebuild 2973 BLAKE2B 2cb43ad48fb3cb684f647adf29871590cc73e66bb7152dd999b36cf94787e31203c7941da60e8df8951bd4091148133b5a654a3d64d6df2953381d7a0ed33529 SHA512 b25ffa9f1390ee64f8f3bdbe57c75cce62ea07de888edb25e209869cc5dabe7a6f407785b1816cf5fc72b77b1cb4bddc8ee91dd396b52cccb1ff66993ac6178d
+EBUILD davinci-resolve-19.1.2.ebuild 2973 BLAKE2B 2cb43ad48fb3cb684f647adf29871590cc73e66bb7152dd999b36cf94787e31203c7941da60e8df8951bd4091148133b5a654a3d64d6df2953381d7a0ed33529 SHA512 b25ffa9f1390ee64f8f3bdbe57c75cce62ea07de888edb25e209869cc5dabe7a6f407785b1816cf5fc72b77b1cb4bddc8ee91dd396b52cccb1ff66993ac6178d
 MISC ChangeLog 984 BLAKE2B 6b5afde0d34caa62f7a6e336c651652380e9144d8c3382dcca2ee680b85724d93deca09c903565ccd79987d39ed61c517f1a5e717f37d3b00d24ac95c038edf3 SHA512 8110c143fd18310b7f12b9eb575f5179a574f0941bf1d6978c96ff4887289ecabfc4c3ab5fb4a9125d9b9d5e65d9d430ebc349965b925ba0bd35cf86466badba
 MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c
diff --git a/media-video/davinci-resolve/davinci-resolve-19.1.2.ebuild b/media-video/davinci-resolve/davinci-resolve-19.1.2.ebuild
new file mode 100644
index 00000000..23bcaee1
--- /dev/null
+++ b/media-video/davinci-resolve/davinci-resolve-19.1.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MAJOR_VER="$(ver_cut 1-3)"
+#MAJOR_VER="19.0b4"
+if [[ "${PN}" == "davinci-resolve-studio" ]] ; then
+	BASE_NAME="DaVinci_Resolve_Studio_${MAJOR_VER}_Linux"
+	CONFLICT_PKG="!!media-video/davinci-resolve"
+else
+	BASE_NAME="DaVinci_Resolve_${MAJOR_VER}_Linux"
+	CONFLICT_PKG="!!media-video/davinci-resolve-studio"
+fi
+ARC_NAME="${BASE_NAME}.zip"
+MRD_VER=1.7.3
+inherit udev xdg
+
+DESCRIPTION="Professional A/V post-production software suite"
+HOMEPAGE="
+	https://www.blackmagicdesign.com/support/family/davinci-resolve-and-fusion
+"
+SRC_URI="${ARC_NAME}
+	https://www.danieltufvesson.com/download/?file=makeresolvedeb/makeresolvedeb_${MRD_VER}_multi.sh.tar.gz"
+
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+IUSE="doc udev +system-glib"
+
+RESTRICT="strip mirror bindist fetch userpriv"
+
+RDEPEND="
+	virtual/glu
+	x11-libs/gtk+:=
+	virtual/libcrypt:=
+	${CONFLICT_PKG}
+"
+
+DEPEND="
+	dev-libs/apr-util
+	app-arch/libarchive
+	dev-libs/openssl-compat
+	sys-libs/ncurses-compat
+	dev-qt/qtcore:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtvirtualkeyboard:5
+	media-libs/gstreamer
+	media-libs/libpng
+	sys-fs/fuse[suid]
+	udev? ( virtual/udev )
+	virtual/opencl
+	x11-misc/xdg-user-dirs
+	${RDEPEND}
+"
+
+BDEPEND="dev-util/patchelf"
+
+S="${WORKDIR}"
+DR="${WORKDIR}/davinci-resolve_${MAJOR_VER}-mrd${MRD_VER}_amd64"
+
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	einfo "Please download installation file"
+	einfo "  - ${ARC_NAME}"
+	einfo "from ${HOMEPAGE} and place it in \$\{DISTDIR\}."
+	einfo "===="
+	einfo "Please download installation file"
+	einfo "  - makeresolvedeb_${MRD_VER}_multi.sh.tar.gz"
+	einfo "from https://www.danieltufvesson.com/makeresolvedeb and place it in \$\{DISTDIR\}."
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/makeresolvedeb*.sh "${WORKDIR}"/makeresolvedeb.sh
+	eapply -p0 "${FILESDIR}/makeresolvedeb_gentoo_${MRD_VER}.patch"
+
+	eapply_user
+
+	sed -i -e "s!#LIBDIR#!$(get_libdir)!" "${WORKDIR}"/makeresolvedeb.sh || die "Sed failed!"
+}
+
+_adjust_sandbox() {
+	addwrite /dev
+	addread /dev
+	addpredict /root
+	addpredict /etc
+	addpredict /lib
+	addpredict /usr
+	addpredict /sys
+	addpredict "/var/BlackmagicDesign"
+	addpredict "/var/BlackmagicDesign/DaVinci Resolve"
+}
+
+src_compile() {
+	_adjust_sandbox
+	cd "${WORKDIR}"
+	chmod u+x ${BASE_NAME}.run
+	CI_TEST="1" "${WORKDIR}"/makeresolvedeb.sh ${BASE_NAME}.run
+}
+
+src_install() {
+	cp -a ${DR}/lib "${ED}" || die
+	cp -a ${DR}/opt "${ED}" || die
+	cp -a ${DR}/usr "${ED}" || die
+	cp -a ${DR}/var "${ED}" || die
+
+	if use doc ; then
+		dodoc *.pdf
+	fi
+
+	# See bug 718070 for reason for the next line.
+	if use system-glib ; then
+		rm -f "${ED}"/opt/resolve/libs/libglib-*
+		rm -f "${ED}"/opt/resolve/libs/libgio-2.0.so*
+		rm -f "${ED}"/opt/resolve/libs/libgmodule-2.0.so*
+        fi
+
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
+
diff --git a/net-im/teams-for-linux/Manifest b/net-im/teams-for-linux/Manifest
index b916788a..01735451 100644
--- a/net-im/teams-for-linux/Manifest
+++ b/net-im/teams-for-linux/Manifest
@@ -1,2 +1,2 @@
-DIST teams-for-linux_1.12.3_amd64.deb 88424942 BLAKE2B 1e983724c671ea8f2ce584888ab7145a981be2fde87a18ed15d8879f7843c842381dd71915652354b86e7c826cf272fd7de883dc643d028c876939255b7b98b2 SHA512 c1df8e1f9000073ac97b0f0538189d45f6112e73798351df9dde153d3899ba07c0cb07c3253e06727055cabc966d35069e40a0f908b5898b0d0eceabf3efbd88
-EBUILD teams-for-linux-1.12.3.ebuild 3387 BLAKE2B 0e9031d17f3f3cab3fa8de3570c17fba700d66e35dd4d99df9054a3e7a2482d57e54c47a1d6ab08122d1fed7316a38802b28774d97d8ccebd11bbbb823d68b3f SHA512 f4a873cb21f097675309cf106edd2ff4b08dce10051cd71f5b5b4c0941bcf627b58de2983d5f59f7186cbd25d923a2ab4994f9526f2ccfd5240d9fe93f1ee462
+DIST teams-for-linux_1.12.5_amd64.deb 88675940 BLAKE2B de071d2db8a3fa02b90028998ef6bd11e2ea5568722bb61a06105300403cffcd645892644af106f0dd5ecb07751cfa2b746dbaf923009efca4c5bcfa51c2a8e3 SHA512 b5511384acbc8440e236e2f8d97e6b47a36d16119fae3b04b84145dca9b69753337e8826a470e8e586d17ac7a52afdb216a60081163e1c67db812165773f4381
+EBUILD teams-for-linux-1.12.5.ebuild 3387 BLAKE2B 0e9031d17f3f3cab3fa8de3570c17fba700d66e35dd4d99df9054a3e7a2482d57e54c47a1d6ab08122d1fed7316a38802b28774d97d8ccebd11bbbb823d68b3f SHA512 f4a873cb21f097675309cf106edd2ff4b08dce10051cd71f5b5b4c0941bcf627b58de2983d5f59f7186cbd25d923a2ab4994f9526f2ccfd5240d9fe93f1ee462
diff --git a/net-im/teams-for-linux/teams-for-linux-1.12.3.ebuild b/net-im/teams-for-linux/teams-for-linux-1.12.5.ebuild
similarity index 100%
rename from net-im/teams-for-linux/teams-for-linux-1.12.3.ebuild
rename to net-im/teams-for-linux/teams-for-linux-1.12.5.ebuild
diff --git a/net-misc/rasclient/Manifest b/net-misc/rasclient/Manifest
index 039fe629..e8e86d69 100644
--- a/net-misc/rasclient/Manifest
+++ b/net-misc/rasclient/Manifest
@@ -1,5 +1,5 @@
-DIST RASClient-19.4.25171_x86_64.tar.bz2 32230894 BLAKE2B 24d674611b2d6c27fe4485ef8107f51f8f814f617d562617997f8708ef38961eb1d3c2cebcdb7781fe78bd5aacba899eddc5a7d29ed85e2c0f5c421d5a86f490 SHA512 7e37981f759b3e65a6943f9fa8c748fd5262c29d1a6ac23e9885ecff8b4c4a6e2dd037dc0980353df28e23f3fbca18d130f6b06c939fa8cac13b2b024964e5c3
-DIST RASClient-sso-19.4.25171_x86_64.tar.bz2 9324 BLAKE2B eece3e00417f3c39c7ac0f5dad9f5c0dc194cc8aa43caef303fd4c08b6d256e8f914443a1d675c8e44913318130f721332068249a2787f36fafdeb3f866519bf SHA512 e380881049586f95068caf1c69d3c3ce6b1b0d0bbd351f5f08850d3477bebc7d31a1c0513074d140e56cdc75f2cce28aca23a2a5312b8a3e5708138a281058f3
-EBUILD rasclient-19.4.2.25171.ebuild 2002 BLAKE2B 83a3c776dd6bc7e24a351a4a0805b16c1d140996b03ccdd895d732b65e34a2f56e92746f8334d1497e7cf582b043a21325fb3b1b5adb09c9fc78432f408ee102 SHA512 c795faab8d827f210fbd3aa314fd08f8689ffed7f1c7033a66294dd366bc497ac3cedfee56bede47cd261805bcae9ba6391ebadbe9259996a85f117862790fb8
+DIST RASClient-20.0.25390_x86_64.tar.bz2 33146232 BLAKE2B 008aabeb55e42ae07a640990c705bfb9e7cb84804e417443df9a6aaf2872c1d35bf80dac90ffd470b698ff48a8163c67013eaabf1de5cb15a29750d70065acad SHA512 2d8ded4c97e1f6a51b93d215b954e0d45fec13e084ff6d20776e047b9d04580bf97fc500c5cc513ce8c0fd613177055fce2cb3862c575a8082a8b1e042ae63e7
+DIST RASClient-sso-20.0.25390_x86_64.tar.bz2 9302 BLAKE2B 56cc7d7316be20bc118d38a7a1642980cc45fc9d4a53acd52c7e8a8e5c3be03467343494e6bab7d7b4a9b74aa89c6483ea34302ebb0c88aaa8fc04f961dc5f16 SHA512 bccd9e11c2b674f47809f33ed22d803c9d70164892e419df09a6d2411c67468a3f022c922f810d33516de39098fe0ac2c5c8439b54bc70c026c08ec27f1c99ef
+EBUILD rasclient-20.0.0.25390.ebuild 2002 BLAKE2B 83a3c776dd6bc7e24a351a4a0805b16c1d140996b03ccdd895d732b65e34a2f56e92746f8334d1497e7cf582b043a21325fb3b1b5adb09c9fc78432f408ee102 SHA512 c795faab8d827f210fbd3aa314fd08f8689ffed7f1c7033a66294dd366bc497ac3cedfee56bede47cd261805bcae9ba6391ebadbe9259996a85f117862790fb8
 MISC ChangeLog 385 BLAKE2B ebe7cc81e97a7c49bd6dc63e83c4701deb3fa3cc665ae2c0c231e7d4dc79ce3a490e325dd57f962fa74b097fa3fb076ebafd6b0a3fc57d985fe6e16fc4cfc7a5 SHA512 eefdb08d4f09532d35752696b1ac758520ae01f5dca8f44fc63dbd1c7cfb3d83f7f03a32db69c051517ac36b16b9298727fc95d85b188ea336760652fb92305f
 MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c
diff --git a/net-misc/rasclient/rasclient-19.4.2.25171.ebuild b/net-misc/rasclient/rasclient-20.0.0.25390.ebuild
similarity index 100%
rename from net-misc/rasclient/rasclient-19.4.2.25171.ebuild
rename to net-misc/rasclient/rasclient-20.0.0.25390.ebuild