From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- net-p2p/ktorrent/Manifest | 4 +- .../files/ktorrent-5.1.1-missing-header.patch | 24 +++++ net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild | 3 +- net-p2p/ktorrent/ktorrent-5.1.1.ebuild | 105 --------------------- 4 files changed, 28 insertions(+), 108 deletions(-) create mode 100644 net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch delete mode 100644 net-p2p/ktorrent/ktorrent-5.1.1.ebuild (limited to 'net-p2p/ktorrent') diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index 1161d5166884..cc88e9e3c237 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,8 +1,8 @@ AUX ktorrent-5.1.1-kcrash.patch 616 BLAKE2B 3293f03911337f447b56ec7bfff36dbdfc4bfa1ed39b06f58522c3a1d31cb87d1df47fec689090eb77927cb14956df3e127d70a8b633013d75ddd6ac2db5ed96 SHA512 c4b2ce42fc2e9048ec1137d522b22d5be8a96e2e73e6b2506d1e9c640403f3fb7ef67c54881975d90907b8324cb04e8a8518a4de4840299ed54f81b415b2d4c8 AUX ktorrent-5.1.1-kdehig.patch 1320 BLAKE2B b34d97f8e55358e97a898c6c4e0b88040a4965a11b3d0ca3904e51d529912265887cdfc4c57200f793fca41495d2ec31511ef1bce987c9ff3ac0579ea9ab7527 SHA512 fbfedc1fc9d17cc4705f66b03853e749b693d6a9477981d6564735a6cf3711b7ff237c0728a300ac8c63378c3085073318ae89da8cfb7f56c854910bdcc90fca +AUX ktorrent-5.1.1-missing-header.patch 609 BLAKE2B 9d27522bb0309775dd330447993ba13d6b2730de74a241ebf091b9fe96a41fa157bf34ac4ec95820ce285c7305f8ebed9010a74af82fc8a26116bb68a95f60cb SHA512 571736ad190d2e75e5d6e1457d688e177388477e346e18f37c05bc74b9d97d3834897d0352b09c6469f3d5e996b093b827ebc0e5054005b8cfa5a5fc5b9fda16 AUX ktorrent-5.1.1-scanfolder-memcorruption.patch 2244 BLAKE2B 53efe0320124f954adff60144981d740e5cdf45ed4712fa43f112bb6133fb24b4303e6f969d9a73598525dea4f6706c22e57d2e5c7378c69e494dd924360a307 SHA512 8d3868a6f75e2f53fa11762378a676736df09e14e6fbde04f0dcfb45eb56e8b739d17b3ea96af4be21edb22edad610982865b33508847f07ac2eba744f62ae5e AUX ktorrent-5.1.1-singlefile-torrent.patch 4654 BLAKE2B 8bef064068df9db5b82eb16e5ca04bb618378c94a5d218654aabb5e49dcc5db1a8b8fd92a4ed6e3e922f8a2eebdf23f4d460261fd396b7a7b8319cc102dce9f8 SHA512 e74632a86967440733ed0d3da9249a04dfe401d3966bc385581b5ba5e50e864b288fb0ca4e1ac17b754289fd8aeb70119f8c1981e9478afff434e17138beb151 DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06 -EBUILD ktorrent-5.1.1-r1.ebuild 3152 BLAKE2B 306d6bcf22b4aac5c1056e3e9a416d2c2148a77c1377a36ce7aba6cf57e307a9d32a236557944ff0cea8de2dd0fc936c6c5cb5b3b068b654b3d51e73ebae41d2 SHA512 ec3fd04130f8eff8fed26198f746af38391f6ec705b138cf37dc3e2d8aad7e34ee4f772ce747a9b830cfeefb4f78ae58673de1d59e1c8ed09ac568ee4f42144f -EBUILD ktorrent-5.1.1.ebuild 3083 BLAKE2B a0fbf718816b1bf154f01dad9ff914fd7e3c9e1e620be3a825f49d03c3af4600ac5e7413e6b743df3477275e227628bbf999144122da2c20ce96d0753d339649 SHA512 e699da98a02493847f71011008311a37555293e5878986489114b7a1f0999c1a6f1ab76c6874babd9d4ba2adae39b2be880b2eb1a4c3ce4689a91593145f3a09 +EBUILD ktorrent-5.1.1-r1.ebuild 3192 BLAKE2B 5d0e9eb5e8a38f4f81c1928158f96973695f179fe7e423317e00959627ea2b66547d1ad043297898dd06ddb230735c1999180c3b43e7385d44689b4b74053ace SHA512 ee10006a6f529e1860f9499cf85df90e19ec8f2c39d03c714465e8a72104bfd82ee09b062f56307c9483f579d1df646549d2bd17df4a77f62e4b9ad3cec31899 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80 diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch new file mode 100644 index 000000000000..b574d3028249 --- /dev/null +++ b/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch @@ -0,0 +1,24 @@ +From 909215cc912d89fbc8573f2f98e3b433472d8eae Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Fri, 9 Aug 2019 20:54:52 +0200 +Subject: [PATCH] Add missing QVector + +--- + libktcore/plugin/pluginmanager.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libktcore/plugin/pluginmanager.h b/libktcore/plugin/pluginmanager.h +index 50eaa768..3a04a729 100644 +--- a/libktcore/plugin/pluginmanager.h ++++ b/libktcore/plugin/pluginmanager.h +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include + #include +-- +2.22.0 + diff --git a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild index 6b12108bfcf4..443883b0dbca 100644 --- a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild +++ b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/internet/ktorrent/" [[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf" @@ -81,6 +81,7 @@ PATCHES=( "${FILESDIR}/${P}-kdehig.patch" "${FILESDIR}/${P}-singlefile-torrent.patch" "${FILESDIR}/${P}-kcrash.patch" + "${FILESDIR}/${P}-missing-header.patch" ) src_configure() { diff --git a/net-p2p/ktorrent/ktorrent-5.1.1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.1.ebuild deleted file mode 100644 index 7e2991a362c5..000000000000 --- a/net-p2p/ktorrent/ktorrent-5.1.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FRAMEWORKS_MINIMAL="5.50.0" # for syndication -KDE_HANDBOOK="optional" -KDE_TEST="optional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks" -HOMEPAGE="https://www.kde.org/applications/internet/ktorrent/" -[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator -+mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf" - -COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(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 kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(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) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - =net-libs/libktorrent-2.1*:5 - infowidget? ( dev-libs/geoip ) - kross? ( - $(add_frameworks_dep karchive) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kross) - ) - mediaplayer? ( - media-libs/phonon[qt5(+)] - >=media-libs/taglib-1.5 - ) - rss? ( - $(add_frameworks_dep kdewebkit) - $(add_frameworks_dep syndication) - ) - search? ( - $(add_frameworks_dep kdewebkit) - $(add_qt_dep qtwebkit) - ) - shutdown? ( $(add_plasma_dep plasma-workspace) ) - stats? ( $(add_frameworks_dep kplotting) ) - upnp? ( $(add_frameworks_dep kcompletion) ) - zeroconf? ( $(add_frameworks_dep kdnssd) ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} - ipfilter? ( - app-arch/bzip2 - app-arch/unzip - $(add_frameworks_dep ktextwidgets) - $(add_kdeapps_dep kio-extras) - ) - !net-p2p/ktorrent:4 -" - -PATCHES=( "${FILESDIR}/${P}-scanfolder-memcorruption.patch" ) - -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-utils_use_find_package rss KF5Syndication) - -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder) - -DENABLE_SEARCH_PLUGIN=$(usex search) - -DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown) - -DENABLE_STATS_PLUGIN=$(usex stats) - -DENABLE_UPNP_PLUGIN=$(usex upnp) - -DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf) - ) -# add back when ported -# -DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface) - kde5_src_configure -} -- cgit v1.2.3