Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/
Date: Wed, 20 Oct 2021 09:40:45
Message-Id: 1634722782.89f94d5d9910d1e81618490d39303549ed0f4d43.mgorny@gentoo
1 commit: 89f94d5d9910d1e81618490d39303549ed0f4d43
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 20 07:18:21 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 20 09:39:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f94d5d
7
8 x11-misc/qt5ct: Remove leftover USE=dbus
9
10 Closes: https://bugs.gentoo.org/802828
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 x11-misc/qt5ct/metadata.xml | 3 ---
14 x11-misc/qt5ct/qt5ct-1.3.ebuild | 8 ++------
15 x11-misc/qt5ct/qt5ct-1.5.ebuild | 8 ++------
16 3 files changed, 4 insertions(+), 15 deletions(-)
17
18 diff --git a/x11-misc/qt5ct/metadata.xml b/x11-misc/qt5ct/metadata.xml
19 index c2c24269a9f..6b15ce319d3 100644
20 --- a/x11-misc/qt5ct/metadata.xml
21 +++ b/x11-misc/qt5ct/metadata.xml
22 @@ -9,9 +9,6 @@
23 This program allows users to configure Qt5 settings (theme, font,
24 icons, etc.) under DE/WM without Qt5 integration.
25 </longdescription>
26 - <use>
27 - <flag name="dbus">Enable system tray and global menu support</flag>
28 - </use>
29 <upstream>
30 <remote-id type="sourceforge">qt5ct</remote-id>
31 </upstream>
32
33 diff --git a/x11-misc/qt5ct/qt5ct-1.3.ebuild b/x11-misc/qt5ct/qt5ct-1.3.ebuild
34 index d12ebfa8b54..5bbd45ce15d 100644
35 --- a/x11-misc/qt5ct/qt5ct-1.3.ebuild
36 +++ b/x11-misc/qt5ct/qt5ct-1.3.ebuild
37 @@ -12,17 +12,13 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
38 LICENSE="BSD-2"
39 SLOT="0"
40 KEYWORDS="amd64 ~arm ~ppc64 x86"
41 -IUSE="+dbus"
42
43 RDEPEND="
44 dev-qt/qtconcurrent:5
45 dev-qt/qtcore:5
46 - dev-qt/qtgui:5=
47 + dev-qt/qtdbus:5
48 + dev-qt/qtgui:5=[dbus]
49 dev-qt/qtwidgets:5
50 - dbus? (
51 - dev-qt/qtdbus:5
52 - dev-qt/qtgui:5[dbus]
53 - )
54 "
55 DEPEND="${RDEPEND}"
56 BDEPEND="
57
58 diff --git a/x11-misc/qt5ct/qt5ct-1.5.ebuild b/x11-misc/qt5ct/qt5ct-1.5.ebuild
59 index bcb0e53195b..79f26d2c1bc 100644
60 --- a/x11-misc/qt5ct/qt5ct-1.5.ebuild
61 +++ b/x11-misc/qt5ct/qt5ct-1.5.ebuild
62 @@ -12,17 +12,13 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
63 LICENSE="BSD-2"
64 SLOT="0"
65 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
66 -IUSE="+dbus"
67
68 RDEPEND="
69 dev-qt/qtconcurrent:5
70 dev-qt/qtcore:5
71 - dev-qt/qtgui:5=
72 + dev-qt/qtdbus:5
73 + dev-qt/qtgui:5=[dbus]
74 dev-qt/qtwidgets:5
75 - dbus? (
76 - dev-qt/qtdbus:5
77 - dev-qt/qtgui:5[dbus]
78 - )
79 "
80 DEPEND="${RDEPEND}"
81 BDEPEND="