1 |
commit: 922fbdd8be012b4d8c9c936a0fdcfa8cd48058b8 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 30 20:59:06 2023 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 30 20:59:06 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=922fbdd8 |
7 |
|
8 |
kde-apps/k3b: Drop IUSE transcode, mp3, sox |
9 |
|
10 |
Bug: https://bugs.gentoo.org/891585 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
kde-apps/k3b/k3b-22.12.49.9999.ebuild | 21 ++++++--------------- |
14 |
kde-apps/k3b/k3b-9999.ebuild | 21 ++++++--------------- |
15 |
2 files changed, 12 insertions(+), 30 deletions(-) |
16 |
|
17 |
diff --git a/kde-apps/k3b/k3b-22.12.49.9999.ebuild b/kde-apps/k3b/k3b-22.12.49.9999.ebuild |
18 |
index 17e5d0f24e..a8a70674de 100644 |
19 |
--- a/kde-apps/k3b/k3b-22.12.49.9999.ebuild |
20 |
+++ b/kde-apps/k3b/k3b-22.12.49.9999.ebuild |
21 |
@@ -16,13 +16,9 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" |
22 |
LICENSE="GPL-2 FDL-1.2" |
23 |
SLOT="5" |
24 |
KEYWORDS="" |
25 |
-IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" |
26 |
+IUSE="dvd flac mad musepack sndfile taglib vcd vorbis" |
27 |
|
28 |
-REQUIRED_USE=" |
29 |
- flac? ( taglib ) |
30 |
- mp3? ( encode taglib ) |
31 |
- sox? ( encode taglib ) |
32 |
-" |
33 |
+REQUIRED_USE="flac? ( taglib )" |
34 |
|
35 |
DEPEND=" |
36 |
>=dev-qt/qtdbus-${QTMIN}:5 |
37 |
@@ -53,7 +49,6 @@ DEPEND=" |
38 |
media-libs/libsamplerate |
39 |
dvd? ( media-libs/libdvdread:= ) |
40 |
flac? ( >=media-libs/flac-1.2:=[cxx] ) |
41 |
- mp3? ( media-sound/lame ) |
42 |
mad? ( media-libs/libmad ) |
43 |
musepack? ( >=media-sound/musepack-tools-444 ) |
44 |
sndfile? ( media-libs/libsndfile ) |
45 |
@@ -68,11 +63,7 @@ RDEPEND="${DEPEND} |
46 |
app-cdr/cdrtools |
47 |
dev-libs/libburn |
48 |
media-sound/cdparanoia |
49 |
- dvd? ( |
50 |
- >=app-cdr/dvd+rw-tools-7 |
51 |
- encode? ( media-video/transcode[dvd] ) |
52 |
- ) |
53 |
- sox? ( media-sound/sox ) |
54 |
+ dvd? ( >=app-cdr/dvd+rw-tools-7 ) |
55 |
vcd? ( media-video/vcdimager ) |
56 |
" |
57 |
|
58 |
@@ -81,19 +72,19 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) |
59 |
src_configure() { |
60 |
local mycmakeargs=( |
61 |
-DK3B_BUILD_API_DOCS=OFF |
62 |
+ -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF |
63 |
+ -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF |
64 |
+ -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF |
65 |
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON |
66 |
-DK3B_ENABLE_HAL_SUPPORT=OFF |
67 |
-DK3B_ENABLE_MUSICBRAINZ=OFF |
68 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON |
69 |
-DK3B_DEBUG=$(usex debug) |
70 |
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd) |
71 |
- -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) |
72 |
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) |
73 |
- -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) |
74 |
-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) |
75 |
-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) |
76 |
-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile) |
77 |
- -DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox) |
78 |
-DK3B_ENABLE_TAGLIB=$(usex taglib) |
79 |
-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) |
80 |
-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) |
81 |
|
82 |
diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild |
83 |
index 17e5d0f24e..a8a70674de 100644 |
84 |
--- a/kde-apps/k3b/k3b-9999.ebuild |
85 |
+++ b/kde-apps/k3b/k3b-9999.ebuild |
86 |
@@ -16,13 +16,9 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" |
87 |
LICENSE="GPL-2 FDL-1.2" |
88 |
SLOT="5" |
89 |
KEYWORDS="" |
90 |
-IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" |
91 |
+IUSE="dvd flac mad musepack sndfile taglib vcd vorbis" |
92 |
|
93 |
-REQUIRED_USE=" |
94 |
- flac? ( taglib ) |
95 |
- mp3? ( encode taglib ) |
96 |
- sox? ( encode taglib ) |
97 |
-" |
98 |
+REQUIRED_USE="flac? ( taglib )" |
99 |
|
100 |
DEPEND=" |
101 |
>=dev-qt/qtdbus-${QTMIN}:5 |
102 |
@@ -53,7 +49,6 @@ DEPEND=" |
103 |
media-libs/libsamplerate |
104 |
dvd? ( media-libs/libdvdread:= ) |
105 |
flac? ( >=media-libs/flac-1.2:=[cxx] ) |
106 |
- mp3? ( media-sound/lame ) |
107 |
mad? ( media-libs/libmad ) |
108 |
musepack? ( >=media-sound/musepack-tools-444 ) |
109 |
sndfile? ( media-libs/libsndfile ) |
110 |
@@ -68,11 +63,7 @@ RDEPEND="${DEPEND} |
111 |
app-cdr/cdrtools |
112 |
dev-libs/libburn |
113 |
media-sound/cdparanoia |
114 |
- dvd? ( |
115 |
- >=app-cdr/dvd+rw-tools-7 |
116 |
- encode? ( media-video/transcode[dvd] ) |
117 |
- ) |
118 |
- sox? ( media-sound/sox ) |
119 |
+ dvd? ( >=app-cdr/dvd+rw-tools-7 ) |
120 |
vcd? ( media-video/vcdimager ) |
121 |
" |
122 |
|
123 |
@@ -81,19 +72,19 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) |
124 |
src_configure() { |
125 |
local mycmakeargs=( |
126 |
-DK3B_BUILD_API_DOCS=OFF |
127 |
+ -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF |
128 |
+ -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF |
129 |
+ -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF |
130 |
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON |
131 |
-DK3B_ENABLE_HAL_SUPPORT=OFF |
132 |
-DK3B_ENABLE_MUSICBRAINZ=OFF |
133 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON |
134 |
-DK3B_DEBUG=$(usex debug) |
135 |
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd) |
136 |
- -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) |
137 |
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) |
138 |
- -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) |
139 |
-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) |
140 |
-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) |
141 |
-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile) |
142 |
- -DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox) |
143 |
-DK3B_ENABLE_TAGLIB=$(usex taglib) |
144 |
-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) |
145 |
-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) |