commit: dae24feb79e12d8279f940ed5131077bbd0c05f5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 16 12:49:50 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 16 12:49:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae24feb
kde-frameworks/kio: Drop 5.54.0 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-frameworks/kio/Manifest | 1 - .../kio/files/kio-5.54.0-elapsedtime.patch | 38 ---------- kde-frameworks/kio/kio-5.54.0.ebuild | 83 ---------------------- 3 files changed, 122 deletions(-) diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index e372e00cd8c..2e609215b01 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,3 +1,2 @@ DIST kio-5.52.0.tar.xz 3159632 BLAKE2B 4be5993157b6ee08be4cb2f40b5669353079fe2174e6204fbe2e375cfa71fb6121b4a2ca0783f3e4f45205cd3ae4bde36823e9543005a1124ac43fe7ecb189bc SHA512 b5a91c9eedc91eb933f16874163b2882986975c67ef329497b2ae936926292241d05f4dae022054d5db673e195e80159ad1cb70a26a5c23a192223bbe6b28c36 -DIST kio-5.54.0.tar.xz 3150624 BLAKE2B 0dbca930cfd82e079f5f7d138d9342f701a23d9f7de99847e2371cd9c137b198c55f6dc61c8b9f78e30b7ecfaee3ff3ed52c88d01e4369434045cc0e02979476 SHA512 163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d DIST kio-5.54.1.tar.xz 3150348 BLAKE2B c72f2e798f50605ac18778204615181013bfba8f33960f5cb78991a8df0e3b1484e6d7b94c74cea088318f7ace00950222ef70e5c854c35b60475f18c7d6d9b7 SHA512 750508355265f1ec68049a36c6b6fba0afcd55f2d787a6fb199d6b0fd933da6db420218fa8504a66fbe90cbf29be78c5a3d22d1771eb5aaa284d0c9120ebb059 diff --git a/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch b/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch deleted file mode 100644 index d18347fb63d..00000000000 --- a/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cd2f67c39b25de026390bfe2bc1c7aa269f78ccb Mon Sep 17 00:00:00 2001 -From: David Edmundson <[email protected]> -Date: Thu, 10 Jan 2019 16:03:06 +0000 -Subject: Fix elapsed time check - -Summary: -To match the code it was refactored from it should be checking the code -since the last time we checked calcSpeed, not since the job started. - -CCBUG: 402665 - -Subscribers: kde-frameworks-devel - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D18158 ---- - src/core/slaveinterface.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/core/slaveinterface.cpp b/src/core/slaveinterface.cpp -index 6eb2b08..d79b498 100644 ---- a/src/core/slaveinterface.cpp -+++ b/src/core/slaveinterface.cpp -@@ -103,7 +103,9 @@ void SlaveInterface::calcSpeed() - // using first and last item from the list. - - const qint64 elapsed_time = d->elapsed_timer.elapsed(); -- if (elapsed_time >= 900) { -+ const qint64 last_time = d->transfer_details.isEmpty() ? 0 : d->transfer_details.last().time; -+ -+ if (elapsed_time - last_time >= 900) { - if (d->transfer_details.count() == max_count) { - d->transfer_details.removeFirst(); - } --- -cgit v1.1 - diff --git a/kde-frameworks/kio/kio-5.54.0.ebuild b/kde-frameworks/kio/kio-5.54.0.ebuild deleted file mode 100644 index 3256957d5aa..00000000000 --- a/kde-frameworks/kio/kio-5.54.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Framework providing transparent file and data management" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="acl +handbook kerberos +kwallet X" - -# drop qtnetwork subslot operator when QT_MINIMAL >= 5.12.0 -RDEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork 'ssl' '' '5=') - $(add_qt_dep qtscript) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/libxml2 - dev-libs/libxslt - acl? ( - sys-apps/attr - virtual/acl - ) - handbook? ( $(add_frameworks_dep kdoctools) ) - kerberos? ( virtual/krb5 ) - kwallet? ( $(add_frameworks_dep kwallet) ) - X? ( $(add_qt_dep qtx11extras) ) -" -DEPEND="${RDEPEND} - $(add_qt_dep qtconcurrent) - test? ( sys-libs/zlib ) - X? ( - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - ) -" -PDEPEND=" - $(add_frameworks_dep kded) -" - -# tests hang -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${P}-elapsedtime.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package acl ACL) - $(cmake-utils_use_find_package handbook KF5DocTools) - $(cmake-utils_use_find_package kerberos GSSAPI) - $(cmake-utils_use_find_package kwallet KF5Wallet) - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -}
