9 files changed, 190 insertions, 106 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d4366ad2c655..59c8f2549a79 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index f3b9354679bf..639022d5fb8d 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,7 +1,7 @@
-DIST homebank-5.8.1.tar.gz 3722739 BLAKE2B 23042c8fc952faf2da039934f4b82c9c5949649647bac1861cf291dc360929911316fa912e676bd1b2d87f7290e0b6a4fdce035b1e7ca6558bf613365f71e8d6 SHA512 900228b813c79bd4a5f1257a51e422e4748c7b7e9945d6d9c72c04097caf2275dd8294fd901a55fa6110c8c75be418e89a3a541a3350d350ef01b052e0cfb1f6
 DIST homebank-5.8.2.tar.gz 3771644 BLAKE2B b660ebbab36ce7f42f9db662e0f2dc62fbac425ea91e2335bbcea14bce799f6b2e79fe130a56e47880cf0b55c86095fecc1b9583f91738126122f94e2ba1c241 SHA512 f241a8569209b9504e1a68b3c72168147641666e838a3a0160e56efcf2070c016a1ae906d7fcea8ac26e6785a74f5bf571a3f14f82bd8daa1f0cf33b0c7be983
 DIST homebank-5.8.3.tar.gz 3773027 BLAKE2B 0af8b22b113c1be391cee455666ed767c9edefbba3973cdbdd85ca020611a5a8d992d85ee7b5e39ec56ea6693b4ee147cc05591623cb10d71b17466e7c205db2 SHA512 20b08c2329c7f11a4317b460be3e3b99072dab618965f9c96b21ed9355843e3cbb68730fa1517a5c6c90f9ab9fa53f7ed1e4f6d5af62a32d7d92e82acf342944
-EBUILD homebank-5.8.1.ebuild 814 BLAKE2B 8190829b7861628d6b7e9a7269df76741b5ddff1928eb33c7e8d64e8f85d2989208b7c983b79d31ab3417ee0a92276ba79f70b3b6c58f71eae56472255b59580 SHA512 c93fc64735ce523eb460e3a7c4b3c36913412dd008cf345d5debb81b3095e80a9b1f3bc1079c4caee925f6d3cdc77d6d833c3a0d2fdc6975f2aa06e70d6e1148
+DIST homebank-5.8.4.tar.gz 3774312 BLAKE2B 4e68b621fcc4cf6b2242c95061d5a959b1a96d5fdb39113d789e125d89fd7b5f85a17e816dec9b2453b1853d9959e3cb43f009ccd0448f7f07609c551ba6e6bf SHA512 998d0902e1a172565599669a63ed2dc894ed5e8b9e167669c8fb8fed13438ce70155978f034af75c5939778e4ed138315662b18c15e61d0b9c646603548a5e27
 EBUILD homebank-5.8.2.ebuild 814 BLAKE2B 8190829b7861628d6b7e9a7269df76741b5ddff1928eb33c7e8d64e8f85d2989208b7c983b79d31ab3417ee0a92276ba79f70b3b6c58f71eae56472255b59580 SHA512 c93fc64735ce523eb460e3a7c4b3c36913412dd008cf345d5debb81b3095e80a9b1f3bc1079c4caee925f6d3cdc77d6d833c3a0d2fdc6975f2aa06e70d6e1148
 EBUILD homebank-5.8.3.ebuild 817 BLAKE2B b0235cee7afa47641e04d45aec669e94fc97cda3fe3f2101dd299a213cbcb7e53867ca985b31266d829f770be434dc16ef07d54640b2c337c42c352f9a75ba38 SHA512 efda2d371b19d611cec5d76cb55fb5f6c4ffa29886d22305d00835fa257e9a229d9587cba8b755dee978b17ec7df53633b0fcf44d6ae8858cb417e057fffcf3f
+EBUILD homebank-5.8.4.ebuild 817 BLAKE2B b0235cee7afa47641e04d45aec669e94fc97cda3fe3f2101dd299a213cbcb7e53867ca985b31266d829f770be434dc16ef07d54640b2c337c42c352f9a75ba38 SHA512 efda2d371b19d611cec5d76cb55fb5f6c4ffa29886d22305d00835fa257e9a229d9587cba8b755dee978b17ec7df53633b0fcf44d6ae8858cb417e057fffcf3f
 MISC metadata.xml 322 BLAKE2B f0ed3691f77c7dba631ced8827fc442dec42c7cae9c07f66e69304ad862112233defc63cb443c5321b3ffc385976ae3b46165d3e31318e564e35ee01b1875d05 SHA512 449b8694aa9236e7925b62ba3249bff5d567a3710ac8ade8db75a5403dd0bb58380717c15fe42cc082beeee3030aa65ce90d047f18a1d67d19dd50771315f013
diff --git a/app-office/homebank/homebank-5.8.1.ebuild b/app-office/homebank/homebank-5.8.4.ebuild
index 3cc624ffae3a..b794b4f11bfc 100644
--- a/app-office/homebank/homebank-5.8.1.ebuild
+++ b/app-office/homebank/homebank-5.8.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.gethomebank.org/public/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+ofx"
 
 RDEPEND="
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 1eb3aaaaf742..0c90ade81c16 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,5 +1,7 @@
 AUX lyx-2.4.0-fix-hunspell.patch 780 BLAKE2B 04c8373fa29e7a1d40901d83104832fe01ca96fca25a99f19d472cfb0387145b14c124fa44a6d2710f0d35e4dc7061c8935b1e03378154de85c2e4c4079269f9 SHA512 992c21e8d3e30bf2c14c006e19c969e93f447a12f0080bf59238ccc66967938fd10fa35387ab3943f0d39ab132b330876e7cf207e49c6ab174a731a2dc4f4ef3
 AUX lyx-2.4.0-prefer-xdg-open.patch 3138 BLAKE2B 95dd25064876a6ab58649249f0a42035bfdb6c91524dc7b6031017eb911efe7534c267e178b0dac26d0090409245962d153f81db3dd28785b11576e988ecef12 SHA512 e2f5a0484742af079bc69aff3056dd2d3afe8f952fd342f3e5da8445894bd8d6c60a575079bdee61a378ce20adba7e31e1e6a5cb6c2b00ba3b7d0b161c55ef12
 DIST lyx-2.4.1.tar.xz 17848700 BLAKE2B 5e9d9530610149a1b0f6a7d536068ff0da97e261a6069a9efc3c45a892c653e7accadcd0bde96bf3ffad9d936fef4a4b88ee7b5233f875bbc568044376a5b37e SHA512 80d57d46dab61ecb655c9d54ba1d20203ad943db5249ed16dbeb5b78b7845896a79224c8032213cc861fd943629fbe87ef8ac9155cc9b34da9be2f59eb087071
+DIST lyx-2.4.2.1.tar.xz 17876336 BLAKE2B 451aa44c34d763f7e2c4bd0bd4980859728781e74e40075d1e660edd08b9f8103c338ebcaea12c4249a1026fccbd99ad6c0449a2f89e13b229a75f9b2a60ee95 SHA512 2cb9773971b466be32333305e36a28ec4efd31ffa7d9f8ec0a2fe670296f428c260d6839b34cebfd7cda4b78bdd43a47e30cc1f2d64e2c836262661032c107db
 EBUILD lyx-2.4.1.ebuild 3832 BLAKE2B c4ef34eaef2db18605cfa75ff5c86153b18ed3100c4486bbff504e836a0378b22ef5c92d28a22a66ffbdf016ec096d3b3521c5624243093a16c68ef80aed66eb SHA512 ce81366f6416af9fdcb3d1c64bd46e7f930c7a30daf1a8be19e892fe81c189bf330e6565aec481afe44a9b84d005ae8b0b0e2c484da2199a5209652f07d7b6ac
+EBUILD lyx-2.4.2.1.ebuild 3850 BLAKE2B e96097d5124c63331e1f10107a160820af59c580bc15b5fba8a2f5a6e04a3e72edb5027f7f7dd7901162558e9fe378a6b7d8020dea40789ed6ed58bac4af05f3 SHA512 09fff52644382dd2b65b3ce8bf4c19951231e0384d099bf65190ab20fd9ee702f7111d022b49d749a50dfeec279f30bcd6c02f9b11947912d8fd4e60eef0ad4f
 MISC metadata.xml 1381 BLAKE2B dde484f4254356ccea9a7110761d3df4ca0dcbddb1b631e09126a762030638e4e3c53859db19df750467b2de8dbe186142b2464b5db2cc563fc2adb3684d8719 SHA512 40ae608e527af9727fbd077dc3e6e1254cd130f32424356d53479a34b6ffdf25b206e044f4071e32e59a7394fafe53ede429732a099e3c66658f337e77517ac9
diff --git a/app-office/lyx/lyx-2.4.2.1.ebuild b/app-office/lyx/lyx-2.4.2.1.ebuild
new file mode 100644
index 000000000000..06836670debe
--- /dev/null
+++ b/app-office/lyx/lyx-2.4.2.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit desktop font optfeature python-single-r1 cmake xdg
+
+DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
+HOMEPAGE="https://www.lyx.org/"
+SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="aspell cups dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/mythes
+	dev-libs/boost:=
+	sys-apps/file
+	sys-libs/zlib:=
+	virtual/imagemagick-tools[png,svg?]
+	x11-libs/libxcb
+	x11-misc/xdg-utils
+
+	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+	dev-qt/qt5compat:6
+	dev-qt/qtsvg:6
+
+	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
+		dev-texlive/texlive-langarabic
+	)
+	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/latex2html
+			dev-tex/hevea
+			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}"
+# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839
+BDEPEND="
+	app-alternatives/bc
+	virtual/pkgconfig
+	dev-qt/qttools[linguist]
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
+
+FONT_S="${S}/lib/fonts"
+FONT_SUFFIX="ttf"
+
+PATCHES=(
+	"${FILESDIR}"/lyx-2.4.0-fix-hunspell.patch
+	# Try first with xdg-open before hardcoded commands
+	# Patch from Debian using a similar approach to Fedora
+	"${FILESDIR}"/lyx-2.4.0-prefer-xdg-open.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	#bug 221921
+	export VARTEXFONTS="${T}"/fonts
+
+	local mycmakeargs=(
+		-DLYX_INSTALL=ON
+		-DLYX_USE_QT=QT6
+		-DLYX_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DLYX_CXX_FLAGS_EXTRA="${CXXFLAGS}"
+
+		-DLYX_NLS=$(usex nls)
+		-DLYX_ASPELL=$(usex aspell)
+		-DLYX_ENCHANT=$(usex enchant)
+		-DLYX_HUNSPELL=$(usex hunspell)
+
+		# external dependencies
+		-DLYX_EXTERNAL_Z=ON
+		-DLYX_EXTERNAL_ICONV=ON
+		-DLYX_EXTERNAL_HUNSPELL=ON
+		-DLYX_EXTERNAL_MYTHES=ON
+		-DLYX_EXTERNAL_BOOST=ON
+		-DLYX_PROGRAM_SUFFIX=OFF
+
+		# debug control
+		-DLYX_NO_OPTIMIZE=OFF
+		-DLYX_RELEASE=ON
+		-DLYX_DEBUG=OFF
+		-DLYX_DEBUG_GLIBC=OFF
+		-DLYX_STDLIB_DEBUG=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	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 -r /usr/share/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_pkg_postinst
+
+	# fix for bug 91108
+	if use latex ; then
+		texhash || die
+	fi
+
+	optfeature "handling more fonts" dev-texlive/texlive-fontsextra
+}
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_pkg_postrm
+
+	if use latex ; then
+		texhash || die
+	fi
+}
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 65ef0281dba6..bd19b66b8f9a 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,9 +1,6 @@
-AUX texstudio-3.0.5-quazip1.patch 554 BLAKE2B 239f468f72655b579b70503856a87230b74da2b5885d1f4d6cc382c41a3067af82bde91a4ec73621a7156b7efa8f65e61e0e567a450438e70db50d2240b5c7b2 SHA512 72dd985ef4b425e4feda3788efacabc33f4bd2b1331a7df7b22c4b05736f27d3851be83dad3569d37a58a69170f13c2eead22333b6da4792975e86e25e304e02
 AUX texstudio-4.7.0-quazip.patch 708 BLAKE2B 0d989cd71dbca6a65d87488bc7dc0bfe293528fe97791d0b6c24a7edb435d55d8756dd0908173b6e48aeceaa25805596f79176b0898d99967e1cc6cbe14ea33d SHA512 e4bfebecb1f52b96166efa48940c574cf18e800c8f850a0e1d7b92b864b6140c4cefd8b398005f81ba524795ce631c9e877d60c71a3cefdbfaedd63624804d26
-DIST texstudio-4.3.1.tar.gz 90529450 BLAKE2B 500f42f8a540aff97d8bb8d65262d6e0a758ccfb431fa00d9aa6e848d76da9eb1320dc3bc5a472e15d4492174e2817181271243c581830958c5e370751ed0b36 SHA512 6fc8717ed22e21947260d0af5c5b857f9b79476f28f400f9036134d9de2d9e11a605a871b6c8d520b366cb43f3fb61bb89c411e5c11aee1e87642e77fe1b0560
 DIST texstudio-4.7.1.tar.gz 111614038 BLAKE2B 01334389930fff5147f49a55b925a64173b8615553b58aaf48a9c9e446997aa0a2600f88a9bd4e5d81f5bef29c97d21796171c2dba231c9f3377c200e6ec676f SHA512 3aebc09f1cec288d841552b3861c4ba33f006b25e9f99418e53bdc0e5a3ece915c1649e7027e3626eec14b6c00214df2eb2012b7a0b71874b0f75cc9f9fb2d06
 DIST texstudio-4.8.4.tar.gz 114147594 BLAKE2B 0f553bea66ef0709434ee8b3afc20db6b8ddce45f1f4a923768215d880b4428acefa54942aa99b36b2f03674de2935d8434a8689e1062e52b05e477de4b56416 SHA512 c42d475f1807feaaf86b0245d8a71ccc28172c5867224383bdc3b4e4c719577c7fbc9b2f3ddac90ad957a9bacd36ecc79accea5d0453552d3856b66129091538
-EBUILD texstudio-4.3.1-r1.ebuild 1839 BLAKE2B 52b56726c968ff969eaa76db32036bd7e10cee8bf2c48da83397eee5ec43e35e3eb6db082540045319d32d72a3f5d5ee1b0357faea5c8eaa7ad891b9e9158ad8 SHA512 384cb266e07a2def93a911888630eab8b82266415138abe82dfa33393195326c8fa765c65334538e65fedb2e4d50a9d57b214ef3318382214c0e730bd9106ac3
 EBUILD texstudio-4.7.1.ebuild 1838 BLAKE2B 6d1b32ed6929d1da46bfd36f446b85451713713e87f37a8592c99e760fd21be01ba201c69fcc69f1f344ea248514233000b1a0f7b0717f9fbcac16da2dd28566 SHA512 600f556bc56338ce3774217231581ff1662854c251f4a2444825a5b45a0256e11dd199c1022367829e7ecfe71338c0fd798842d00bb96716a2cd0cb9abf34b89
-EBUILD texstudio-4.8.4.ebuild 1369 BLAKE2B 67f67b23d4fabcceb1a79f22456fbab541175c5f382070779797f74d1d4771d720338901c743b43069762479d150a8905e4da4d84a02b35536ef8a77aaed352d SHA512 6a518ea25a76dd6d8f95715b86d7d6510bfb35566e054485057a8158c3c94659e453edd4212064a5de9b55f5aead358c23b45d52f958c2b7aa2bd308f484ebcc
+EBUILD texstudio-4.8.4-r1.ebuild 1445 BLAKE2B 9b95100f6c0cfd30174af69f05834b9e09c3e6d5a2f2fe89ec22fe20db302f86873147b665416e9510b7ef46425222f0e18cc5080ca64a4f52f7f0d5468ddde3 SHA512 93d3785b92d9c3cf5c2f0253b023875ec4fddeb53524d1f12c1c7ff95a918053c969c1c09a475e792fb748423961f04864ffae65d30f290864a5132ae5b353d5
 MISC metadata.xml 529 BLAKE2B d8b78ba95403c235139ec1371c7d4429d75ee40d5e7b6dae9cf5871e50bd27dda283415827d8d5682ccb82904d1bfc6eba93dbbfae4d4cfbdb91f4796fbddf9e SHA512 0fc0c0468e7ae07577d2a392537a44c775cd0ef8fc88aa7fc18b6db7c650dbdc651fcb9eedd6315bc9f85e9b3e11a0e35eb9656a93511c187a11bd75f6655886
diff --git a/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch b/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch
deleted file mode 100644
index a2a9033abd66..000000000000
--- a/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix build with QuaZip-1.0.
-
---- a/texstudio.pro
-+++ b/texstudio.pro
-@@ -369,11 +369,9 @@
- isEmpty(USE_SYSTEM_QUAZIP) {
-     include(src/quazip/quazip/quazip.pri)
- } else {
--        message(System quazip5)
--        isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
--        isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5
--        INCLUDEPATH += $${QUAZIP_INCLUDE}
--        LIBS += $${QUAZIP_LIB}
-+        message(System QuaZip)
-+        CONFIG += link_pkgconfig
-+        PKGCONFIG += quazip1-qt5
- }
- 
- include(src/pdfviewer/pdfviewer.pri)
diff --git a/app-office/texstudio/texstudio-4.3.1-r1.ebuild b/app-office/texstudio/texstudio-4.3.1-r1.ebuild
deleted file mode 100644
index b9d465b6d461..000000000000
--- a/app-office/texstudio/texstudio-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="video"
-
-DEPEND="
-	app-text/hunspell:=
-	app-text/poppler:=[qt5]
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	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[qt5(+)] )
-"
-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() {
-	# 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
-	default
-}
-
-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
-
-	# We don't install licences per package
-	rm "${ED}"/usr/share/texstudio/COPYING || die
-}
diff --git a/app-office/texstudio/texstudio-4.8.4.ebuild b/app-office/texstudio/texstudio-4.8.4-r1.ebuild
index 859bcaad2a9b..43bd8a076684 100644
--- a/app-office/texstudio/texstudio-4.8.4.ebuild
+++ b/app-office/texstudio/texstudio-4.8.4-r1.ebuild
@@ -46,6 +46,9 @@ src_prepare() {
 		rm -r "${dir}" || die "Failed to delete ${dir}"
 	done
 
+	# https://bugs.gentoo.org/940747
+	sed -i 's/Qt5 //' CMakeLists.txt || die
+
 	cmake_src_prepare
 }