Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Sun, 29 Jan 2023 17:01:06
Message-Id: 1675011635.7d6756c8422726fb75d2bdca762975e06561c54b.asturm@gentoo
1 commit: 7d6756c8422726fb75d2bdca762975e06561c54b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 24 22:10:49 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 17:00:35 2023 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d6756c8
7
8 ecm.eclass: Drop Qt 5.15.7 from ECM_QTHELP Portage bug workaround
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/ecm.eclass | 23 +++++++----------------
13 1 file changed, 7 insertions(+), 16 deletions(-)
14
15 diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
16 index fdcb92cf96..25e8493ecc 100644
17 --- a/eclass/ecm.eclass
18 +++ b/eclass/ecm.eclass
19 @@ -235,22 +235,13 @@ case ${ECM_QTHELP} in
20 if [[ ${_KFSLOT} == 6 ]]; then
21 BDEPEND+=" dev-qt/qttools:${_KFSLOT}[doc]"
22 else
23 - BDEPEND+=" doc? ( || (
24 - (
25 - =dev-qt/qtcore-5.15.8*:5
26 - =dev-qt/qtgui-5.15.8*:5
27 - =dev-qt/qthelp-5.15.8*:5
28 - =dev-qt/qtsql-5.15.8*:5
29 - =dev-qt/qtwidgets-5.15.8*:5
30 - )
31 - (
32 - =dev-qt/qtcore-5.15.7*:5
33 - =dev-qt/qtgui-5.15.7*:5
34 - =dev-qt/qthelp-5.15.7*:5
35 - =dev-qt/qtsql-5.15.7*:5
36 - =dev-qt/qtwidgets-5.15.7*:5
37 - )
38 - ) )"
39 + BDEPEND+=" doc? (
40 + =dev-qt/qtcore-5.15.8*:5
41 + =dev-qt/qtgui-5.15.8*:5
42 + =dev-qt/qthelp-5.15.8*:5
43 + =dev-qt/qtsql-5.15.8*:5
44 + =dev-qt/qtwidgets-5.15.8*:5
45 + )"
46 fi
47 ;;
48 false) ;;