gentoo resync : 16.01.2021

8 files changed, 339 insertions, 1 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 361b1fd272f3..538e6bbd57fc 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 6df3c13cd750..edf48dc93d46 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,9 +2,10 @@ AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27
 AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
+AUX scribus-1.5.7-osg-cpp17.patch 11762 BLAKE2B 4f83dd7de919025606068ca5c05d2dd234b0d21d35cb7f784b1cebccc068f638730b7527ea07ed9a2bee16dd1524fa99e0e0ae10db5e98148066c882c00853fb SHA512 1e1e18967ce764d0b228d667d1673f6f7a03a7cba6fe07371435a6c7b9dcb0900fe73974a3a06ff22c87b35f27434bb44a3ec0b264914b8329c92b7e8d857c2c
 AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
 AUX scribus-1.5.8-harfbuzz-3.patch 2703 BLAKE2B c870a6be1a9e2921ff3336852782bb1fbeb51c0fd797de1a59605723810279e4c48ac65bc8abce5a71cdad16a9c62c7d2f0759fa7593bc3ddc70f5f22a6e0d5b SHA512 589e87973d316d8a96d731e649becfe63b24f26bab9e81da57cf8d049b9a0da78a659c089ab71439232fa56019c0cfaea6fbdce3081eb90c2cd07c6c995d740e
 DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
-EBUILD scribus-1.5.7.ebuild 4057 BLAKE2B d54e5ece7d4d089e4871d7917556ca48d6c46a3ca67f04b8e74238fa803f6f78308bbec4578a09edac39d10b6087e633a493e112fdfd6d485e9988a4bca82c4f SHA512 c72afb841bea4ca8f18419151d480278cfb89d589ece9c8bc7e3550b7bf1fcaac2b22e377fa23544c85bd506b3cd54f2f70a0b44731f052b652403221d19f505
+EBUILD scribus-1.5.7.ebuild 4100 BLAKE2B b2006dbed58cbb72a90c7956d7fc6b270ba309279117a073a004c7ce14645e3bb7a67176ff351a252c131c1dbc56632433002dd8bba01b5bdda6523f907cb8a7 SHA512 b1a23ef9be8fd537072537c2a80710019c0cd0f85d2ed333c0b44cfb3deb7eb4cfbfd50ba8afc9165f4ee4e8791ba91a2d4ac8e98272003e4b4b8a17e2103d48
 EBUILD scribus-9999.ebuild 3964 BLAKE2B 8152771bbcb2b632c8b691b441613103147eb2cdb4bb50765940c20342f33308f01967d7b929ed076cb3be2a012fba00fb47d49040eb1220e2a20e28b76e5d28 SHA512 e3d4884e9f265257a33941eaec56d20cbf0bd0fc0155ca8852db23e54766285d19e4b74017faba3824aeb843e08906dee2387949bdcef73fa5191b16def49499
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
new file mode 100644
index 000000000000..21f0c00554d2
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
@@ -0,0 +1,219 @@
+https://bugs.gentoo.org/831161
+Backport of https://github.com/scribusproject/scribus/commit/80405ce
+
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Mon, 10 Jan 2022 20:38:51 +0000
+Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential
+ conflict with std::byte in c++17 mode
+--- a/scribus/third_party/prc/oPRCFile.cc
++++ b/scribus/third_party/prc/oPRCFile.cc
+@@ -76,3 +76,3 @@
+ // Map [0,1] to [0,255]
+-inline uint8_t byte(double r) 
++inline uint8_t to_byte(double r) 
+ {
+@@ -451,5 +451,5 @@
+               {
+-                tess->rgba_vertices.push_back(byte(lit->color.red));
+-                tess->rgba_vertices.push_back(byte(lit->color.green));
+-                tess->rgba_vertices.push_back(byte(lit->color.blue));
++                tess->rgba_vertices.push_back(to_byte(lit->color.red));
++                tess->rgba_vertices.push_back(to_byte(lit->color.green));
++                tess->rgba_vertices.push_back(to_byte(lit->color.blue));
+               }
+@@ -595,19 +595,19 @@
+           {
+-            tessFace->rgba_vertices.push_back(byte(C[1].R));
+-            tessFace->rgba_vertices.push_back(byte(C[1].G));
+-            tessFace->rgba_vertices.push_back(byte(C[1].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[1].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[1].A));
+             
+-            tessFace->rgba_vertices.push_back(byte(C[2].R));
+-            tessFace->rgba_vertices.push_back(byte(C[2].G));
+-            tessFace->rgba_vertices.push_back(byte(C[2].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[2].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[2].A));
+             
+-            tessFace->rgba_vertices.push_back(byte(C[3].R));
+-            tessFace->rgba_vertices.push_back(byte(C[3].G));
+-            tessFace->rgba_vertices.push_back(byte(C[3].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[3].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[3].A));
+           }
+@@ -622,19 +622,19 @@
+           {
+-            tessFace->rgba_vertices.push_back(byte(C[0].R));
+-            tessFace->rgba_vertices.push_back(byte(C[0].G));
+-            tessFace->rgba_vertices.push_back(byte(C[0].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[0].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[0].A));
+             
+-            tessFace->rgba_vertices.push_back(byte(C[2].R));
+-            tessFace->rgba_vertices.push_back(byte(C[2].G));
+-            tessFace->rgba_vertices.push_back(byte(C[2].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[2].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[2].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[2].A));
+             
+-            tessFace->rgba_vertices.push_back(byte(C[3].R));
+-            tessFace->rgba_vertices.push_back(byte(C[3].G));
+-            tessFace->rgba_vertices.push_back(byte(C[3].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[3].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[3].A));
+           }
+@@ -646,19 +646,19 @@
+           {
+-            tessFace->rgba_vertices.push_back(byte(C[3].R));
+-            tessFace->rgba_vertices.push_back(byte(C[3].G));
+-            tessFace->rgba_vertices.push_back(byte(C[3].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[3].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[3].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[3].A));
+           
+-            tessFace->rgba_vertices.push_back(byte(C[1].R));
+-            tessFace->rgba_vertices.push_back(byte(C[1].G));
+-            tessFace->rgba_vertices.push_back(byte(C[1].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[1].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[1].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[1].A));
+           
+-            tessFace->rgba_vertices.push_back(byte(C[0].R));
+-            tessFace->rgba_vertices.push_back(byte(C[0].G));
+-            tessFace->rgba_vertices.push_back(byte(C[0].B));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].R));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].G));
++            tessFace->rgba_vertices.push_back(to_byte(C[0].B));
+             if(tessFace->is_rgba)
+-              tessFace->rgba_vertices.push_back(byte(C[0].A));
++              tessFace->rgba_vertices.push_back(to_byte(C[0].A));
+           }
+@@ -1650,17 +1650,17 @@
+     {
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
+     }
+@@ -1794,33 +1794,33 @@
+        // first triangle
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
+        // second triangle
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
+        if(tessFace->is_rgba)
+-       tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
++       tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
+     }
+@@ -1912,7 +1912,7 @@
+     {
+-       tess->rgba_vertices.push_back(byte(C[CI[i]].R));
+-       tess->rgba_vertices.push_back(byte(C[CI[i]].G));
+-       tess->rgba_vertices.push_back(byte(C[CI[i]].B));
++       tess->rgba_vertices.push_back(to_byte(C[CI[i]].R));
++       tess->rgba_vertices.push_back(to_byte(C[CI[i]].G));
++       tess->rgba_vertices.push_back(to_byte(C[CI[i]].B));
+        if(tess->is_rgba)
+-       tess->rgba_vertices.push_back(byte(C[CI[i]].A));
++       tess->rgba_vertices.push_back(to_byte(C[CI[i]].A));
+     }
diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 5f63eeb1aa19..2d3e677154da 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -78,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
 	# upstream
 	"${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch
+	"${FILESDIR}"/${PN}-1.5.7-osg-cpp17.patch
 )
 
 CMAKE_BUILD_TYPE="Release"
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 87fdcd2e994b..77706f3f64cf 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -2,8 +2,10 @@ AUX texstudio-3.0.5-quazip1.patch 554 BLAKE2B 239f468f72655b579b70503856a87230b7
 DIST texstudio-4.0.2.tar.gz 88557508 BLAKE2B 51c7b80f01e6e657b901d197bae01e4314446690d8169da823d2bc0be13a1918c248976f81ec64c1ce57dc523fd1b3a1aa01709cce3d56de207a69d42c9cb512 SHA512 a2579788cac0ddf1edc7be2040ea13bc7aece5596a91cd8361a4de8c7fafaa86c95ef34e40f4a0bdf3b5cfc52c951af737138ccd26dbf8ac730ec64f8a38cfd7
 DIST texstudio-4.1.1.tar.gz 88564492 BLAKE2B d3a198b4d355ea0f07391b8ff816baacd03f6d9b3f21e69c4b2303ee9e754e9cf49e3bd7a22b5e1cdd74f463d81f95ffee8212ed89825d9a05b7aa5f13355610 SHA512 eb78bdd565c7cc1c84214975f2e7b6b01e2b00f136eb0890bca363fafe61a540caa9a360c10848b836315d3107775a7a289ea6f02480dbb8c5d17e2d09c0f481
 DIST texstudio-4.1.2.tar.gz 88666134 BLAKE2B 7c4310fd0d8fd446b8844f11c687f55818f7314a2e0614ac26b8023f8fa7e5eca1b60a3b3c0ce61ccb15d383b61c24280a67dd530a907b4b8e00a965b10230bf SHA512 0b88f82514462c363e6dcee899f3681883ce9db1bb21cbf9e5e657208338bba4a6cdb79feeaefb242350bc01b83851c5d2704a7d0e2888034070ef2588b77964
+DIST texstudio-4.2.0.tar.gz 88795988 BLAKE2B da849849d9ab57cb04de63f24e207b03b47393b876cd2762277e00f17d39b8c19a7508df567642faec8a5ac10400d2a6327343b40ab076f24f0bc8bb1b2ec683 SHA512 aff5ae645a3b3c362e0456270576770c5b39212902a37633b7279476cf6278ee292ef93c4a0c917b1d4d513aaf597d634f4cf7a469fd4e918f35ddbbe5cb1700
 EBUILD texstudio-4.0.2.ebuild 1721 BLAKE2B 99ca4fab9bfa132aa0b40ddc56ac8629f3e89d2479e0e9cc6b9a2d6df31c214f02ef40b62b95722005b6cd321f1c58fa27459e2675b990e6ee5630d35cb04639 SHA512 09e380741881e0e6a7ec6ae2c97236bcda625a66577c4ff448e9dcc11a954053452789251747d35dafcaf8dd801363a442a32292c770dfbc24b4dd77865e95dd
 EBUILD texstudio-4.1.1.ebuild 1738 BLAKE2B b8ca60e4d518b455550ea678db98711ae0cc5a77854f640b426c81f837442d7c476ea201cac301109777f4ca2d8d5d5a0f1238414022e7bce398157c573456ac SHA512 d74b3da403e6a8ccccf24e02abd5ada314ea6fdbf4f989cd3b1bc617a75dfc436362e582c89b43ffff1f254c135b6a8084ff09b35c4b1aedc2684638e851dc5a
 EBUILD texstudio-4.1.2.ebuild 1738 BLAKE2B b8ca60e4d518b455550ea678db98711ae0cc5a77854f640b426c81f837442d7c476ea201cac301109777f4ca2d8d5d5a0f1238414022e7bce398157c573456ac SHA512 d74b3da403e6a8ccccf24e02abd5ada314ea6fdbf4f989cd3b1bc617a75dfc436362e582c89b43ffff1f254c135b6a8084ff09b35c4b1aedc2684638e851dc5a
+EBUILD texstudio-4.2.0.ebuild 1738 BLAKE2B 6c37086bb056e8eb8f00f0606d8e073dccbe280ba1de4d787e805045c0cd05887e35954b23f06721f3a77a7b0330fd4569febe9fd920c5c3029115026a0029b5 SHA512 56fcb02a16038295708bc075f7279dc3795e6a7d48f002f678b6c124783d8ba8cd368b3c43919c8b798393635a3da3280f1b3ef5b13d151422979944d35dbd80
 EBUILD texstudio-9999.ebuild 1661 BLAKE2B 7ab31d156cb4b4a192ebbd96628f4f427ffe8f2f05296292bd3c98590c73110d5022e929df11f009188c347e108d5d460498ce44e243cfd91e49f9d8b2e7a405 SHA512 293d1621312fc9c5fb580a868bd67a43434c671b3b623048e9b93e6093d292e3975b292c1a7f6014853e44f803b0253a87a716ee30fa68bfec251f6dead07780
 MISC metadata.xml 523 BLAKE2B a16bc006c6ab5dd0536e77a5bbe1681cc84c3aa5be50bdb567eccecab426688c751c0bec2c34bf221ec54f5ba772236a81a227067e426bb545755a129ebb6e41 SHA512 91f8748cb661e3e2ef7c027d02aecccbe23cce00c0da8486227d237ee6429e84ac9a8c2b32d4c518a4583d0643871b0c50c838d3c40004c0df7ae9c8ecefceed
diff --git a/app-office/texstudio/texstudio-4.2.0.ebuild b/app-office/texstudio/texstudio-4.2.0.ebuild
new file mode 100644
index 000000000000..befb6b7f9969
--- /dev/null
+++ b/app-office/texstudio/texstudio-4.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+MY_PV="${PV/_/}"
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="video"
+
+DEPEND="
+	app-text/hunspell:=
+	app-text/poppler:=[qt5]
+	>=dev-libs/quazip-0.7.3-r1:0=
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="
+	${DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-quazip1.patch" # TODO: upstream
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+	rm -r src/quazip || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
+		-i ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1 NO_TESTS=false
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
+	done
+
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
index 4aeb7fd60129..71315a6ff818 100644
--- a/app-office/unoconv/Manifest
+++ b/app-office/unoconv/Manifest
@@ -1,4 +1,5 @@
 AUX timeout.patch 460 BLAKE2B 66cb2918b2ad85cb987ecae492626a0ca06344cac4e9fab1f6a141bcb7822356936439e2239ac586aed8a163e297a5b563e51d382e372c2435256933a4ca3612 SHA512 00ccee1c2040149432565abf4cc0bc8966801202a88c75f246d4b4c986dd43288f30045d4e966c973efa946532eec1f07a6bdff0b9307bd9c12475c9309f3fa5
 DIST unoconv-0.9.0.tar.gz 108493 BLAKE2B 36761f5cabd8cf0186ffa74202d8a9e0388ab9dc1a135b8e6b2275ed380de79da85d4955bca446810f4f71dff61bd38d7b131a91930729cbabfb10d656ba3891 SHA512 37d63ada32675fd0ebd089a74db453fdb7332a24e62cbf3e060d6d15cc503c76ede9ccc5e09467f4a38833a8358c09fde23cc8780a77c343268f20e0c37f2469
+EBUILD unoconv-0.9.0-r1.ebuild 765 BLAKE2B a988830891110549ee9a82f199ce69ef0b1495b4b7932802c3b14f559b875f969a9dc586df590e5a912763986be29e09856a1c17d71095f246fe94190a587005 SHA512 7ab755ecd51efa14e3830984c05b2386e3db8e6149e0ccb3a08860db1d078702c70708a7d34eb69258f957706c03179a361824a9b870c673f1b2f394a1545984
 EBUILD unoconv-0.9.0.ebuild 762 BLAKE2B 4db20db39164e4179e19fd077b7e7e2722538df7026d30b3b9c2a14b2e6923c812f5ef5da9421924075c8c375fb38838c94b2767f161d86226807e3ce7c8f153 SHA512 c7bf4ddfd4dc26f611ce5c49c74936d437216c520607bdf064ae61a8fb8743de4cb3192f3e36781ee2fbe75688c820ad5e6411f52f63c66bbeab0b82f43c58ec
 MISC metadata.xml 430 BLAKE2B 389284b355ace7dd8290d21a17014d47055aee2b0639658779eef804b5596fd98ad8dcbac35a992f3e51027be32c7c510f3b164d6d27bccd9059e7108fed1a01 SHA512 c2980bbbb63eb4d75a1be788eccf6d0516bef672fb3e2653059a84582ee715b0a40fd63acd158be9a809abec6f6de76845963002476d9e577969aa2f3b57e960
diff --git a/app-office/unoconv/unoconv-0.9.0-r1.ebuild b/app-office/unoconv/unoconv-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..e6a52ebfc18b
--- /dev/null
+++ b/app-office/unoconv/unoconv-0.9.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit python-single-r1
+
+DESCRIPTION="Convert between document formats supported by LibreOffice"
+HOMEPAGE="http://dag.wiee.rs/home-made/unoconv/"
+SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!app-text/odt2txt
+	virtual/ooo
+"
+
+PATCHES=( "${FILESDIR}/timeout.patch" )
+
+src_prepare() {
+	default
+	python_fix_shebang .
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake -j1 doc-install install install-links DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog CHANGELOG.md README.adoc
+}