From 7428c443ed1374abebdf70e1bebe482a11b4bf1f Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Thu, 21 May 2020 09:02:14 -0500 Subject: dev-qt/qtnetwork: sync stable keywords with ::gentoo Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Jory Pratt --- dev-qt/qtnetwork/Manifest | 1 - dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild | 68 -------------------------------- dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild | 4 +- 3 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 62cc41e..8401e88 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1 @@ -DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild deleted file mode 100644 index 81014a1..0000000 --- a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="bindist connman libproxy libressl networkmanager sctp +ssl" - -DEPEND=" - ~dev-qt/qtcore-${PV} - 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= ) - ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - 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: - ssl::SSL - ssl::OPENSSL - 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) -} - -src_configure() { - local myconf=( - $(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.14.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild index 1d3f86b..5aeed06 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild @@ -8,7 +8,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 ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86" fi IUSE="bindist connman gssapi libproxy libressl networkmanager sctp +ssl" @@ -17,7 +17,7 @@ DEPEND=" ~dev-qt/qtcore-${PV}:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-${PV} ) - gssapi? ( virtual/krb5 ) + gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-${PV} ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) -- cgit v1.2.3-65-gdbad