dev-qt/qtnetwork-5.12.4: Add 5.12.4

.travis.yml

@@ -11,6 +11,7 @@ notifications:
 env:
     global:
         - PORTAGE_VER="2.3.52"
+        - PORTAGE_PROFILE="default/linux/amd64/17.0"
 before_install:
     - sudo apt-get -qq update
     - pip install lxml pyyaml
@@ -27,7 +28,7 @@ before_script:
     - echo "portage::250:portage,travis" >> /etc/group
     - wget "https://www.gentoo.org/dtd/metadata.dtd" -O /usr/portage/distfiles/metadata.dtd
     - ln -s portage-portage-${PORTAGE_VER}/cnf/repos.conf /etc/portage/repos.conf
-    - ln -s /usr/portage/profiles/default/linux/amd64/13.0 /etc/portage/make.profile
+    - ln -s /usr/portage/profiles/${PORTAGE_PROFILE} /etc/portage/make.profile
     - cd travis-overlay
 script:
     - ./../spinner.sh "python ../portage-portage-${PORTAGE_VER}/repoman/bin/repoman full -i -d"

dev-qt/qtnetwork/Manifest

@@ -1,2 +1,2 @@
-DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
+DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946

dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch

@@ -0,0 +1,14 @@
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
+index c8bc6e06..76324ea5 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
++++ b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -460,7 +460,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+             q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+     }
+ #endif
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+

dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild → dev-qt/qtnetwork/qtnetwork-5.12.4.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
@@ -11,14 +11,15 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
-IUSE="bindist connman libproxy libressl networkmanager +ssl"
+IUSE="bindist connman libproxy libressl networkmanager sctp +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} )
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0=[bindist=] )
 		libressl? ( dev-libs/libressl:0= )
@@ -29,13 +30,18 @@ RDEPEND="${DEPEND}
 	networkmanager? ( net-misc/networkmanager )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.12.1-libressl.patch
+	"${FILESDIR}"/${PN}-5.12.4-libressl.patch
+)
+
 QT5_TARGET_SUBDIRS=(
 	src/network
 	src/plugins/bearer/generic
 )
 
 QT5_GENTOO_CONFIG=(
-	libproxy
+	libproxy:libproxy:
 	ssl::SSL
 	ssl::OPENSSL
 	ssl:openssl-linked:LINKED_OPENSSL
@@ -50,20 +56,12 @@ pkg_setup() {
 	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
 }
 
-src_prepare() {
-	has_version '>=dev-libs/libressl-2.8.0' && \
-		eapply "${FILESDIR}/${P}-libressl-2.8.patch"
-
-	has_version '<dev-libs/libressl-2.8.0' && \
-		eapply "${FILESDIR}/${P}-libressl-2.6.patch"
-
-	qt5-build_src_prepare
-}
-
 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