Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
Date: Thu, 17 Sep 2020 20:08:00
Message-Id: 1600364620.379d1096fd7f9f87964da6e1f55efef009c8f2f4.asturm@gentoo
1 commit: 379d1096fd7f9f87964da6e1f55efef009c8f2f4
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 17 17:26:21 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 17 17:43:40 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=379d1096
7
8 kde-apps/k3b: Drop IUSE=webkit
9
10 Completely avoidable and only sacrificing "prettier" k3bdiskinfoview.
11
12 Package-Manager: Portage-3.0.7, Repoman-3.0.1
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-apps/k3b/k3b-20.08.49.9999.ebuild | 5 ++---
16 kde-apps/k3b/k3b-9999.ebuild | 5 ++---
17 2 files changed, 4 insertions(+), 6 deletions(-)
18
19 diff --git a/kde-apps/k3b/k3b-20.08.49.9999.ebuild b/kde-apps/k3b/k3b-20.08.49.9999.ebuild
20 index 031e96d8fe..40bc86c11d 100644
21 --- a/kde-apps/k3b/k3b-20.08.49.9999.ebuild
22 +++ b/kde-apps/k3b/k3b-20.08.49.9999.ebuild
23 @@ -17,7 +17,7 @@ https://userbase.kde.org/K3b"
24 LICENSE="GPL-2 FDL-1.2"
25 SLOT="5"
26 KEYWORDS=""
27 -IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
28 +IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
29
30 REQUIRED_USE="
31 flac? ( taglib )
32 @@ -64,7 +64,6 @@ DEPEND="
33 media-libs/libogg
34 media-libs/libvorbis
35 )
36 - webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
37 "
38 RDEPEND="${DEPEND}
39 app-cdr/cdrdao
40 @@ -87,6 +86,7 @@ src_configure() {
41 -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
42 -DK3B_ENABLE_HAL_SUPPORT=OFF
43 -DK3B_ENABLE_MUSICBRAINZ=OFF
44 + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
45 -DK3B_DEBUG=$(usex debug)
46 -DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
47 -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
48 @@ -100,7 +100,6 @@ src_configure() {
49 -DK3B_ENABLE_TAGLIB=$(usex taglib)
50 -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
51 -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
52 - $(cmake_use_find_package webkit Qt5WebKitWidgets)
53 )
54
55 ecm_src_configure
56
57 diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild
58 index 7072c49bea..fb70317dc1 100644
59 --- a/kde-apps/k3b/k3b-9999.ebuild
60 +++ b/kde-apps/k3b/k3b-9999.ebuild
61 @@ -17,7 +17,7 @@ https://userbase.kde.org/K3b"
62 LICENSE="GPL-2 FDL-1.2"
63 SLOT="5"
64 KEYWORDS=""
65 -IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
66 +IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
67
68 REQUIRED_USE="
69 flac? ( taglib )
70 @@ -64,7 +64,6 @@ DEPEND="
71 media-libs/libogg
72 media-libs/libvorbis
73 )
74 - webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
75 "
76 RDEPEND="${DEPEND}
77 app-cdr/cdrdao
78 @@ -87,6 +86,7 @@ src_configure() {
79 -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
80 -DK3B_ENABLE_HAL_SUPPORT=OFF
81 -DK3B_ENABLE_MUSICBRAINZ=OFF
82 + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
83 -DK3B_DEBUG=$(usex debug)
84 -DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
85 -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
86 @@ -100,7 +100,6 @@ src_configure() {
87 -DK3B_ENABLE_TAGLIB=$(usex taglib)
88 -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
89 -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
90 - $(cmake_use_find_package webkit Qt5WebKitWidgets)
91 )
92
93 ecm_src_configure