[gentoo-commits] repo/gentoo:master commit in: www-client/otter/

[Jeroen Roovers]

commit:     88c074ca3e58d416a23de2a6f9ef7e0dec357482
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 03:56:45 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 03:57:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88c074ca

www-client/otter: Allow for both qtwebkit and qtwebengine to be enabled (bug #649170).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-client/otter/otter-0.9.96.ebuild | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/www-client/otter/otter-0.9.96.ebuild b/www-client/otter/otter-0.9.96.ebuild
index 8796679bc7d..6db6a4cad02 100644
--- a/www-client/otter/otter-0.9.96.ebuild
+++ b/www-client/otter/otter-0.9.96.ebuild
@@ -11,7 +11,10 @@ SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.ta
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="webengine spell"
+IUSE="webengine +webkit spell"
+REQUIRED_USE="
+	|| ( webengine webkit )
+"
 
 DEPEND="
 	dev-qt/qtconcurrent:5
@@ -25,11 +28,11 @@ DEPEND="
 	dev-qt/qtscript:5
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxmlpatterns:5
 	spell? ( kde-frameworks/sonnet )
 	webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] )
+	webkit? ( dev-qt/qtwebkit:5 )
 "
 RDEPEND="
 	${DEPEND}
@@ -59,17 +62,10 @@ src_prepare() {
 }
 
 src_configure() {
-	if use webengine; then
-		mycmakeargs=(
-			-DENABLE_QTWEBENGINE=yes
-			-DENABLE_QTWEBKIT=no
-		)
-	else
-		mycmakeargs=(
-			-DENABLE_QTWEBENGINE=no
-			-DENABLE_QTWEBKIT=yes
-		)
-	fi
+	mycmakeargs=(
+		-DENABLE_QTWEBENGINE="$(usex webengine)"
+		-DENABLE_QTWEBKIT="$(usex webkit)"
+	)
 
 	cmake-utils_src_configure
 }