From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-942978-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E0FD139694 for <garchives@archives.gentoo.org>; Wed, 5 Apr 2017 21:31:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2E5EE0E2C; Wed, 5 Apr 2017 21:31:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D282E0E2C for <gentoo-commits@lists.gentoo.org>; Wed, 5 Apr 2017 21:31:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CD47341683 for <gentoo-commits@lists.gentoo.org>; Wed, 5 Apr 2017 21:31:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5755A73D2 for <gentoo-commits@lists.gentoo.org>; Wed, 5 Apr 2017 21:31:00 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1491427849.59e1ecd04f67dde1253faa059ba0bfac51888a3f.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-text/kbibtex/ X-VCS-Repository: proj/kde X-VCS-Files: app-text/kbibtex/kbibtex-9999.ebuild app-text/kbibtex/metadata.xml X-VCS-Directories: app-text/kbibtex/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 59e1ecd04f67dde1253faa059ba0bfac51888a3f X-VCS-Branch: master Date: Wed, 5 Apr 2017 21:31:00 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 55c3ccb4-00c0-4dd7-b542-d54de05d0860 X-Archives-Hash: 42598182bac988bc628ce3cc935bfe07 commit: 59e1ecd04f67dde1253faa059ba0bfac51888a3f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Apr 5 21:28:19 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Apr 5 21:30:49 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=59e1ecd0 app-text/kbibtex: Add USE=webengine,webkit, set KDE_TEST=true Upstream commits d0a53e018ea9e6ec9a7136aa25d544ee07148d67 6ebe499f32dff8a7ff6187ce8aac3816accf8afe Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-text/kbibtex/kbibtex-9999.ebuild | 18 +++++++++++++++--- app-text/kbibtex/metadata.xml | 4 ++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app-text/kbibtex/kbibtex-9999.ebuild b/app-text/kbibtex/kbibtex-9999.ebuild index 7a3d87240e..cef2e2e85c 100644 --- a/app-text/kbibtex/kbibtex-9999.ebuild +++ b/app-text/kbibtex/kbibtex-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 KDE_GCC_MINIMAL="4.9" KDE_HANDBOOK="optional" -KDE_TEST="forceoptional" +KDE_TEST="true" inherit kde5 DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX" @@ -17,7 +17,9 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then fi LICENSE="GPL-2" -IUSE="" +IUSE="webengine webkit" + +REQUIRED_USE="?? ( webengine webkit )" DEPEND=" $(add_frameworks_dep kcompletion) @@ -38,7 +40,6 @@ DEPEND=" $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) - $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) $(add_qt_dep qtxmlpatterns) @@ -46,6 +47,8 @@ DEPEND=" dev-libs/icu:= dev-libs/qoauth:5 virtual/tex-base + webengine? ( $(add_qt_dep qtwebengine 'widgets') ) + webkit? ( $(add_qt_dep qtwebkit) ) " RDEPEND="${DEPEND} !app-text/kbibtex:4 @@ -65,3 +68,12 @@ src_prepare() { rm -r src/3rdparty/qoauth || die "Failed to remove bundled qoauth" } + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package webengine Qt5WebEngineWidgets) + $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) + ) + + kde5_src_configure +} diff --git a/app-text/kbibtex/metadata.xml b/app-text/kbibtex/metadata.xml index 2fdbf33d96..41132c0622 100644 --- a/app-text/kbibtex/metadata.xml +++ b/app-text/kbibtex/metadata.xml @@ -5,4 +5,8 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <use> + <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for HTML previews</flag> + <flag name="webkit">Use <pkg>dev-qt/qtwebengine</pkg> for HTML previews</flag> + </use> </pkgmetadata>