gentoo resync : 22.05.2021

11 files changed, 363 insertions, 3 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 7c3525234cd9..484e876222bd 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 4f2585825513..3b95edba59eb 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -2,5 +2,5 @@ AUX kexi-3.2.0-glib-2.68.patch 1223 BLAKE2B 354fbb183b30bf678eb0b896fee5ae607bf8
 AUX kexi-3.2.0-missing-header.patch 739 BLAKE2B da09cf24f4852222040112a7774bd5d0463f85d52d52c352b453f4d0502085a0faa67ae3ae8fd44102c2fa3b8840525929e53c9ad1a05acfb5c23747cdbb6d91 SHA512 14779c27e47d7e3c0f3f8de917deae8fed7b38673bcc5ec53fa0ca7c89c354a3601af80c6fe17ab3231f633852c47c0dcd2858834cee79a961fc3d02a1043fa1
 AUX kexi-3.2.0-postgresql-9.12.patch 1094 BLAKE2B ac9ba4ff8f5c29ae8ebdcfa6820ed8663aa0f13a9fb55f4eff85265fa3d76a3e33e6c1000400a7a21721e9f45ba58006dbb97c312fd4b96f9d0e9e49dfd88690 SHA512 cfde38090e163ff441477c7f8262629589c9ab49c2687eefe7e0a107f4d70fd447cc35e1031612a6ce970e3b3ec3b9394f13e6e2876c29614cb43ba0b9fc9fbd
 DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93
-EBUILD kexi-3.2.0-r1.ebuild 2603 BLAKE2B bfb4377c5404f13dd0be73c09476c42dae650eefe81c84ab97d152ce9292e9ed2d6064c090747c09a6a01d523156a01938b0c3251fdd1ffa3e0b22b373fa6512 SHA512 43cd659391a563cd4b536736501cd8979c9f36a3634eb45f6418511e28be1fe1a8ce2d60abeec8eb7e9ee67d2847c4389312c8911ed622bb983a1cc1e0b8a601
+EBUILD kexi-3.2.0-r1.ebuild 2601 BLAKE2B 5ae522733df3d337adeece30f5a52cec7982c8eb52234ecd50edbd56556ff879f08252b7908b8567e86fb6c4832a0f068001f2c8efe704dc124989f987d862b8 SHA512 c8b25e537ac32f3d8969b915aaac413d035ec8847cc493c709e033847b5028f709140e1b2fb0d428bb4f47df1d07690e7bc13421731f204acc2e956eeab145dd
 MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f
diff --git a/app-office/kexi/kexi-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild
index 9732672ee1a9..73ce61cd4464 100644
--- a/app-office/kexi/kexi-3.2.0-r1.ebuild
+++ b/app-office/kexi/kexi-3.2.0-r1.ebuild
@@ -10,7 +10,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Visual database applications creator"
-HOMEPAGE="https://apps.kde.org/en/kexi-3.3 http://kexi-project.org/
+HOMEPAGE="https://apps.kde.org/kexi-3.3/ http://kexi-project.org/
 https://userbase.kde.org/Kexi"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4e80ff476811..4ea3052de88c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ AUX libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch 3460 BLAKE2B
 AUX libreoffice-6.4.7.2-icu-68-1.patch 1930 BLAKE2B 20a59bb0141d9e5831963f79ab59aeaf7a137b619b1ad55a3a6825f944f25a241c951164f00ca2c4f90de5713b8b0392768d9fc429d67cc5ac1343972842271f SHA512 501fc1b980727bdbf4e0bfa319a3df16aa065829bcbd9f8c7689de4bbae5ae73535a5547c8d69916966e3b83fdf817159db52f5b617a127eccdb761ed47a4177
 AUX libreoffice-6.4.7.2-icu-68-2.patch 961 BLAKE2B 610ba98ae4c57f79bb6b950081e4b565937d5f9fa38eeed4a086f7790adf65064e3b114aedcfdfa6dd328acd41f43520e4ee033e160f481567452782f92e552c SHA512 5e70548d52d693602f7fe40c2d9486158e5fa3c0d43c8e1ae87a014781966b39219a82c456e71e561d6c2b2c7da258dcb77ba70712b3677801ac28b2a5a1cc82
 AUX libreoffice-7.0.3.1-qt5detect.patch 1065 BLAKE2B bce0bb8d36f903516f437520e0b1a99080984933173ac30686136632a795f16b8e82f7bfb9dfe77b048154cf3616b3c6c96fd7c563284212ce4b3f9a4490f368 SHA512 e4273fcb2140c50c9030ef3ffeb451169c2e04fcf7e43650ad1d0928fa18ebe77dd482e2686fbaf9660aebfc17b9ce22b3dfa76f2248ae4af9bc51826e2785c2
+AUX libreoffice-7.1.3.2-bashism.patch 1092 BLAKE2B 0c14e7a282cafe030a39b15551695e61bd9fd70090589e4b94b0839a31b28e634f927b7a21e73de74ea890fc575ab23923a14ad9e226a626dec331db9014391f SHA512 abafcf90b93078c1ec8cc8bf807ec089fc0f79a3eb0823a1da4026a40281369998b72a2c894dc268c56af586476d39991099b99a2f9a74d03fac98b856d4e84d
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44
@@ -32,7 +33,7 @@ DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e3
 DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
 EBUILD libreoffice-6.4.7.2.ebuild 17756 BLAKE2B ecd2929b57fb0dd0b06017f2940018e324c83ef7dd752528a87e69358e644ec7a26f32b24a3174f45d29e14c0060e099d31e7ed6f1d0a0afbd98eaf157257729 SHA512 9319d0a04425e38feedecaf9542d6d0636b950ed8c5733f8eedf47dd16b89b69538fd96ec9fd9458a5ea54b775387ac8fd0dbe80cc842090d8c35b13ba06aa21
-EBUILD libreoffice-7.1.3.2.ebuild 19538 BLAKE2B 30d719cd058db0f73d26c6d943349eecb7e2f581703156f2b4b5bea19ad2230184bdf6adde5adf06ee3a143a9b67949f12d05dad9b32475872d83cf06f1b3043 SHA512 5ecedf36b0a8a8d80c8306e6b3821a02654dc7683c267b02a4343e35418274ce2d61004f9597c69c897052147a8a46c9fc0e1c12516e7b268527731f6655dd90
+EBUILD libreoffice-7.1.3.2.ebuild 19603 BLAKE2B 9628f154b069a29937a1d5bf8662ef81db8e11ce63bc7e0bf39d37fa1bb944dafc7c5ebc82b062013ba590b0ae76c8bca3ff4bb8a2fa194e0d9bf86f23f1a0b4 SHA512 55100197f8b17b23bdc243bafdbfaeb1c49bda18dc0bea06a202cbce95e608e4de9d3712d40fb3ea06fa5b56120a3b816223e5ac86b42233400e5ff1fd029b8b
 EBUILD libreoffice-7.1.9999.ebuild 19533 BLAKE2B a8188e1fed67316f27c43c98ee9ec5401c0c452aea17ee1d67be489d60cca8b6fb12738bfd3536e6f057e4ca329cf269ed4abd3f9ac2c27a4ff4955340b27454 SHA512 1ad4750417630ed56700da1ac658c9d65e71de7bc36155cf3e5be70fc747197912c77830c751603ee697ffe1e6dd26db96b7ed6579cac99e85b8ac8863841ae0
 EBUILD libreoffice-9999.ebuild 19517 BLAKE2B 409577c0d2592cffe177102833b3a2531846f65bd8cf78a8db077304e1f151d6d9b2fa73829bfa32a3244dd7037a180faadd4b94a749fb6ddcc15495a1fd53a6 SHA512 327c5140f8d5b852b0de3469a05cf43c9fc6b0184f6b671ea4b3116d3637400e6be990d3756fe334a937950f19b47559adb0317e8f9d7afdc344c3fc4af4da16
 MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957
diff --git a/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch b/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch
new file mode 100644
index 000000000000..36d43f29d397
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch
@@ -0,0 +1,33 @@
+From 2c4dd73c4c9f471fa2083f9f99dd27a7148f3175 Mon Sep 17 00:00:00 2001
+From: Julien Nabet <serval2412@yahoo.fr>
+Date: Mon, 17 May 2021 18:43:48 +0200
+Subject: tdf#142335: fix bashism in configure.ac
+
+Thanks to Matt Whitlock!
+
+(also reported in https://bugs.gentoo.org/show_bug.cgi?id=780432)
+
+Change-Id: I38fec6faf9a929adf1f300b8c369ec6c16a91ed8
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115716
+Tested-by: Jenkins
+Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d7b831435713..3d14c5e4258c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2682,7 +2682,7 @@ AC_SUBST(ENABLE_RELEASE_BUILD)
+ AC_SUBST(GET_TASK_ALLOW_ENTITLEMENT)
+ 
+ AC_MSG_CHECKING([whether to build a Community flavor])
+-if test -z "$enable_community_flavor" -o "$enable_community_flavor" == "yes"; then
++if test -z "$enable_community_flavor" -o "$enable_community_flavor" = "yes"; then
+     AC_DEFINE(HAVE_FEATURE_COMMUNITY_FLAVOR)
+     AC_MSG_RESULT([yes])
+ else
+-- 
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
index 43efb5a66253..57948352e89d 100644
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
@@ -292,6 +292,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+	# master branch
+	"${FILESDIR}/${P}-bashism.patch" # bug 780432
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 0fe5a1072b36..e5a0e2fe3b59 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,5 +1,7 @@
+AUX lyx-prefer-xdg-open.patch 3470 BLAKE2B f989c3455d4cfb332d36edbca9b3bcc0208709d361696f04bdd565ea455104d1809877bdb85a362e950c2d48159c52d9a1a69c92d79f075269cfc9ccfceee4d7 SHA512 d17a2af0d75b6dcca06c1d31e615b814df3e75c3039c7ff5a14ab270b7cb75ab6f42ec851db7c804c90b7724a95eeec02d74de5c7511523c8400f0d50c2c0ce3
 DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
 DIST lyx-2.3.6.1.tar.xz 16242608 BLAKE2B d59c6db79d7760902f93405e3737974fa9c6bd79c5ab4b02010021532903c76a77701f1f99a0838b4379c548f3f37dcdd9eeb492b733c4162162d868d1d92970 SHA512 233f6c54d4a036ad12f33c6705810bfb99747bdbd015550a8a0a9d7b664d3be50a06dc337191b820c42de4407c5f790efa50c706a45fb2260a71f772fb22c872
 EBUILD lyx-2.3.5.2-r2.ebuild 3937 BLAKE2B d1b8daa94a0f51563c6bbfe59f4f87a79fd5ae5c0cfef92d2add3881fb82904011b9ef489890a626c5f05d91f1c13538b1314b120812db9ac8d0c589eae39e85 SHA512 f3fbc672b9514925e33d1bbbe0a9a89d9a6e3b6834c5b48b62bed5c5f44aca5bc5fee5e10dacefa9557ee79fb04058196924bd07a6860aea382b8a7c368d0161
+EBUILD lyx-2.3.6.1-r1.ebuild 4120 BLAKE2B fee38035212de49dc2dd50bb234a60ed6c79d623edf836dfef984e5ac150a18334a6fbef78ed760a57a8e551c5044162887917a993e625b976586545ebd882ca SHA512 213c56e0e496fafbb7855468b2691a52bfc139c1a4e5dc2110e735eeaa0835d25a79137c10a7707d91a6d3b152e90fa0d621ce26e1b1c9d0fffec424120be157
 EBUILD lyx-2.3.6.1.ebuild 3936 BLAKE2B 992c3937c0c7408c57d95447e7120cbbf829192897f050f88373521b68c1d88dc1d8c1cd0b6077e71e936a55cf0e4a289e0ac5b64176bc5095822d3b6fc05997 SHA512 b5cc1834d7b76b8e36f61ff25db3a5132ad6654f8874b2f3593dbda690a067bd855b729a2bf28f66a52303786757e683399097fad68bf7752fbd860f179d1ef9
 MISC metadata.xml 1269 BLAKE2B b400b34cf521d12c4bf93a828b8b4b4cb578abf511a951c680ba8eb25fccd83d17302ae8921155c93e5f4718f818923675c97eb6a4debde6df10d797592e290e SHA512 b46c4aab0ef227d8eb3f38aac8b9f9e99aaaca05f9f7b992e9cfcec90cbf3825521b111b5d0473d78b2742fc5bbbacbc3ea16c3eaf7d4beed2a0d66f88b5f168
diff --git a/app-office/lyx/files/lyx-prefer-xdg-open.patch b/app-office/lyx/files/lyx-prefer-xdg-open.patch
new file mode 100644
index 000000000000..5e12f6c2e699
--- /dev/null
+++ b/app-office/lyx/files/lyx-prefer-xdg-open.patch
@@ -0,0 +1,60 @@
+From: "Dr. Tobias Quathamer" <toddy@debian.org>
+Date: Wed, 31 Jan 2018 23:27:37 +0100
+Subject: Prefer xdg-open
+
+Add xdg-open as the first choice whenever this seems to be useful.
+---
+ lib/configure.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/configure.py b/lib/configure.py
+index 7fee68d..abc4d53 100644
+--- a/lib/configure.py
++++ b/lib/configure.py
+@@ -657,7 +657,7 @@ def checkFormatEntries(dtl_tools):
+     checkViewerEditor('a Dia viewer and editor', ['dia'],
+         rc_entry = [r'\Format dia        dia     DIA                    "" "%%"	"%%"	"vector,zipped=native", "application/x-dia-diagram"'])
+     #
+-    checkViewerEditor('an OpenDocument drawing viewer and editor', ['libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
++    checkViewerEditor('an OpenDocument drawing viewer and editor', ['xdg-open', 'libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
+         rc_entry = [r'\Format odg        "odg, sxd" "OpenDocument drawing"   "" "%%"	"%%"	"vector,zipped=native"	"application/vnd.oasis.opendocument.graphics"'])
+     #
+     checkViewerEditor('a Grace viewer and editor', ['xmgrace'],
+@@ -682,16 +682,16 @@ def checkFormatEntries(dtl_tools):
+ \Format xbm        xbm     XBM                    "" "%s"	"%s"	""	"image/x-xbitmap"
+ \Format xpm        xpm     XPM                    "" "%s"	"%s"	""	"image/x-xpixmap"'''
+     path, iv = checkViewerNoRC('a raster image viewer',
+-        ['xv', 'gwenview', 'kview',
++        ['xdg-open', 'xv', 'gwenview', 'kview',
+          'eog', 'xviewer', 'ristretto', 'gpicview', 'lximage-qt',
+-         'xdg-open', 'gimp-remote', 'gimp'],
++         'gimp-remote', 'gimp'],
+         rc_entry = [imageformats])
+     path, ie = checkEditorNoRC('a raster image editor',
+         ['gimp-remote', 'gimp'], rc_entry = [imageformats])
+     addToRC(imageformats % ((iv, ie)*10))
+     #
+     checkViewerEditor('a text editor',
+-        ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
++        ['xdg-open', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
+          'nedit', 'gedit', 'geany', 'leafpad', 'mousepad', 'xed', 'notepad'],
+         rc_entry = [r'''\Format asciichess asc    "Plain text (chess output)"  "" ""	"%%"	""	""
+ \Format docbook    sgml    DocBook                B  ""	"%%"	"document,menu=export"	""
+@@ -745,7 +745,7 @@ def checkFormatEntries(dtl_tools):
+     #checkProg('a Postscript interpreter', ['gs'],
+     #  rc_entry = [ r'\ps_command "%%"' ])
+     checkViewer('a Postscript previewer',
+-                ['kghostview', 'okular', 'qpdfview --unique',
++                ['xdg-open', 'kghostview', 'okular', 'qpdfview --unique',
+                  'evince', 'xreader',
+                  'gv', 'ghostview -swap', 'gsview64', 'gsview32'],
+         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"	"image/x-eps"
+@@ -756,7 +756,7 @@ def checkFormatEntries(dtl_tools):
+     # maybe use "bestApplication()" from https://github.com/jleclanche/python-mime
+     # the MIME type is set for pdf6, because that one needs to be autodetectable by libmime
+     checkViewer('a PDF previewer',
+-                ['pdfview', 'kpdf', 'okular', 'qpdfview --unique',
++                ['xdg-open', 'pdfview', 'kpdf', 'okular', 'qpdfview --unique',
+                  'evince', 'xreader', 'kghostview', 'xpdf', 'SumatraPDF',
+                  'acrobat', 'acroread', 'mupdf',
+                  'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'],
diff --git a/app-office/lyx/lyx-2.3.6.1-r1.ebuild b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
new file mode 100644
index 000000000000..d9922fde669e
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+MY_P="${P/_}"
+inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
+HOMEPAGE="https://www.lyx.org/"
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
+	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${PYTHON_DEPS}
+	app-text/mythes
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-texlive/texlive-fontsextra
+	sys-apps/file
+	sys-libs/zlib
+	virtual/imagemagick-tools[png,svg?]
+
+	x11-misc/xdg-utils
+
+	aspell? ( app-text/aspell )
+	cups? ( net-print/cups )
+	dia? ( app-office/dia )
+	dot? ( media-gfx/graphviz )
+	enchant? ( app-text/enchant:2 )
+	gnumeric? ( app-office/gnumeric )
+	html? ( dev-tex/html2latex )
+	hunspell? ( app-text/hunspell )
+	l10n_he? ( dev-tex/culmus-latex )
+	latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/ps2eps
+		app-text/texlive
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-plaingeneric
+		|| (
+			dev-tex/hevea
+			dev-tex/latex2html
+			dev-tex/tex4ht[java]
+			dev-tex/tth
+		)
+	)
+	rcs? ( dev-vcs/rcs )
+	rtf? (
+		app-text/unrtf
+		dev-tex/html2latex
+		dev-tex/latex2rtf
+	)
+	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
+
+S="${WORKDIR}/${MY_P}"
+
+FONT_S="${S}/lib/fonts"
+FONT_SUFFIX="ttf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+	# Try first with xdg-open before hardcoded commands
+	# Patch from Debian using a similar approach to Fedora
+	eapply "${FILESDIR}"/${PN}-prefer-xdg-open.patch
+
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
+}
+
+src_configure() {
+	tc-export CXX
+	#bug 221921
+	export VARTEXFONTS="${T}"/fonts
+
+	econf \
+		$(use_with aspell) \
+		$(use_enable debug) \
+		$(use_with enchant) \
+		$(use_with hunspell) \
+		$(use_enable monolithic-build) \
+		$(use_enable nls) \
+		--enable-qt5 \
+		--with-qt-dir=$(qt5_get_libdir)/qt5 \
+		--disable-stdlib-debug \
+		--without-included-boost \
+		--with-packaging=posix
+}
+
+src_install() {
+	default
+
+	if use l10n_he ; then
+		echo "\bind_file cua" > "${T}"/hebrew.bind || die
+		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind || die
+
+		insinto /usr/share/lyx/bind
+		doins "${T}"/hebrew.bind
+	fi
+
+	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	doicon -s 48 "lib/images/lyx.png"
+	doicon -s scalable "lib/images/lyx.svg"
+
+	# fix for bug 91108
+	if use latex ; then
+		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
+	fi
+
+	# fonts needed for proper math display, see also bug #15629
+	font_src_install
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	if use hunspell ; then
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
+	fi
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	# fix for bug 91108
+	if use latex ; then
+		texhash || die
+	fi
+
+	# instructions for RTL support. See also bug 168331.
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
+		elog
+		elog "Enabling RTL support in LyX:"
+		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
+		elog "You must enable RTL support in LyX. To do so start LyX and go to"
+		elog "Tools->Preferences->Language settings->Language"
+		elog "and make sure the \"Right-to-left language support\" is checked"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	if use latex ; then
+		texhash || die
+	fi
+}
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index d35f9f084b58..c7a67bed8ca4 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-3.0.5.tar.gz 83231803 BLAKE2B 739a57fa5305ad8044f8fc13903910ee743cac353aeed53b298dd3d50291c4e5b2d2b67db7785305d1f1c71ba805769a57b46374c762efd39bc1a450f1df470e SHA512 240d177ffbd64f51a8f2aa93644cae29764876ed6fdd03733da05ed97a8ec10e21c1f3aebcb05b35617083abf0442b60ffe8f0a89edb28adacaf9ebe40609a48
 DIST texstudio-3.1.0.tar.gz 83232492 BLAKE2B 6e890fb19a51d8f1fdecbf844f674579391cfea4c3e41535db1daca78d24774e085d7c3c7d2c1eae6e7c287e9ab1d465e1082a25e95b95a7b62930a416bd654d SHA512 83d758102b597eae928e68a59035a83d90a950920995dc992a4478f8eba8ccb1f038a01bd07cce2681f354cad735394b2637cb79899d8e89960bae258652b3d8
 DIST texstudio-3.1.1.tar.gz 83239128 BLAKE2B 7aeedba9ec5a404d51e8854a67c2e07f4efdc03882ebe83ba4d5e99376dcac5c906b40f093129106cfbec716be6001ae6c1848f323147289a5d252c713cb25a6 SHA512 b8c843693d781052914f43215ee42c7bafd4bffe676aede966bafa08b4b74616b55a60e611878a8f0188c84d364ba27f86425adfd4e640c7d4390b0fdfcee8c7
+DIST texstudio-3.1.2.tar.gz 83987451 BLAKE2B 0649a4f2a429d1d7a6134e154c338f623de23c8b05829a169599f6950b59190736a0f4c2a4dc0e57ae2c47a5eb26594639660a8b691adbb768cb013061d5c1d8 SHA512 c8ce74cca6620ba725c4e8ff66564cc4804f3b922877af5c4952a8cd5b43fdf2deb88c1515f457f75a67d7d29ca1d6307779b8304c0b78b37f585c61a12221c4
 EBUILD texstudio-3.0.5-r1.ebuild 1728 BLAKE2B d92337a8275176ba700df9ade1ae31596037622bf27713f5aaa9af672e82c86802294fdc5ededa55f652b770327b18d730959b6db7ecc54a0b182e12e30402f0 SHA512 a5b36e967193fce6866bb492218be9c615fbfce34bb4aa3ae8eb696f365aba4704ac804be79bc5f58ea5d967b9bf696c2cd5c8e02f30a734c6f7c3e1dc22dccc
 EBUILD texstudio-3.1.0-r1.ebuild 1737 BLAKE2B 0bde46f53e9f4944fec024eb812ee72f0ec680ca53ce553e940c7dea8388e768b50126aaff2162eafcf9c49b928325f5a473518d112ed08b0a157bf9c91275f4 SHA512 14fbbfba5c373a0ada45eb727ef5fcb558fc0171a91e5935affff4d2b751fad48c039e19b0150901bcea88692027b0708e8cc0dc3927e6be25fd5b1ba4840bbb
 EBUILD texstudio-3.1.1.ebuild 1739 BLAKE2B 0563538ab7062dfefb828d3ab45065fe75826b4bdda1baa4669e03a7701665caa35a1699936c093c47bd416ad967dc3601e94c5c8d6910aad0d64ecf7df7b69d SHA512 76bc3bbd2d4280d8153360d97fbe2a66cbe113ca147f8ab75fb68109b6ca7ab12bb4bfdcd9aa799beb82e6c5493c735bcc759032abbf72605be4aaedea476616
+EBUILD texstudio-3.1.2.ebuild 1741 BLAKE2B 28f823a8dcb662af2690637539ddb1d9d6be8aba172d1fb37364679549ba0f68f2ca848d52906d6be5561787e03a4601f33fac4e643de588c4149b92007c3b1f SHA512 745fb3ed7aeea744c4d5c9c50f71d85ecf774e576c9ec521aaed123714b4f0ad0a6b06edba801a37b418bc879efddb2636d9adaa85b29ebdf7c417afed578a7d
 EBUILD texstudio-9999.ebuild 1654 BLAKE2B 4cfbbb1fabba6c923fee9e1a8bd70c3226f4f70ce6bec0f88edb91c34259030a020bdee025d78d12f9d66cad808bdf2165c51d31112bf5aa0eb41ed71e955483 SHA512 32d7d6174407756c0141c1d19f3435b577753b7c020302aa0c329b762524c8582bdb0029cf5ca0ee8657ddc90ef09167a8f672255fb486fda798ad730dbd57a8
 MISC metadata.xml 522 BLAKE2B ab0ebf559f01fbc49a42f0c33ba3b5b5b501d9fb406afe208e0c781afc034e0e8aa93643b3c09ace87c5771e41d13d094429792497a2d086d9679d012b89b860 SHA512 b5127e3ed2139b39a49cb091e1cef0d5e2f6c7c25b7b77d01bdb6d314a5388145d962439ddc0ddef9187b660b9affd9bc51cb4f18828a8b86542631a756fd05a
diff --git a/app-office/texstudio/texstudio-3.1.2.ebuild b/app-office/texstudio/texstudio-3.1.2.ebuild
new file mode 100644
index 000000000000..3d74c1d7efa9
--- /dev/null
+++ b/app-office/texstudio/texstudio-3.1.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 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/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript: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
+
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i ${PN}.pro || die
+	fi
+	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
+}
+
+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
+}