gentoo auto-resync : 02:06:2023 - 21:29:38

3 files changed, 38 insertions, 1 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index dd17b58b8f50..2755e671292b 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -8,6 +8,7 @@ AUX virtualbox-6.1.26-configure-include-qt5-path.patch 717 BLAKE2B d6d9f1b0d3060
 AUX virtualbox-6.1.34-r3-python.patch 343 BLAKE2B 6eb68ba31ab57a1f2065a7d48ef75175f5c3ba45ff9514c1f1ece8f6f54c1d8fe907ca3a10e411bc6b4474cddb39224d54b4bf4cd7b57522b2ca499ce85061c8 SHA512 a22f46e82f163676a5c07b8010160444cc621f9d12ec1226a304ebdf0800f8f24174dec2fb5e8999ba51f574cd2d290af1c7b94b54ca8c2cd6abdad9025e7fea
 AUX virtualbox-6.1.36-fcf-protection.patch 374 BLAKE2B 6c7410ce1fa78aa7476c9b9a6f519c80957b3c7d55569f2ac02d3642d29574b9f8ed4b1c043cf14a899ff3cc67d7f7442bdd1ce27079b987783c36f38b39b49a SHA512 eb1f5d4ef64ea3306ae0489b3c7019a98e6f00c8a62ec8414c78bc8c14ab654ddae57c579557511e4144bf367ad3a2ea58dc5d9ba1a2c796f30fbbec0be7f414
 AUX virtualbox-6.1.42-python3_11.patch 2737 BLAKE2B a0dcd9afcdf2e07a55e3fba54e0eedc7e7072a126aa4791e676209f2c060745df9c32eba0378b9fc275591801947636411186aa2a3c8b5b1927fc93375815cd8 SHA512 7dd4101b7c10a3c1f4f4294c65a80cb392bb31a7cb8113bde59ee112d3d5c5e768daf1645d5b9c5b13ce49c08ed23b7a47064127c9e168743aeb66c614ef249f
+AUX virtualbox-6.1.44-fix-libxml2.patch 1115 BLAKE2B bdcbd6ef7e4812065ad1aa47c3acbff5c402a21af7ece4c3e3ca1867248eff3f16e0d98d8c70c3306d900f285de077ee7f48d744b40df7e2f3566517ebdd6150 SHA512 fe3ee1671dbcacd71c0cdc9f2179dcb0a05121ded8e7f6a1acfea07b5e951d4d2701377c57ae638148e09cc224893f0efdb2f760cd9ccbdf7f3415d9ff563711
 AUX virtualbox-7.0.0-fix-compilation-clang.patch 1638 BLAKE2B 2c1c021a5b95ffdbd46982249c3a60e97d79db17994491c3c1774d7fc889d5b5a0da974d05859e21772b6f265bf1009ad3f13d19a5d264c7f8b4b2bacd6a9bdb SHA512 9c83dfb1550463fc9ddce68dd0648b12721ad1f9fa92fac2e7234ac8149fc5a1a5698a759d1352fc8003d737ce987fbc476ed9a9b350490cf52e42e1a08444dd
 AUX virtualbox-7.0.6-fix-libxml2.patch 15849 BLAKE2B 2a12ab133aeed3295fd9c1281a3a2f56526468a11f2b2426d3a3f8e3d912130b3eeaa21d6c537ff916e7c91499bb97ef8c3c8e11baea2866ad35e93cc3cf636f SHA512 042a4dbee2a5b665240cdd2af4bd5d88fe0da717f562afa1c7c89df634bc0c31a7bb38c34d0b928a4d38db13693a647db61f1c5ae963172b3fb6f83bd9441d3b
 AUX virtualbox-7.0.6-gcc-13.patch 579 BLAKE2B 50d629cafe1aff45ed08d712ab730555f2093336f28be38246c54a60ccbefab880b4b5a548b45e151c583749d347a26dc43fc5fef4e8c400c7bad424c9fa366a SHA512 34b5543c62044d530ee5927b367301f39d465d6177cfa2023578ff572d8e62eef2c5a06e1ec8d274fc582c017232b3603f668a1c09ec7774620e83245cdf90ba
@@ -21,6 +22,6 @@ DIST VirtualBox-7.0.8a.tar.bz2 199387757 BLAKE2B 0ba397825277ecbb851bd4ea94c8544
 DIST virtualbox-help-7.0.8.tar.xz 3941816 BLAKE2B f1c82ccc8a0d4e99f2302a7024a551e7e4a70348b193cf0c3a3b2917a717451c74d652555cadb278f6e27c47dac88a8121acfe9425bc0f5b82b5101475f384b3 SHA512 7483c4321492effb5b4329d48b363d8d2b3aaa248c0259cd06569497090aa438c39e94d6a5da4f511202f424e596f66e7580e37ffa5da66661fd0fadcd99c5ef
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
-EBUILD virtualbox-6.1.44.ebuild 18624 BLAKE2B 8aed30ec5f1cc112e5379ccdbad23780af06b3f3852ac819f3637fe252633a30ae727fbf6f7a272be786f929d18c93d57286c83ded4d3e2a00609929b9c03748 SHA512 447529d4eba2f3cea4551ba0bc09f2cde5d01fc21b5780bfddcb6381cb5dfdc7e609c042ac21e53c1c762d1b1e123b5a16c6b5150cde836bb13351a97217e15f
+EBUILD virtualbox-6.1.44.ebuild 18931 BLAKE2B 9427315b0a0aa723a834d5f553547569472c7b61814eeaf2bae629cc166b947919bf970f844f3e3bdceeb749825ab2240ed9a3043c27db0d9eb60e1f65bc41d2 SHA512 798b5b80140315880a3fb06319a8cef1b12517863a802290772b937bb94b41b85ce90eb9f5447476a40d1cb398501d6d2f8255df75d1f59b2b57c508adf81fb2
 EBUILD virtualbox-7.0.8a.ebuild 20647 BLAKE2B eec6de1dacef37a8367528b3848b562ffcebc48e53217a9e1c3587ff0161917d0e869dd24b34df10f57bddc120574f0a6854e8412f7ebf4805cd3ac1b6dc33a6 SHA512 d746f705c58b9452e6400e12d15690013e0e90cfa820bc3828f7bd0612318e01a1c5a03d434f870251e2b3c83d4fe346ffceefa928960de1f497c5eb89d1ffd0
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.44-fix-libxml2.patch b/app-emulation/virtualbox/files/virtualbox-6.1.44-fix-libxml2.patch
new file mode 100644
index 000000000000..c3e76e58c3f2
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.44-fix-libxml2.patch
@@ -0,0 +1,25 @@
+With dev-libs/libxml2-2.11, xi:include errors out if it can't find a file, so add an empty fallback.
+Used to work with dev-libs/libxml2-2.10.
+
+See also: https://bugs.gentoo.org/906309
+
+--- a/doc/manual/en_US/user_Frontends.xml
++++ b/doc/manual/en_US/user_Frontends.xml
+@@ -1205,6 +1205,6 @@
+ 
+   </sect1>
+ 
+-  <xi:include href="user_man_VBoxHeadless.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++  <xi:include href="user_man_VBoxHeadless.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+ </chapter>
+--- b/doc/manual/en_US/user_VBoxManage.xml
++++ a/doc/manual/en_US/user_VBoxManage.xml
+@@ -8975,6 +8975,6 @@
+ <!-- TODO: Figure out how we can handle other manpages. The xml is bolted to
+              sect1, so it's not possible to have them "in place" -->
+ 
+-  <xi:include href="user_man_vboximg-mount.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++  <xi:include href="user_man_vboximg-mount.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+ </chapter>
diff --git a/app-emulation/virtualbox/virtualbox-6.1.44.ebuild b/app-emulation/virtualbox/virtualbox-6.1.44.ebuild
index 84d1d998b3b0..b148184cbd9b 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.44.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.44.ebuild
@@ -179,6 +179,9 @@ PATCHES=(
 	# 865361
 	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
 
+	# 906309
+	"${FILESDIR}"/${PN}-6.1.44-fix-libxml2.patch
+
 	# Downloaded patchset
 	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
 )
@@ -278,6 +281,14 @@ src_configure() {
 		append-cxxflags $(test-flags-CXX -mno-$i)
 	done
 
+	# 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
+
 	tc-export AR CC CXX LD RANLIB
 	export HOST_CC="$(tc-getBUILD_CC)"