public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: app-office/skrooge/
Date: Thu, 17 Sep 2020 20:07:55 +0000 (UTC)	[thread overview]
Message-ID: <1600364620.157ab0e4ed3fbbab2a4b54be6a606f690650bcd9.asturm@gentoo> (raw)

commit:     157ab0e4ed3fbbab2a4b54be6a606f690650bcd9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 17:29:18 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 17:43:40 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=157ab0e4

app-office/skrooge: Drop IUSE=webkit

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/skrooge/metadata.xml        |  1 -
 app-office/skrooge/skrooge-9999.ebuild | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index 5156b3be98..6afd808cbb 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild
index 3ed8aceba6..285accb3fe 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="activities designer kde ofx webkit"
+IUSE="activities designer kde ofx"
 
 REQUIRED_USE="test? ( designer )"
 
@@ -41,6 +41,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtscript-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5=
 	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
@@ -65,16 +66,14 @@ COMMON_DEPEND="
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
 	ofx? ( dev-libs/libofx )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 "
 DEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	designer? (
-		>=kde-frameworks/kdesignerplugin-${KFMIN}:5
 		>=dev-qt/designer-${QTMIN}:5
+		>=kde-frameworks/kdesignerplugin-${KFMIN}:5
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -86,12 +85,12 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
+		-DSKG_WEBENGINE=ON
 		$(cmake_use_find_package activities KF5Activities)
+		-DSKG_DESIGNER=$(usex designer)
 		$(cmake_use_find_package kde KF5Runner)
 		$(cmake_use_find_package ofx LibOfx)
-		-DSKG_WEBENGINE=$(usex !webkit)
+		-DSKG_BUILD_TEST=$(usex test)
 	)
 
 	ecm_src_configure


             reply	other threads:[~2020-09-17 20:07 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-17 20:07 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-18 21:54 [gentoo-commits] proj/kde:master commit in: app-office/skrooge/ Andreas Sturmlechner
2025-02-18 21:18 Andreas Sturmlechner
2025-01-12 15:50 Andreas Sturmlechner
2025-01-12 15:50 Andreas Sturmlechner
2025-01-11 10:22 Andreas Sturmlechner
2024-11-23 13:48 Andreas Sturmlechner
2024-10-31  7:43 Andreas Sturmlechner
2024-10-07 23:21 Andreas Sturmlechner
2023-02-19  9:58 Andreas Sturmlechner
2023-02-18 14:09 Andreas Sturmlechner
2022-10-11 15:18 Andreas Sturmlechner
2021-07-29 19:03 Andreas Sturmlechner
2021-07-29 18:57 Andreas Sturmlechner
2020-11-25  9:35 Andreas Sturmlechner
2020-10-10 21:39 Andreas Sturmlechner
2019-06-20 10:45 Andreas Sturmlechner
2019-02-07 22:50 Andreas Sturmlechner
2019-01-26 20:29 Andreas Sturmlechner
2018-12-18 23:29 Andreas Sturmlechner
2018-02-03 23:17 Andreas Sturmlechner
2017-09-10 12:21 Johannes Huber
2017-08-26 12:29 Michael Palimaka
2017-06-24 17:07 Andreas Sturmlechner
2017-01-24  0:21 Andreas Sturmlechner
2016-10-09 14:56 Michael Palimaka
2016-02-23 14:15 Michael Palimaka
2015-12-02 13:41 Michael Palimaka
2015-12-02 12:54 Michael Palimaka
2015-12-02 12:29 Michael Palimaka
2015-12-02 11:06 Michael Palimaka
2015-09-23 14:50 Michael Palimaka
2015-09-17  8:36 Manuel Rüger
2015-06-27 22:13 Johannes Huber
2015-06-27 20:44 Johannes Huber
2015-06-21 15:22 Michael Palimaka
2015-06-21 15:21 Michael Palimaka
2015-06-17 19:43 Michael Palimaka
2015-06-15 18:23 Michael Palimaka
2015-05-15 17:08 Michael Palimaka
2015-05-15 16:34 Michael Palimaka
2015-01-28 23:01 Johannes Huber
2014-12-26 10:30 Michael Palimaka
2014-07-17 13:04 Michael Palimaka
2014-04-12 19:30 Johannes Huber
2013-12-16 18:08 Johannes Huber
2013-10-09 21:38 Johannes Huber
2013-09-03  3:34 Manuel Rüger
2013-08-03 10:55 Manuel Rüger
2013-07-06 17:14 Manuel Rüger
2013-07-06 16:59 Manuel Rüger
2013-05-14 17:37 Johannes Huber
2013-04-13 14:48 Michael Palimaka
2013-03-10  9:04 Michael Palimaka
2012-03-23  9:32 Johannes Huber
2012-01-18 15:35 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1600364620.157ab0e4ed3fbbab2a4b54be6a606f690650bcd9.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox