4 files changed, 68 insertions, 81 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 99bcdf6594f8..d4366ad2c655 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 7cbcf628dac3..65ef0281dba6 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -2,8 +2,8 @@ AUX texstudio-3.0.5-quazip1.patch 554 BLAKE2B 239f468f72655b579b70503856a87230b7
 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.1.tar.gz 116013004 BLAKE2B 57479b1f6f0daf560258728ec7216c62d8eeacbc4b29f3a4ac5391bc4c933b3fbb152661062b93ec5a97b9ab16b9ace0070cf6af07743a13e451294acd2c58fc SHA512 9749c9d4c67afb8c48171a051f8d7876c89cb40d088a58707cf19209f9da515c1e817b4c46fc333279c9f42652000fa2029291ba83d748137c98b0b34981b1bf
+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.1.ebuild 1822 BLAKE2B a639820549cfe5e23a3e67f99a7424787552235ad80bdac5b0e3c05c4405e4d184119deb37975f260137b7ba09d930998528521255d6e241ad00b3a5a05dbc48 SHA512 229b8a1c9a77b1b9d10bd9800939a52178334c9a469c8d85c62ca02b9c3933e4ff71f8ae33e61ef9eb40f24f2126266b1966c33b9e09f010b5ce953bbd033765
+EBUILD texstudio-4.8.4.ebuild 1369 BLAKE2B 67f67b23d4fabcceb1a79f22456fbab541175c5f382070779797f74d1d4771d720338901c743b43069762479d150a8905e4da4d84a02b35536ef8a77aaed352d SHA512 6a518ea25a76dd6d8f95715b86d7d6510bfb35566e054485057a8158c3c94659e453edd4212064a5de9b55f5aead358c23b45d52f958c2b7aa2bd308f484ebcc
 MISC metadata.xml 529 BLAKE2B d8b78ba95403c235139ec1371c7d4429d75ee40d5e7b6dae9cf5871e50bd27dda283415827d8d5682ccb82904d1bfc6eba93dbbfae4d4cfbdb91f4796fbddf9e SHA512 0fc0c0468e7ae07577d2a392537a44c775cd0ef8fc88aa7fc18b6db7c650dbdc651fcb9eedd6315bc9f85e9b3e11a0e35eb9656a93511c187a11bd75f6655886
diff --git a/app-office/texstudio/texstudio-4.8.1.ebuild b/app-office/texstudio/texstudio-4.8.1.ebuild
deleted file mode 100644
index 187f608c4f49..000000000000
--- a/app-office/texstudio/texstudio-4.8.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 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
-	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}-4.7.0-quazip.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.ebuild
new file mode 100644
index 000000000000..859bcaad2a9b
--- /dev/null
+++ b/app-office/texstudio/texstudio-4.8.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop 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"
+
+DEPEND="
+	app-text/hunspell:=
+	app-text/poppler:=[qt6]
+	>=dev-libs/quazip-1.0:0=[qt6(+)]
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtmultimedia:6
+	dev-qt/qtsvg:6
+	dev-qt/qttools:6[widgets]
+	sys-libs/zlib
+	x11-libs/libX11
+"
+RDEPEND="
+	${DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	local dir
+	for dir in src/quazip src/hunspell utilities/poppler-data; do
+		rm -r "${dir}" || die "Failed to delete ${dir}"
+	done
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_VERSION_MAJOR=6
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
+	done
+}