[patch] texmaker-4.5-r1.ebuild.diff

texmaker-4.5-r1.ebuild.diff (text/plain), 2.33 KB, created by Andreas Sturmlechner on 2016-10-25 08:42:29 UTC

--- texmaker-4.5.ebuild	2016-06-11 01:12:26.581751704 +0200
+++ texmaker-4.5-r1.ebuild	2016-10-25 10:32:30.136914417 +0200
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils qmake-utils readme.gentoo
+inherit qmake-utils readme.gentoo-r1
 
 DESCRIPTION="A nice LaTeX-IDE"
 HOMEPAGE="http://www.xm1math.net/texmaker/"
@@ -12,58 +12,49 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="qt4 +qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
 
 COMMON_DEPEND="
 	app-text/hunspell
-	app-text/poppler:=[qt4?,qt5?]
+	app-text/poppler:=[qt5]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[X,qt5]
+	dev-qt/qtwebkit:5[printsupport]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	dev-qt/qtsingleapplication[X,qt4?,qt5?]
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtcore:4
-		dev-qt/qtscript:4
-		dev-qt/qtwebkit:4
-		)
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtscript:5
-		dev-qt/qtwebkit:5[printsupport]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
 "
 RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
 	app-text/ghostscript-gpl
+	app-text/psutils
 	media-libs/netpbm
-	qt4? ( app-i18n/ibus-qt )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+	virtual/latex-base
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-unbundle.patch
 	"${FILESDIR}"/${P}-modern-styles.patch
-	)
+)
 
 DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
 HTML_DOCS=( doc/. )
 
 src_prepare() {
-	find singleapp hunspell -delete || die
+	default
 
-	epatch "${PATCHES[@]}"
+	find singleapp hunspell -delete || die
 
-	cat >> ${PN}.pro <<- EOF
+	cat >> ${PN}.pro <<- EOF || die
 	exists(texmakerx_my.pri):include(texmakerx_my.pri)
 	EOF
 
@@ -85,11 +76,8 @@
 		DESKTOPDIR="${EPREFIX}/usr/share/applications"
 		ICONDIR="${EPREFIX}/usr/share/pixmaps"
 		)
-	if use qt4; then
-		eqmake4 ${myeqmakeargs[@]}
-	else
-		eqmake5 ${myeqmakeargs[@]}
-	fi
+
+	eqmake5 "${myeqmakeargs[@]}"
 }
 
 src_install() {