app-office/texstudio: Support build with >=dev-libs/quazip-1.0

Drop prefix.eclass, using pkgconfig for dev-libs/quazip:0/0 instead.
Raise minimum dev-libs/quazip version to first w/o IUSE=qt5, cleanup usedep.
Raise minimum media-libs/phonon version to first w/o IUSE=qt5, cleanup usedep.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 186 insertions, 15 deletions

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..17c7377b06e8
--- /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.1.0-r1.ebuild b/app-office/texstudio/texstudio-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..3a47094b7680
--- /dev/null
+++ b/app-office/texstudio/texstudio-3.1.0-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}/${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..0526576f09e8 100644
--- a/app-office/texstudio/texstudio-9999.ebuild
+++ b/app-office/texstudio/texstudio-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit desktop git-r3 prefix qmake-utils xdg
-
 MY_PV="${PV/_/}"
+inherit desktop git-r3 qmake-utils xdg
+
 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"
@@ -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,30 @@ 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() {