gentoo resync : 17.02.2021

6 files changed, 81 insertions, 5 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 68f1f9b2f28f..5737c5c42dd2 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 19636def53e1..4032cbd95b97 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,5 +1,7 @@
 AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
 DIST texstudio-3.0.4.tar.gz 83191627 BLAKE2B a800b369967051a7154a1ec5d00ae735477fdbb4237e6653bf5469c5fcfa1083fa28f56e3e6bda304821084281e1bf02dfdc4738e6762072d7fb43988e029641 SHA512 094fc53cab388d2e5f9ecfc1172a6ae853c04abe746ed03afe8819be3acdf4e7cb2bdf9ce1edda43fda9396c260f2063aa05ca9aae66871505555d7da6c49beb
-EBUILD texstudio-3.0.4.ebuild 1610 BLAKE2B 5756d61d34c6d1d69c82a6cd4bcbafc09b512fe2c40daebd9063d45384fb0c23ae410f71b71ef73addee87f450151e2a752e660c4a3fe3709beffec09bd8ebaa SHA512 da73b60841bbf88ba2086fdb740ab9cfcf2908ea59cf91b9466a265133810a71decd5184052395dd3ef48dcd9cf4f1e2a1195e37c585cfdd0de0642b235e9bf1
-EBUILD texstudio-9999.ebuild 1643 BLAKE2B b012ec3ad6fd6fa435f0df4adbfc08e1b18d371f3dce870a24540413dbe5ed05875bd0303aaa7b3a038cd9365a535881b5a16baae938bb375461a66f1ec9faf0 SHA512 6e226db629b12310543dfbf440078a6e574aea9e319e9bae2a7a6d0d39f4f07dcd662a609e4dabfcce55efb1e507cc527ed5b737bd058426dadfeffade1b1f1e
-MISC metadata.xml 411 BLAKE2B e545d68a6bb26046f5e43df2bcc64371e5a4237ef20a83c8811675ddde9dfec1eee8f5dc6405e7005a3ea35e39e2f3bf019d92bbd4b68e5c74524c7e785a2214 SHA512 c82d3d1b0b50af84b34a1c6cc17e19ab50afd45206939abe3c96c2d8b93a69201eeef81c72e1eef56dc717ecdf1d0c67637b59bea94160188a673f233d57458b
+DIST texstudio-3.0.5.tar.gz 83231803 BLAKE2B 739a57fa5305ad8044f8fc13903910ee743cac353aeed53b298dd3d50291c4e5b2d2b67db7785305d1f1c71ba805769a57b46374c762efd39bc1a450f1df470e SHA512 240d177ffbd64f51a8f2aa93644cae29764876ed6fdd03733da05ed97a8ec10e21c1f3aebcb05b35617083abf0442b60ffe8f0a89edb28adacaf9ebe40609a48
+EBUILD texstudio-3.0.4-r1.ebuild 1612 BLAKE2B da5a132b2dc7a4af6874d08efc204e751bff3b57309300f314eacd7e7311268ea7ffe08233b68443c09edaf005b6bf7046f39dc2bd882f15b73d4038f6e8dc39 SHA512 16ef97c412dd08bdc4f6bf307a97c3624507e24450d4844f86b0c55be63c2d2cf364d21f1c2e71e7f69ea97110a6e3428e01adc408aa3a3d1a1881da715e66e9
+EBUILD texstudio-3.0.5.ebuild 1614 BLAKE2B e347b05acb43f36c799b552af1ebdec586514ac2970213767817bbca142e6d2551507ea890205905b03c34ef6c537b9f2a67652599fb32e0576886c7d8c19180 SHA512 c12aff44e1f14de02a4d74223a0783733d4ebbf245bc3c52a6bd5735b91f2a3e56ea8de298e4cf1a8616b8947769d1de45007ade16e1061e819261ec5fac7ec3
+EBUILD texstudio-9999.ebuild 1645 BLAKE2B 2c57811aed2bee50da3757bf949808add3bcc28dac6611898cf34073678e4d64d4625ea74a6a43a2d3292f129e4bbc628e1542ad38e0e7e74e653f8ae67a9be2 SHA512 421e887f27c61b3e95e2fb6fbf749580e1239fd3189094f390740ab037a2c76e0248ed8478c8303607b43917b844b16a83feb76b2795fb0c177f2b1afbc74f4f
+MISC metadata.xml 522 BLAKE2B ab0ebf559f01fbc49a42f0c33ba3b5b5b501d9fb406afe208e0c781afc034e0e8aa93643b3c09ace87c5771e41d13d094429792497a2d086d9679d012b89b860 SHA512 b5127e3ed2139b39a49cb091e1cef0d5e2f6c7c25b7b77d01bdb6d314a5388145d962439ddc0ddef9187b660b9affd9bc51cb4f18828a8b86542631a756fd05a
diff --git a/app-office/texstudio/metadata.xml b/app-office/texstudio/metadata.xml
index 26ac55a20447..625085199f69 100644
--- a/app-office/texstudio/metadata.xml
+++ b/app-office/texstudio/metadata.xml
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">texstudio-org/texstudio</remote-id>
+		<changelog>https://github.com/texstudio-org/texstudio/blob/master/utilities/manual/CHANGELOG.txt</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/app-office/texstudio/texstudio-3.0.4.ebuild b/app-office/texstudio/texstudio-3.0.4-r1.ebuild
index cf2f6704d36c..fca57b96036c 100644
--- a/app-office/texstudio/texstudio-3.0.4.ebuild
+++ b/app-office/texstudio/texstudio-3.0.4-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="video"
 COMMON_DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2[qt5(+)]
+	>=dev-libs/quazip-0.7.2:0[qt5(+)]
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
diff --git a/app-office/texstudio/texstudio-3.0.5.ebuild b/app-office/texstudio/texstudio-3.0.5.ebuild
new file mode 100644
index 000000000000..b762eb4fbdd4
--- /dev/null
+++ b/app-office/texstudio/texstudio-3.0.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop prefix 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"
+
+COMMON_DEPEND="
+	app-text/hunspell:=
+	app-text/poppler[qt5]
+	>=dev-libs/quazip-0.7.2:0[qt5(+)]
+	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[qt5(+)] )"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base"
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed \
+		-e '/qtsingleapplication.pri/d' \
+		-i ${PN}.pro || die
+
+	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
+	eprefixify ${PN}.pri
+}
+
+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 5088db2d1687..feb15564ad18 100644
--- a/app-office/texstudio/texstudio-9999.ebuild
+++ b/app-office/texstudio/texstudio-9999.ebuild
@@ -18,7 +18,7 @@ IUSE="video"
 COMMON_DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2[qt5(+)]
+	>=dev-libs/quazip-0.7.2:0[qt5(+)]
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5