gentoo resync : 03.03.2021

6 files changed, 218 insertions, 31 deletions

diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 4032cbd95b97..e331c4e63b25 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,7 +1,12 @@
 AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
+AUX texstudio-3.0.5-quazip1.patch 554 BLAKE2B 239f468f72655b579b70503856a87230b74da2b5885d1f4d6cc382c41a3067af82bde91a4ec73621a7156b7efa8f65e61e0e567a450438e70db50d2240b5c7b2 SHA512 72dd985ef4b425e4feda3788efacabc33f4bd2b1331a7df7b22c4b05736f27d3851be83dad3569d37a58a69170f13c2eead22333b6da4792975e86e25e304e02
 DIST texstudio-3.0.4.tar.gz 83191627 BLAKE2B a800b369967051a7154a1ec5d00ae735477fdbb4237e6653bf5469c5fcfa1083fa28f56e3e6bda304821084281e1bf02dfdc4738e6762072d7fb43988e029641 SHA512 094fc53cab388d2e5f9ecfc1172a6ae853c04abe746ed03afe8819be3acdf4e7cb2bdf9ce1edda43fda9396c260f2063aa05ca9aae66871505555d7da6c49beb
 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
 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
+EBUILD texstudio-3.0.5-r1.ebuild 1728 BLAKE2B d92337a8275176ba700df9ade1ae31596037622bf27713f5aaa9af672e82c86802294fdc5ededa55f652b770327b18d730959b6db7ecc54a0b182e12e30402f0 SHA512 a5b36e967193fce6866bb492218be9c615fbfce34bb4aa3ae8eb696f365aba4704ac804be79bc5f58ea5d967b9bf696c2cd5c8e02f30a734c6f7c3e1dc22dccc
+EBUILD texstudio-3.1.0-r1.ebuild 1737 BLAKE2B 0bde46f53e9f4944fec024eb812ee72f0ec680ca53ce553e940c7dea8388e768b50126aaff2162eafcf9c49b928325f5a473518d112ed08b0a157bf9c91275f4 SHA512 14fbbfba5c373a0ada45eb727ef5fcb558fc0171a91e5935affff4d2b751fad48c039e19b0150901bcea88692027b0708e8cc0dc3927e6be25fd5b1ba4840bbb
+EBUILD texstudio-3.1.1.ebuild 1741 BLAKE2B 28f823a8dcb662af2690637539ddb1d9d6be8aba172d1fb37364679549ba0f68f2ca848d52906d6be5561787e03a4601f33fac4e643de588c4149b92007c3b1f SHA512 745fb3ed7aeea744c4d5c9c50f71d85ecf774e576c9ec521aaed123714b4f0ad0a6b06edba801a37b418bc879efddb2636d9adaa85b29ebdf7c417afed578a7d
+EBUILD texstudio-9999.ebuild 1654 BLAKE2B 4cfbbb1fabba6c923fee9e1a8bd70c3226f4f70ce6bec0f88edb91c34259030a020bdee025d78d12f9d66cad808bdf2165c51d31112bf5aa0eb41ed71e955483 SHA512 32d7d6174407756c0141c1d19f3435b577753b7c020302aa0c329b762524c8582bdb0029cf5ca0ee8657ddc90ef09167a8f672255fb486fda798ad730dbd57a8
 MISC metadata.xml 522 BLAKE2B ab0ebf559f01fbc49a42f0c33ba3b5b5b501d9fb406afe208e0c781afc034e0e8aa93643b3c09ace87c5771e41d13d094429792497a2d086d9679d012b89b860 SHA512 b5127e3ed2139b39a49cb091e1cef0d5e2f6c7c25b7b77d01bdb6d314a5388145d962439ddc0ddef9187b660b9affd9bc51cb4f18828a8b86542631a756fd05a
diff --git a/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch b/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch
new file mode 100644
index 000000000000..a2a9033abd66
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch
@@ -0,0 +1,19 @@
+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-3.0.5-r1.ebuild b/app-office/texstudio/texstudio-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..375790905ee9
--- /dev/null
+++ b/app-office/texstudio/texstudio-3.0.5-r1.ebuild
@@ -0,0 +1,76 @@
+# 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}/${P}-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.0.5.ebuild b/app-office/texstudio/texstudio-3.1.0-r1.ebuild
index b762eb4fbdd4..3a47094b7680 100644
--- a/app-office/texstudio/texstudio-3.0.5.ebuild
+++ b/app-office/texstudio/texstudio-3.1.0-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit desktop prefix qmake-utils xdg
-
 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"
@@ -16,10 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="video"
 
-COMMON_DEPEND="
+DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2:0[qt5(+)]
+	>=dev-libs/quazip-0.7.3-r1:0=
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
@@ -35,29 +35,32 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	video? ( media-libs/phonon[qt5(+)] )"
-RDEPEND="${COMMON_DEPEND}
+	video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl
 	app-text/psutils
 	media-libs/netpbm
-	virtual/latex-base"
-DEPEND="${COMMON_DEPEND}"
-
+	virtual/latex-base
+"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${PN}-3.0.5-quazip1.patch" ) # TODO: upstream
+
 src_prepare() {
-	default
+	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/d' \
+	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
 		-i ${PN}.pro || die
-
-	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
-	eprefixify ${PN}.pri
 }
 
 src_configure() {
diff --git a/app-office/texstudio/texstudio-3.1.1.ebuild b/app-office/texstudio/texstudio-3.1.1.ebuild
new file mode 100644
index 000000000000..3d74c1d7efa9
--- /dev/null
+++ b/app-office/texstudio/texstudio-3.1.1.ebuild
@@ -0,0 +1,80 @@
+# 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/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-9999.ebuild b/app-office/texstudio/texstudio-9999.ebuild
index feb15564ad18..c37e0bd19c1d 100644
--- a/app-office/texstudio/texstudio-9999.ebuild
+++ b/app-office/texstudio/texstudio-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop git-r3 prefix qmake-utils xdg
+inherit desktop git-r3 qmake-utils xdg
 
 MY_PV="${PV/_/}"
 DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
@@ -15,10 +15,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="video"
 
-COMMON_DEPEND="
+DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2:0[qt5(+)]
+	>=dev-libs/quazip-1.0:0=
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
@@ -34,30 +34,33 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	video? ( media-libs/phonon[qt5(+)] )"
-RDEPEND="${COMMON_DEPEND}
+	video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="
+	${DEPEND}
 	app-text/ghostscript-gpl
 	app-text/psutils
 	media-libs/netpbm
-	virtual/latex-base"
-DEPEND="${COMMON_DEPEND}"
-
+	virtual/latex-base
+"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-quazip1.patch" # TODO: upstream
+)
+
 src_prepare() {
-	default
+	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/d' \
+	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
 		-i ${PN}.pro || die
-
-	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
-	eprefixify ${PN}.pri
 }
 
 src_configure() {
@@ -69,5 +72,6 @@ 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
 }