Gentoo Archives: gentoo-commits

From: Jimi Huotari <chiitoo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/libfm-qt/, lxqt-base/lxqt-powermanagement/, lxqt-base/lxqt-sudo/, ...
Date: Mon, 18 Feb 2019 21:56:08
Message-Id: 1550526922.a6d3c8fcfb555fd1c0293a037c4ba58c4fb7132b.chiitoo@gentoo
1 commit: a6d3c8fcfb555fd1c0293a037c4ba58c4fb7132b
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 18 21:55:22 2019 +0000
4 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 18 21:55:22 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a6d3c8fc
7
8 lxqt: add blockers for 'lxqt-base/lxqt-l10n'
9
10 Due to the translation changes, this package installs conflicting
11 files, not to mention it is deprecated upstream.
12
13 Package-Manager: Portage-2.3.61, Repoman-2.3.12
14 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
15
16 lxqt-base/liblxqt/liblxqt-9999.ebuild | 1 +
17 lxqt-base/lxqt-about/lxqt-about-9999.ebuild | 1 +
18 lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild | 1 +
19 lxqt-base/lxqt-config/lxqt-config-9999.ebuild | 1 +
20 lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild | 1 +
21 lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild | 1 +
22 lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild | 1 +
23 lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild | 1 +
24 lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild | 1 +
25 lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild | 1 +
26 lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild | 1 +
27 lxqt-base/lxqt-session/lxqt-session-9999.ebuild | 1 +
28 lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild | 1 +
29 media-gfx/lximage-qt/lximage-qt-9999.ebuild | 1 +
30 x11-libs/libfm-qt/libfm-qt-9999.ebuild | 1 +
31 x11-misc/obconf-qt/obconf-qt-9999.ebuild | 1 +
32 x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild | 1 +
33 17 files changed, 17 insertions(+)
34
35 diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild
36 index 42e598a4..76fc3330 100644
37 --- a/lxqt-base/liblxqt/liblxqt-9999.ebuild
38 +++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild
39 @@ -35,6 +35,7 @@ RDEPEND="
40 kde-frameworks/kwindowsystem:5[X]
41 x11-libs/libX11
42 x11-libs/libXScrnSaver
43 + !lxqt-base/lxqt-l10n
44 "
45 DEPEND="${RDEPEND}
46 policykit? ( sys-auth/polkit-qt )
47
48 diff --git a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
49 index 75f43775..024038f6 100644
50 --- a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
51 +++ b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
52 @@ -26,5 +26,6 @@ RDEPEND="
53 dev-qt/qtgui:5
54 dev-qt/qtwidgets:5
55 =lxqt-base/liblxqt-$(ver_cut 1-2)*
56 + !lxqt-base/lxqt-l10n
57 "
58 DEPEND="${RDEPEND}"
59
60 diff --git a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild
61 index 21736a39..6675bd34 100644
62 --- a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild
63 +++ b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild
64 @@ -27,5 +27,6 @@ RDEPEND="
65 dev-qt/qtwidgets:5
66 =lxqt-base/liblxqt-$(ver_cut 1-2)*
67 kde-frameworks/kwindowsystem:5
68 + !lxqt-base/lxqt-l10n
69 "
70 DEPEND="${RDEPEND}"
71
72 diff --git a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
73 index 810341ce..00ac0c9d 100644
74 --- a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
75 +++ b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
76 @@ -46,6 +46,7 @@ RDEPEND="
77 x11-drivers/xf86-input-libinput
78 x11-libs/libXext
79 )
80 + !lxqt-base/lxqt-l10n
81 "
82 DEPEND="${DEPEND}"
83
84
85 diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
86 index a8088d71..0858b261 100644
87 --- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
88 +++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
89 @@ -35,5 +35,6 @@ RDEPEND="
90 kde-frameworks/kwindowsystem:5
91 x11-libs/libX11
92 !lxqt-base/lxqt-common
93 + !lxqt-base/lxqt-l10n
94 "
95 DEPEND="${RDEPEND}"
96
97 diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
98 index ee258c49..31c8db47 100644
99 --- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
100 +++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
101 @@ -32,5 +32,6 @@ RDEPEND="
102 kde-frameworks/kwindowsystem:5
103 =lxqt-base/liblxqt-$(ver_cut 1-2)*
104 !lxqt-base/lxqt-common
105 + !lxqt-base/lxqt-l10n
106 "
107 DEPEND="${RDEPEND}"
108
109 diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
110 index 0da13230..333f665d 100644
111 --- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
112 +++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
113 @@ -27,6 +27,7 @@ RDEPEND="
114 dev-qt/qtcore:5
115 dev-qt/qtwidgets:5
116 =lxqt-base/liblxqt-$(ver_cut 1-2)*
117 + !lxqt-base/lxqt-l10n
118 "
119 DEPEND="${RDEPEND}"
120
121
122 diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
123 index bec24119..f8e34a5d 100644
124 --- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
125 +++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
126 @@ -67,6 +67,7 @@ RDEPEND="
127 )
128 )
129 !lxqt-base/lxqt-common
130 + !lxqt-base/lxqt-l10n
131 "
132 DEPEND="${RDEPEND}"
133
134
135 diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
136 index d27fe6da..a41b83fd 100644
137 --- a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
138 +++ b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
139 @@ -33,6 +33,7 @@ RDEPEND="
140 =lxqt-base/liblxqt-$(ver_cut 1-2)*
141 sys-auth/polkit-qt[qt5(+)]
142 !lxqt-base/lxqt-common
143 + !lxqt-base/lxqt-l10n
144 "
145 DEPEND="${RDEPEND}"
146
147
148 diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
149 index aa506a5a..f787aa6c 100644
150 --- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
151 +++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
152 @@ -37,5 +37,6 @@ RDEPEND="
153 =lxqt-base/liblxqt-$(ver_cut 1-2)*
154 sys-power/upower
155 !lxqt-base/lxqt-common
156 + !lxqt-base/lxqt-l10n
157 "
158 DEPEND="${RDEPEND}"
159
160 diff --git a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
161 index eb8e1c97..44dae620 100644
162 --- a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
163 +++ b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
164 @@ -38,6 +38,7 @@ RDEPEND="
165 =lxqt-base/liblxqt-${MY_PV}
166 =lxqt-base/lxqt-globalkeys-${MY_PV}
167 !lxqt-base/lxqt-common
168 + !lxqt-base/lxqt-l10n
169 "
170 DEPEND="${RDEPEND}"
171
172
173 diff --git a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
174 index 1d49ebfc..ef9a3b27 100644
175 --- a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
176 +++ b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
177 @@ -41,6 +41,7 @@ RDEPEND="
178 themes? ( =x11-themes/lxqt-themes-${MY_PV} )
179 udev? ( virtual/libudev )
180 !lxqt-base/lxqt-common
181 + !lxqt-base/lxqt-l10n
182 "
183 DEPEND="${RDEPEND}"
184
185
186 diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild
187 index 6714b3bc..90154671 100644
188 --- a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild
189 +++ b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild
190 @@ -26,5 +26,6 @@ RDEPEND="
191 dev-qt/qtcore:5
192 dev-qt/qtwidgets:5
193 =lxqt-base/liblxqt-$(ver_cut 1-2)*
194 + !lxqt-base/lxqt-l10n
195 "
196 DEPEND="${RDEPEND}"
197
198 diff --git a/media-gfx/lximage-qt/lximage-qt-9999.ebuild b/media-gfx/lximage-qt/lximage-qt-9999.ebuild
199 index bd2bf321..a1dc7bd2 100644
200 --- a/media-gfx/lximage-qt/lximage-qt-9999.ebuild
201 +++ b/media-gfx/lximage-qt/lximage-qt-9999.ebuild
202 @@ -39,5 +39,6 @@ RDEPEND="
203 >=x11-libs/libfm-qt-0.12.0:=
204 x11-libs/libX11
205 x11-libs/libXfixes
206 + !lxqt-base/lxqt-l10n
207 "
208 DEPEND="${RDEPEND}"
209
210 diff --git a/x11-libs/libfm-qt/libfm-qt-9999.ebuild b/x11-libs/libfm-qt/libfm-qt-9999.ebuild
211 index 5dea1d3e..61b7192b 100644
212 --- a/x11-libs/libfm-qt/libfm-qt-9999.ebuild
213 +++ b/x11-libs/libfm-qt/libfm-qt-9999.ebuild
214 @@ -34,5 +34,6 @@ RDEPEND="
215 media-libs/libexif:=
216 >=x11-libs/libfm-1.2.0:=
217 x11-libs/libxcb:=
218 + !lxqt-base/lxqt-l10n
219 "
220 DEPEND="${RDEPEND}"
221
222 diff --git a/x11-misc/obconf-qt/obconf-qt-9999.ebuild b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
223 index 6a7d1bee..3fc2e65c 100644
224 --- a/x11-misc/obconf-qt/obconf-qt-9999.ebuild
225 +++ b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
226 @@ -32,6 +32,7 @@ RDEPEND="
227 dev-qt/qtx11extras:5
228 x11-wm/openbox:3
229 x11-libs/libX11
230 + !lxqt-base/lxqt-l10n
231 "
232 DEPEND="${RDEPEND}
233 sys-apps/sed
234
235 diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
236 index 92201293..5e4cc2f9 100644
237 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
238 +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
239 @@ -37,6 +37,7 @@ RDEPEND="
240 virtual/eject
241 virtual/freedesktop-icon-theme
242 !lxqt-base/lxqt-common
243 + !lxqt-base/lxqt-l10n
244 "
245 DEPEND="${RDEPEND}"