[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtscxml/, dev-qt/qt3d/, dev-qt/qtgui/, ...

2023-10-07 Thread Andreas Sturmlechner
commit: 654bc4905259cd3b95445a756f89dbcb8a43439d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct  7 08:33:20 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct  7 08:33:20 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=654bc490

dev-qt/*: Rebased to 5.15.11 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../{assistant-5.15.10..ebuild => assistant-5.15.11..ebuild}  | 0
 .../{designer-5.15.10..ebuild => designer-5.15.11..ebuild}| 0
 ...guist-tools-5.15.10..ebuild => linguist-tools-5.15.11..ebuild} | 0
 .../{linguist-5.15.10..ebuild => linguist-5.15.11..ebuild}| 0
 .../{pixeltool-5.15.10..ebuild => pixeltool-5.15.11..ebuild}  | 0
 dev-qt/qdbus/{qdbus-5.15.10..ebuild => qdbus-5.15.11..ebuild} | 0
 .../{qdbusviewer-5.15.10..ebuild => qdbusviewer-5.15.11..ebuild}  | 0
 dev-qt/qdoc/{qdoc-5.15.10..ebuild => qdoc-5.15.11..ebuild}| 0
 dev-qt/qt3d/{qt3d-5.15.10..ebuild => qt3d-5.15.11..ebuild}| 0
 .../{qtbluetooth-5.15.10..ebuild => qtbluetooth-5.15.11..ebuild}  | 0
 .../{qtcharts-5.15.10..ebuild => qtcharts-5.15.11..ebuild}| 0
 ...{qtconcurrent-5.15.10..ebuild => qtconcurrent-5.15.11..ebuild} | 0
 dev-qt/qtcore/{qtcore-5.15.10..ebuild => qtcore-5.15.11..ebuild}  | 0
 .../{qtdatavis3d-5.15.10..ebuild => qtdatavis3d-5.15.11..ebuild}  | 0
 dev-qt/qtdbus/{qtdbus-5.15.10..ebuild => qtdbus-5.15.11..ebuild}  | 0
 ...tdeclarative-5.15.10..ebuild => qtdeclarative-5.15.11..ebuild} | 0
 dev-qt/qtdiag/{qtdiag-5.15.10..ebuild => qtdiag-5.15.11..ebuild}  | 0
 .../{qtgamepad-5.15.10..ebuild => qtgamepad-5.15.11..ebuild}  | 0
 ...effects-5.15.10..ebuild => qtgraphicaleffects-5.15.11..ebuild} | 0
 dev-qt/qtgui/{qtgui-5.15.10..ebuild => qtgui-5.15.11..ebuild} | 0
 dev-qt/qthelp/{qthelp-5.15.10..ebuild => qthelp-5.15.11..ebuild}  | 0
 ...mageformats-5.15.10..ebuild => qtimageformats-5.15.11..ebuild} | 0
 .../{qtlocation-5.15.10..ebuild => qtlocation-5.15.11..ebuild}| 0
 ...{qtmultimedia-5.15.10..ebuild => qtmultimedia-5.15.11..ebuild} | 0
 .../{qtnetwork-5.15.10..ebuild => qtnetwork-5.15.11..ebuild}  | 0
 ...tnetworkauth-5.15.10..ebuild => qtnetworkauth-5.15.11..ebuild} | 0
 .../{qtopengl-5.15.10..ebuild => qtopengl-5.15.11..ebuild}| 0
 .../qtpaths/{qtpaths-5.15.10..ebuild => qtpaths-5.15.11..ebuild}  | 0
 ...{qtplugininfo-5.15.10..ebuild => qtplugininfo-5.15.11..ebuild} | 0
 ...tpositioning-5.15.10..ebuild => qtpositioning-5.15.11..ebuild} | 0
 ...rintsupport-5.15.10..ebuild => qtprintsupport-5.15.11..ebuild} | 0
 ...ckcontrols-5.15.10..ebuild => qtquickcontrols-5.15.11..ebuild} | 0
 ...controls2-5.15.10..ebuild => qtquickcontrols2-5.15.11..ebuild} | 0
 ...cktimeline-5.15.10..ebuild => qtquicktimeline-5.15.11..ebuild} | 0
 .../{qtscript-5.15.10..ebuild => qtscript-5.15.11..ebuild}| 0
 .../qtscxml/{qtscxml-5.15.10..ebuild => qtscxml-5.15.11..ebuild}  | 0
 .../{qtsensors-5.15.10..ebuild => qtsensors-5.15.11..ebuild}  | 0
 .../{qtserialbus-5.15.10..ebuild => qtserialbus-5.15.11..ebuild}  | 0
 ...{qtserialport-5.15.10..ebuild => qtserialport-5.15.11..ebuild} | 0
 .../{qtspeech-5.15.10..ebuild => qtspeech-5.15.11..ebuild}| 0
 dev-qt/qtsql/{qtsql-5.15.10..ebuild => qtsql-5.15.11..ebuild} | 0
 dev-qt/qtsvg/{qtsvg-5.15.10..ebuild => qtsvg-5.15.11..ebuild} | 0
 dev-qt/qttest/{qttest-5.15.10..ebuild => qttest-5.15.11..ebuild}  | 0
 ...ranslations-5.15.10..ebuild => qttranslations-5.15.11..ebuild} | 0
 ...keyboard-5.15.10..ebuild => qtvirtualkeyboard-5.15.11..ebuild} | 0
 .../{qtwayland-5.15.10..ebuild => qtwayland-5.15.11..ebuild}  | 0
 ...ndscanner-5.15.10..ebuild => qtwaylandscanner-5.15.11..ebuild} | 0
 ...{qtwebchannel-5.15.10..ebuild => qtwebchannel-5.15.11..ebuild} | 0
 .../{qtwebengine-5.15.10..ebuild => qtwebengine-5.15.11..ebuild}  | 0
 ...{qtwebsockets-5.15.10..ebuild => qtwebsockets-5.15.11..ebuild} | 0
 .../{qtwebview-5.15.10..ebuild => qtwebview-5.15.11..ebuild}  | 0
 .../{qtwidgets-5.15.10..ebuild => qtwidgets-5.15.11..ebuild}  | 0
 .../{qtx11extras-5.15.10..ebuild => qtx11extras-5.15.11..ebuild}  | 0
 dev-qt/qtxml/{qtxml-5.15.10..ebuild => qtxml-5.15.11..ebuild} | 0
 ...txmlpatterns-5.15.10..ebuild => qtxmlpatterns-5.15.11..ebuild} | 0
 55 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.15.10..ebuild 
b/dev-qt/assistant/assistant-5.15.11..ebuild
similarity index 100%
rename from dev-qt/assistant/assistant-5.15.10..ebuild
rename to dev-qt/ass

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

2023-06-22 Thread Andreas Sturmlechner
commit: 014aa49c8371ae6fe80faf90e8d4b4ab1aec116c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 19 19:50:20 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 22 15:51:44 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=014aa49c

dev-qt/qtnetwork: Drop bearer plugins (IUSE=connman,networkmanager)

Can not drop src/plugins/bearer/generic (builds libqgenericbearer.so)
though, as without it things like akonadi (KMail remains offline) and
Plasma POTD stop working.

QTBUG: https://bugreports.qt.io/browse/QTBUG-114666

Upstream in #kde-devel:
- the bearer plugins were created in another era: for Symbian, when we
  weren't always connected to the Internet and the user maybe didn't want
  to turn on their data
- now, we're always connected, so the bearer plugins are unnecessary
- they've been removed from Qt 6 due to their design problems
- so just do the same in Qt 5: don't use them
- especially when upstream has already declared
  "the use of this API is a design flaw"

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtnetwork/metadata.xml  |  3 ---
 dev-qt/qtnetwork/qtnetwork-5.15.10..ebuild | 16 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 8a8481b4..dfe9a543 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -6,12 +6,9 @@
Gentoo Qt Project


-   Enable net-misc/connman-based 
bearer plugin
Enable support for GSSAPI 
(virtual/krb5)
Use net-libs/libproxy for 
automatic
HTTP/SOCKS proxy configuration
-   Enable 
net-misc/networkmanager-based
-   bearer plugin


https://bugreports.qt.io/

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15.10..ebuild
index f41edbd2..148c6d9f 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.10..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.10..ebuild
@@ -13,22 +13,17 @@ inherit qt5-build
 
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
-IUSE="connman gssapi libproxy networkmanager sctp +ssl"
+IUSE="gssapi libproxy sctp +ssl"
 
 DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
sys-libs/zlib:=
-   connman? ( =dev-qt/qtdbus-${QT5_PV}* )
gssapi? ( virtual/krb5 )
libproxy? ( net-libs/libproxy )
-   networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
-RDEPEND="${DEPEND}
-   connman? ( net-misc/connman )
-   networkmanager? ( net-misc/networkmanager )
-"
+RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
src/network
@@ -46,17 +41,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:network
 )
 
-pkg_setup() {
-   use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-   use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
 src_configure() {
local myconf=(
-   $(usev connman -dbus-linked)
$(qt_use gssapi feature-gssapi)
$(qt_use libproxy)
-   $(usev networkmanager -dbus-linked)
$(qt_use sctp)
$(usev ssl -openssl-linked)
)



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

2022-06-18 Thread Andreas Sturmlechner
commit: 4d8bae82432e7e665cb707878e5eb1130ab3bf1e
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed May 25 11:17:36 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 18 14:21:50 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4d8bae82

dev-qt/qtnetwork: keyword 5.15.5. for ~loong

See: https://github.com/xen0n/loongson-overlay/pull/25
Tested-by: HougeLangley  gmail.com>
Signed-off-by: WANG Xuerui  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.15.5..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15.5..ebuild
index 828ef20a..d0789ddb 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.5..ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
 IUSE="connman gssapi libproxy networkmanager sctp +ssl"



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

2021-12-13 Thread Andreas Sturmlechner
commit: d3c7da917da39096761b7dcdf10c43a23bea8a81
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  3 04:36:37 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 13 16:34:32 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d3c7da91

dev-qt/qtnetwork: drop USE=bindist for OpenSSL changes

OpenSSL no longer has USE=bindist.

Bug: https://bugs.gentoo.org/762850
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild
index e82f5de0..da38c9ee 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
+IUSE="connman gssapi libproxy networkmanager sctp +ssl"
 
 DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
@@ -22,7 +22,7 @@ DEPEND="
libproxy? ( net-libs/libproxy )
networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-   ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] )
+   ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )



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

2021-09-15 Thread Davide Pesavento
commit: 41f14b18478482680d2881b28f1677ff4f2eb3fb
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 18:36:36 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 18:36:36 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=41f14b18

dev-qt/qtnetwork: usex -> qt_use

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild
index db4d08b4..e82f5de0 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild
@@ -53,7 +53,7 @@ pkg_setup() {
 src_configure() {
local myconf=(
$(usev connman -dbus-linked)
-   $(usex gssapi -feature-gssapi -no-feature-gssapi)
+   $(qt_use gssapi feature-gssapi)
$(qt_use libproxy)
$(usev networkmanager -dbus-linked)
$(qt_use sctp)
@@ -64,6 +64,7 @@ src_configure() {
 
 src_install() {
qt5-build_src_install
+
# workaround for bug 652650
if use ssl; then
sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \



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

2021-06-20 Thread Andreas Sturmlechner
commit: 9bbffd57cf4dfd94a0eb3a1bb967554e54658861
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun 17 19:46:49 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 20 18:48:58 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9bbffd57

dev-qt/qtnetwork: Fix MissingUseDepDefault for dev-libs/openssl[bindist]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.15..ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
index 3d72693c..a6d20ec2 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
@@ -22,9 +22,7 @@ DEPEND="
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-   ssl? (
-   >=dev-libs/openssl-1.1.1:0=[bindist=]
-   )
+   ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/

2021-05-02 Thread Andreas Sturmlechner
commit: f225854791b3ffaba783f8307822ce8cf10b94c9
Author: Sam James  gentoo  org>
AuthorDate: Sat May  1 17:31:06 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  2 19:38:08 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f2258547

dev-qt/qtnetwork: drop obsolete LibreSSL patch

Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/qtnetwork-5.15.2-libressl.patch  | 377 -
 dev-qt/qtnetwork/qtnetwork-5.15..ebuild|   2 -
 2 files changed, 379 deletions(-)

diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch 
b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
deleted file mode 100644
index f7fe32f0..
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-From 07a00f9c6d87f1fa5360cfb8f086670f3fa5bd3f Mon Sep 17 00:00:00 2001
-From: Stefan Strogin 
-Date: Sat, 28 Nov 2020 06:12:22 +0200
-Subject: [PATCH] QSslSocket: add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin 

- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp   | 19 +++-
- src/network/ssl/qsslcontext_openssl_p.h   |  7 +++
- src/network/ssl/qsslsocket_openssl.cpp|  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp| 31 +
- .../ssl/qsslsocket_openssl_symbols_p.h| 45 +++
- 6 files changed, 103 insertions(+), 3 deletions(-)
-
-diff --git a/src/network/ssl/qsslcertificate_openssl.cpp 
b/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61cc..19774432 100644
 a/src/network/ssl/qsslcertificate_openssl.cpp
-+++ b/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap 
_q_mapFromX509Name(X509_NAME *name)
- unsigned char *data = nullptr;
- int size = q_ASN1_STRING_to_UTF8(&data, 
q_X509_NAME_ENTRY_get_data(e));
- info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
- q_CRYPTO_free(data, nullptr, 0);
- #else
- q_CRYPTO_free(data);
-diff --git a/src/network/ssl/qsslcontext_openssl.cpp 
b/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f5..d3626cab 100644
 a/src/network/ssl/qsslcontext_openssl.cpp
-+++ b/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
- return;
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- // A nasty hacked OpenSSL using a level that will make our auto-tests 
fail:
- if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && 
*forceSecurityLevel())
- q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
- maxVersion = DTLS1_VERSION;
- break;
- case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
- minVersion = DTLS1_VERSION;
- maxVersion = DTLS_MAX_VERSION;
-+#else
-+Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
- break;
- case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
- minVersion = DTLS1_2_VERSION;
- maxVersion = DTLS1_2_VERSION;
-+#else
-+Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
- break;
- case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
- minVersion = DTLS1_2_VERSION;
- maxVersion = DTLS_MAX_VERSION;
-+#else
-+Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
- break;
- case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext 
*sslContext)
- }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- QSharedPointer cctx(q_SSL_CONF_CTX_new(), 
&q_SSL_CONF_CTX_free);
- if (cctx) {
- q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext 
*sslContext)
- sslContext->errorStr = 
msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
- sslContext->errorCode = QSslError::UnspecifiedError;
- }
--} else {
-+} else
-+#endif // LIBRESSL_VERSION_NUMBER
-+{
- sslContext->errorStr = 
msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
- sslContext->errorCode = QSslError::UnspecifiedError;
- }
-diff --git a/src/network/ssl/qsslcontext_openssl_p.h 
b/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aa..01a61cf5 100644
 a/src/network/ssl/qsslcontext_openssl_p.h
-+++ b/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1
-+#endif
-+#ifndef TLS_ANY_V

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

2021-05-02 Thread Andreas Sturmlechner
commit: 4c5e6317b7697ac0edb9e0c15fc36a92f08197d9
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Apr 30 19:07:14 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  2 19:38:04 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4c5e6317

dev-qt/qtnetwork: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.15..ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
index fe28c35c..0a952be8 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="bindist connman gssapi libressl libproxy networkmanager sctp +ssl"
+IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}:5=
@@ -23,8 +23,7 @@ DEPEND="
networkmanager? ( ~dev-qt/qtdbus-${PV} )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
ssl? (
-   !libressl? ( >=dev-libs/openssl-1.1.1:0=[bindist=] )
-   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/openssl-1.1.1:0=[bindist=]
)
 "
 RDEPEND="${DEPEND}



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/

2020-11-28 Thread Andreas Sturmlechner
commit: 2653c5a703c411483009291858bb7f98a6e1acf2
Author: Stefan Strogin  steils  org>
AuthorDate: Sat Nov 28 19:37:21 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 28 19:45:05 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2653c5a7

dev-qt/qtnetwork: update patch for LibreSSL

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Stefan Strogin  gentoo.org>
Closes: https://github.com/gentoo/qt/pull/230
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...ressl.patch => qtnetwork-5.15.2-libressl.patch} | 70 ++
 dev-qt/qtnetwork/qtnetwork-5.15..ebuild|  2 +-
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch 
b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
similarity index 87%
rename from dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
rename to dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
index d78e1929..f7fe32f0 100644
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
@@ -1,6 +1,6 @@
-From faefff58d6669a41ed7831589420c4413bc28f97 Mon Sep 17 00:00:00 2001
+From 07a00f9c6d87f1fa5360cfb8f086670f3fa5bd3f Mon Sep 17 00:00:00 2001
 From: Stefan Strogin 
-Date: Wed, 5 Feb 2020 03:49:35 +0200
+Date: Sat, 28 Nov 2020 06:12:22 +0200
 Subject: [PATCH] QSslSocket: add LibreSSL support
 
 Upstream-Status: Inappropriate
@@ -8,18 +8,18 @@ Upstream-Status: Inappropriate
 Signed-off-by: Stefan Strogin 
 ---
  src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp   | 17 ++-
+ src/network/ssl/qsslcontext_openssl.cpp   | 19 +++-
  src/network/ssl/qsslcontext_openssl_p.h   |  7 +++
  src/network/ssl/qsslsocket_openssl.cpp|  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp| 29 
+ .../ssl/qsslsocket_openssl_symbols.cpp| 31 +
  .../ssl/qsslsocket_openssl_symbols_p.h| 45 +++
- 6 files changed, 99 insertions(+), 3 deletions(-)
+ 6 files changed, 103 insertions(+), 3 deletions(-)
 
 diff --git a/src/network/ssl/qsslcertificate_openssl.cpp 
b/src/network/ssl/qsslcertificate_openssl.cpp
-index 6f1fb26add..eba5a72951 100644
+index ca9d61cc..19774432 100644
 --- a/src/network/ssl/qsslcertificate_openssl.cpp
 +++ b/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -658,7 +658,7 @@ static QMultiMap 
_q_mapFromX509Name(X509_NAME *name)
+@@ -661,7 +661,7 @@ static QMultiMap 
_q_mapFromX509Name(X509_NAME *name)
  unsigned char *data = nullptr;
  int size = q_ASN1_STRING_to_UTF8(&data, 
q_X509_NAME_ENTRY_get_data(e));
  info.insert(name, QString::fromUtf8((char*)data, size));
@@ -29,10 +29,22 @@ index 6f1fb26add..eba5a72951 100644
  #else
  q_CRYPTO_free(data);
 diff --git a/src/network/ssl/qsslcontext_openssl.cpp 
b/src/network/ssl/qsslcontext_openssl.cpp
-index abc398b209..c2f90be009 100644
+index c9f202f5..d3626cab 100644
 --- a/src/network/ssl/qsslcontext_openssl.cpp
 +++ b/src/network/ssl/qsslcontext_openssl.cpp
-@@ -397,16 +397,28 @@ init_context:
+@@ -351,9 +351,11 @@ init_context:
+ return;
+ }
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ // A nasty hacked OpenSSL using a level that will make our auto-tests 
fail:
+ if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && 
*forceSecurityLevel())
+ q_SSL_CTX_set_security_level(sslContext->ctx, 1);
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ const long anyVersion =
+ #if QT_CONFIG(dtls)
+@@ -408,16 +410,28 @@ init_context:
  maxVersion = DTLS1_VERSION;
  break;
  case QSsl::DtlsV1_0OrLater:
@@ -61,7 +73,7 @@ index abc398b209..c2f90be009 100644
  break;
  case QSsl::TlsV1_3OrLater:
  #ifdef TLS1_3_VERSION
-@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext 
*sslContext)
+@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext 
*sslContext)
  }
  #endif // ocsp
  
@@ -69,7 +81,7 @@ index abc398b209..c2f90be009 100644
  QSharedPointer cctx(q_SSL_CONF_CTX_new(), 
&q_SSL_CONF_CTX_free);
  if (cctx) {
  q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext 
*sslContext)
+@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext 
*sslContext)
  sslContext->errorStr = 
msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
  sslContext->errorCode = QSslError::UnspecifiedError;
  }
@@ -81,7 +93,7 @@ index abc398b209..c2f90be009 100644
  sslContext->errorCode = QSslError::UnspecifiedError;
  }
 diff --git a/src/network/ssl/qsslcontext_openssl_p.h 
b/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
+index 70cb97aa..01a61cf5 100644
 --- a/src/network/ssl/qsslcontext_openssl_p.h
 +++ b/src/networ

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

2020-11-18 Thread Andreas Sturmlechner
commit: dcc79770bc78ebb3855a50a6397862828f9a93e3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 17 23:38:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 18 21:05:22 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dcc79770

dev-qt/qtnetwork: Fix macro redefinition of QT_LINKED_OPENSSL warning

Bug: https://bugs.gentoo.org/652650
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.15..ebuild | 9 +
 1 file changed, 9 insertions(+)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
index cd62434c..e3ae43aa 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
@@ -66,3 +66,12 @@ src_configure() {
)
qt5-build_src_configure
 }
+
+src_install() {
+   qt5-build_src_install
+   # workaround for bug 652650
+   if use ssl; then
+   sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
+   -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
+   fi
+}



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

2020-11-17 Thread Andreas Sturmlechner
commit: d0a17115aae895e3f5b4a1e8c027e9cf52271f40
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 17 21:18:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 17 21:20:11 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d0a17115

dev-qt/qtnetwork: Update minimum dev-libs/openssl version to 1.1.1

See also: https://github.com/gentoo/gentoo/pull/18297

Thanks-to: Маша  tutamail.com>
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.15..ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
index 3ac6956d..cd62434c 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qtbase"
 inherit qt5-build
 
@@ -22,7 +23,7 @@ DEPEND="
networkmanager? ( ~dev-qt/qtdbus-${PV} )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
ssl? (
-   !libressl? ( dev-libs/openssl:0=[bindist=] )
+   !libressl? ( >=dev-libs/openssl-1.1.1:0=[bindist=] )
libressl? ( dev-libs/libressl:0= )
)
 "



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

2020-09-29 Thread Andreas Sturmlechner
commit: cab20a25c0947446ea8486c147f9a679a56c2d73
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Sep 11 16:08:37 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 29 20:39:41 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=cab20a25

dev-qt/qtnetwork: add LibreSSL logic back

* This was dropped as the logic was not added to the Qt overlay. Will
  fix this so future bumps do not drop support.

Closes: https://bugs.gentoo.org/741662
Signed-off-by: Aaron Bauman  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.15..ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
index 4cbbe349..3ac6956d 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
+IUSE="bindist connman gssapi libressl libproxy networkmanager sctp +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}:5=
@@ -21,7 +21,10 @@ DEPEND="
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-   ssl? ( dev-libs/openssl:0=[bindist=] )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[bindist=] )
+   libressl? ( dev-libs/libressl:0= )
+   )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/

2020-09-10 Thread Andreas Sturmlechner
commit: 4903411dff611982037b87042efa2033a0f9311a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 10 17:46:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 10 17:49:05 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4903411d

dev-qt/qtnetwork: Sync with Gentoo ebuild repo

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...network-5.15.-libressl.patch => qtnetwork-5.15.1-libressl.patch} | 0
 dev-qt/qtnetwork/qtnetwork-5.15..ebuild | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.-libressl.patch 
b/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
similarity index 100%
rename from dev-qt/qtnetwork/files/qtnetwork-5.15.-libressl.patch
rename to dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
index ab3fa869..4cbbe349 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
@@ -44,7 +44,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:network
 )
 
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) # Bug 562050, not upstreamable
+PATCHES=( "${FILESDIR}"/${PN}-5.15.1-libressl.patch ) # Bug 562050, not 
upstreamable
 
 pkg_setup() {
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/

2020-05-28 Thread Stefan Strogin
commit: 431b0cfa1327f4732beb8f8fcf962fa4bf691bf4
Author: Stefan Strogin  gentoo  org>
AuthorDate: Sun Feb  9 02:13:53 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Thu May 28 07:17:29 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=431b0cfa

dev-qt/qtnetwork: [5.15] add patch for LibreSSL

Closes: https://github.com/gentoo/qt/pull/207
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Stefan Strogin  gentoo.org>

 .../files/qtnetwork-5.15.-libressl.patch   | 359 +
 dev-qt/qtnetwork/qtnetwork-5.15..ebuild|   2 +
 2 files changed, 361 insertions(+)

diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.-libressl.patch 
b/dev-qt/qtnetwork/files/qtnetwork-5.15.-libressl.patch
new file mode 100644
index ..d78e1929
--- /dev/null
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.-libressl.patch
@@ -0,0 +1,359 @@
+From faefff58d6669a41ed7831589420c4413bc28f97 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin 
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket: add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin 
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp   | 17 ++-
+ src/network/ssl/qsslcontext_openssl_p.h   |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp|  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp| 29 
+ .../ssl/qsslsocket_openssl_symbols_p.h| 45 +++
+ 6 files changed, 99 insertions(+), 3 deletions(-)
+
+diff --git a/src/network/ssl/qsslcertificate_openssl.cpp 
b/src/network/ssl/qsslcertificate_openssl.cpp
+index 6f1fb26add..eba5a72951 100644
+--- a/src/network/ssl/qsslcertificate_openssl.cpp
 b/src/network/ssl/qsslcertificate_openssl.cpp
+@@ -658,7 +658,7 @@ static QMultiMap 
_q_mapFromX509Name(X509_NAME *name)
+ unsigned char *data = nullptr;
+ int size = q_ASN1_STRING_to_UTF8(&data, 
q_X509_NAME_ENTRY_get_data(e));
+ info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+ q_CRYPTO_free(data, nullptr, 0);
+ #else
+ q_CRYPTO_free(data);
+diff --git a/src/network/ssl/qsslcontext_openssl.cpp 
b/src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- a/src/network/ssl/qsslcontext_openssl.cpp
 b/src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+ maxVersion = DTLS1_VERSION;
+ break;
+ case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+ minVersion = DTLS1_VERSION;
+ maxVersion = DTLS_MAX_VERSION;
++#else
++Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+ break;
+ case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+ minVersion = DTLS1_2_VERSION;
+ maxVersion = DTLS1_2_VERSION;
++#else
++Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+ break;
+ case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+ minVersion = DTLS1_2_VERSION;
+ maxVersion = DTLS_MAX_VERSION;
++#else
++Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+ break;
+ case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext 
*sslContext)
+ }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ QSharedPointer cctx(q_SSL_CONF_CTX_new(), 
&q_SSL_CONF_CTX_free);
+ if (cctx) {
+ q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext 
*sslContext)
+ sslContext->errorStr = 
msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+ sslContext->errorCode = QSslError::UnspecifiedError;
+ }
+-} else {
++} else
++#endif // LIBRESSL_VERSION_NUMBER
++{
+ sslContext->errorStr = 
msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+ sslContext->errorCode = QSslError::UnspecifiedError;
+ }
+diff --git a/src/network/ssl/qsslcontext_openssl_p.h 
b/src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- a/src/network/ssl/qsslcontext_openssl_p.h
 b/src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x1
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp 
b/src/network/ssl/qsslsocket_openssl.cpp
+index 6239537949..6f5e7fd6e2 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
 b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -605,7 +605,7 @@ bool QS

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

2020-04-09 Thread Andreas Sturmlechner
commit: 364473fecb17123992bd52e6279f3bbe1d36a297
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  9 11:13:01 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 12:36:24 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=364473fe

dev-qt/qtnetwork: Add USE gssapi

Reported-by: Michał Górny  gentoo.org>
Bug: https://bugs.gentoo.org/716754
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtnetwork/metadata.xml  | 1 +
 dev-qt/qtnetwork/qtnetwork-5.14..ebuild| 6 --
 dev-qt/qtnetwork/qtnetwork-5.15.0_beta3.ebuild | 4 +++-
 dev-qt/qtnetwork/qtnetwork-5.15..ebuild| 6 --
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 4 +++-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index cc8f0589..19a09a6d 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -8,6 +8,7 @@

Disable EC support via 
dev-libs/openssl
Enable net-misc/connman-based 
bearer plugin
+   Enable support for GSSAPI 
(virtual/krb5)
Use net-libs/libproxy for 
automatic
HTTP/SOCKS proxy configuration
Enable 
net-misc/networkmanager-based

diff --git a/dev-qt/qtnetwork/qtnetwork-5.14..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.14..ebuild
index 5497d923..0b778799 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.14..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.14..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="bindist connman libproxy networkmanager sctp +ssl"
+IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
sys-libs/zlib:=
connman? ( ~dev-qt/qtdbus-${PV} )
+   gssapi? ( virtual/krb5 )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
@@ -51,6 +52,7 @@ pkg_setup() {
 src_configure() {
local myconf=(
$(usex connman -dbus-linked '')
+   $(usex gssapi -feature-gssapi -no-feature-gssapi)
$(qt_use libproxy)
$(usex networkmanager -dbus-linked '')
$(qt_use sctp)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.0_beta3.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15.0_beta3.ebuild
index 66f05153..0b778799 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.0_beta3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.0_beta3.ebuild
@@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="bindist connman libproxy networkmanager sctp +ssl"
+IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
sys-libs/zlib:=
connman? ( ~dev-qt/qtdbus-${PV} )
+   gssapi? ( virtual/krb5 )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
@@ -51,6 +52,7 @@ pkg_setup() {
 src_configure() {
local myconf=(
$(usex connman -dbus-linked '')
+   $(usex gssapi -feature-gssapi -no-feature-gssapi)
$(qt_use libproxy)
$(usex networkmanager -dbus-linked '')
$(qt_use sctp)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
index 5497d923..0b778799 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,12 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="bindist connman libproxy networkmanager sctp +ssl"
+IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
sys-libs/zlib:=
connman? ( ~dev-qt/qtdbus-${PV} )
+   gssapi? ( virtual/krb5 )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
@@ -51,6 +52,7 @@ pkg_setup() {
 src_configure() {
local myconf=(
$(usex connman -dbus-linked '')
+   $(usex gssapi -feature-gssapi -no-feature-gssapi)
$(qt_use libproxy)
$(usex networkmanager -dbus-linked '')
 

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtsvg/, dev-qt/qtmultimedia/, dev-qt/qtcharts/, ...

2019-06-20 Thread Andreas Sturmlechner
commit: 797c4bc0aafdba284b9c0afc0efbbb3b8f1c1f07
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 18 10:23:06 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 18 10:23:06 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=797c4bc0

dev-qt: 5.13 stable branch EAPI-7 bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-qt/assistant/assistant-5.13..ebuild   |  8 
 dev-qt/designer/designer-5.13..ebuild |  8 
 dev-qt/linguist-tools/linguist-tools-5.13..ebuild |  2 +-
 dev-qt/linguist/linguist-5.13..ebuild |  8 
 dev-qt/pixeltool/pixeltool-5.13..ebuild   |  2 +-
 dev-qt/qdbus/qdbus-5.13..ebuild   |  2 +-
 dev-qt/qdbusviewer/qdbusviewer-5.13..ebuild   |  8 
 dev-qt/qdoc/qdoc-5.13..ebuild |  2 +-
 dev-qt/qt3d/qt3d-5.13..ebuild |  2 +-
 dev-qt/qtbluetooth/qtbluetooth-5.13..ebuild   |  2 +-
 dev-qt/qtcharts/qtcharts-5.13..ebuild |  2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.13..ebuild |  2 +-
 dev-qt/qtcore/qtcore-5.13..ebuild |  2 +-
 dev-qt/qtdatavis3d/qtdatavis3d-5.13..ebuild   |  2 +-
 dev-qt/qtdbus/qtdbus-5.13..ebuild |  2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.13..ebuild   | 10 --
 dev-qt/qtdiag/qtdiag-5.13..ebuild |  2 +-
 dev-qt/qtgamepad/qtgamepad-5.13..ebuild   |  4 ++--
 dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13..ebuild |  2 +-
 dev-qt/qtgui/qtgui-5.13..ebuild   |  2 +-
 dev-qt/qthelp/qthelp-5.13..ebuild |  2 +-
 dev-qt/qtimageformats/qtimageformats-5.13..ebuild |  2 +-
 dev-qt/qtlocation/qtlocation-5.13..ebuild |  2 +-
 dev-qt/qtmultimedia/qtmultimedia-5.13..ebuild |  2 +-
 dev-qt/qtnetwork/qtnetwork-5.13..ebuild   |  2 +-
 dev-qt/qtnetworkauth/qtnetworkauth-5.13..ebuild   |  2 +-
 dev-qt/qtopengl/qtopengl-5.13..ebuild |  2 +-
 dev-qt/qtpaths/qtpaths-5.13..ebuild   |  2 +-
 dev-qt/qtplugininfo/qtplugininfo-5.13..ebuild |  2 +-
 dev-qt/qtpositioning/qtpositioning-5.13..ebuild   |  2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.13..ebuild |  2 +-
 dev-qt/qtquickcontrols/qtquickcontrols-5.13..ebuild   |  2 +-
 dev-qt/qtquickcontrols2/qtquickcontrols2-5.13..ebuild |  2 +-
 dev-qt/qtscript/qtscript-5.13..ebuild |  2 +-
 dev-qt/qtscxml/qtscxml-5.13..ebuild   |  2 +-
 dev-qt/qtsensors/qtsensors-5.13..ebuild   |  2 +-
 dev-qt/qtserialbus/qtserialbus-5.13..ebuild   |  2 +-
 dev-qt/qtserialport/qtserialport-5.13..ebuild |  2 +-
 dev-qt/qtspeech/qtspeech-5.13..ebuild |  2 +-
 dev-qt/qtsql/qtsql-5.13..ebuild   |  2 +-
 dev-qt/qtsvg/qtsvg-5.13..ebuild   |  2 +-
 dev-qt/qttest/qttest-5.13..ebuild |  2 +-
 dev-qt/qttranslations/qttranslations-5.13..ebuild |  2 +-
 dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13..ebuild   |  2 +-
 dev-qt/qtwayland/qtwayland-5.13..ebuild   |  2 +-
 dev-qt/qtwebchannel/qtwebchannel-5.13..ebuild |  2 +-
 dev-qt/qtwebengine/qtwebengine-5.13..ebuild   |  6 +++---
 dev-qt/qtwebsockets/qtwebsockets-5.13..ebuild |  2 +-
 dev-qt/qtwebview/qtwebview-5.13..ebuild   |  2 +-
 dev-qt/qtwidgets/qtwidgets-5.13..ebuild   |  2 +-
 dev-qt/qtx11extras/qtx11extras-5.13..ebuild   |  2 +-
 dev-qt/qtxml/qtxml-5.13..ebuild   |  2 +-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.13..ebuild   |  2 +-
 53 files changed, 71 insertions(+), 73 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.13..ebuild 
b/dev-qt/assistant/assistant-5.13..ebuild
index 6d109d6a..135cf542 100644
--- a/dev-qt/assistant/assistant-5.13..ebuild
+++ b/dev-qt/assistant/assistant-5.13..ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop qt5-build xdg-utils
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
@@ -46,10 +46,10 @@ src_install() {
 
 pkg_postinst() {
qt5-build_pkg_postinst
-   gnome2_icon_cache_update
+   xdg_icon_cache_upd

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

2019-01-06 Thread Davide Pesavento
commit: 149d52a8be3e2077a00ee7776b4f31bbc6ab1f78
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jan  6 21:27:54 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jan  6 21:27:54 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=149d52a8

dev-qt/qtnetwork: add := subslot dep on sys-libs/zlib

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild| 4 ++--
 dev-qt/qtnetwork/qtnetwork-5.12..ebuild | 4 ++--
 dev-qt/qtnetwork/qtnetwork-5..ebuild| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
index be09aeb3..25f63002 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="bindist connman libproxy networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
-   >=sys-libs/zlib-1.2.5
+   sys-libs/zlib:=
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )

diff --git a/dev-qt/qtnetwork/qtnetwork-5.12..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.12..ebuild
index 95290d66..25f63002 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="bindist connman libproxy networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
-   >=sys-libs/zlib-1.2.5
+   sys-libs/zlib:=
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index 95290d66..25f63002 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="bindist connman libproxy networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
-   >=sys-libs/zlib-1.2.5
+   sys-libs/zlib:=
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )



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

2019-01-06 Thread Davide Pesavento
commit: 88377ee7f3916b332e5bfbb7da09372d524dcf8d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jan  7 00:54:56 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jan  7 00:58:52 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=88377ee7

dev-qt/qtnetwork: add sctp USE flag

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild| 7 +--
 dev-qt/qtnetwork/qtnetwork-5.12..ebuild | 7 +--
 dev-qt/qtnetwork/qtnetwork-5..ebuild| 7 +--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
index b7da112b..820a6422 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 fi
 
-IUSE="bindist connman libproxy networkmanager +ssl"
+IUSE="bindist connman libproxy networkmanager sctp +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
@@ -19,6 +19,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
+   sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
ssl? ( dev-libs/openssl:0=[bindist=] )
 "
 RDEPEND="${DEPEND}
@@ -49,8 +50,10 @@ pkg_setup() {
 
 src_configure() {
local myconf=(
-   $(use connman || use networkmanager && echo -dbus-linked)
+   $(usex connman -dbus-linked '')
$(qt_use libproxy)
+   $(usex networkmanager -dbus-linked '')
+   $(qt_use sctp)
$(usex ssl -openssl-linked '')
)
qt5-build_src_configure

diff --git a/dev-qt/qtnetwork/qtnetwork-5.12..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.12..ebuild
index b7da112b..820a6422 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 fi
 
-IUSE="bindist connman libproxy networkmanager +ssl"
+IUSE="bindist connman libproxy networkmanager sctp +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
@@ -19,6 +19,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
+   sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
ssl? ( dev-libs/openssl:0=[bindist=] )
 "
 RDEPEND="${DEPEND}
@@ -49,8 +50,10 @@ pkg_setup() {
 
 src_configure() {
local myconf=(
-   $(use connman || use networkmanager && echo -dbus-linked)
+   $(usex connman -dbus-linked '')
$(qt_use libproxy)
+   $(usex networkmanager -dbus-linked '')
+   $(qt_use sctp)
$(usex ssl -openssl-linked '')
)
qt5-build_src_configure

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index b7da112b..820a6422 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 fi
 
-IUSE="bindist connman libproxy networkmanager +ssl"
+IUSE="bindist connman libproxy networkmanager sctp +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
@@ -19,6 +19,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
+   sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
ssl? ( dev-libs/openssl:0=[bindist=] )
 "
 RDEPEND="${DEPEND}
@@ -49,8 +50,10 @@ pkg_setup() {
 
 src_configure() {
local myconf=(
-   $(use connman || use networkmanager && echo -dbus-linked)
+   $(usex connman -dbus-linked '')
$(qt_use libproxy)
+   $(usex networkmanager -dbus-linked '')
+   $(qt_use sctp)
$(usex ssl -openssl-linked '')
)
qt5-build_src_configure



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/files/, dev-qt/qttest/, dev-qt/qtscript/, ...

2018-12-06 Thread Andreas Sturmlechner
commit: 646e233cab570c13102c244e2aae2d00310e9e9e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec  6 13:06:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec  6 13:31:22 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=646e233c

dev-qt: Drop Qt 5.12.0 RC

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/assistant/Manifest  |   1 -
 dev-qt/assistant/assistant-5.12.0_rc.ebuild|  55 ---
 dev-qt/designer/Manifest   |   1 -
 dev-qt/designer/designer-5.12.0_rc.ebuild  |  57 ---
 dev-qt/linguist-tools/Manifest |   1 -
 .../linguist-tools/linguist-tools-5.12.0_rc.ebuild |  35 -
 dev-qt/linguist/Manifest   |   1 -
 dev-qt/linguist/linguist-5.12.0_rc.ebuild  |  48 --
 dev-qt/pixeltool/Manifest  |   1 -
 dev-qt/pixeltool/pixeltool-5.12.0_rc.ebuild|  25 ---
 dev-qt/qdbus/Manifest  |   1 -
 dev-qt/qdbus/qdbus-5.12.0_rc.ebuild|  25 ---
 dev-qt/qdbusviewer/Manifest|   1 -
 dev-qt/qdbusviewer/qdbusviewer-5.12.0_rc.ebuild|  45 --
 dev-qt/qdoc/Manifest   |   1 -
 dev-qt/qdoc/qdoc-5.12.0_rc.ebuild  |  37 -
 dev-qt/qt3d/Manifest   |   1 -
 dev-qt/qt3d/qt3d-5.12.0_rc.ebuild  |  32 
 dev-qt/qtbluetooth/Manifest|   1 -
 dev-qt/qtbluetooth/qtbluetooth-5.12.0_rc.ebuild|  33 
 dev-qt/qtcanvas3d/Manifest |   1 -
 dev-qt/qtcanvas3d/qtcanvas3d-5.12.0_rc.ebuild  |  21 ---
 dev-qt/qtcharts/Manifest   |   1 -
 dev-qt/qtcharts/qtcharts-5.12.0_rc.ebuild  |  29 
 dev-qt/qtconcurrent/Manifest   |   1 -
 dev-qt/qtconcurrent/qtconcurrent-5.12.0_rc.ebuild  |  23 ---
 dev-qt/qtcore/Manifest |   1 -
 dev-qt/qtcore/qtcore-5.12.0_rc.ebuild  |  75 -
 dev-qt/qtdatavis3d/Manifest|   1 -
 dev-qt/qtdatavis3d/qtdatavis3d-5.12.0_rc.ebuild|  31 
 dev-qt/qtdbus/Manifest |   1 -
 dev-qt/qtdbus/qtdbus-5.12.0_rc.ebuild  |  43 --
 dev-qt/qtdeclarative/Manifest  |   1 -
 .../qtdeclarative/qtdeclarative-5.12.0_rc.ebuild   |  64 
 dev-qt/qtdiag/Manifest |   1 -
 dev-qt/qtdiag/qtdiag-5.12.0_rc.ebuild  |  36 -
 dev-qt/qtgamepad/Manifest  |   1 -
 dev-qt/qtgamepad/qtgamepad-5.12.0_rc.ebuild|  35 -
 dev-qt/qtgraphicaleffects/Manifest |   1 -
 .../qtgraphicaleffects-5.12.0_rc.ebuild|  21 ---
 dev-qt/qtgui/Manifest  |   1 -
 dev-qt/qtgui/qtgui-5.12.0_rc.ebuild| 169 -
 dev-qt/qthelp/Manifest |   1 -
 dev-qt/qthelp/qthelp-5.12.0_rc.ebuild  |  28 
 dev-qt/qtimageformats/Manifest |   1 -
 .../qtimageformats/qtimageformats-5.12.0_rc.ebuild |  29 
 dev-qt/qtlocation/Manifest |   1 -
 dev-qt/qtlocation/qtlocation-5.12.0_rc.ebuild  |  44 --
 dev-qt/qtmultimedia/Manifest   |   1 -
 dev-qt/qtmultimedia/qtmultimedia-5.12.0_rc.ebuild  |  68 -
 dev-qt/qtnetwork/Manifest  |   1 -
 .../files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch  |  35 -
 dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild|  59 ---
 dev-qt/qtnetworkauth/Manifest  |   1 -
 .../qtnetworkauth/qtnetworkauth-5.12.0_rc.ebuild   |  20 ---
 dev-qt/qtopengl/Manifest   |   1 -
 dev-qt/qtopengl/qtopengl-5.12.0_rc.ebuild  |  34 -
 dev-qt/qtpaths/Manifest|   1 -
 dev-qt/qtpaths/qtpaths-5.12.0_rc.ebuild|  23 ---
 dev-qt/qtplugininfo/Manifest   |   1 -
 dev-qt/qtplugininfo/qtplugininfo-5.12.0_rc.ebuild  |  23 ---
 dev-qt/qtpositioning/Manifest  |   1 -
 .../qtpositioning/qtpositioning-5.12.0_rc.ebuild   |  40 -
 dev-qt/qtprintsupport/Manifest |   1 -
 .../qtprintsupport/qtprintsupport-5.12.0_rc.ebuild |  42 -
 dev-qt/qtquickcontrols/Manifest|   1 -
 .../qtquickcontrols-5.12.0_rc.ebuild   |  32 
 dev-qt/qtquickcontrols2/Manifest   |   1 -
 .../qtquickcontrols2-5.12.0_rc.ebuild  |  30 
 dev-qt/qtscript/Manifest   |   1 -
 dev-qt/qtscript/qtscript-5.12.0_rc.ebuild  |  36 -
 dev-qt/qtscxml/Manifest|   1 -
 dev-qt/qtscxml/qtscxml-5.12.0_rc.ebuild|  19 ---
 dev-qt/qtsensors/Manifest 

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/

2018-12-02 Thread Andreas Sturmlechner
commit: 007b79d537cf1f67753f8b86907042567d1908a3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  2 22:27:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  2 22:27:38 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=007b79d5

dev-qt/qtnetwork: Fix build with =OpenSSL-1.1.0

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch  | 35 ++
 dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild|  2 ++
 2 files changed, 37 insertions(+)

diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch 
b/dev-qt/qtnetwork/files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch
new file mode 100644
index ..7012eae7
--- /dev/null
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch
@@ -0,0 +1,35 @@
+From 05892bca9b0dc57dc3b4fbc57e2aab3dac1ad830 Mon Sep 17 00:00:00 2001
+From: Timur Pocheptsov 
+Date: Thu, 22 Nov 2018 18:32:50 +0100
+Subject: [PATCH] Fix build errors in OpenSSL 1.1 backend
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+SSL_CTX_set_ciphers is new in 1.1.1.
+
+Task-number: QTBUG-71983
+Change-Id: If0ae9f95dcc867c62ed0d3a6a60c22c7f5e1cc9f
+Reviewed-by: MÃ¥rten Nordheim 
+(cherry picked from commit 36f3eeaf3ec12126956d151a026379ab0385ab72)
+Reviewed-by: Timur Pocheptsov 
+---
+ src/network/ssl/qsslsocket_openssl_symbols.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp 
b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 781b3d6640a..fd58e9548e5 100644
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
 b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -161,7 +161,9 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, 
return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return 
nullptr, return)
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned 
long op, op, return 0, return)
++#ifdef TLS1_3_VERSION
+ DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char 
*str, str, return 0, return)
++#endif
+ DEFINEFUNC3(size_t, SSL_get_client_random, SSL *a, a, unsigned char *out, 
out, size_t outlen, outlen, return 0, return)
+ DEFINEFUNC3(size_t, SSL_SESSION_get_master_key, const SSL_SESSION *ses, ses, 
unsigned char *out, out, size_t outlen, outlen, return 0, return)
+ DEFINEFUNC6(int, CRYPTO_get_ex_new_index, int class_index, class_index, long 
argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup 
*dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return)
+-- 
+2.16.3

diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild
index be09aeb3..d59a4de7 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild
@@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:network
 )
 
+PATCHES=( "${FILESDIR}/${P}-openssl-1.1.0.patch" ) # QTBUG-71983
+
 pkg_setup() {
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)



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

2018-02-09 Thread Michael Palimaka
commit: 1badf7a1bca143d3819cb076932a7d33778aaf79
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Feb 10 02:49:08 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Feb 10 02:49:45 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1badf7a1

dev-qt/qtnetwork: introduce libressl support

This commit deliberately only targets 5.9. until I can complete testing on
later versions.

Bug: https://bugs.gentoo.org/562050
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtnetwork/qtnetwork-5.9..ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.9..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.9..ebuild
index 3cb59340..94849a21 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="bindist connman libproxy networkmanager +ssl"
+IUSE="bindist connman libproxy libressl networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}
@@ -19,7 +19,10 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
-   ssl? ( dev-libs/openssl:0=[bindist=] )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[bindist=] )
+   libressl? ( dev-libs/libressl:0= )
+   )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )



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

2018-02-02 Thread Michael Palimaka
commit: 0df85edd0ee87e69959669a263fe970cea454a05
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 26 06:48:49 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Feb  2 11:53:57 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0df85edd

dev-qt/qtnetwork: add QT5_GENTOO_PRIVATE_CONFIG

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtnetwork/qtnetwork-5.10.0.ebuild| 6 +-
 dev-qt/qtnetwork/qtnetwork-5.10..ebuild | 6 +-
 dev-qt/qtnetwork/qtnetwork-5.11..ebuild | 4 
 dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild | 4 
 dev-qt/qtnetwork/qtnetwork-5.9..ebuild  | 6 +-
 dev-qt/qtnetwork/qtnetwork-5..ebuild| 6 +-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.10.0.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.10.0.ebuild
index 48c13b15..3cb59340 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.10.0.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,10 @@ QT5_GENTOO_CONFIG=(
ssl:openssl-linked:LINKED_OPENSSL
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :network
+)
+
 pkg_setup() {
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.10..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.10..ebuild
index 48c13b15..3cb59340 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.10..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.10..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,10 @@ QT5_GENTOO_CONFIG=(
ssl:openssl-linked:LINKED_OPENSSL
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :network
+)
+
 pkg_setup() {
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.11..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.11..ebuild
index 25314845..3cb59340 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.11..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.11..ebuild
@@ -38,6 +38,10 @@ QT5_GENTOO_CONFIG=(
ssl:openssl-linked:LINKED_OPENSSL
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :network
+)
+
 pkg_setup() {
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
index 25314845..3cb59340 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
@@ -38,6 +38,10 @@ QT5_GENTOO_CONFIG=(
ssl:openssl-linked:LINKED_OPENSSL
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :network
+)
+
 pkg_setup() {
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.9..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.9..ebuild
index 48c13b15..3cb59340 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,10 @@ QT5_GENTOO_CONFIG=(
ssl:openssl-linked:LINKED_OPENSSL
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :network
+)
+
 pkg_setup() {
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index 48c13b15..3cb59340 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,10 @@ QT5_GENTOO_CONFIG=(
ssl:openssl-linked:LINKED_OPENSSL
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :network
+)
+
 pkg_setup() {
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtconcurrent/, dev-qt/qtwebsockets/, ...

2017-12-09 Thread Jimi Huotari
commit: 045231f9f1e5ded0c225d4f8a8df4d9c0f5d6147
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sat Dec  9 22:51:25 2017 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sat Dec  9 23:04:10 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=045231f9

dev-qt: add 5.10.0

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 dev-qt/assistant/Manifest  |   1 +
 dev-qt/assistant/assistant-5.10.0.ebuild   |  37 +
 dev-qt/designer/Manifest   |   1 +
 dev-qt/designer/designer-5.10.0.ebuild |  40 +
 dev-qt/linguist-tools/Manifest |   1 +
 dev-qt/linguist-tools/linguist-tools-5.10.0.ebuild |  35 +
 dev-qt/linguist/Manifest   |   1 +
 dev-qt/linguist/linguist-5.10.0.ebuild |  28 
 dev-qt/pixeltool/Manifest  |   1 +
 dev-qt/pixeltool/pixeltool-5.10.0.ebuild   |  25 
 dev-qt/qdbus/Manifest  |   1 +
 dev-qt/qdbus/qdbus-5.10.0.ebuild   |  25 
 dev-qt/qdbusviewer/Manifest|   1 +
 dev-qt/qdbusviewer/qdbusviewer-5.10.0.ebuild   |  27 
 dev-qt/qdoc/Manifest   |   1 +
 dev-qt/qdoc/qdoc-5.10.0.ebuild |  31 
 dev-qt/qt3d/Manifest   |   1 +
 dev-qt/qt3d/qt3d-5.10.0.ebuild |  32 
 dev-qt/qtbluetooth/Manifest|   1 +
 dev-qt/qtbluetooth/qtbluetooth-5.10.0.ebuild   |  33 +
 dev-qt/qtcharts/Manifest   |   1 +
 dev-qt/qtcharts/qtcharts-5.10.0.ebuild |  29 
 dev-qt/qtconcurrent/Manifest   |   1 +
 dev-qt/qtconcurrent/qtconcurrent-5.10.0.ebuild |  23 +++
 dev-qt/qtcore/Manifest |   1 +
 dev-qt/qtcore/qtcore-5.10.0.ebuild |  67 +
 dev-qt/qtdatavis3d/Manifest|   1 +
 dev-qt/qtdatavis3d/qtdatavis3d-5.10.0.ebuild   |  31 
 dev-qt/qtdbus/Manifest |   1 +
 dev-qt/qtdbus/qtdbus-5.10.0.ebuild |  38 +
 dev-qt/qtdeclarative/Manifest  |   1 +
 dev-qt/qtdeclarative/qtdeclarative-5.10.0.ebuild   |  56 +++
 dev-qt/qtdiag/Manifest |   1 +
 dev-qt/qtdiag/qtdiag-5.10.0.ebuild |  36 +
 dev-qt/qtgraphicaleffects/Manifest |   1 +
 .../qtgraphicaleffects-5.10.0.ebuild   |  21 +++
 dev-qt/qtgui/Manifest  |   1 +
 dev-qt/qtgui/qtgui-5.10.0.ebuild   | 164 +
 dev-qt/qthelp/Manifest |   1 +
 dev-qt/qthelp/qthelp-5.10.0.ebuild |  30 
 dev-qt/qtimageformats/Manifest |   1 +
 dev-qt/qtimageformats/qtimageformats-5.10.0.ebuild |  23 +++
 dev-qt/qtlocation/Manifest |   1 +
 dev-qt/qtlocation/qtlocation-5.10.0.ebuild |  44 ++
 dev-qt/qtmultimedia/Manifest   |   1 +
 dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild |  65 
 dev-qt/qtnetwork/Manifest  |   1 +
 dev-qt/qtnetwork/qtnetwork-5.10.0.ebuild   |  53 +++
 dev-qt/qtnetworkauth/Manifest  |   1 +
 dev-qt/qtnetworkauth/qtnetworkauth-5.10.0.ebuild   |  20 +++
 dev-qt/qtopengl/Manifest   |   1 +
 dev-qt/qtopengl/qtopengl-5.10.0.ebuild |  34 +
 dev-qt/qtpaths/Manifest|   1 +
 dev-qt/qtpaths/qtpaths-5.10.0.ebuild   |  23 +++
 dev-qt/qtplugininfo/Manifest   |   1 +
 dev-qt/qtplugininfo/qtplugininfo-5.10.0.ebuild |  23 +++
 dev-qt/qtpositioning/Manifest  |   1 +
 dev-qt/qtpositioning/qtpositioning-5.10.0.ebuild   |  37 +
 dev-qt/qtprintsupport/Manifest |   1 +
 dev-qt/qtprintsupport/qtprintsupport-5.10.0.ebuild |  42 ++
 dev-qt/qtquickcontrols/Manifest|   1 +
 .../qtquickcontrols/qtquickcontrols-5.10.0.ebuild  |  32 
 dev-qt/qtquickcontrols2/Manifest   |   1 +
 .../qtquickcontrols2-5.10.0.ebuild |  30 
 dev-qt/qtscript/Manifest   |   1 +
 dev-qt/qtscript/qtscript-5.10.0.ebuild |  36 +
 dev-qt/qtscxml/Manifest|   1 +
 dev-qt/qtscxml/qtscxml-5.10.0.ebuild   |  19 +++
 dev-qt/qtsensors/Manifest  |   1 +
 dev-qt/qtsensors/qtsensors-5.10.0.ebuild   |  28 
 dev-qt/qtserialbus/Manifest|   1 +
 dev-qt/qtserialbus/qtserialbus-5.10.0.ebuild   |  20 +++
 dev-qt/qtserialport/Manifest   |   1 +
 dev-qt/qtserialport/qtserialport-5.10.0.ebuild |  27 
 dev-qt/qtspeech/Manifest   |  

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

2017-07-22 Thread Michael Palimaka
commit: f870719955d11ee464eae001542cdb679ffe57f0
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 23 04:43:40 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 23 04:48:16 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f8707199

dev-qt/qtnetwork: add dev-libs/openssl subslot operator

libQt5Network links to libssl

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtnetwork/qtnetwork-5.6..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.7..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.9.1.ebuild| 2 +-
 dev-qt/qtnetwork/qtnetwork-5.9..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.6..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.6..ebuild
index f392876a..48c13b15 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.6..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.6..ebuild
@@ -19,7 +19,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
-   ssl? ( dev-libs/openssl:0[bindist=] )
+   ssl? ( dev-libs/openssl:0=[bindist=] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )

diff --git a/dev-qt/qtnetwork/qtnetwork-5.7..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.7..ebuild
index f392876a..48c13b15 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.7..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.7..ebuild
@@ -19,7 +19,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
-   ssl? ( dev-libs/openssl:0[bindist=] )
+   ssl? ( dev-libs/openssl:0=[bindist=] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )

diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.1.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.9.1.ebuild
index f392876a..48c13b15 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.1.ebuild
@@ -19,7 +19,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
-   ssl? ( dev-libs/openssl:0[bindist=] )
+   ssl? ( dev-libs/openssl:0=[bindist=] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )

diff --git a/dev-qt/qtnetwork/qtnetwork-5.9..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.9..ebuild
index f392876a..48c13b15 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9..ebuild
@@ -19,7 +19,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
-   ssl? ( dev-libs/openssl:0[bindist=] )
+   ssl? ( dev-libs/openssl:0=[bindist=] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index f392876a..48c13b15 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -19,7 +19,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV} )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV} )
-   ssl? ( dev-libs/openssl:0[bindist=] )
+   ssl? ( dev-libs/openssl:0=[bindist=] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtdiag/, dev-qt/qtwidgets/, dev-qt/qtdbus/, ...

2017-05-26 Thread Davide Pesavento
commit: cb87e855d14a26dce2b59668cebbe9d1c20e88a8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri May 26 18:42:17 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri May 26 18:42:17 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=cb87e855

dev-qt: bump to 5.9.0_rc

 dev-qt/assistant/Manifest   | 2 +-
 .../{assistant-5.9.0_beta3.ebuild => assistant-5.9.0_rc.ebuild} | 0
 dev-qt/designer/Manifest| 2 +-
 .../designer/{designer-5.9.0_beta3.ebuild => designer-5.9.0_rc.ebuild}  | 0
 dev-qt/linguist-tools/Manifest  | 2 +-
 ...linguist-tools-5.9.0_beta3.ebuild => linguist-tools-5.9.0_rc.ebuild} | 0
 dev-qt/linguist/Manifest| 2 +-
 .../linguist/{linguist-5.9.0_beta3.ebuild => linguist-5.9.0_rc.ebuild}  | 0
 dev-qt/pixeltool/Manifest   | 2 +-
 .../{pixeltool-5.9.0_beta3.ebuild => pixeltool-5.9.0_rc.ebuild} | 0
 dev-qt/qdbus/Manifest   | 2 +-
 dev-qt/qdbus/{qdbus-5.9.0_beta3.ebuild => qdbus-5.9.0_rc.ebuild}| 0
 dev-qt/qdbusviewer/Manifest | 2 +-
 .../{qdbusviewer-5.9.0_beta3.ebuild => qdbusviewer-5.9.0_rc.ebuild} | 0
 dev-qt/qdoc/Manifest| 2 +-
 dev-qt/qdoc/{qdoc-5.9.0_beta3.ebuild => qdoc-5.9.0_rc.ebuild}   | 0
 dev-qt/qt3d/Manifest| 2 +-
 dev-qt/qt3d/{qt3d-5.9.0_beta3.ebuild => qt3d-5.9.0_rc.ebuild}   | 0
 dev-qt/qtbluetooth/Manifest | 2 +-
 .../{qtbluetooth-5.9.0_beta3.ebuild => qtbluetooth-5.9.0_rc.ebuild} | 0
 dev-qt/qtcharts/Manifest| 2 +-
 .../qtcharts/{qtcharts-5.9.0_beta3.ebuild => qtcharts-5.9.0_rc.ebuild}  | 0
 dev-qt/qtconcurrent/Manifest| 2 +-
 .../{qtconcurrent-5.9.0_beta3.ebuild => qtconcurrent-5.9.0_rc.ebuild}   | 0
 dev-qt/qtcore/Manifest  | 2 +-
 dev-qt/qtcore/{qtcore-5.9.0_beta3.ebuild => qtcore-5.9.0_rc.ebuild} | 0
 dev-qt/qtdatavis3d/Manifest | 2 +-
 .../{qtdatavis3d-5.9.0_beta3.ebuild => qtdatavis3d-5.9.0_rc.ebuild} | 0
 dev-qt/qtdbus/Manifest  | 2 +-
 dev-qt/qtdbus/{qtdbus-5.9.0_beta3.ebuild => qtdbus-5.9.0_rc.ebuild} | 0
 dev-qt/qtdeclarative/Manifest   | 2 +-
 .../{qtdeclarative-5.9.0_beta3.ebuild => qtdeclarative-5.9.0_rc.ebuild} | 0
 dev-qt/qtdiag/Manifest  | 2 +-
 dev-qt/qtdiag/{qtdiag-5.9.0_beta3.ebuild => qtdiag-5.9.0_rc.ebuild} | 0
 dev-qt/qtgraphicaleffects/Manifest  | 2 +-
 ...caleffects-5.9.0_beta3.ebuild => qtgraphicaleffects-5.9.0_rc.ebuild} | 0
 dev-qt/qtgui/Manifest   | 2 +-
 dev-qt/qtgui/{qtgui-5.9.0_beta3.ebuild => qtgui-5.9.0_rc.ebuild}| 0
 dev-qt/qthelp/Manifest  | 2 +-
 dev-qt/qthelp/{qthelp-5.9.0_beta3.ebuild => qthelp-5.9.0_rc.ebuild} | 0
 dev-qt/qtimageformats/Manifest  | 2 +-
 ...qtimageformats-5.9.0_beta3.ebuild => qtimageformats-5.9.0_rc.ebuild} | 0
 dev-qt/qtlocation/Manifest  | 2 +-
 .../{qtlocation-5.9.0_beta3.ebuild => qtlocation-5.9.0_rc.ebuild}   | 0
 dev-qt/qtmultimedia/Manifest| 2 +-
 .../{qtmultimedia-5.9.0_beta3.ebuild => qtmultimedia-5.9.0_rc.ebuild}   | 0
 dev-qt/qtnetwork/Manifest   | 2 +-
 .../{qtnetwork-5.9.0_beta3.ebuild => qtnetwork-5.9.0_rc.ebuild} | 0
 dev-qt/qtnetworkauth/Manifest   | 2 +-
 .../{qtnetworkauth-5.9.0_beta3.ebuild => qtnetworkauth-5.9.0_rc.ebuild} | 0
 dev-qt/qtopengl/Manifest| 2 +-
 .../qtopengl/{qtopengl-5.9.0_beta3.ebuild => qtopengl-5.9.0_rc.ebuild}  | 0
 dev-qt/qtpaths/Manifest | 2 +-
 dev-qt/qtpaths/{qtpaths-5.9.0_beta3.ebuild => qtpaths-5.9.0_rc.ebuild}  | 0
 dev-qt/qtplugininfo/Manifest| 2 +-
 .../{qtplugininfo-5.9.0_beta3.ebuild => qtplugininfo-5.9.0_rc.ebuild}   | 0
 dev-qt/qtpositioning/Manifest   | 2 +-
 .../{qtpositioning-5.9.0_beta3.ebuild => qtpositioning-5.9.0_rc.ebuild} | 0
 dev-qt/qtprintsupport/Manifest  | 2 +-
 ...qtprintsupport-5.9.0_beta3.ebuild => qtp

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

2016-06-12 Thread Davide Pesavento
commit: 19b89e1039c24d8676c3faaea0f42dd6e5d361b6
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 12 23:53:41 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jun 13 00:11:05 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=19b89e10

dev-qt/qtnetwork: convert to usex

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtnetwork/qtnetwork-5.6.1.ebuild| 2 +-
 dev-qt/qtnetwork/qtnetwork-5.6..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.7.0_rc.ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.7..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.6.1.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.6.1.ebuild
index f60f0be..f713792 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.6.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.6.1.ebuild
@@ -48,7 +48,7 @@ src_configure() {
local myconf=(
$(use connman || use networkmanager && echo -dbus-linked)
$(qt_use libproxy)
-   $(use ssl && echo -openssl-linked)
+   $(usex ssl -openssl-linked '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtnetwork/qtnetwork-5.6..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.6..ebuild
index f60f0be..f713792 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.6..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.6..ebuild
@@ -48,7 +48,7 @@ src_configure() {
local myconf=(
$(use connman || use networkmanager && echo -dbus-linked)
$(qt_use libproxy)
-   $(use ssl && echo -openssl-linked)
+   $(usex ssl -openssl-linked '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtnetwork/qtnetwork-5.7.0_rc.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.7.0_rc.ebuild
index f60f0be..f713792 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.7.0_rc.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.7.0_rc.ebuild
@@ -48,7 +48,7 @@ src_configure() {
local myconf=(
$(use connman || use networkmanager && echo -dbus-linked)
$(qt_use libproxy)
-   $(use ssl && echo -openssl-linked)
+   $(usex ssl -openssl-linked '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtnetwork/qtnetwork-5.7..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.7..ebuild
index f60f0be..f713792 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.7..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.7..ebuild
@@ -48,7 +48,7 @@ src_configure() {
local myconf=(
$(use connman || use networkmanager && echo -dbus-linked)
$(qt_use libproxy)
-   $(use ssl && echo -openssl-linked)
+   $(usex ssl -openssl-linked '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index f60f0be..f713792 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -48,7 +48,7 @@ src_configure() {
local myconf=(
$(use connman || use networkmanager && echo -dbus-linked)
$(qt_use libproxy)
-   $(use ssl && echo -openssl-linked)
+   $(usex ssl -openssl-linked '')
)
qt5-build_src_configure
 }



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

2016-04-23 Thread Michael Palimaka
commit: 043c2a15c822f91966ecc256d3eb3904440ca7d9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Apr 23 17:29:16 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Apr 23 17:29:16 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=043c2a15

dev-qt/qtnetwork: drop unused patch

Package-Manager: portage-2.2.28

 .../qtnetwork/files/qtnetwork-5.5-socklen_t.patch  | 40 --
 1 file changed, 40 deletions(-)

diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch 
b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch
deleted file mode 100644
index dd8c335..000
--- a/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 813f468a14fb84af43c1f8fc0a1430277358eba2 Mon Sep 17 00:00:00 2001
-From: Dave Flogeras 
-Date: Tue, 29 Sep 2015 08:52:31 -0300
-Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc.
-
-Rather than treating >=glibc-2 specially, we treat http://patchwork.openembedded.org/patch/94947/ and
-tested with armv6j-hardfloat-linux-uclibceabi and
-armv6j-hardfloat-linux-musleabi.
-
-Change-Id: I3850b1561a2e240f6564afedd80ce39407cc50b6
-Reviewed-by: Oswald Buddenhagen 
-Reviewed-by: Thiago Macieira 

- mkspecs/linux-g++/qplatformdefs.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mkspecs/linux-g++/qplatformdefs.h 
b/mkspecs/linux-g++/qplatformdefs.h
-index 5c18632..95a5758 100644
 a/mkspecs/linux-g++/qplatformdefs.h
-+++ b/mkspecs/linux-g++/qplatformdefs.h
-@@ -78,10 +78,10 @@
- 
- #undef QT_SOCKLEN_T
- 
--#if defined(__GLIBC__) && (__GLIBC__ >= 2)
--#define QT_SOCKLEN_Tsocklen_t
--#else
-+#if defined(__GLIBC__) && (__GLIBC__ < 2)
- #define QT_SOCKLEN_Tint
-+#else
-+#define QT_SOCKLEN_Tsocklen_t
- #endif
- 
- #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
--- 
-2.6.0
-



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/

2015-09-30 Thread Davide Pesavento
commit: 9b7fa0e214e6c3dc33bfd41139a87dfcf0574c8f
Author: Dave Flogeras  gmail  com>
AuthorDate: Tue Sep 29 13:20:29 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Oct  1 01:59:39 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9b7fa0e2

dev-qt/qtnetwork: fix build on non-glibc systems (musl/uclibc)

This patch has been accepted by upstream for the 5.6 branch, but won't
be backported. See qtbase commit 813f468a14fb84af43c1f8fc0a1430277358eba2.

Gentoo-Bug: 554556

 .../qtnetwork/files/qtnetwork-5.5-socklen_t.patch  | 40 ++
 dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild|  4 +++
 dev-qt/qtnetwork/qtnetwork-5.5..ebuild |  4 +++
 3 files changed, 48 insertions(+)

diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch 
b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch
new file mode 100644
index 000..dd8c335
--- /dev/null
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch
@@ -0,0 +1,40 @@
+From 813f468a14fb84af43c1f8fc0a1430277358eba2 Mon Sep 17 00:00:00 2001
+From: Dave Flogeras 
+Date: Tue, 29 Sep 2015 08:52:31 -0300
+Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc.
+
+Rather than treating >=glibc-2 specially, we treat http://patchwork.openembedded.org/patch/94947/ and
+tested with armv6j-hardfloat-linux-uclibceabi and
+armv6j-hardfloat-linux-musleabi.
+
+Change-Id: I3850b1561a2e240f6564afedd80ce39407cc50b6
+Reviewed-by: Oswald Buddenhagen 
+Reviewed-by: Thiago Macieira 
+---
+ mkspecs/linux-g++/qplatformdefs.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mkspecs/linux-g++/qplatformdefs.h 
b/mkspecs/linux-g++/qplatformdefs.h
+index 5c18632..95a5758 100644
+--- a/mkspecs/linux-g++/qplatformdefs.h
 b/mkspecs/linux-g++/qplatformdefs.h
+@@ -78,10 +78,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_Tsocklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_Tint
++#else
++#define QT_SOCKLEN_Tsocklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+-- 
+2.6.0
+

diff --git a/dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild
index 934c523..5be50a5 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.5.0.ebuild
@@ -27,6 +27,10 @@ RDEPEND="${DEPEND}
networkmanager? ( net-misc/networkmanager )
 "
 
+PATCHES=(
+   "${FILESDIR}/${PN}-5.5-socklen_t.patch" # bug 554556
+)
+
 QT5_TARGET_SUBDIRS=(
src/network
src/plugins/bearer/generic

diff --git a/dev-qt/qtnetwork/qtnetwork-5.5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.5..ebuild
index 934c523..5be50a5 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.5..ebuild
@@ -27,6 +27,10 @@ RDEPEND="${DEPEND}
networkmanager? ( net-misc/networkmanager )
 "
 
+PATCHES=(
+   "${FILESDIR}/${PN}-5.5-socklen_t.patch" # bug 554556
+)
+
 QT5_TARGET_SUBDIRS=(
src/network
src/plugins/bearer/generic



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

2015-04-28 Thread Davide Pesavento
commit: e6630860bdaf0c1f19b7bbfcbf919e02b0b36b67
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Apr 28 14:45:45 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Apr 28 14:45:45 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e6630860

[dev-qt/qtnetwork] Fix USE=bindist description.

Package-Manager: portage-2.2.18

 dev-qt/qtnetwork/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 78f609e..651a7c8 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -3,7 +3,7 @@
 
qt

-   Enable EC support via 
dev-libs/openssl
+   Disable EC support via 
dev-libs/openssl
Enable net-misc/connman-based 
bearer plugin
Use net-libs/libproxy for 
automatic
HTTP/SOCKS proxy configuration



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

2015-04-28 Thread Michael Palimaka
commit: 11bdc7fc898a8c6fa896c058f5e1d3d433c06d4b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Apr 28 12:30:47 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Apr 28 12:30:47 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=11bdc7fc

[dev-qt/qtnetwork] Fix bindist USE flag description by Arfrever.

Package-Manager: portage-2.2.18

 dev-qt/qtnetwork/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 78f609e..651a7c8 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -3,7 +3,7 @@
 
qt

-   Enable EC support via 
dev-libs/openssl
+   Disable EC support via 
dev-libs/openssl
Enable net-misc/connman-based 
bearer plugin
Use net-libs/libproxy for 
automatic
HTTP/SOCKS proxy configuration



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

2015-04-25 Thread Michael Palimaka
commit: f69ba7168660a7d27ef17e828ad98240234da88d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Apr 25 18:22:43 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Apr 25 18:22:43 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f69ba716

[dev-qt/qtnetwork] Add description for bindist USE flag.

Package-Manager: portage-2.2.18

 dev-qt/qtnetwork/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 9b1a520..78f609e 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -3,6 +3,7 @@
 
qt

+   Enable EC support via 
dev-libs/openssl
Enable net-misc/connman-based 
bearer plugin
Use net-libs/libproxy for 
automatic
HTTP/SOCKS proxy configuration



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

2015-04-22 Thread Michael Palimaka
commit: 508a10f1fb190877d01d93d197c369a46a7f9c26
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Apr 22 16:18:47 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Apr 22 16:18:47 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=508a10f1

[dev-qt/qtnetwork] Introduce bindist USE flag to better handle OpenSSL EC 
support wrt bug #546328.

Package-Manager: portage-2.2.18

 dev-qt/qtnetwork/qtnetwork-5.4..ebuild | 4 ++--
 dev-qt/qtnetwork/qtnetwork-5.5..ebuild | 4 ++--
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.4..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.4..ebuild
index 8502358..0cb08c7 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.4..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.4..ebuild
@@ -16,14 +16,14 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 fi
 
-IUSE="connman networkmanager +ssl"
+IUSE="bindist connman networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
>=sys-libs/zlib-1.2.5
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
-   ssl? ( dev-libs/openssl:0[-bindist] )
+   ssl? ( dev-libs/openssl:0[bindist=] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )

diff --git a/dev-qt/qtnetwork/qtnetwork-5.5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.5..ebuild
index 53f1fb5..2fbad0a 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.5..ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 fi
 
-IUSE="connman libproxy networkmanager +ssl"
+IUSE="bindist connman libproxy networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
@@ -24,7 +24,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
-   ssl? ( dev-libs/openssl:0[-bindist] )
+   ssl? ( dev-libs/openssl:0[bindist=] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index 53f1fb5..2fbad0a 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 fi
 
-IUSE="connman libproxy networkmanager +ssl"
+IUSE="bindist connman libproxy networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
@@ -24,7 +24,7 @@ DEPEND="
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
-   ssl? ( dev-libs/openssl:0[-bindist] )
+   ssl? ( dev-libs/openssl:0[bindist=] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )



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

2015-03-25 Thread Davide Pesavento
commit: 62c9decd18eb47f802ad3ead07e8f626939a8fa8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Mar 26 01:45:23 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Mar 26 01:45:23 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=62c9decd

[dev-qt/qtnetwork:5] Raise zlib dep based on the bundled copy version.

Package-Manager: portage-2.2.18

 dev-qt/qtnetwork/qtnetwork-5.4..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.5..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.4..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.4..ebuild
index 037dc98..635e6e5 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.4..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.4..ebuild
@@ -20,7 +20,7 @@ IUSE="connman networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   sys-libs/zlib
+   >=sys-libs/zlib-1.2.5
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
ssl? ( dev-libs/openssl:0[-bindist] )

diff --git a/dev-qt/qtnetwork/qtnetwork-5.5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.5..ebuild
index 13bc9f4..71905b6 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.5..ebuild
@@ -20,7 +20,7 @@ IUSE="connman libproxy networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   sys-libs/zlib
+   >=sys-libs/zlib-1.2.5
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index 13bc9f4..71905b6 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -20,7 +20,7 @@ IUSE="connman libproxy networkmanager +ssl"
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   sys-libs/zlib
+   >=sys-libs/zlib-1.2.5
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtwidgets/, dev-qt/qtopenvg/, dev-qt/qtwebsockets/, ...

2015-01-08 Thread Davide Pesavento
commit: 6d47a91e91428f4768676ee3c3c7510a17157520
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Jan  8 22:34:48 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Jan  8 22:34:48 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6d47a91e

[dev-qt] Update upstream bugtracker URL.

---
 dev-qt/assistant/metadata.xml  | 2 +-
 dev-qt/designer/metadata.xml   | 2 +-
 dev-qt/linguist-tools/metadata.xml | 2 +-
 dev-qt/linguist/metadata.xml   | 2 +-
 dev-qt/pixeltool/metadata.xml  | 2 +-
 dev-qt/qdbus/metadata.xml  | 2 +-
 dev-qt/qdbusviewer/metadata.xml| 2 +-
 dev-qt/qdoc/metadata.xml   | 2 +-
 dev-qt/qt-creator/metadata.xml | 2 +-
 dev-qt/qt3d/metadata.xml   | 2 +-
 dev-qt/qt3support/metadata.xml | 2 +-
 dev-qt/qtbearer/metadata.xml   | 2 +-
 dev-qt/qtconcurrent/metadata.xml   | 2 +-
 dev-qt/qtcore/metadata.xml | 2 +-
 dev-qt/qtdbus/metadata.xml | 2 +-
 dev-qt/qtdeclarative/metadata.xml  | 2 +-
 dev-qt/qtdemo/metadata.xml | 2 +-
 dev-qt/qtdiag/metadata.xml | 2 +-
 dev-qt/qtgraphicaleffects/metadata.xml | 2 +-
 dev-qt/qtgui/metadata.xml  | 2 +-
 dev-qt/qthelp/metadata.xml | 2 +-
 dev-qt/qtimageformats/metadata.xml | 2 +-
 dev-qt/qtlocation/metadata.xml | 2 +-
 dev-qt/qtmultimedia/metadata.xml   | 2 +-
 dev-qt/qtnetwork/metadata.xml  | 2 +-
 dev-qt/qtopengl/metadata.xml   | 2 +-
 dev-qt/qtopenvg/metadata.xml   | 2 +-
 dev-qt/qtpaths/metadata.xml| 2 +-
 dev-qt/qtphonon/metadata.xml   | 2 +-
 dev-qt/qtpositioning/metadata.xml  | 2 +-
 dev-qt/qtprintsupport/metadata.xml | 2 +-
 dev-qt/qtquick1/metadata.xml   | 2 +-
 dev-qt/qtquickcontrols/metadata.xml| 2 +-
 dev-qt/qtscript/metadata.xml   | 2 +-
 dev-qt/qtsensors/metadata.xml  | 2 +-
 dev-qt/qtserialport/metadata.xml   | 2 +-
 dev-qt/qtsql/metadata.xml  | 2 +-
 dev-qt/qtsvg/metadata.xml  | 2 +-
 dev-qt/qttest/metadata.xml | 2 +-
 dev-qt/qttranslations/metadata.xml | 2 +-
 dev-qt/qtwayland/metadata.xml  | 2 +-
 dev-qt/qtwebkit/metadata.xml   | 2 +-
 dev-qt/qtwebsockets/metadata.xml   | 2 +-
 dev-qt/qtwidgets/metadata.xml  | 2 +-
 dev-qt/qtx11extras/metadata.xml| 2 +-
 dev-qt/qtxml/metadata.xml  | 2 +-
 dev-qt/qtxmlpatterns/metadata.xml  | 2 +-
 47 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
index 14dca05..d058599 100644
--- a/dev-qt/assistant/metadata.xml
+++ b/dev-qt/assistant/metadata.xml
@@ -7,7 +7,7 @@
inside the event loop (recommended by upstream)


-   https://bugreports.qt-project.org/
+   https://bugreports.qt.io/
http://qt-project.org/doc/

 

diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
index 4f7e848..273867d 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -11,7 +11,7 @@
Build the qwebview plugin


-   https://bugreports.qt-project.org/
+   https://bugreports.qt.io/
http://qt-project.org/doc/

 

diff --git a/dev-qt/linguist-tools/metadata.xml 
b/dev-qt/linguist-tools/metadata.xml
index 64a2bbe..a0aaf4f 100644
--- a/dev-qt/linguist-tools/metadata.xml
+++ b/dev-qt/linguist-tools/metadata.xml
@@ -6,7 +6,7 @@

qt

-   https://bugreports.qt-project.org/
+   https://bugreports.qt.io/
http://qt-project.org/doc/

 

diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml
index 14dca05..d058599 100644
--- a/dev-qt/linguist/metadata.xml
+++ b/dev-qt/linguist/metadata.xml
@@ -7,7 +7,7 @@
inside the event loop (recommended by upstream)


-   https://bugreports.qt-project.org/
+   https://bugreports.qt.io/
http://qt-project.org/doc/

 

diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml
index 14dca05..d058599 100644
--- a/dev-qt/pixeltool/metadata.xml
+++ b/dev-qt/pixeltool/metadata.xml
@@ -7,7 +7,7 @@
inside the event loop (recommended by upstream)


-   https://bugreports.qt-project.org/
+   https://bugreports.qt.io/
http://qt-project.org/doc/

 

diff --git a/dev-qt/qdbus/metadata.xml b/dev-qt/qdbus/metadata.xml
index 9d5bff1..39c6359 100644
--- a/dev-qt/qdbus/metadata.xml
+++ b/dev-qt/qdbus/metadata.xml
@@ -3,7 +3,7 @@
 
qt

-   https://bugreports.qt-project.org/
+   https://bugreports.qt.io/
 

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtpaths/, dev-qt/pixeltool/, dev-qt/qdbusviewer/, ...

2014-09-12 Thread Davide Pesavento
commit: 4f5dbf76baa2dc7e4272c0881dd822f9845eda61
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Sep 12 18:11:43 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Sep 12 18:11:43 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4f5dbf76

Qt 5.4.0_alpha version bump.

---
 dev-qt/assistant/Manifest  |   1 +
 dev-qt/assistant/assistant-5.4.0_alpha.ebuild  |  42 ++
 dev-qt/designer/Manifest   |   1 +
 dev-qt/designer/designer-5.4.0_alpha.ebuild|  41 ++
 dev-qt/linguist-tools/Manifest |   1 +
 .../linguist-tools-5.4.0_alpha.ebuild  |  40 ++
 dev-qt/linguist/Manifest   |   1 +
 dev-qt/linguist/linguist-5.4.0_alpha.ebuild|  33 +
 dev-qt/pixeltool/Manifest  |   1 +
 dev-qt/pixeltool/pixeltool-5.4.0_alpha.ebuild  |  31 +
 dev-qt/qdbus/Manifest  |   1 +
 dev-qt/qdbus/qdbus-5.4.0_alpha.ebuild  |  30 
 dev-qt/qdbusviewer/Manifest|   1 +
 dev-qt/qdbusviewer/qdbusviewer-5.4.0_alpha.ebuild  |  32 +
 dev-qt/qdoc/Manifest   |   1 +
 dev-qt/qdoc/qdoc-5.4.0_alpha.ebuild|  29 
 dev-qt/qtconcurrent/Manifest   |   1 +
 .../qtconcurrent/qtconcurrent-5.4.0_alpha.ebuild   |  28 
 dev-qt/qtcore/Manifest |   1 +
 dev-qt/qtcore/qtcore-5.4.0_alpha.ebuild|  43 ++
 dev-qt/qtdbus/Manifest |   1 +
 dev-qt/qtdbus/qtdbus-5.4.0_alpha.ebuild|  44 ++
 dev-qt/qtdeclarative/Manifest  |   1 +
 .../qtdeclarative/qtdeclarative-5.4.0_alpha.ebuild |  49 +++
 dev-qt/qtdiag/Manifest |   1 +
 dev-qt/qtdiag/qtdiag-5.4.0_alpha.ebuild|  30 
 dev-qt/qtgraphicaleffects/Manifest |   1 +
 .../qtgraphicaleffects-5.4.0_alpha.ebuild  |  31 +
 dev-qt/qtgui/Manifest  |   1 +
 dev-qt/qtgui/qtgui-5.4.0_alpha.ebuild  | 152 +
 dev-qt/qthelp/Manifest |   1 +
 dev-qt/qthelp/qthelp-5.4.0_alpha.ebuild|  36 +
 dev-qt/qtimageformats/Manifest |   1 +
 .../qtimageformats-5.4.0_alpha.ebuild  |  27 
 dev-qt/qtmultimedia/Manifest   |   1 +
 .../qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild   |  64 +
 dev-qt/qtnetwork/Manifest  |   1 +
 dev-qt/qtnetwork/qtnetwork-5.4.0_alpha.ebuild  |  55 
 dev-qt/qtopengl/Manifest   |   1 +
 dev-qt/qtopengl/qtopengl-5.4.0_alpha.ebuild|  39 ++
 dev-qt/qtpaths/Manifest|   1 +
 dev-qt/qtpaths/qtpaths-5.4.0_alpha.ebuild  |  28 
 dev-qt/qtprintsupport/Manifest |   1 +
 .../qtprintsupport-5.4.0_alpha.ebuild  |  46 +++
 dev-qt/qtquick1/Manifest   |   1 +
 dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild|  52 +++
 dev-qt/qtquickcontrols/Manifest|   1 +
 .../qtquickcontrols-5.4.0_alpha.ebuild |  36 +
 dev-qt/qtscript/Manifest   |   1 +
 dev-qt/qtscript/qtscript-5.4.0_alpha.ebuild|  33 +
 dev-qt/qtserialport/Manifest   |   1 +
 .../qtserialport/qtserialport-5.4.0_alpha.ebuild   |  23 
 dev-qt/qtsql/Manifest  |   1 +
 dev-qt/qtsql/qtsql-5.4.0_alpha.ebuild  |  58 
 dev-qt/qtsvg/Manifest  |   1 +
 dev-qt/qtsvg/qtsvg-5.4.0_alpha.ebuild  |  27 
 dev-qt/qttest/Manifest |   1 +
 dev-qt/qttest/qttest-5.4.0_alpha.ebuild|  34 +
 dev-qt/qttranslations/Manifest |   1 +
 .../qttranslations-5.4.0_alpha.ebuild  |  23 
 dev-qt/qtwayland/Manifest  |   1 +
 dev-qt/qtwayland/qtwayland-5.4.0_alpha.ebuild  |  42 ++
 dev-qt/qtwebkit/Manifest   |   1 +
 dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild|  88 
 dev-qt/qtwebsockets/Manifest   |   1 +
 .../qtwebsockets/qtwebsockets-5.4.0_alpha.ebuild   |  31 +
 dev-qt/qtwidgets/Manifest  |   1 +
 dev-qt/qtwidgets/qtwidgets-5.4.0_alpha.ebuild  |  57 
 dev-qt/qtx11extras/Manifest|   1 +
 dev-qt/qtx11extras/qtx11extras-5.4.0_alpha.ebuild  |  24 
 dev-qt/qtxml/Manifest  |   1 +
 dev-qt/qtxml/qtxml-5.4.0_alpha.ebuild  |  30 
 dev-qt/qtxmlpatterns/Manifest  |   1 +
 .../qtxmlpatterns/qtxmlpatterns-5.4.0_alpha.ebuild |  23 
 74 files changed, 1568 insertions

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtpaths/, dev-qt/pixeltool/, dev-qt/qdbusviewer/, ...

2014-09-10 Thread Davide Pesavento
commit: 71b19e22b74d8c3e9073b7c25405f9feaa369272
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Sep 11 03:01:32 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Sep 11 03:01:32 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=71b19e22

Remove Qt 5.3.1, now in portage.

---
 dev-qt/assistant/Manifest  |   1 -
 dev-qt/assistant/assistant-5.3.1.ebuild|  42 --
 dev-qt/designer/Manifest   |   1 -
 dev-qt/designer/designer-5.3.1.ebuild  |  41 --
 dev-qt/linguist-tools/Manifest |   1 -
 dev-qt/linguist-tools/linguist-tools-5.3.1.ebuild  |  40 --
 dev-qt/linguist/Manifest   |   1 -
 dev-qt/linguist/linguist-5.3.1.ebuild  |  33 -
 dev-qt/pixeltool/Manifest  |   1 -
 dev-qt/pixeltool/pixeltool-5.3.1.ebuild|  31 -
 dev-qt/qdbus/Manifest  |   1 -
 dev-qt/qdbus/qdbus-5.3.1.ebuild|  30 
 dev-qt/qdbusviewer/Manifest|   1 -
 dev-qt/qdbusviewer/qdbusviewer-5.3.1.ebuild|  32 -
 dev-qt/qdoc/Manifest   |   1 -
 dev-qt/qdoc/qdoc-5.3.1.ebuild  |  29 
 dev-qt/qtconcurrent/Manifest   |   1 -
 dev-qt/qtconcurrent/qtconcurrent-5.3.1.ebuild  |  28 
 dev-qt/qtcore/Manifest |   1 -
 dev-qt/qtcore/qtcore-5.3.1-r1.ebuild   |  43 --
 dev-qt/qtdbus/Manifest |   1 -
 dev-qt/qtdbus/qtdbus-5.3.1-r1.ebuild   |  44 --
 dev-qt/qtdeclarative/Manifest  |   1 -
 dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild|  49 ---
 dev-qt/qtdiag/Manifest |   1 -
 dev-qt/qtdiag/qtdiag-5.3.1.ebuild  |  30 
 dev-qt/qtgraphicaleffects/Manifest |   1 -
 .../qtgraphicaleffects-5.3.1.ebuild|  31 -
 dev-qt/qtgui/Manifest  |   1 -
 dev-qt/qtgui/qtgui-5.3.1-r1.ebuild | 151 -
 dev-qt/qthelp/Manifest |   1 -
 dev-qt/qthelp/qthelp-5.3.1-r1.ebuild   |  36 -
 dev-qt/qtimageformats/Manifest |   1 -
 dev-qt/qtimageformats/qtimageformats-5.3.1.ebuild  |  27 
 dev-qt/qtmultimedia/Manifest   |   1 -
 dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild  |  64 -
 dev-qt/qtnetwork/Manifest  |   1 -
 dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild |  55 
 dev-qt/qtopengl/Manifest   |   1 -
 dev-qt/qtopengl/qtopengl-5.3.1.ebuild  |  39 --
 dev-qt/qtpaths/Manifest|   1 -
 dev-qt/qtpaths/qtpaths-5.3.1.ebuild|  28 
 dev-qt/qtprintsupport/Manifest |   1 -
 dev-qt/qtprintsupport/qtprintsupport-5.3.1.ebuild  |  46 ---
 dev-qt/qtquick1/Manifest   |   1 -
 dev-qt/qtquick1/qtquick1-5.3.1.ebuild  |  52 ---
 dev-qt/qtquickcontrols/Manifest|   1 -
 .../qtquickcontrols/qtquickcontrols-5.3.1.ebuild   |  36 -
 dev-qt/qtscript/Manifest   |   1 -
 dev-qt/qtscript/qtscript-5.3.1.ebuild  |  33 -
 dev-qt/qtserialport/Manifest   |   1 -
 dev-qt/qtserialport/qtserialport-5.3.1.ebuild  |  23 
 dev-qt/qtsql/Manifest  |   1 -
 dev-qt/qtsql/qtsql-5.3.1.ebuild|  62 -
 dev-qt/qtsvg/Manifest  |   1 -
 dev-qt/qtsvg/qtsvg-5.3.1.ebuild|  34 -
 dev-qt/qttest/Manifest |   1 -
 dev-qt/qttest/qttest-5.3.1.ebuild  |  34 -
 dev-qt/qttranslations/Manifest |   1 -
 dev-qt/qttranslations/qttranslations-5.3.1.ebuild  |  23 
 dev-qt/qtwebkit/Manifest   |   1 -
 dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild  |  88 
 dev-qt/qtwebsockets/Manifest   |   1 -
 dev-qt/qtwebsockets/qtwebsockets-5.3.1.ebuild  |  35 -
 dev-qt/qtwidgets/Manifest  |   1 -
 dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild |  63 -
 dev-qt/qtx11extras/Manifest|   1 -
 dev-qt/qtx11extras/qtx11extras-5.3.1.ebuild|  24 
 dev-qt/qtxml/Manifest  |   1 -
 dev-qt/qtxml/qtxml-5.3.1.ebuild|  30 
 dev-qt/qtxmlpatterns/Manifest  |   1 -
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.3.1.ebuild|  23 
 72 files changed, 1545 deletions(-)

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 22923e9..27884f4 100644
--- a/dev-qt/assi

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtpaths/, dev-qt/pixeltool/, dev-qt/qdbusviewer/, ...

2014-08-19 Thread Davide Pesavento
commit: 951092838e9db69bf5837cf365b05b84e5780bdf
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug 11 15:55:29 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Aug 11 15:55:29 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=95109283

[Qt5] Add live ebuilds for the 5.4 branch.

---
 .../assistant-tools-5.4..ebuild|  33 +
 dev-qt/assistant/assistant-5.4..ebuild |  42 ++
 dev-qt/designer/designer-5.4..ebuild   |  41 ++
 .../linguist-tools/linguist-tools-5.4..ebuild  |  40 ++
 dev-qt/linguist/linguist-5.4..ebuild   |  33 +
 dev-qt/pixeltool/pixeltool-5.4..ebuild |  31 +
 dev-qt/qdbus/qdbus-5.4..ebuild |  30 
 dev-qt/qdbusviewer/qdbusviewer-5.4..ebuild |  32 +
 dev-qt/qdoc/qdoc-5.4..ebuild   |  29 
 dev-qt/qtconcurrent/qtconcurrent-5.4..ebuild   |  28 
 dev-qt/qtcore/qtcore-5.4..ebuild   |  42 ++
 dev-qt/qtdbus/qtdbus-5.4..ebuild   |  44 ++
 dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild |  48 +++
 dev-qt/qtdiag/qtdiag-5.4..ebuild   |  29 
 .../qtgraphicaleffects-5.4..ebuild |  31 +
 dev-qt/qtgui/qtgui-5.4..ebuild | 153 +
 dev-qt/qthelp/qthelp-5.4..ebuild   |  33 +
 .../qtimageformats/qtimageformats-5.4..ebuild  |  27 
 dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild   |  62 +
 dev-qt/qtnetwork/qtnetwork-5.4..ebuild |  57 
 dev-qt/qtopengl/qtopengl-5.4..ebuild   |  39 ++
 dev-qt/qtpaths/qtpaths-5.4..ebuild |  28 
 .../qtprintsupport/qtprintsupport-5.4..ebuild  |  46 +++
 dev-qt/qtquick1/qtquick1-5.4..ebuild   |  52 +++
 .../qtquickcontrols-5.4..ebuild|  36 +
 dev-qt/qtscript/qtscript-5.4..ebuild   |  33 +
 dev-qt/qtserialport/qtserialport-5.4..ebuild   |  23 
 dev-qt/qtsql/qtsql-5.4..ebuild |  58 
 dev-qt/qtsvg/qtsvg-5.4..ebuild |  27 
 dev-qt/qttest/qttest-5.4..ebuild   |  34 +
 .../qttranslations/qttranslations-5.4..ebuild  |  23 
 dev-qt/qtwayland/qtwayland-5.4..ebuild |  42 ++
 dev-qt/qtwebkit/qtwebkit-5.4..ebuild   |  93 +
 dev-qt/qtwebsockets/qtwebsockets-5.4..ebuild   |  31 +
 dev-qt/qtwidgets/qtwidgets-5.4..ebuild |  52 +++
 dev-qt/qtx11extras/qtx11extras-5.4..ebuild |  24 
 dev-qt/qtxml/qtxml-5.4..ebuild |  30 
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.4..ebuild |  23 
 eclass/qt5-build.eclass|   4 +-
 39 files changed, 1561 insertions(+), 2 deletions(-)

diff --git a/dev-qt/assistant-tools/assistant-tools-5.4..ebuild 
b/dev-qt/assistant-tools/assistant-tools-5.4..ebuild
new file mode 100644
index 000..be3a8c2
--- /dev/null
+++ b/dev-qt/assistant-tools/assistant-tools-5.4..ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Extra tools for working with Qt help files"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=""
+else
+   KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+   >=dev-qt/qtcore-${PV}:5[debug=]
+   >=dev-qt/qtgui-${PV}:5[debug=]
+   >=dev-qt/qthelp-${PV}:5[debug=]
+   >=dev-qt/qtwidgets-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/qcollectiongenerator
+   src/assistant/qhelpconverter
+   src/assistant/qhelpgenerator
+)

diff --git a/dev-qt/assistant/assistant-5.4..ebuild 
b/dev-qt/assistant/assistant-5.4..ebuild
new file mode 100644
index 000..b26acbc
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.4..ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=""
+else
+   KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+   >=dev-qt/qtcore-${PV}:5[debug=]
+   >=dev-qt/qtgui-${PV}:5[debug=]
+   >=dev-qt/qthelp-${PV}:5[debug=]
+   >=dev-qt/qtnetwork-${PV}:5[debug=]
+   >=dev-qt/qtprintsupport-${PV}:5[debug=]
+   >=dev-qt/qtsql-${PV}:5[debug=,sqlite]
+   >=dev-qt/qtwidgets-${PV}:5[debug=]
+   webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/assistant
+)
+
+src_prepare() {
+   qt_use_disable_mod

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtgui/, eclass/, dev-qt/qtwebkit/

2014-08-17 Thread Davide Pesavento
commit: 8881a1b7b068f78aeca09c3b53ed268ed898056b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Aug 17 12:32:19 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Aug 17 12:32:19 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8881a1b7

[qt5-build.eclass] Stop defining/exporting pkg_setup.

---
 dev-qt/qtgui/qtgui-5.3.1-r1.ebuild |  2 --
 dev-qt/qtgui/qtgui-5.3..ebuild |  2 --
 dev-qt/qtgui/qtgui-5.4..ebuild |  2 --
 dev-qt/qtgui/qtgui-5..ebuild   |  2 --
 dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild |  2 --
 dev-qt/qtnetwork/qtnetwork-5.3..ebuild |  2 --
 dev-qt/qtnetwork/qtnetwork-5.4..ebuild |  2 --
 dev-qt/qtnetwork/qtnetwork-5..ebuild   |  2 --
 dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild  |  5 -
 dev-qt/qtwebkit/qtwebkit-5.3..ebuild   |  5 -
 dev-qt/qtwebkit/qtwebkit-5.4..ebuild   |  5 -
 dev-qt/qtwebkit/qtwebkit-5..ebuild |  5 -
 eclass/qt5-build.eclass| 19 ++-
 13 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild 
b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
index b76db5c..0688654 100644
--- a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
@@ -117,8 +117,6 @@ pkg_setup() {
 
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || 
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
-   qt5-build_pkg_setup
 }
 
 src_configure() {

diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild 
b/dev-qt/qtgui/qtgui-5.3..ebuild
index b76db5c..0688654 100644
--- a/dev-qt/qtgui/qtgui-5.3..ebuild
+++ b/dev-qt/qtgui/qtgui-5.3..ebuild
@@ -117,8 +117,6 @@ pkg_setup() {
 
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || 
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
-   qt5-build_pkg_setup
 }
 
 src_configure() {

diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild 
b/dev-qt/qtgui/qtgui-5.4..ebuild
index 1a468bb..a5647d9 100644
--- a/dev-qt/qtgui/qtgui-5.4..ebuild
+++ b/dev-qt/qtgui/qtgui-5.4..ebuild
@@ -118,8 +118,6 @@ pkg_setup() {
 
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || 
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
-   qt5-build_pkg_setup
 }
 
 src_configure() {

diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 1a468bb..a5647d9 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -118,8 +118,6 @@ pkg_setup() {
 
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || 
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
-   qt5-build_pkg_setup
 }
 
 src_configure() {

diff --git a/dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild
index 6c2cfa1..79b546e 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild
@@ -42,8 +42,6 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-   qt5-build_pkg_setup
-
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
 }

diff --git a/dev-qt/qtnetwork/qtnetwork-5.3..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
index 6c2cfa1..79b546e 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
@@ -42,8 +42,6 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-   qt5-build_pkg_setup
-
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
 }

diff --git a/dev-qt/qtnetwork/qtnetwork-5.4..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.4..ebuild
index 6c2cfa1..79b546e 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.4..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.4..ebuild
@@ -42,8 +42,6 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-   qt5-build_pkg_setup
-
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
 }

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index 6c2cfa1..79b546e 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -42,8 +42,6 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-   qt5-build_pkg_setup
-
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
use networkmanager && 
QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
 }

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild
index a031505..49d482e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild
+++ b/dev-qt/qtwebkit/qtw

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtpaths/, dev-qt/pixeltool/, dev-qt/qdbusviewer/, ...

2014-08-11 Thread Davide Pesavento
commit: 951092838e9db69bf5837cf365b05b84e5780bdf
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug 11 15:55:29 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Aug 11 15:55:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=95109283

[Qt5] Add live ebuilds for the 5.4 branch.

---
 .../assistant-tools-5.4..ebuild|  33 +
 dev-qt/assistant/assistant-5.4..ebuild |  42 ++
 dev-qt/designer/designer-5.4..ebuild   |  41 ++
 .../linguist-tools/linguist-tools-5.4..ebuild  |  40 ++
 dev-qt/linguist/linguist-5.4..ebuild   |  33 +
 dev-qt/pixeltool/pixeltool-5.4..ebuild |  31 +
 dev-qt/qdbus/qdbus-5.4..ebuild |  30 
 dev-qt/qdbusviewer/qdbusviewer-5.4..ebuild |  32 +
 dev-qt/qdoc/qdoc-5.4..ebuild   |  29 
 dev-qt/qtconcurrent/qtconcurrent-5.4..ebuild   |  28 
 dev-qt/qtcore/qtcore-5.4..ebuild   |  42 ++
 dev-qt/qtdbus/qtdbus-5.4..ebuild   |  44 ++
 dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild |  48 +++
 dev-qt/qtdiag/qtdiag-5.4..ebuild   |  29 
 .../qtgraphicaleffects-5.4..ebuild |  31 +
 dev-qt/qtgui/qtgui-5.4..ebuild | 153 +
 dev-qt/qthelp/qthelp-5.4..ebuild   |  33 +
 .../qtimageformats/qtimageformats-5.4..ebuild  |  27 
 dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild   |  62 +
 dev-qt/qtnetwork/qtnetwork-5.4..ebuild |  57 
 dev-qt/qtopengl/qtopengl-5.4..ebuild   |  39 ++
 dev-qt/qtpaths/qtpaths-5.4..ebuild |  28 
 .../qtprintsupport/qtprintsupport-5.4..ebuild  |  46 +++
 dev-qt/qtquick1/qtquick1-5.4..ebuild   |  52 +++
 .../qtquickcontrols-5.4..ebuild|  36 +
 dev-qt/qtscript/qtscript-5.4..ebuild   |  33 +
 dev-qt/qtserialport/qtserialport-5.4..ebuild   |  23 
 dev-qt/qtsql/qtsql-5.4..ebuild |  58 
 dev-qt/qtsvg/qtsvg-5.4..ebuild |  27 
 dev-qt/qttest/qttest-5.4..ebuild   |  34 +
 .../qttranslations/qttranslations-5.4..ebuild  |  23 
 dev-qt/qtwayland/qtwayland-5.4..ebuild |  42 ++
 dev-qt/qtwebkit/qtwebkit-5.4..ebuild   |  93 +
 dev-qt/qtwebsockets/qtwebsockets-5.4..ebuild   |  31 +
 dev-qt/qtwidgets/qtwidgets-5.4..ebuild |  52 +++
 dev-qt/qtx11extras/qtx11extras-5.4..ebuild |  24 
 dev-qt/qtxml/qtxml-5.4..ebuild |  30 
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.4..ebuild |  23 
 eclass/qt5-build.eclass|   4 +-
 39 files changed, 1561 insertions(+), 2 deletions(-)

diff --git a/dev-qt/assistant-tools/assistant-tools-5.4..ebuild 
b/dev-qt/assistant-tools/assistant-tools-5.4..ebuild
new file mode 100644
index 000..be3a8c2
--- /dev/null
+++ b/dev-qt/assistant-tools/assistant-tools-5.4..ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Extra tools for working with Qt help files"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=""
+else
+   KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+   >=dev-qt/qtcore-${PV}:5[debug=]
+   >=dev-qt/qtgui-${PV}:5[debug=]
+   >=dev-qt/qthelp-${PV}:5[debug=]
+   >=dev-qt/qtwidgets-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/qcollectiongenerator
+   src/assistant/qhelpconverter
+   src/assistant/qhelpgenerator
+)

diff --git a/dev-qt/assistant/assistant-5.4..ebuild 
b/dev-qt/assistant/assistant-5.4..ebuild
new file mode 100644
index 000..b26acbc
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.4..ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=""
+else
+   KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+   >=dev-qt/qtcore-${PV}:5[debug=]
+   >=dev-qt/qtgui-${PV}:5[debug=]
+   >=dev-qt/qthelp-${PV}:5[debug=]
+   >=dev-qt/qtnetwork-${PV}:5[debug=]
+   >=dev-qt/qtprintsupport-${PV}:5[debug=]
+   >=dev-qt/qtsql-${PV}:5[debug=,sqlite]
+   >=dev-qt/qtwidgets-${PV}:5[debug=]
+   webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/assistant
+)
+
+src_prepare() {
+   qt_use_disab

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtdbus/

2014-07-30 Thread Davide Pesavento
commit: 87962754e028c289e5a5b1b367e770321119b8ae
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Jul 31 00:51:58 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Jul 31 00:51:58 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=87962754

[dev-qt/qt{dbus,network}:5] Revbump to avoid bug 518620.

---
 dev-qt/qtdbus/{qtdbus-5.3.1.ebuild => qtdbus-5.3.1-r1.ebuild}  | 0
 dev-qt/qtnetwork/{qtnetwork-5.3.1.ebuild => qtnetwork-5.3.1-r1.ebuild} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtdbus/qtdbus-5.3.1.ebuild 
b/dev-qt/qtdbus/qtdbus-5.3.1-r1.ebuild
similarity index 100%
rename from dev-qt/qtdbus/qtdbus-5.3.1.ebuild
rename to dev-qt/qtdbus/qtdbus-5.3.1-r1.ebuild

diff --git a/dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild
similarity index 100%
rename from dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild
rename to dev-qt/qtnetwork/qtnetwork-5.3.1-r1.ebuild



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

2014-07-27 Thread Davide Pesavento
commit: 819f0896b75cc7f03a4293f76401a3cfbd7983ec
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 27 13:50:46 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 27 13:50:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=819f0896

[dev-qt/qtnetwork:5] Simplify dbus and ssl handling.

qt5_base_configure already disables both by default, DRY.

Package-Manager: portage-2.2.10

---
 dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild| 4 ++--
 dev-qt/qtnetwork/qtnetwork-5.3..ebuild | 4 ++--
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild
index b67c60d..6c2cfa1 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild
@@ -50,8 +50,8 @@ pkg_setup() {
 
 src_configure() {
local myconf=(
-   $(use connman || use networkmanager && echo -dbus-linked || 
echo -no-dbus)
-   $(use ssl && echo -openssl-linked || echo -no-openssl)
+   $(use connman || use networkmanager && echo -dbus-linked)
+   $(use ssl && echo -openssl-linked)
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtnetwork/qtnetwork-5.3..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
index b67c60d..6c2cfa1 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
@@ -50,8 +50,8 @@ pkg_setup() {
 
 src_configure() {
local myconf=(
-   $(use connman || use networkmanager && echo -dbus-linked || 
echo -no-dbus)
-   $(use ssl && echo -openssl-linked || echo -no-openssl)
+   $(use connman || use networkmanager && echo -dbus-linked)
+   $(use ssl && echo -openssl-linked)
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index b67c60d..6c2cfa1 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -50,8 +50,8 @@ pkg_setup() {
 
 src_configure() {
local myconf=(
-   $(use connman || use networkmanager && echo -dbus-linked || 
echo -no-dbus)
-   $(use ssl && echo -openssl-linked || echo -no-openssl)
+   $(use connman || use networkmanager && echo -dbus-linked)
+   $(use ssl && echo -openssl-linked)
)
qt5-build_src_configure
 }



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

2014-07-24 Thread Davide Pesavento
commit: 4ee8568d3509a85ea5c0ff0ebac70dfcc1f714bd
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Jul 24 01:04:48 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Jul 24 01:04:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4ee8568d

[dev-qt/qtnetwork:5] Properly handle ssl in QT5_GENTOO_CONFIG.

Package-Manager: portage-2.2.10

---
 dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild| 6 ++
 dev-qt/qtnetwork/qtnetwork-5.3..ebuild | 6 ++
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 6 ++
 3 files changed, 18 insertions(+)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild
index 158bf45..b67c60d 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild
@@ -35,6 +35,12 @@ QT5_TARGET_SUBDIRS=(
src/plugins/bearer/generic
 )
 
+QT5_GENTOO_CONFIG=(
+   ssl::SSL
+   ssl::OPENSSL
+   ssl:openssl-linked:LINKED_OPENSSL
+)
+
 pkg_setup() {
qt5-build_pkg_setup
 

diff --git a/dev-qt/qtnetwork/qtnetwork-5.3..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
index 158bf45..b67c60d 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
@@ -35,6 +35,12 @@ QT5_TARGET_SUBDIRS=(
src/plugins/bearer/generic
 )
 
+QT5_GENTOO_CONFIG=(
+   ssl::SSL
+   ssl::OPENSSL
+   ssl:openssl-linked:LINKED_OPENSSL
+)
+
 pkg_setup() {
qt5-build_pkg_setup
 

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index 158bf45..b67c60d 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -35,6 +35,12 @@ QT5_TARGET_SUBDIRS=(
src/plugins/bearer/generic
 )
 
+QT5_GENTOO_CONFIG=(
+   ssl::SSL
+   ssl::OPENSSL
+   ssl:openssl-linked:LINKED_OPENSSL
+)
+
 pkg_setup() {
qt5-build_pkg_setup
 



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qttest/, dev-qt/qttranslations/, dev-qt/qtmultimedia/, ...

2014-07-12 Thread Michael Palimaka
commit: bd47c28c99013feeef5f54203a8ec67b1273d3c9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jul 12 15:57:40 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jul 12 15:57:40 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bd47c28c

[dev-qt] Improve DESCRIPTION.

---
 dev-qt/linguist-tools/linguist-tools-5.3.1.ebuild| 2 +-
 dev-qt/linguist-tools/linguist-tools-5.3..ebuild | 2 +-
 dev-qt/linguist-tools/linguist-tools-5..ebuild   | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.3.1.ebuild| 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.3..ebuild | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5..ebuild   | 2 +-
 dev-qt/qtdbus/qtdbus-5.3.1.ebuild| 2 +-
 dev-qt/qtdbus/qtdbus-5.3..ebuild | 2 +-
 dev-qt/qtdbus/qtdbus-5..ebuild   | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild  | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.3..ebuild   | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 2 +-
 dev-qt/qtgui/qtgui-5.3.1.ebuild  | 2 +-
 dev-qt/qtgui/qtgui-5.3..ebuild   | 2 +-
 dev-qt/qtgui/qtgui-5..ebuild | 2 +-
 dev-qt/qthelp/qthelp-5.3.1.ebuild| 2 +-
 dev-qt/qthelp/qthelp-5.3..ebuild | 2 +-
 dev-qt/qthelp/qthelp-5..ebuild   | 2 +-
 dev-qt/qtlocation/qtlocation-5..ebuild   | 2 +-
 dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild| 2 +-
 dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild | 2 +-
 dev-qt/qtmultimedia/qtmultimedia-5..ebuild   | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.3.1.ebuild  | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.3..ebuild   | 2 +-
 dev-qt/qtnetwork/qtnetwork-5..ebuild | 2 +-
 dev-qt/qtopengl/qtopengl-5.3.1.ebuild| 2 +-
 dev-qt/qtopengl/qtopengl-5.3..ebuild | 2 +-
 dev-qt/qtopengl/qtopengl-5..ebuild   | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.3.1.ebuild| 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.3..ebuild | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5..ebuild   | 2 +-
 dev-qt/qtquick1/qtquick1-5.3.1.ebuild| 2 +-
 dev-qt/qtquick1/qtquick1-5.3..ebuild | 2 +-
 dev-qt/qtquick1/qtquick1-5..ebuild   | 2 +-
 dev-qt/qtscript/qtscript-5.3.1.ebuild| 2 +-
 dev-qt/qtscript/qtscript-5.3..ebuild | 2 +-
 dev-qt/qtscript/qtscript-5..ebuild   | 2 +-
 dev-qt/qtserialport/qtserialport-5.3.1.ebuild| 2 +-
 dev-qt/qtserialport/qtserialport-5.3..ebuild | 2 +-
 dev-qt/qtserialport/qtserialport-5..ebuild   | 2 +-
 dev-qt/qtsvg/qtsvg-5.3.1.ebuild  | 2 +-
 dev-qt/qtsvg/qtsvg-5.3..ebuild   | 2 +-
 dev-qt/qtsvg/qtsvg-5..ebuild | 2 +-
 dev-qt/qttest/qttest-5.3.1.ebuild| 2 +-
 dev-qt/qttest/qttest-5.3..ebuild | 2 +-
 dev-qt/qttest/qttest-5..ebuild   | 2 +-
 dev-qt/qttranslations/qttranslations-5.3.1.ebuild| 2 +-
 dev-qt/qttranslations/qttranslations-5.3..ebuild | 2 +-
 dev-qt/qttranslations/qttranslations-5..ebuild   | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.3.1.ebuild| 2 +-
 dev-qt/qtwebkit/qtwebkit-5.3..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 2 +-
 dev-qt/qtwebsockets/qtwebsockets-5.3.1.ebuild| 2 +-
 dev-qt/qtwebsockets/qtwebsockets-5.3..ebuild | 2 +-
 dev-qt/qtwebsockets/qtwebsockets-5..ebuild   | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild   | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.3..ebuild   | 2 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild | 2 +-
 dev-qt/qtx11extras/qtx11extras-5.3.1.ebuild  | 2 +-
 dev-qt/qtx11extras/qtx11extras-5.3..ebuild   | 2 +-
 dev-qt/qtx11extras/qtx11extras-5..ebuild | 2 +-
 dev-qt/qtxml/qtxml-5.3.1.ebuild  | 2 +-
 dev-qt/qtxml/qtxml-5.3..ebuild   | 2 +-
 dev-qt/qtxml/qtxml-5..ebuild | 2 +-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.3.1.ebuild  | 2 +-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.3..ebuild   | 2 +-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5..ebuild | 2 +-
 67 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/dev-qt/linguist-tools/linguist-tools-5.3.1.ebuild 
b/dev-qt/linguist-tools/linguist-tools-5.3.1.ebuild
index 129d5c9..edf57ca 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.3.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.3.1.ebuild
@@ -8,7 +8,7 @@ QT5_MODULE="qttools"
 
 inherit qt5-build
 
-DESCRIPTION="Extra tools for working with Qt translation data files"
+DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORD

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtpaths/, dev-qt/pixeltool/, dev-qt/qdbusviewer/, ...

2014-06-12 Thread Michael Palimaka
commit: 3ddd7b65863515c802cf56ad87c61be2dcdd6ecb
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jun 12 17:02:53 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jun 12 17:02:53 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3ddd7b65

[dev-qt] Fully propagate ~x86 KEYWORD from 
d541fd9246661f7fe146357b975b0de288d2dddc.

---
 dev-qt/assistant/assistant-5.3..ebuild   | 2 +-
 dev-qt/assistant/assistant-5..ebuild | 2 +-
 dev-qt/designer/designer-5.3..ebuild | 2 +-
 dev-qt/designer/designer-5..ebuild   | 2 +-
 dev-qt/linguist-tools/linguist-tools-5.3..ebuild | 2 +-
 dev-qt/linguist-tools/linguist-tools-5..ebuild   | 2 +-
 dev-qt/linguist/linguist-5.3..ebuild | 2 +-
 dev-qt/linguist/linguist-5..ebuild   | 2 +-
 dev-qt/pixeltool/pixeltool-5.3..ebuild   | 2 +-
 dev-qt/pixeltool/pixeltool-5..ebuild | 2 +-
 dev-qt/qdbus/qdbus-5.3..ebuild   | 2 +-
 dev-qt/qdbus/qdbus-5..ebuild | 2 +-
 dev-qt/qdbusviewer/qdbusviewer-5.3..ebuild   | 2 +-
 dev-qt/qdbusviewer/qdbusviewer-5..ebuild | 2 +-
 dev-qt/qt3d/qt3d-5..ebuild   | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.3..ebuild | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5..ebuild   | 2 +-
 dev-qt/qtcore/qtcore-5.3..ebuild | 2 +-
 dev-qt/qtcore/qtcore-5..ebuild   | 2 +-
 dev-qt/qtdbus/qtdbus-5.3..ebuild | 2 +-
 dev-qt/qtdbus/qtdbus-5..ebuild   | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.3..ebuild   | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 2 +-
 dev-qt/qtdiag/qtdiag-5.3..ebuild | 2 +-
 dev-qt/qtdiag/qtdiag-5..ebuild   | 2 +-
 dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.3..ebuild | 2 +-
 dev-qt/qtgraphicaleffects/qtgraphicaleffects-5..ebuild   | 2 +-
 dev-qt/qtgui/qtgui-5.3..ebuild   | 2 +-
 dev-qt/qtgui/qtgui-5..ebuild | 2 +-
 dev-qt/qthelp/qthelp-5.3..ebuild | 2 +-
 dev-qt/qthelp/qthelp-5..ebuild   | 2 +-
 dev-qt/qtlocation/qtlocation-5..ebuild   | 2 +-
 dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild | 2 +-
 dev-qt/qtmultimedia/qtmultimedia-5..ebuild   | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.3..ebuild   | 2 +-
 dev-qt/qtnetwork/qtnetwork-5..ebuild | 2 +-
 dev-qt/qtopengl/qtopengl-5.3..ebuild | 2 +-
 dev-qt/qtopengl/qtopengl-5..ebuild   | 2 +-
 dev-qt/qtpaths/qtpaths-5.3..ebuild   | 2 +-
 dev-qt/qtpaths/qtpaths-5..ebuild | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.3..ebuild | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5..ebuild   | 2 +-
 dev-qt/qtquick1/qtquick1-5.3..ebuild | 2 +-
 dev-qt/qtquick1/qtquick1-5..ebuild   | 2 +-
 dev-qt/qtquickcontrols/qtquickcontrols-5.3..ebuild   | 2 +-
 dev-qt/qtquickcontrols/qtquickcontrols-5..ebuild | 2 +-
 dev-qt/qtscript/qtscript-5.3..ebuild | 2 +-
 dev-qt/qtscript/qtscript-5..ebuild   | 2 +-
 dev-qt/qtserialport/qtserialport-5.3..ebuild | 2 +-
 dev-qt/qtserialport/qtserialport-5..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.3..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild | 2 +-
 dev-qt/qtsvg/qtsvg-5.3..ebuild   | 2 +-
 dev-qt/qtsvg/qtsvg-5..ebuild | 2 +-
 dev-qt/qttest/qttest-5.3..ebuild | 2 +-
 dev-qt/qttest/qttest-5..ebuild   | 2 +-
 dev-qt/qttranslations/qttranslations-5.3..ebuild | 2 +-
 dev-qt/qttranslations/qttranslations-5..ebuild   | 2 +-
 dev-qt/qtwayland/qtwayland-5.3..ebuild   | 2 +-
 dev-qt/qtwayland/qtwayland-5..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.3..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 2 +-
 dev-qt/qtwebsockets/qtwebsockets-5.3..ebuild | 2 +-
 dev-qt/qtwebsockets/qtwebsockets-5..ebuild   | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.3..ebuild   | 2 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild | 2 +-
 dev-qt/qtx11extras/qtx11extras-5.3..e

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtpaths/, dev-qt/pixeltool/, dev-qt/qdbusviewer/, ...

2014-05-23 Thread Michael Palimaka
commit: d541fd9246661f7fe146357b975b0de288d2dddc
Author: Jeff Horelick  gentoo  org>
AuthorDate: Fri May 23 15:52:42 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri May 23 15:52:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d541fd92

[dev-qt] Add ~x86 KEYWORD.

---
 dev-qt/assistant/assistant-5.3.0.ebuild   | 2 +-
 dev-qt/designer/designer-5.3.0.ebuild | 2 +-
 dev-qt/linguist-tools/linguist-tools-5.3.0.ebuild | 2 +-
 dev-qt/linguist/linguist-5.3.0.ebuild | 2 +-
 dev-qt/pixeltool/pixeltool-5.3.0.ebuild   | 2 +-
 dev-qt/qdbus/qdbus-5.3.0.ebuild   | 2 +-
 dev-qt/qdbusviewer/qdbusviewer-5.3.0.ebuild   | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.3.0.ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.3.0.ebuild | 2 +-
 dev-qt/qtdbus/qtdbus-5.3.0.ebuild | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.3.0.ebuild   | 2 +-
 dev-qt/qtdiag/qtdiag-5.3.0.ebuild | 2 +-
 dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.3.0.ebuild | 2 +-
 dev-qt/qtgui/qtgui-5.3.0.ebuild   | 2 +-
 dev-qt/qthelp/qthelp-5.3.0.ebuild | 2 +-
 dev-qt/qtmultimedia/qtmultimedia-5.3.0.ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.3.0.ebuild   | 2 +-
 dev-qt/qtopengl/qtopengl-5.3.0.ebuild | 2 +-
 dev-qt/qtpaths/qtpaths-5.3.0.ebuild   | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.3.0.ebuild | 2 +-
 dev-qt/qtquick1/qtquick1-5.3.0.ebuild | 2 +-
 dev-qt/qtquickcontrols/qtquickcontrols-5.3.0.ebuild   | 2 +-
 dev-qt/qtscript/qtscript-5.3.0.ebuild | 2 +-
 dev-qt/qtserialport/qtserialport-5.3.0.ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.3.0.ebuild   | 2 +-
 dev-qt/qtsvg/qtsvg-5.3.0.ebuild   | 2 +-
 dev-qt/qttest/qttest-5.3.0.ebuild | 2 +-
 dev-qt/qttranslations/qttranslations-5.3.0.ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild | 2 +-
 dev-qt/qtwebsockets/qtwebsockets-5.3.0.ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.3.0.ebuild   | 2 +-
 dev-qt/qtx11extras/qtx11extras-5.3.0.ebuild   | 2 +-
 dev-qt/qtxml/qtxml-5.3.0.ebuild   | 2 +-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.3.0.ebuild   | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.3.0.ebuild 
b/dev-qt/assistant/assistant-5.3.0.ebuild
index ab4edd8..675b596 100644
--- a/dev-qt/assistant/assistant-5.3.0.ebuild
+++ b/dev-qt/assistant/assistant-5.3.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="The Qt toolkit is a comprehensive C++ 
application development frame
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=""
 else
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 IUSE="webkit"

diff --git a/dev-qt/designer/designer-5.3.0.ebuild 
b/dev-qt/designer/designer-5.3.0.ebuild
index 462f781..1d04c18 100644
--- a/dev-qt/designer/designer-5.3.0.ebuild
+++ b/dev-qt/designer/designer-5.3.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="The Qt toolkit is a comprehensive C++ 
application development frame
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=""
 else
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 IUSE="webkit"

diff --git a/dev-qt/linguist-tools/linguist-tools-5.3.0.ebuild 
b/dev-qt/linguist-tools/linguist-tools-5.3.0.ebuild
index 9dfdfae..fca91f2 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.3.0.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.3.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="The Qt toolkit is a comprehensive C++ 
application development frame
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=""
 else
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 IUSE="qml"

diff --git a/dev-qt/linguist/linguist-5.3.0.ebuild 
b/dev-qt/linguist/linguist-5.3.0.ebuild
index aaf6019..7fa288e 100644
--- a/dev-qt/linguist/linguist-5.3.0.ebuild
+++ b/dev-qt/linguist/linguist-5.3.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="The Qt toolkit is a comprehensive C++ 
application development frame
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=""
 else
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/pixeltool/pixeltool-5.3.0.ebuild 
b/dev-qt/pixeltool/pixeltool-5.3.0.ebuild
index 791a846..48f6391 100644
--- a/dev-qt/pixeltool/pixeltool-5.3.0.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.3.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="The Qt toolkit is a comprehensive C++ 
application development frame
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=""
 else
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qdbus/

[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtpaths/, dev-qt/pixeltool/, dev-qt/qdbusviewer/, ...

2014-05-22 Thread Michael Palimaka
commit: 30700a8efd223af62d512f00e3656e3e2cca5dfb
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu May 22 11:21:41 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu May 22 11:21:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=30700a8e

[dev-qt] Bump to 5.3.0 final.

Package-Manager: portage-2.2.8-r1

---
 dev-qt/assistant/Manifest   | 2 +-
 dev-qt/assistant/{assistant-5.3.0_rc.ebuild => assistant-5.3.0.ebuild}  | 0
 dev-qt/designer/Manifest| 2 +-
 dev-qt/designer/{designer-5.3.0_rc.ebuild => designer-5.3.0.ebuild} | 0
 dev-qt/linguist-tools/Manifest  | 2 +-
 .../{linguist-tools-5.3.0_rc.ebuild => linguist-tools-5.3.0.ebuild} | 0
 dev-qt/linguist/Manifest| 2 +-
 dev-qt/linguist/{linguist-5.3.0_rc.ebuild => linguist-5.3.0.ebuild} | 0
 dev-qt/pixeltool/Manifest   | 2 +-
 dev-qt/pixeltool/{pixeltool-5.3.0_rc.ebuild => pixeltool-5.3.0.ebuild}  | 0
 dev-qt/qdbus/Manifest   | 2 +-
 dev-qt/qdbus/{qdbus-5.3.0_rc.ebuild => qdbus-5.3.0.ebuild}  | 0
 dev-qt/qdbusviewer/Manifest | 2 +-
 .../{qdbusviewer-5.3.0_rc.ebuild => qdbusviewer-5.3.0.ebuild}   | 0
 dev-qt/qtconcurrent/Manifest| 2 +-
 .../{qtconcurrent-5.3.0_rc.ebuild => qtconcurrent-5.3.0.ebuild} | 0
 dev-qt/qtcore/Manifest  | 2 +-
 dev-qt/qtcore/{qtcore-5.3.0_rc.ebuild => qtcore-5.3.0.ebuild}   | 0
 dev-qt/qtdbus/Manifest  | 2 +-
 dev-qt/qtdbus/{qtdbus-5.3.0_rc.ebuild => qtdbus-5.3.0.ebuild}   | 0
 dev-qt/qtdeclarative/Manifest   | 2 +-
 .../{qtdeclarative-5.3.0_rc.ebuild => qtdeclarative-5.3.0.ebuild}   | 0
 dev-qt/qtdiag/Manifest  | 2 +-
 dev-qt/qtdiag/{qtdiag-5.3.0_rc.ebuild => qtdiag-5.3.0.ebuild}   | 0
 dev-qt/qtgraphicaleffects/Manifest  | 2 +-
 ...graphicaleffects-5.3.0_rc.ebuild => qtgraphicaleffects-5.3.0.ebuild} | 0
 dev-qt/qtgui/Manifest   | 2 +-
 dev-qt/qtgui/{qtgui-5.3.0_rc.ebuild => qtgui-5.3.0.ebuild}  | 0
 dev-qt/qthelp/Manifest  | 2 +-
 dev-qt/qthelp/{qthelp-5.3.0_rc.ebuild => qthelp-5.3.0.ebuild}   | 0
 dev-qt/qtmultimedia/Manifest| 2 +-
 .../{qtmultimedia-5.3.0_rc.ebuild => qtmultimedia-5.3.0.ebuild} | 0
 dev-qt/qtnetwork/Manifest   | 2 +-
 dev-qt/qtnetwork/{qtnetwork-5.3.0_rc.ebuild => qtnetwork-5.3.0.ebuild}  | 0
 dev-qt/qtopengl/Manifest| 2 +-
 dev-qt/qtopengl/{qtopengl-5.3.0_rc.ebuild => qtopengl-5.3.0.ebuild} | 0
 dev-qt/qtpaths/Manifest | 2 +-
 dev-qt/qtpaths/{qtpaths-5.3.0_rc.ebuild => qtpaths-5.3.0.ebuild}| 0
 dev-qt/qtprintsupport/Manifest  | 2 +-
 .../{qtprintsupport-5.3.0_rc.ebuild => qtprintsupport-5.3.0.ebuild} | 0
 dev-qt/qtquick1/Manifest| 2 +-
 dev-qt/qtquick1/{qtquick1-5.3.0_rc.ebuild => qtquick1-5.3.0.ebuild} | 0
 dev-qt/qtquickcontrols/Manifest | 2 +-
 .../{qtquickcontrols-5.3.0_rc.ebuild => qtquickcontrols-5.3.0.ebuild}   | 0
 dev-qt/qtscript/Manifest| 2 +-
 dev-qt/qtscript/{qtscript-5.3.0_rc.ebuild => qtscript-5.3.0.ebuild} | 0
 dev-qt/qtserialport/Manifest| 2 +-
 .../{qtserialport-5.3.0_rc.ebuild => qtserialport-5.3.0.ebuild} | 0
 dev-qt/qtsql/Manifest   | 2 +-
 dev-qt/qtsql/{qtsql-5.3.0_rc.ebuild => qtsql-5.3.0.ebuild}  | 0
 dev-qt/qtsvg/Manifest   | 2 +-
 dev-qt/qtsvg/{qtsvg-5.3.0_rc.ebuild => qtsvg-5.3.0.ebuild}  | 0
 dev-qt/qttest/Manifest  | 2 +-
 dev-qt/qttest/{qttest-5.3.0_rc.ebuild => qttest-5.3.0.ebuild}   | 0
 dev-qt/qttranslations/Manifest  | 2 +-
 .../{qttranslations-5.3.0_rc.ebuild => qttranslations-5.3.0.ebuild} | 0
 dev-qt/qtwebkit/Manifest| 2 +-
 dev-qt/qtwebkit/{qtwebkit-5.3.0_rc.ebuild => qtwebkit-5.3.0.ebuild} | 0
 dev-qt/qtwebsockets/Manifest   

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

2014-05-11 Thread Michael Palimaka
commit: 0470a2a298987bd1aace43fb94d68cff3a65109d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun May 11 19:09:30 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun May 11 19:09:30 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0470a2a2

[dev-qt/qtnetwork] Update dependencies.

Package-Manager: portage-2.2.8-r1

---
 dev-qt/qtnetwork/qtnetwork-5.3.0_rc.ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.3..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.3.0_rc.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.3.0_rc.ebuild
index b8fdee0..82c03c1 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3.0_rc.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3.0_rc.ebuild
@@ -23,7 +23,7 @@ DEPEND="
sys-libs/zlib
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
-   ssl? ( dev-libs/openssl:0 )
+   ssl? ( dev-libs/openssl:0[-bindist] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )

diff --git a/dev-qt/qtnetwork/qtnetwork-5.3..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
index b8fdee0..82c03c1 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.3..ebuild
@@ -23,7 +23,7 @@ DEPEND="
sys-libs/zlib
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
-   ssl? ( dev-libs/openssl:0 )
+   ssl? ( dev-libs/openssl:0[-bindist] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )

diff --git a/dev-qt/qtnetwork/qtnetwork-5..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5..ebuild
index b8fdee0..82c03c1 100644
--- a/dev-qt/qtnetwork/qtnetwork-5..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5..ebuild
@@ -23,7 +23,7 @@ DEPEND="
sys-libs/zlib
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
-   ssl? ( dev-libs/openssl:0 )
+   ssl? ( dev-libs/openssl:0[-bindist] )
 "
 RDEPEND="${DEPEND}
connman? ( net-misc/connman )



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qttest/, dev-qt/pixeltool/, dev-qt/qttranslations/, ...

2014-05-09 Thread Michael Palimaka
commit: fab9ca0ef937298e2f72a696f5c4eb821641e98f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri May  9 19:13:20 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri May  9 19:13:20 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fab9ca0e

[dev-qt] Bump to 5.3.0_rc

Package-Manager: portage-2.2.8-r1

---
 dev-qt/designer/Manifest| 2 +-
 .../designer/{designer-5.3.0_beta.ebuild => designer-5.3.0_rc.ebuild}   | 0
 dev-qt/linguist-tools/Manifest  | 2 +-
 ...{linguist-tools-5.3.0_beta.ebuild => linguist-tools-5.3.0_rc.ebuild} | 0
 dev-qt/linguist/Manifest| 2 +-
 .../linguist/{linguist-5.3.0_beta.ebuild => linguist-5.3.0_rc.ebuild}   | 0
 dev-qt/pixeltool/Manifest   | 2 +-
 .../{pixeltool-5.3.0_beta.ebuild => pixeltool-5.3.0_rc.ebuild}  | 0
 dev-qt/qdbus/Manifest   | 2 +-
 dev-qt/qdbus/{qdbus-5.3.0_beta.ebuild => qdbus-5.3.0_rc.ebuild} | 0
 dev-qt/qdbusviewer/Manifest | 2 +-
 .../{qdbusviewer-5.3.0_beta.ebuild => qdbusviewer-5.3.0_rc.ebuild}  | 0
 dev-qt/qtconcurrent/Manifest| 2 +-
 .../{qtconcurrent-5.3.0_beta.ebuild => qtconcurrent-5.3.0_rc.ebuild}| 0
 dev-qt/qtcore/Manifest  | 2 +-
 dev-qt/qtcore/{qtcore-5.3.0_beta.ebuild => qtcore-5.3.0_rc.ebuild}  | 0
 dev-qt/qtdbus/Manifest  | 2 +-
 dev-qt/qtdbus/{qtdbus-5.3.0_beta.ebuild => qtdbus-5.3.0_rc.ebuild}  | 0
 dev-qt/qtdeclarative/Manifest   | 2 +-
 .../{qtdeclarative-5.3.0_beta.ebuild => qtdeclarative-5.3.0_rc.ebuild}  | 0
 dev-qt/qtgraphicaleffects/Manifest  | 2 +-
 ...icaleffects-5.3.0_beta.ebuild => qtgraphicaleffects-5.3.0_rc.ebuild} | 0
 dev-qt/qtgui/Manifest   | 2 +-
 dev-qt/qtgui/{qtgui-5.3.0_beta.ebuild => qtgui-5.3.0_rc.ebuild} | 0
 dev-qt/qtmultimedia/Manifest| 2 +-
 .../{qtmultimedia-5.3.0_beta.ebuild => qtmultimedia-5.3.0_rc.ebuild}| 0
 dev-qt/qtnetwork/Manifest   | 2 +-
 .../{qtnetwork-5.3.0_beta.ebuild => qtnetwork-5.3.0_rc.ebuild}  | 0
 dev-qt/qtopengl/Manifest| 2 +-
 .../qtopengl/{qtopengl-5.3.0_beta.ebuild => qtopengl-5.3.0_rc.ebuild}   | 0
 dev-qt/qtprintsupport/Manifest  | 2 +-
 ...{qtprintsupport-5.3.0_beta.ebuild => qtprintsupport-5.3.0_rc.ebuild} | 0
 dev-qt/qtquick1/Manifest| 2 +-
 .../qtquick1/{qtquick1-5.3.0_beta.ebuild => qtquick1-5.3.0_rc.ebuild}   | 0
 dev-qt/qtquickcontrols/Manifest | 2 +-
 ...tquickcontrols-5.3.0_beta.ebuild => qtquickcontrols-5.3.0_rc.ebuild} | 0
 dev-qt/qtscript/Manifest| 2 +-
 .../qtscript/{qtscript-5.3.0_beta.ebuild => qtscript-5.3.0_rc.ebuild}   | 0
 dev-qt/qtserialport/Manifest| 2 +-
 .../{qtserialport-5.3.0_beta.ebuild => qtserialport-5.3.0_rc.ebuild}| 0
 dev-qt/qtsql/Manifest   | 2 +-
 dev-qt/qtsql/{qtsql-5.3.0_beta.ebuild => qtsql-5.3.0_rc.ebuild} | 0
 dev-qt/qtsvg/Manifest   | 2 +-
 dev-qt/qtsvg/{qtsvg-5.3.0_beta.ebuild => qtsvg-5.3.0_rc.ebuild} | 0
 dev-qt/qttest/Manifest  | 2 +-
 dev-qt/qttest/{qttest-5.3.0_beta.ebuild => qttest-5.3.0_rc.ebuild}  | 0
 dev-qt/qttranslations/Manifest  | 2 +-
 ...{qttranslations-5.3.0_beta.ebuild => qttranslations-5.3.0_rc.ebuild} | 0
 dev-qt/qtwebkit/Manifest| 2 +-
 .../qtwebkit/{qtwebkit-5.3.0_beta.ebuild => qtwebkit-5.3.0_rc.ebuild}   | 0
 dev-qt/qtwidgets/Manifest   | 2 +-
 .../{qtwidgets-5.3.0_beta.ebuild => qtwidgets-5.3.0_rc.ebuild}  | 0
 dev-qt/qtx11extras/Manifest | 2 +-
 .../{qtx11extras-5.3.0_beta.ebuild => qtx11extras-5.3.0_rc.ebuild}  | 0
 dev-qt/qtxml/Manifest   | 2 +-
 dev-qt/qtxml/{qtxml-5.3.0_beta.ebuild => qtxml-5.3.0_rc.ebuild} | 0
 dev-qt/qtxmlpatterns/Manifest   | 2 +-
 .../{qtxmlpatterns-5.3.0_beta.ebuild => qtxmlpatterns-5.3.0_rc.ebuild}  | 0
 58 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/d