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

[Sam James]

commit:     1230b1078432eb63bdc864823bcd6c3f77c1f2b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 18:09:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 18:10:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1230b107

dev-qt/qtnetwork: drop 5.15.2-r11

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qtnetwork/Manifest                    |  1 -
 dev-qt/qtnetwork/metadata.xml                |  1 -
 dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild | 74 ----------------------------
 3 files changed, 76 deletions(-)

diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 762e23e56ce9..a31b5db3c8c8 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,4 +1,3 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
 SHA512 
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 
3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54
 SHA512 
6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B 
a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c
 SHA512 
042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 
9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c
 SHA512 
01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079

diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 5e81d7dc838d..8a8481b49e8b 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -6,7 +6,6 @@
                <name>Gentoo Qt Project</name>
        </maintainer>
        <use>
-               <flag name="bindist">Disable EC support via 
<pkg>dev-libs/openssl</pkg></flag>
                <flag name="connman">Enable <pkg>net-misc/connman</pkg>-based 
bearer plugin</flag>
                <flag name="gssapi">Enable support for GSSAPI 
(<pkg>virtual/krb5</pkg>)</flag>
                <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for 
automatic

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
deleted file mode 100644
index babaf742b4c9..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-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 ~riscv ~sparc x86"
-fi
-
-IUSE="bindist connman gssapi libproxy networkmanager 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=[bindist(-)=] )
-"
-RDEPEND="${DEPEND}
-       connman? ( net-misc/connman )
-       networkmanager? ( net-misc/networkmanager )
-"
-
-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=(
-               $(usev connman -dbus-linked)
-               $(qt_use gssapi feature-gssapi)
-               $(qt_use libproxy)
-               $(usev networkmanager -dbus-linked)
-               $(qt_use sctp)
-               $(usev ssl -openssl-linked)
-       )
-       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
-}