1 |
commit: e4242744e076f040b68bdb40487583d7fb3788ba |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 20 18:39:57 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 20 18:40:44 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e4242744 |
7 |
|
8 |
kde-apps/kwave: Sort, drop unused DEPENDs |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
kde-apps/kwave/kwave-20.04.49.9999.ebuild | 12 +++++++----- |
14 |
kde-apps/kwave/kwave-9999.ebuild | 12 +++++++----- |
15 |
2 files changed, 14 insertions(+), 10 deletions(-) |
16 |
|
17 |
diff --git a/kde-apps/kwave/kwave-20.04.49.9999.ebuild b/kde-apps/kwave/kwave-20.04.49.9999.ebuild |
18 |
index 178d8f012d..9fba01e0dc 100644 |
19 |
--- a/kde-apps/kwave/kwave-20.04.49.9999.ebuild |
20 |
+++ b/kde-apps/kwave/kwave-20.04.49.9999.ebuild |
21 |
@@ -4,7 +4,6 @@ |
22 |
EAPI=7 |
23 |
|
24 |
ECM_HANDBOOK="forceoptional" |
25 |
-PVCUT=$(ver_cut 1-3) |
26 |
KFMIN=5.70.0 |
27 |
QTMIN=5.14.1 |
28 |
inherit ecm kde.org |
29 |
@@ -25,6 +24,8 @@ BDEPEND=" |
30 |
) ) |
31 |
" |
32 |
RDEPEND=" |
33 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
34 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
35 |
>=kde-frameworks/kcompletion-${KFMIN}:5 |
36 |
>=kde-frameworks/kconfig-${KFMIN}:5 |
37 |
>=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
38 |
@@ -37,8 +38,6 @@ RDEPEND=" |
39 |
>=kde-frameworks/ktextwidgets-${KFMIN}:5 |
40 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
41 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
42 |
- >=dev-qt/qtgui-${QTMIN}:5 |
43 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
44 |
media-libs/audiofile:= |
45 |
>=sci-libs/fftw-3 |
46 |
media-libs/libsamplerate |
47 |
@@ -47,7 +46,11 @@ RDEPEND=" |
48 |
mp3? ( |
49 |
media-libs/id3lib |
50 |
media-libs/libmad |
51 |
- || ( media-sound/lame media-sound/toolame media-sound/twolame ) |
52 |
+ || ( |
53 |
+ media-sound/lame |
54 |
+ media-sound/toolame |
55 |
+ media-sound/twolame |
56 |
+ ) |
57 |
) |
58 |
qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) |
59 |
opus? ( |
60 |
@@ -61,7 +64,6 @@ RDEPEND=" |
61 |
) |
62 |
" |
63 |
DEPEND="${RDEPEND} |
64 |
- >=kde-apps/poxml-${PVCUT}:5 |
65 |
>=dev-qt/qtconcurrent-${QTMIN}:5 |
66 |
" |
67 |
|
68 |
|
69 |
diff --git a/kde-apps/kwave/kwave-9999.ebuild b/kde-apps/kwave/kwave-9999.ebuild |
70 |
index 178d8f012d..9fba01e0dc 100644 |
71 |
--- a/kde-apps/kwave/kwave-9999.ebuild |
72 |
+++ b/kde-apps/kwave/kwave-9999.ebuild |
73 |
@@ -4,7 +4,6 @@ |
74 |
EAPI=7 |
75 |
|
76 |
ECM_HANDBOOK="forceoptional" |
77 |
-PVCUT=$(ver_cut 1-3) |
78 |
KFMIN=5.70.0 |
79 |
QTMIN=5.14.1 |
80 |
inherit ecm kde.org |
81 |
@@ -25,6 +24,8 @@ BDEPEND=" |
82 |
) ) |
83 |
" |
84 |
RDEPEND=" |
85 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
86 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
87 |
>=kde-frameworks/kcompletion-${KFMIN}:5 |
88 |
>=kde-frameworks/kconfig-${KFMIN}:5 |
89 |
>=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
90 |
@@ -37,8 +38,6 @@ RDEPEND=" |
91 |
>=kde-frameworks/ktextwidgets-${KFMIN}:5 |
92 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
93 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
94 |
- >=dev-qt/qtgui-${QTMIN}:5 |
95 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
96 |
media-libs/audiofile:= |
97 |
>=sci-libs/fftw-3 |
98 |
media-libs/libsamplerate |
99 |
@@ -47,7 +46,11 @@ RDEPEND=" |
100 |
mp3? ( |
101 |
media-libs/id3lib |
102 |
media-libs/libmad |
103 |
- || ( media-sound/lame media-sound/toolame media-sound/twolame ) |
104 |
+ || ( |
105 |
+ media-sound/lame |
106 |
+ media-sound/toolame |
107 |
+ media-sound/twolame |
108 |
+ ) |
109 |
) |
110 |
qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) |
111 |
opus? ( |
112 |
@@ -61,7 +64,6 @@ RDEPEND=" |
113 |
) |
114 |
" |
115 |
DEPEND="${RDEPEND} |
116 |
- >=kde-apps/poxml-${PVCUT}:5 |
117 |
>=dev-qt/qtconcurrent-${QTMIN}:5 |
118 |
" |