Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdiag/
Date: Sun, 23 Jul 2017 02:55:17
Message-Id: 1500778505.fb9db9600576fa2b341b3625b9cca7ba269020b4.kensington@gentoo
1 commit: fb9db9600576fa2b341b3625b9cca7ba269020b4
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 23 02:53:03 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 23 02:55:05 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=fb9db960
7
8 dev-qt/qtdiag: rename ssl -> network USE flag
9
10 While it is still used to display SSL information, it better reflects the
11 module split and avoids a '=' USE dependency.
12
13 Package-Manager: Portage-2.3.6, Repoman-2.3.3
14
15 dev-qt/qtdiag/metadata.xml | 1 +
16 dev-qt/qtdiag/qtdiag-5.9.1.ebuild | 7 +++++--
17 dev-qt/qtdiag/qtdiag-5.9.9999.ebuild | 7 +++++--
18 dev-qt/qtdiag/qtdiag-5.9999.ebuild | 7 +++++--
19 4 files changed, 16 insertions(+), 6 deletions(-)
20
21 diff --git a/dev-qt/qtdiag/metadata.xml b/dev-qt/qtdiag/metadata.xml
22 index 78e062f9..79e82c87 100644
23 --- a/dev-qt/qtdiag/metadata.xml
24 +++ b/dev-qt/qtdiag/metadata.xml
25 @@ -6,6 +6,7 @@
26 <name>Gentoo Qt Project</name>
27 </maintainer>
28 <use>
29 + <flag name="network">Report network information</flag>
30 <flag name="widgets">Report widget style information</flag>
31 </use>
32 <upstream>
33
34 diff --git a/dev-qt/qtdiag/qtdiag-5.9.1.ebuild b/dev-qt/qtdiag/qtdiag-5.9.1.ebuild
35 index fffc2d08..dc0d2587 100644
36 --- a/dev-qt/qtdiag/qtdiag-5.9.1.ebuild
37 +++ b/dev-qt/qtdiag/qtdiag-5.9.1.ebuild
38 @@ -11,12 +11,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
39 KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
40 fi
41
42 -IUSE="+ssl widgets"
43 +IUSE="network widgets"
44
45 DEPEND="
46 ~dev-qt/qtcore-${PV}
47 ~dev-qt/qtgui-${PV}
48 - ~dev-qt/qtnetwork-${PV}[ssl=]
49 + network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
50 widgets? ( ~dev-qt/qtwidgets-${PV} )
51 "
52 RDEPEND="${DEPEND}"
53 @@ -26,6 +26,9 @@ QT5_TARGET_SUBDIRS=(
54 )
55
56 src_prepare() {
57 + qt_use_disable_mod network network \
58 + src/qtdiag/qtdiag.pro
59 +
60 qt_use_disable_mod widgets widgets \
61 src/qtdiag/qtdiag.pro
62
63
64 diff --git a/dev-qt/qtdiag/qtdiag-5.9.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.9.9999.ebuild
65 index fffc2d08..dc0d2587 100644
66 --- a/dev-qt/qtdiag/qtdiag-5.9.9999.ebuild
67 +++ b/dev-qt/qtdiag/qtdiag-5.9.9999.ebuild
68 @@ -11,12 +11,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
69 KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
70 fi
71
72 -IUSE="+ssl widgets"
73 +IUSE="network widgets"
74
75 DEPEND="
76 ~dev-qt/qtcore-${PV}
77 ~dev-qt/qtgui-${PV}
78 - ~dev-qt/qtnetwork-${PV}[ssl=]
79 + network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
80 widgets? ( ~dev-qt/qtwidgets-${PV} )
81 "
82 RDEPEND="${DEPEND}"
83 @@ -26,6 +26,9 @@ QT5_TARGET_SUBDIRS=(
84 )
85
86 src_prepare() {
87 + qt_use_disable_mod network network \
88 + src/qtdiag/qtdiag.pro
89 +
90 qt_use_disable_mod widgets widgets \
91 src/qtdiag/qtdiag.pro
92
93
94 diff --git a/dev-qt/qtdiag/qtdiag-5.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.9999.ebuild
95 index fffc2d08..dc0d2587 100644
96 --- a/dev-qt/qtdiag/qtdiag-5.9999.ebuild
97 +++ b/dev-qt/qtdiag/qtdiag-5.9999.ebuild
98 @@ -11,12 +11,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
99 KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
100 fi
101
102 -IUSE="+ssl widgets"
103 +IUSE="network widgets"
104
105 DEPEND="
106 ~dev-qt/qtcore-${PV}
107 ~dev-qt/qtgui-${PV}
108 - ~dev-qt/qtnetwork-${PV}[ssl=]
109 + network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
110 widgets? ( ~dev-qt/qtwidgets-${PV} )
111 "
112 RDEPEND="${DEPEND}"
113 @@ -26,6 +26,9 @@ QT5_TARGET_SUBDIRS=(
114 )
115
116 src_prepare() {
117 + qt_use_disable_mod network network \
118 + src/qtdiag/qtdiag.pro
119 +
120 qt_use_disable_mod widgets widgets \
121 src/qtdiag/qtdiag.pro