gentoo resync : 28.04.2021

5 files changed, 12 insertions, 294 deletions

diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 7ea50c626730..9374b6b2ca27 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,7 +1,5 @@
-AUX ktorrent-5.2.0-fix-start-in-systray.patch 769 BLAKE2B c9832a15f75bd5495fb59e2521bb82e0bb0fe530d3132ea52147c8dc531162f96e165011fd7f61fc046a4d5dc7e52ca1a9be74a0790b0b2b62ca968bd8c9d45d SHA512 67b9ce967fc295ece3607f909f80cf1362fdd88d7172c9ec556275fab2019d016440b9f605a49e50eb0fd82f7c7c0bc3b78195204215630aba0d848df6d4ba15
-AUX ktorrent-5.2.0-taglib-linking.patch 8105 BLAKE2B 232c167489c139973b1c57cd2330c4f27c5878843593ecfd3c5020384f5bf891c06ac21c0a5644d0881cf846ed712441e7501f560a711b8d4e72481599cb40d6 SHA512 4dc3d63e07c8f8c56019ab95230dadf3e9fbe37eb7d7f9ed31e58ebca9219b47e6bec78049e36ce1b783620b82b386e71ca9fc1d6bb797e56ac521daa5f0d996
 DIST ktorrent-20.12.3.tar.xz 2141556 BLAKE2B 8c1bfd675597a724ae6143bddb88005da0ec852a93ef3cc843605b4a3a47d80acba23df2a2cc13ff49efa9e4576269f3157e8456c80388b7e309527befbf0297 SHA512 fb54341368b3260ceefdb9be8bbc62c74397ada1a824a96f9de316caa365be438adc96ed15ee0bc44b7cc0db8eb1082c9ffb49eacb9448c31e8fbfe6e6314e93
-DIST ktorrent-5.2.0.tar.xz 2056012 BLAKE2B c59cb34675b9c4e023b6c22f795bf146d64acaea069efa1f1663888a0ada6f7c8328a15bdc2fc453e31a9f451c6b0203dfdfd02098cc52f5d828b87c23d857b5 SHA512 141976612cfe6bf4bd06e96842d7bc51ced7a3ab8e13c25446a00c031054698f851fbb1a31f3425dda5a428408bb1ceb51a4a420eaf2e79193b17a0cc7d7a387
-EBUILD ktorrent-20.12.3.ebuild 3093 BLAKE2B 752919b5db5de0eebe4f6a17f6c1112ef4dc375dd46b1a3c368a0b1b11697c18fbb366fa75ba2cb36e87230d88f577985b13b26dc3e71316769412c3d86d7e74 SHA512 00dc54f1c77c84c6a604dcd0b4419f4769d68a13effcf1677a510d52a9dd8d9f1f29a86506fd778539e6daecb8b9b896e4f4e06cbc33e39fff8b5ee65f79c6bc
-EBUILD ktorrent-5.2.0-r1.ebuild 3323 BLAKE2B 5ad47003adf805cc00c62ba4e64ef92ff5e8f65dddd7024478500d5805725ca5c73688c9990662cdccc2512899efd46e4f3f74bb32c6d75317c0ce32cffd4652 SHA512 ecaed570927d6181dd2cfa41a5c0dacafc65252f72e628b64b99a31cd2a0a179e3adcabab3c42b538ed014e5be45801d949edb86188dbfd80354983cde144457
+DIST ktorrent-21.04.0.tar.xz 2071924 BLAKE2B 75b49c604b79ff6afd305355945136050ab0acfc684ab9067031b499d4111356ae9340f481d2ac3ad22469e12b6e535eec50e115baa37e2cf96784a311941c0a SHA512 6b5c16329438f4ced5a91e23957c5e1beb106b4c91e48a1ad6abf87b9657fc604f5e016a534e67e2b63bf431fd522096caf8fb5d5d8d343b73d5a6cc7186e313
+EBUILD ktorrent-20.12.3.ebuild 3090 BLAKE2B 9c5ca5e2b8a21ea60cf99a43555a746e74ca70e17dd60337d3b064b7b31d5533912f2db3e414f3a2af2731fc900a7f610b10f0809846d0ebece8522aaf770580 SHA512 6160d8afa98ccf87fc51b2619ec902d7f9b3c0d63795c52dda6c1b395184c40c10512680435798172471a195cb01b9ed5defcd592cb146de8dffa86b4af76fa8
+EBUILD ktorrent-21.04.0.ebuild 3082 BLAKE2B 89d15fcb46bc1b14531bb1a09bd4c9acf889bfa06219906b899a6d0cb4329ba75217882b0d450b4f43b23108f2f3f89358d7bb1057c28d4e652c824a0474be4e SHA512 524de4f06e039bd7476fd8465cdea4c7635a7a4bb904b218b4ef3a4f9d9cc70ee2c6ae1d0b6e28b46e4f2e5fec687f5e7b54a66349a6d38c18eb5f80bbf2832e
 MISC metadata.xml 1389 BLAKE2B b928cdf2526433fcf48c5600049b27c9f7c12aa043a332931b5a567d1baff9fa0bb0ac6e4e8de056947637d1253ee338a8b6620e52b294b20cdd7127a3b1c81d SHA512 4cf5204afc5a9f451752efcf1bae64a947c3bbb0d259641a85771071a7c390ee50818518a15c38f47f7778cdb3ff10732428dfff3c99a09049ca8c2486736991
diff --git a/net-p2p/ktorrent/files/ktorrent-5.2.0-fix-start-in-systray.patch b/net-p2p/ktorrent/files/ktorrent-5.2.0-fix-start-in-systray.patch
deleted file mode 100644
index 50049afae35f..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.2.0-fix-start-in-systray.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9747a8f524942b57e2fd42254c3de73f9d42918c Mon Sep 17 00:00:00 2001
-From: Matt Scheirer <matt.scheirer@gmail.com>
-Date: Sun, 17 May 2020 02:36:09 -0400
-Subject: [PATCH] Fix starting in tray by removing redundant show() in main
-
----
- ktorrent/main.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/ktorrent/main.cpp b/ktorrent/main.cpp
-index b5866c22..8e532c9c 100644
---- a/ktorrent/main.cpp
-+++ b/ktorrent/main.cpp
-@@ -208,7 +208,6 @@ int main(int argc, char** argv)
-         bt::InitLog(kt::DataDir(kt::CreateIfNotExists) + QLatin1String("log"), true, true, logToStdout);
- 
-         kt::GUI widget;
--        widget.show();
- 
-         auto handleCmdLine = [&widget, &parser](const QStringList &arguments, const QString &workingDirectory)
-         {
--- 
-GitLab
-
diff --git a/net-p2p/ktorrent/files/ktorrent-5.2.0-taglib-linking.patch b/net-p2p/ktorrent/files/ktorrent-5.2.0-taglib-linking.patch
deleted file mode 100644
index 1d02dcbfd9c4..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.2.0-taglib-linking.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From f4c1c91d9b091941ebb4dae6aef95bcf9bc1c388 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 21 Jun 2020 14:19:49 +0200
-Subject: [PATCH] Update FindTaglib from ECM.
-
-This fixes linking for me, there was just nothing in TAGLIB_LIBRARIES
-on my system (taglib in the same custom prefix as KDE code)
----
- cmake/modules/FindTaglib.cmake     | 191 +++++++++++------------------
- plugins/mediaplayer/CMakeLists.txt |   3 +-
- 2 files changed, 74 insertions(+), 120 deletions(-)
-
-diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
-index 13db60b2..1e1b9075 100644
---- a/cmake/modules/FindTaglib.cmake
-+++ b/cmake/modules/FindTaglib.cmake
-@@ -1,135 +1,90 @@
--# - Try to find the Taglib library
--# Once done this will define
-+#.rst:
-+# FindTaglib
-+#-----------
- #
--#  TAGLIB_FOUND - system has the taglib library
--#  TAGLIB_CFLAGS - the taglib cflags
--#  TAGLIB_LIBRARIES - The libraries needed to use taglib
--
--# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-+# Try to find the Taglib library.
- #
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--if(NOT TAGLIB_MIN_VERSION)
--  set(TAGLIB_MIN_VERSION "1.6")
--endif()
--
--if(NOT WIN32)
--    find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
--       ${BIN_INSTALL_DIR}
--    )
--endif()
--
--#reset vars
--set(TAGLIB_LIBRARIES)
--set(TAGLIB_CFLAGS)
--
--# if taglib-config has been found
--if(TAGLIBCONFIG_EXECUTABLE)
--
--  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
--
--  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
--     message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
--     set(TAGLIB_FOUND FALSE)
--  else()
--
--     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
--
--     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
-+# This will define the following variables:
-+#
-+# ``Taglib_FOUND``
-+#       True if the system has the taglib library of at least the minimum
-+#       version specified by the version parameter to find_package()
-+# ``Taglib_INCLUDE_DIRS``
-+#       The taglib include dirs for use with target_include_directories
-+# ``Taglib_LIBRARIES``
-+#       The taglib libraries for use with target_link_libraries()
-+# ``Taglib_VERSION``
-+#       The version of taglib that was found
-+#
-+# If ``Taglib_FOUND is TRUE, it will also define the following imported
-+# target:
-+#
-+# ``Taglib::Taglib``
-+#       The Taglib library
-+#
-+# Since 5.72.0
-+#
-+# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
-+# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
-+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
-+# SPDX-License-Identifier: BSD-3-Clause
- 
--     if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
--        set(TAGLIB_FOUND TRUE)
--     endif()
--     string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--  endif() 
--  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
-+find_package(PkgConfig QUIET)
- 
--else()
-+pkg_search_module(PC_TAGLIB QUIET taglib)
- 
--  find_path(TAGLIB_INCLUDES
--    NAMES
--    tag.h
-+find_path(Taglib_INCLUDE_DIRS
-+    NAMES tag.h
-     PATH_SUFFIXES taglib
--    PATHS
--    ${KDE4_INCLUDE_DIR}
--    ${INCLUDE_INSTALL_DIR}
--  )
--
--    if(NOT WIN32)
--      # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
-+    HINTS ${PC_TAGLIB_INCLUDEDIR}
-+)
- 
--      find_library(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-+find_library(Taglib_LIBRARIES
-+    NAMES tag
-+    HINTS ${PC_TAGLIB_LIBDIR}
-+)
- 
--    else()
-+set(Taglib_VERSION ${PC_TAGLIB_VERSION})
- 
--      # 1. get all possible libnames
--      set(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})             
--      set(newargs "")               
--      set(libnames_release "")      
--      set(libnames_debug "")        
-+if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
-+    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
-+        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
- 
--      list(LENGTH args listCount)
-+        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
- 
--        # just one name
--        list(APPEND libnames_release "tag")
--        list(APPEND libnames_debug   "tagd")
--
--        set(newargs ${args})
--
--      # search the release lib
--      find_library(TAGLIB_LIBRARIES_RELEASE
--                   NAMES ${libnames_release}
--                   ${newargs}
--      )
--
--      # search the debug lib
--      find_library(TAGLIB_LIBRARIES_DEBUG
--                   NAMES ${libnames_debug}
--                   ${newargs}
--      )
--
--      if(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
--
--        # both libs found
--        set(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE}
--                        debug     ${TAGLIB_LIBRARIES_DEBUG})
--
--      else()
--
--        if(TAGLIB_LIBRARIES_RELEASE)
--
--          # only release found
--          set(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE})
--
--        else()
--
--          # only debug (or nothing) found
--          set(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG})
--
--        endif()
--
--      endif()
--
--      mark_as_advanced(TAGLIB_LIBRARIES_RELEASE)
--      mark_as_advanced(TAGLIB_LIBRARIES_DEBUG)
-+        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
- 
-+        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
-     endif()
--  
--  include(FindPackageMessage)
--  include(FindPackageHandleStandardArgs)
--  find_package_handle_standard_args(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES)
--
- endif()
- 
--
--if(TAGLIB_FOUND)
--  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
--    message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}")
--  endif()
--else()
--  if(Taglib_FIND_REQUIRED)
--    message(FATAL_ERROR "Could not find Taglib")
--  endif()
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Taglib
-+    FOUND_VAR
-+        Taglib_FOUND
-+    REQUIRED_VARS
-+        Taglib_LIBRARIES
-+        Taglib_INCLUDE_DIRS
-+    VERSION_VAR
-+        Taglib_VERSION
-+)
-+
-+if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
-+    add_library(Taglib::Taglib UNKNOWN IMPORTED)
-+    set_target_properties(Taglib::Taglib PROPERTIES
-+        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
-+    )
- endif()
- 
-+mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
-+
-+include(FeatureSummary)
-+set_package_properties(Taglib PROPERTIES
-+    URL "https://taglib.org/"
-+    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
-+)
-diff --git a/plugins/mediaplayer/CMakeLists.txt b/plugins/mediaplayer/CMakeLists.txt
-index 8bbeeb74..5fbe056f 100644
---- a/plugins/mediaplayer/CMakeLists.txt
-+++ b/plugins/mediaplayer/CMakeLists.txt
-@@ -1,5 +1,4 @@
- find_package(Taglib REQUIRED)
--include_directories(${TAGLIB_INCLUDES})
- #find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Multimedia MultimediaWidgets)
- #include_directories(${Qt5Multimedia_INCLUDE_DIRS})
- include_directories(${PHONON_INCLUDES})
-@@ -34,7 +33,7 @@ kcoreaddons_desktop_to_json(ktorrent_mediaplayer ktorrent_mediaplayer.desktop)
- target_link_libraries(
-     ktorrent_mediaplayer
-     ktcore
--    ${TAGLIB_LIBRARIES}
-+    Taglib::Taglib
-     Phonon::phonon4qt5
-     KF5::Torrent
-     KF5::I18n
--- 
-GitLab
-
diff --git a/net-p2p/ktorrent/ktorrent-20.12.3.ebuild b/net-p2p/ktorrent/ktorrent-20.12.3.ebuild
index 1b1646510219..b6e2cfedd649 100644
--- a/net-p2p/ktorrent/ktorrent-20.12.3.ebuild
+++ b/net-p2p/ktorrent/ktorrent-20.12.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://apps.kde.org/en/ktorrent"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
 
diff --git a/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild b/net-p2p/ktorrent/ktorrent-21.04.0.ebuild
index 45aada634c71..59bf5cd82ab1 100644
--- a/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-21.04.0.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="optional"
-KFMIN=5.64.0
-QTMIN=5.12.3
+KDE_GEAR="true"
+KFMIN=5.80.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
 HOMEPAGE="https://apps.kde.org/en/ktorrent"
-[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
 
@@ -43,7 +44,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=net-libs/libktorrent-2.2.0:5
+	>=net-libs/libktorrent-${PVCUT}:5
 	infowidget? ( dev-libs/geoip )
 	kross? (
 		>=kde-frameworks/karchive-${KFMIN}:5
@@ -51,7 +52,7 @@ COMMON_DEPEND="
 		>=kde-frameworks/kross-${KFMIN}:5
 	)
 	mediaplayer? (
-		media-libs/phonon[qt5(+)]
+		>=media-libs/phonon-4.11.0
 		>=media-libs/taglib-1.5
 	)
 	rss? (
@@ -76,16 +77,6 @@ RDEPEND="${COMMON_DEPEND}
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-start-in-systray.patch" # 5.2 branch
-	"${FILESDIR}/${P}-taglib-linking.patch" # 5.2 branch
-)
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep Qt Script
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)