commit: c9dc8c9a1b796c48261e7a65ec5e7294a13020c8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 6 08:12:13 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 6 08:23:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9dc8c9a
net-p2p/ktorrent: Drop 5.2.0-r1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-p2p/ktorrent/Manifest | 1 -
.../ktorrent-5.2.0-fix-start-in-systray.patch | 24 --
.../files/ktorrent-5.2.0-taglib-linking.patch | 247 ---------------------
net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild | 111 ---------
4 files changed, 383 deletions(-)
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 36b942632ae..a1b8fb594dd 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,2 +1 @@
DIST ktorrent-20.12.3.tar.xz 2141556 BLAKE2B
8c1bfd675597a724ae6143bddb88005da0ec852a93ef3cc843605b4a3a47d80acba23df2a2cc13ff49efa9e4576269f3157e8456c80388b7e309527befbf0297
SHA512
fb54341368b3260ceefdb9be8bbc62c74397ada1a824a96f9de316caa365be438adc96ed15ee0bc44b7cc0db8eb1082c9ffb49eacb9448c31e8fbfe6e6314e93
-DIST ktorrent-5.2.0.tar.xz 2056012 BLAKE2B
c59cb34675b9c4e023b6c22f795bf146d64acaea069efa1f1663888a0ada6f7c8328a15bdc2fc453e31a9f451c6b0203dfdfd02098cc52f5d828b87c23d857b5
SHA512
141976612cfe6bf4bd06e96842d7bc51ced7a3ab8e13c25446a00c031054698f851fbb1a31f3425dda5a428408bb1ceb51a4a420eaf2e79193b17a0cc7d7a387
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 50049afae35..00000000000
--- 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.schei...@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 1d02dcbfd9c..00000000000
--- 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 <fa...@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, <mon...@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 <mon...@kde.org>
-+# SPDX-FileCopyrightText: 2019 Heiko Becker <heire...@exherbo.org>
-+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelac...@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-5.2.0-r1.ebuild
b/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
deleted file mode 100644
index 45aada634c7..00000000000
--- a/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 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
-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"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer
+magnetgenerator
-+mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=net-libs/libktorrent-2.2.0:5
- infowidget? ( dev-libs/geoip )
- kross? (
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kross-${KFMIN}:5
- )
- mediaplayer? (
- media-libs/phonon[qt5(+)]
- >=media-libs/taglib-1.5
- )
- rss? (
- >=dev-qt/qtwebengine-${QTMIN}:5
- >=kde-frameworks/syndication-${KFMIN}:5
- )
- shutdown? ( kde-plasma/libkworkspace:5 )
- stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 )
- upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 )
- webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
- zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
- ipfilter? (
- app-arch/bzip2
- app-arch/unzip
- kde-apps/kio-extras:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- )
-"
-
-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)
- -DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
- -DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
- -DWITH_SYSTEM_GEOIP=$(usex infowidget)
- -DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
- -DENABLE_SCRIPTING_PLUGIN=$(usex kross)
- -DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
- -DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
- -DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
- $(cmake_use_find_package rss KF5Syndication)
- -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
- -DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
- -DENABLE_STATS_PLUGIN=$(usex stats)
- -DENABLE_UPNP_PLUGIN=$(usex upnp)
- -DENABLE_SEARCH_PLUGIN=$(usex webengine)
- -DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
- )
-# add back when ported
-# -DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
- ecm_src_configure
-}
