Gentoo Archives: gentoo-commits

From: Stefan Strogin <steils@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
Date: Tue, 02 Jun 2020 02:14:42
Message-Id: 1591063692.da1e90a474c81ada492744556ca4a826a57d3af5.steils@gentoo
1 commit: da1e90a474c81ada492744556ca4a826a57d3af5
2 Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 2 02:08:12 2020 +0000
4 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 2 02:08:12 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=da1e90a4
7
8 dev-qt/qtnetwork: drop old 5.14.1
9
10 dev-qtnetwork-5.15.0 is fixed in gentoo.git, but not 5.14.2.
11 So drop just the old version, not the entire package yet, as some users
12 may want to use 5.14.2 on stable systems.
13
14 Package-Manager: Portage-2.3.100, Repoman-2.3.22
15 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
16
17 dev-qt/qtnetwork/Manifest | 1 -
18 dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild | 68 --------------------------------
19 2 files changed, 69 deletions(-)
20
21 diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
22 index 4905e98..f458c94 100644
23 --- a/dev-qt/qtnetwork/Manifest
24 +++ b/dev-qt/qtnetwork/Manifest
25 @@ -1,3 +1,2 @@
26 -DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
27 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
28 DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
29
30 diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild
31 deleted file mode 100644
32 index 31d151f..0000000
33 --- a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild
34 +++ /dev/null
35 @@ -1,68 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -QT5_MODULE="qtbase"
41 -inherit qt5-build
42 -
43 -DESCRIPTION="Network abstraction library for the Qt5 framework"
44 -
45 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
46 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
47 -fi
48 -
49 -IUSE="bindist connman libproxy libressl networkmanager sctp +ssl"
50 -
51 -DEPEND="
52 - ~dev-qt/qtcore-${PV}
53 - sys-libs/zlib:=
54 - connman? ( ~dev-qt/qtdbus-${PV} )
55 - libproxy? ( net-libs/libproxy )
56 - networkmanager? ( ~dev-qt/qtdbus-${PV} )
57 - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
58 - ssl? (
59 - !libressl? ( dev-libs/openssl:0=[bindist=] )
60 - libressl? ( dev-libs/libressl:0= )
61 - )
62 -"
63 -RDEPEND="${DEPEND}
64 - connman? ( net-misc/connman )
65 - networkmanager? ( net-misc/networkmanager )
66 -"
67 -
68 -PATCHES=(
69 - "${FILESDIR}"/${PN}-5.12.1-libressl.patch
70 - "${FILESDIR}"/${PN}-5.12.4-libressl.patch
71 -)
72 -
73 -QT5_TARGET_SUBDIRS=(
74 - src/network
75 - src/plugins/bearer/generic
76 -)
77 -
78 -QT5_GENTOO_CONFIG=(
79 - libproxy:libproxy:
80 - ssl::SSL
81 - ssl::OPENSSL
82 - ssl:openssl-linked:LINKED_OPENSSL
83 -)
84 -
85 -QT5_GENTOO_PRIVATE_CONFIG=(
86 - :network
87 -)
88 -
89 -pkg_setup() {
90 - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
91 - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
92 -}
93 -
94 -src_configure() {
95 - local myconf=(
96 - $(usex connman -dbus-linked '')
97 - $(qt_use libproxy)
98 - $(usex networkmanager -dbus-linked '')
99 - $(qt_use sctp)
100 - $(usex ssl -openssl-linked '')
101 - )
102 - qt5-build_src_configure
103 -}