commit 6b9aba9a1aa045153df090284d8b50c2a9edf054 Author: Andreas Sturmlechner Date: Tue Jan 10 00:21:05 2017 +0100 app-office/texmaker: Switch USE=qt4 to !qt5 and drop REQUIRED_USE See also: https://wiki.gentoo.org/wiki/Project:Qt/Policies (Requires one of two Qt versions) Package-Manager: portage-2.3.0 diff --git a/app-office/texmaker/texmaker-4.5.ebuild b/app-office/texmaker/texmaker-4.5.ebuild index a1fa521..d27c466 100644 --- a/app-office/texmaker/texmaker-4.5.ebuild +++ b/app-office/texmaker/texmaker-4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,40 +13,40 @@ SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="qt4 +qt5" - -REQUIRED_USE="^^ ( qt4 qt5 )" +IUSE="+qt5" COMMON_DEPEND=" app-text/hunspell - app-text/poppler:=[qt4?,qt5?] sys-libs/zlib x11-libs/libX11 x11-libs/libXext - dev-qt/qtsingleapplication[X,qt4?,qt5?] - qt4? ( + !qt5? ( + app-text/poppler:=[-qt5] dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtscript:4 + dev-qt/qtsingleapplication[X,-qt5] dev-qt/qtwebkit:4 ) qt5? ( + app-text/poppler:=[qt5] dev-qt/qtconcurrent:5 - dev-qt/qtgui: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 ) " RDEPEND="${COMMON_DEPEND} - virtual/latex-base - app-text/psutils app-text/ghostscript-gpl + app-text/psutils media-libs/netpbm - qt4? ( app-i18n/ibus-qt )" + virtual/latex-base + !qt5? ( app-i18n/ibus-qt )" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" @@ -85,7 +85,7 @@ src_configure() { DESKTOPDIR="${EPREFIX}/usr/share/applications" ICONDIR="${EPREFIX}/usr/share/pixmaps" ) - if use qt4; then + if ! use qt5; then eqmake4 ${myeqmakeargs[@]} else eqmake5 ${myeqmakeargs[@]}