From c748acf4192a1e08c9feb2d5f0004937a4869639 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Sep 2023 04:59:22 +0100 Subject: gentoo auto-resync : 16:09:2023 - 04:59:22 --- net-p2p/Manifest.gz | Bin 6744 -> 6743 bytes net-p2p/ktorrent/Manifest | 5 +- .../ktorrent/files/ktorrent-23.08.1-cmake.patch | 50 +++++++++++ net-p2p/ktorrent/ktorrent-23.08.0.ebuild | 93 -------------------- net-p2p/ktorrent/ktorrent-23.08.1.ebuild | 97 +++++++++++++++++++++ 5 files changed, 150 insertions(+), 95 deletions(-) create mode 100644 net-p2p/ktorrent/files/ktorrent-23.08.1-cmake.patch delete mode 100644 net-p2p/ktorrent/ktorrent-23.08.0.ebuild create mode 100644 net-p2p/ktorrent/ktorrent-23.08.1.ebuild (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index 724938eaf914..eafbfe11f7aa 100644 Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index af9a0196f54a..54166a060292 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,5 +1,6 @@ +AUX ktorrent-23.08.1-cmake.patch 1526 BLAKE2B 69344aa5ecb3ba3f811fa9905a582233ba410ef4c9d9e3af05c474caa04c826bd1df3e1c1306e1127e3d22e17a851e0371aac306b533f11712befc48f460db81 SHA512 940ac7ffbf3456b3cac85f87be52c6f8baee73b2c9c1e7f8384d036e35c0171041838968f74a888ca1c4a755688ba767cd3a55d769cc91b651e21595d0c279d7 DIST ktorrent-23.04.3.tar.xz 2150912 BLAKE2B a5dd4db22d68098192d4a7d8e3b6f8ce60ffb46de46a007ed05548031db1e8a2e31e987fc36ea1a09186e27c08985319336ae5ba90c7127fe4c9035881fb357b SHA512 a803ed8963184f15029e034de4e6e25945d26bd3903afe838eaf0f0f74b3ccb53f1b7732694bda443b8d6bae5ca91f27622334fc628a41002eed7f8e3459c0e5 -DIST ktorrent-23.08.0.tar.xz 2154144 BLAKE2B 1d8f701d4fe3d49ceeac08dee9074f59163be8b3b3573d1c73065b2b8d5a292d281752c8481c953cabb9818f2c942754dd6b552ff388e4dbb224c84b913c2055 SHA512 1c8ccb8492b2aa3ffec5d5dd35531770869e8d77bc78f6c5e247ed6e8e091a76ac19e188dbaaf70efcc8806de246143d3f53302f1494976fc264c585e37da196 +DIST ktorrent-23.08.1.tar.xz 2154312 BLAKE2B 614a4c19cebe29d27def7a04621570a2c7f2cff55381b4d286d375dbf9e0ca10723c9e78e54005a4b5242b9bb3adbdf091d056ab7938fdd60d2a4044bbbcb9ff SHA512 af209b84b246cc1cf5f08f85728bbaa4dfcaf299d7e2d4c14a65598d9cddfa01ae5518e794dceaf62f78bd1b8d106e2d6e837e827791a332641b4993454f2b32 EBUILD ktorrent-23.04.3.ebuild 2831 BLAKE2B 99a3a534b77abb06e29ef8f2ebf1234eea1fd9c5a1fdba7d6d2e3facc00f8f38ac21edbf03400942512aa455b10aa97824f6259e0f503ecb070058ec9d692f21 SHA512 3d12b2809e53083bfc9c39fffeadebf99f9b35ebb9360e8b5292d61c939bde15be782c5fd79959e80ee79ace23db411524b38c26f464a76a16cae9556baf7a5e -EBUILD ktorrent-23.08.0.ebuild 2833 BLAKE2B e43d1bc96044532858fb66a88740ef76efa3e36e4e92892af1a7d7d6fc8bd86c1f74cecea9fd9372bc150ddddf4d77d64414fc6490d917da888c8f64d889f4dd SHA512 cc4afb97367e8dc22ced139444ab1c8ef67c73b2042caddf1a49d6502d49d1b94deb1915e21caae63151871b9193086409eef4b63ae14ce8e43f4cd9975551cc +EBUILD ktorrent-23.08.1.ebuild 2997 BLAKE2B 6b13c66da6148d0f5bdf89e45ec80d6dbc0c626b767f5353575ff36704179ed5079bc0106ab476198f40d11493bf8cd5eb7ce0d679f7f46da0f315d4087bb0b6 SHA512 b367fde4c860f589c8585d0d3fbfde8d029fff171e5550d2ca74b95122261fe528bdf13091f754efeb34864d0c2c2bfefee8de5c74229d034815a93234869ad7 MISC metadata.xml 1460 BLAKE2B 51ebe2b5f66b522da72da170d514b03cfb03756c9006e1b722fa6346d693082dda487299d356a011484c7217bf94cda5233e7a561450114ee1be063bc2e850f9 SHA512 075e0d77256155dceacf5df0dd6e0ddab45c93d2914da9a16f2ca9895a563bf1cdced2931436c772d4915661d0bdff32bb531901b8b8e4b99af00b5ff45fab68 diff --git a/net-p2p/ktorrent/files/ktorrent-23.08.1-cmake.patch b/net-p2p/ktorrent/files/ktorrent-23.08.1-cmake.patch new file mode 100644 index 000000000000..5505092ccac1 --- /dev/null +++ b/net-p2p/ktorrent/files/ktorrent-23.08.1-cmake.patch @@ -0,0 +1,50 @@ +From 5d1dddb5322e19baf464f7aa82540eaf38bc88d0 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 14 Sep 2023 10:18:36 +0200 +Subject: [PATCH] Make KF5Archive required for ipfilter plugin + +Cleanup HAVE_KF5Archive var - it was unused since 023def08d07a4a3e346eef34e6142bf574435f6c, +but we require libktorrent which has a hard requirement for KF5Archive anyway. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 10 ---------- + plugins/ipfilter/CMakeLists.txt | 2 ++ + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 07ad54d6..9010d632 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,16 +83,6 @@ if(KF5TextWidgets_FOUND) + set(HAVE_KF5TextWidgets 1) + endif() + +-find_package(KF5Archive ${KF5_MIN_VERSION}) +-set_package_properties(KF5Archive +- PROPERTIES +- TYPE OPTIONAL +- PURPOSE "Required for KTorrent's scripting plugin" +-) +-if(KF5Archive_FOUND) +- set(HAVE_KF5Archive 1) +-endif() +- + find_package(KF5ItemViews ${KF5_MIN_VERSION}) + set_package_properties(KF5ItemViews + PROPERTIES +diff --git a/plugins/ipfilter/CMakeLists.txt b/plugins/ipfilter/CMakeLists.txt +index f59f251c..2a809a62 100644 +--- a/plugins/ipfilter/CMakeLists.txt ++++ b/plugins/ipfilter/CMakeLists.txt +@@ -1,5 +1,7 @@ + ktorrent_add_plugin(ktorrent_ipfilter) + ++find_package(KF5Archive ${KF5_MIN_VERSION} REQUIRED) ++ + target_sources(ktorrent_ipfilter PRIVATE + ipblocklist.cpp + ipblockingprefpage.cpp +-- +2.42.0 + diff --git a/net-p2p/ktorrent/ktorrent-23.08.0.ebuild b/net-p2p/ktorrent/ktorrent-23.08.0.ebuild deleted file mode 100644 index 06376d2a56b4..000000000000 --- a/net-p2p/ktorrent/ktorrent-23.08.0.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="optional" -KFMIN=5.106.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/ktorrent/" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +logviewer +magnetgenerator -+mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf" - -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-${PVCUT}:5 - infowidget? ( dev-libs/geoip ) - mediaplayer? ( - >=media-libs/phonon-4.11.0 - >=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-1.71 -" -RDEPEND="${COMMON_DEPEND} - ipfilter? ( - app-arch/bzip2 - app-arch/unzip - kde-apps/kio-extras:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - ) -" -BDEPEND="sys-devel/gettext" - -src_configure() { - local mycmakeargs=( - -DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler) - -DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder) - -DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget) - -DENABLE_IPFILTER_PLUGIN=$(usex ipfilter) - -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 -} diff --git a/net-p2p/ktorrent/ktorrent-23.08.1.ebuild b/net-p2p/ktorrent/ktorrent-23.08.1.ebuild new file mode 100644 index 000000000000..df93a5e05e34 --- /dev/null +++ b/net-p2p/ktorrent/ktorrent-23.08.1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="optional" +KFMIN=5.106.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks" +HOMEPAGE="https://apps.kde.org/ktorrent/" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +logviewer +magnetgenerator ++mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf" + +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-${PVCUT}:5 + infowidget? ( dev-libs/geoip ) + ipfilter? ( >=kde-frameworks/karchive-${KFMIN}:5 ) + mediaplayer? ( + >=media-libs/phonon-4.11.0 + >=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-1.71 +" +RDEPEND="${COMMON_DEPEND} + ipfilter? ( + app-arch/bzip2 + app-arch/unzip + kde-apps/kio-extras:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + ) +" +BDEPEND="sys-devel/gettext" + +# TODO: https://invent.kde.org/network/ktorrent/-/merge_requests/76 +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) + +src_configure() { + local mycmakeargs=( + -DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler) + -DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder) + -DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget) + -DENABLE_IPFILTER_PLUGIN=$(usex ipfilter) + -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 +} -- cgit v1.2.3