gentoo resync : 01.10.2021

3 files changed, 83 insertions, 3 deletions

diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 3229d497f206..dc3b04551772 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,7 +1,9 @@
 AUX texstudio-3.0.5-quazip1.patch 554 BLAKE2B 239f468f72655b579b70503856a87230b74da2b5885d1f4d6cc382c41a3067af82bde91a4ec73621a7156b7efa8f65e61e0e567a450438e70db50d2240b5c7b2 SHA512 72dd985ef4b425e4feda3788efacabc33f4bd2b1331a7df7b22c4b05736f27d3851be83dad3569d37a58a69170f13c2eead22333b6da4792975e86e25e304e02
 DIST texstudio-3.1.1.tar.gz 83239128 BLAKE2B 7aeedba9ec5a404d51e8854a67c2e07f4efdc03882ebe83ba4d5e99376dcac5c906b40f093129106cfbec716be6001ae6c1848f323147289a5d252c713cb25a6 SHA512 b8c843693d781052914f43215ee42c7bafd4bffe676aede966bafa08b4b74616b55a60e611878a8f0188c84d364ba27f86425adfd4e640c7d4390b0fdfcee8c7
 DIST texstudio-3.1.2.tar.gz 83987451 BLAKE2B 0649a4f2a429d1d7a6134e154c338f623de23c8b05829a169599f6950b59190736a0f4c2a4dc0e57ae2c47a5eb26594639660a8b691adbb768cb013061d5c1d8 SHA512 c8ce74cca6620ba725c4e8ff66564cc4804f3b922877af5c4952a8cd5b43fdf2deb88c1515f457f75a67d7d29ca1d6307779b8304c0b78b37f585c61a12221c4
+DIST texstudio-4.0.0.tar.gz 88426776 BLAKE2B 616ffaf35a4f2c5e5290517b38301c575b91251374ee96dc58560f40115ffd5e4e68830fe927283dcdf0f9c9b38815fe04a86a7e58e2dc7936b2b32e38bd6662 SHA512 9025e0709145ed9c352f9cfd748087b331fd2894c913d7b7707254050ea41d5df74077c8f94cc3fb19c4700d468d55e91895da1ea474759d83af499ef436cdbc
 EBUILD texstudio-3.1.1-r1.ebuild 1741 BLAKE2B 7fec25e47073dd6943faf080e207c83c5e4c37cf491fd7e43a4996bab28e025520f2a448e3b1125c5ce77af1ca9f8939b2ca2aff6842de199c42bd5ab93526a0 SHA512 0ca6c81335acbf0eda33c201569c39b475e4e75a585aa2e5fd0949ce2fd9378767e0e61a06735d63c3e185e4e28b6a4786ff207a5985428791180450e57a32f6
 EBUILD texstudio-3.1.2-r1.ebuild 1741 BLAKE2B 7fec25e47073dd6943faf080e207c83c5e4c37cf491fd7e43a4996bab28e025520f2a448e3b1125c5ce77af1ca9f8939b2ca2aff6842de199c42bd5ab93526a0 SHA512 0ca6c81335acbf0eda33c201569c39b475e4e75a585aa2e5fd0949ce2fd9378767e0e61a06735d63c3e185e4e28b6a4786ff207a5985428791180450e57a32f6
-EBUILD texstudio-9999.ebuild 1656 BLAKE2B 8bc3fd18051e2efb3f3fbeb0277c07955e01a82d8751123b55dd04b95ceccbd9f743a2a4f55f714e146f4313bd7ea91418cfc2d14398d1987510a38918ae814b SHA512 eaaee42397593ba11891f683798eb5a13223bc4bc8e99693a8c5023fee1f0a3d1bd04c67d0adf43044187ba3f9150f054eac2a82394ad1abb0c23e0a9733e5ad
+EBUILD texstudio-4.0.0-r1.ebuild 1723 BLAKE2B 74614a553436ae07150a474ac73e2bec598b9d7b83179858f6b2c432bd1b960efa5aa9d02b6bee2f821eae0f3ee7335a3c0549750bd929c816b5b5d92216fcb1 SHA512 72e0e969688680647b1538efbbc28f53519886a5d54a3cd2c7e1081e01855de904d70b7a1e1c475d7b459bfaffd703572dd7aad11f3f44bc366344699639e19a
+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.0.0-r1.ebuild b/app-office/texstudio/texstudio-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..1e8cd724e856
--- /dev/null
+++ b/app-office/texstudio/texstudio-4.0.0-r1.ebuild
@@ -0,0 +1,78 @@
+# 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/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
+}
+
+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-9999.ebuild b/app-office/texstudio/texstudio-9999.ebuild
index be66de953bf4..8c4937f86d75 100644
--- a/app-office/texstudio/texstudio-9999.ebuild
+++ b/app-office/texstudio/texstudio-9999.ebuild
@@ -22,10 +22,10 @@ DEPEND="
 	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
@@ -52,8 +52,8 @@ PATCHES=(
 src_prepare() {
 	xdg_src_prepare
 
-	rm -r src/quazip || die
 	# 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