[gentoo-commits] proj/qt:master commit in: dev-qt/qtdiag/

[Michael Palimaka]

commit:     fb9db9600576fa2b341b3625b9cca7ba269020b4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 02:53:03 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 02:55:05 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=fb9db960

dev-qt/qtdiag: rename ssl -> network USE flag

While it is still used to display SSL information, it better reflects the
module split and avoids a '=' USE dependency.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtdiag/metadata.xml           | 1 +
 dev-qt/qtdiag/qtdiag-5.9.1.ebuild    | 7 +++++--
 dev-qt/qtdiag/qtdiag-5.9.9999.ebuild | 7 +++++--
 dev-qt/qtdiag/qtdiag-5.9999.ebuild   | 7 +++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtdiag/metadata.xml b/dev-qt/qtdiag/metadata.xml
index 78e062f9..79e82c87 100644
--- a/dev-qt/qtdiag/metadata.xml
+++ b/dev-qt/qtdiag/metadata.xml
@@ -6,6 +6,7 @@
                <name>Gentoo Qt Project</name>
        </maintainer>
        <use>
+               <flag name="network">Report network information</flag>
                <flag name="widgets">Report widget style information</flag>
        </use>
        <upstream>

diff --git a/dev-qt/qtdiag/qtdiag-5.9.1.ebuild 
b/dev-qt/qtdiag/qtdiag-5.9.1.ebuild
index fffc2d08..dc0d2587 100644
--- a/dev-qt/qtdiag/qtdiag-5.9.1.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.9.1.ebuild
@@ -11,12 +11,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="+ssl widgets"
+IUSE="network widgets"
 
 DEPEND="
        ~dev-qt/qtcore-${PV}
        ~dev-qt/qtgui-${PV}
-       ~dev-qt/qtnetwork-${PV}[ssl=]
+       network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
        widgets? ( ~dev-qt/qtwidgets-${PV} )
 "
 RDEPEND="${DEPEND}"
@@ -26,6 +26,9 @@ QT5_TARGET_SUBDIRS=(
 )
 
 src_prepare() {
+       qt_use_disable_mod network network \
+               src/qtdiag/qtdiag.pro
+
        qt_use_disable_mod widgets widgets \
                src/qtdiag/qtdiag.pro
 

diff --git a/dev-qt/qtdiag/qtdiag-5.9.9999.ebuild 
b/dev-qt/qtdiag/qtdiag-5.9.9999.ebuild
index fffc2d08..dc0d2587 100644
--- a/dev-qt/qtdiag/qtdiag-5.9.9999.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.9.9999.ebuild
@@ -11,12 +11,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="+ssl widgets"
+IUSE="network widgets"
 
 DEPEND="
        ~dev-qt/qtcore-${PV}
        ~dev-qt/qtgui-${PV}
-       ~dev-qt/qtnetwork-${PV}[ssl=]
+       network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
        widgets? ( ~dev-qt/qtwidgets-${PV} )
 "
 RDEPEND="${DEPEND}"
@@ -26,6 +26,9 @@ QT5_TARGET_SUBDIRS=(
 )
 
 src_prepare() {
+       qt_use_disable_mod network network \
+               src/qtdiag/qtdiag.pro
+
        qt_use_disable_mod widgets widgets \
                src/qtdiag/qtdiag.pro
 

diff --git a/dev-qt/qtdiag/qtdiag-5.9999.ebuild 
b/dev-qt/qtdiag/qtdiag-5.9999.ebuild
index fffc2d08..dc0d2587 100644
--- a/dev-qt/qtdiag/qtdiag-5.9999.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.9999.ebuild
@@ -11,12 +11,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="+ssl widgets"
+IUSE="network widgets"
 
 DEPEND="
        ~dev-qt/qtcore-${PV}
        ~dev-qt/qtgui-${PV}
-       ~dev-qt/qtnetwork-${PV}[ssl=]
+       network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
        widgets? ( ~dev-qt/qtwidgets-${PV} )
 "
 RDEPEND="${DEPEND}"
@@ -26,6 +26,9 @@ QT5_TARGET_SUBDIRS=(
 )
 
 src_prepare() {
+       qt_use_disable_mod network network \
+               src/qtdiag/qtdiag.pro
+
        qt_use_disable_mod widgets widgets \
                src/qtdiag/qtdiag.pro