7 files changed, 54 insertions, 186 deletions
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 6c75fec2963c..1c85078b56af 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,3 +1,2 @@
-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-4.3.1.tar.gz 90529450 BLAKE2B 500f42f8a540aff97d8bb8d65262d6e0a758ccfb431fa00d9aa6e848d76da9eb1320dc3bc5a472e15d4492174e2817181271243c581830958c5e370751ed0b36 SHA512 6fc8717ed22e21947260d0af5c5b857f9b79476f28f400f9036134d9de2d9e11a605a871b6c8d520b366cb43f3fb61bb89c411e5c11aee1e87642e77fe1b0560
+DIST texstudio-4.7.1.tar.gz 111614038 BLAKE2B 01334389930fff5147f49a55b925a64173b8615553b58aaf48a9c9e446997aa0a2600f88a9bd4e5d81f5bef29c97d21796171c2dba231c9f3377c200e6ec676f SHA512 3aebc09f1cec288d841552b3861c4ba33f006b25e9f99418e53bdc0e5a3ece915c1649e7027e3626eec14b6c00214df2eb2012b7a0b71874b0f75cc9f9fb2d06
diff --git a/app-office/texstudio/files/texstudio-4.7.0-quazip.patch b/app-office/texstudio/files/texstudio-4.7.0-quazip.patch
new file mode 100644
index 000000000000..f8b65d665fbc
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-4.7.0-quazip.patch
@@ -0,0 +1,18 @@
+diff -U3 -r texstudio-4.7.0.orig/texstudio.pro texstudio-4.7.0/texstudio.pro
+--- texstudio-4.7.0.orig/texstudio.pro	2023-11-28 03:20:38.000000000 +0700
++++ texstudio-4.7.0/texstudio.pro	2023-12-03 20:59:39.074498926 +0700
+@@ -371,11 +371,9 @@
+         PKGCONFIG += quazip1-qt6
+     }
+     !versionGreaterOrEqual($$QT_VERSION, "6.0.0") {
+-            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
+     }
+ }
+ 
diff --git a/app-office/texstudio/metadata.xml b/app-office/texstudio/metadata.xml
index 625085199f69..66abc48facf5 100644
--- a/app-office/texstudio/metadata.xml
+++ b/app-office/texstudio/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>tex@gentoo.org</email>
diff --git a/app-office/texstudio/texstudio-3.1.0-r1.ebuild b/app-office/texstudio/texstudio-3.1.0-r1.ebuild
deleted file mode 100644
index 3a47094b7680..000000000000
--- a/app-office/texstudio/texstudio-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_/}"
-inherit desktop qmake-utils xdg
-
-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
-}
diff --git a/app-office/texstudio/texstudio-3.1.1.ebuild b/app-office/texstudio/texstudio-4.3.1-r1.ebuild
index 5c69d5a5941c..b9d465b6d461 100644
--- a/app-office/texstudio/texstudio-3.1.1.ebuild
+++ b/app-office/texstudio/texstudio-4.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop qmake-utils xdg
 
@@ -13,20 +13,20 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="video"
 
 DEPEND="
 	app-text/hunspell:=
-	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.3-r1:0=
+	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/qtscript:5
 	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtsvg:5
 	dev-qt/qttest:5
@@ -35,7 +35,7 @@ DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	video? ( >=media-libs/phonon-4.11.0 )
+	video? ( >=media-libs/phonon-4.11.0[qt5(+)] )
 "
 RDEPEND="
 	${DEPEND}
@@ -51,11 +51,7 @@ PATCHES=(
 )
 
 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
+	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
 	rm -r src/quazip || die
 
 	if use video; then
@@ -64,10 +60,11 @@ src_prepare() {
 
 	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
 		-i ${PN}.pro || die
+	default
 }
 
 src_configure() {
-	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1 NO_TESTS=false
 }
 
 src_install() {
@@ -77,4 +74,7 @@ src_install() {
 	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-3.0.5-r1.ebuild b/app-office/texstudio/texstudio-4.7.1.ebuild
index 375790905ee9..319528ac8fa1 100644
--- a/app-office/texstudio/texstudio-3.0.5-r1.ebuild
+++ b/app-office/texstudio/texstudio-4.7.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-MY_PV="${PV/_/}"
 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"
@@ -13,20 +13,20 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="video"
 
 DEPEND="
 	app-text/hunspell:=
-	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.3-r1:0=
+	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/qtscript:5
 	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtsvg:5
 	dev-qt/qttest:5
@@ -35,9 +35,10 @@ DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	video? ( >=media-libs/phonon-4.11.0 )
+	video? ( >=media-libs/phonon-4.11.0[qt5(+)] )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	app-text/ghostscript-gpl
 	app-text/psutils
 	media-libs/netpbm
@@ -45,14 +46,12 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-quazip1.patch" ) # TODO: upstream
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.0-quazip.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
+	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
 	rm -r src/quazip || die
 
 	if use video; then
@@ -61,10 +60,11 @@ src_prepare() {
 
 	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
 		-i ${PN}.pro || die
+	default
 }
 
 src_configure() {
-	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1 NO_TESTS=false
 }
 
 src_install() {
@@ -72,5 +72,9 @@ src_install() {
 	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-9999.ebuild b/app-office/texstudio/texstudio-9999.ebuild
deleted file mode 100644
index c37e0bd19c1d..000000000000
--- a/app-office/texstudio/texstudio-9999.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop git-r3 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"
-EGIT_REPO_URI="https://github.com/texstudio-org/texstudio.git"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="video"
-
-DEPEND="
-	app-text/hunspell:=
-	app-text/poppler[qt5]
-	>=dev-libs/quazip-1.0: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
-
-	rm -r src/quazip || die
-	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || 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
-}