commit: 80054c028619878721c171a81444bb515fb34192 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Tue Jan 10 18:27:21 2017 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Tue Jan 10 18:27:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80054c02
net-p2p/ktorrent: Drop slot 4 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-p2p/ktorrent/Manifest | 1 - .../ktorrent/files/ktorrent-4.3.1-ipfilter.patch | 72 --------------- .../files/ktorrent-4.3.1-underlinking.patch | 21 ----- net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild | 101 --------------------- net-p2p/ktorrent/metadata.xml | 5 - 5 files changed, 200 deletions(-) diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index ccc07d1..e6d6c2e 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,2 +1 @@ -DIST ktorrent-4.3.1.tar.bz2 2943708 SHA256 66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1 SHA512 bf1fa144295cb00fccce3a511afe845bc7bf42d77d70205f5893686e7b1fa78c5799c46c7e4e04435ab6fdd4bc9b3b4a25bffb2c5538a25af36302c60742900e WHIRLPOOL 61303c19f0160bba9bdd288415d86519594f26c5c062f394cee7924093506a9cc6236fd8eedec16c6f799f71a15cb4af15c4b7c079831dccb4e498b833c2234e DIST ktorrent-5.0.1.tar.xz 2152908 SHA256 d00feeca5dcc6a76a039d67dbe91a2d5a5e1da0f5e0bbd8da2c156d9c44879e5 SHA512 6ceced3d578e58f480ada5b71a66be244c75de726389d39b40c02c5a9445c6bb0b70573fac810abd1659c3172bff79c0c3e5cbfe1a84e0d50836b52291597bc1 WHIRLPOOL 11d59e1762b12e0c740337b05e9e678f71df1a5d43cffee6dcb1a3159afe1da00c118b62b84fdb80dbd6d98f3998250882406e8e61ad181b67b7043d350c8682 diff --git a/net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch b/net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch deleted file mode 100644 index 4572c3d..00000000 --- a/net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3dfcbeb9765e99f9b99951134b17268eb7a617d2 Mon Sep 17 00:00:00 2001 -From: Joris Guisson <[email protected]> -Date: Thu, 1 Aug 2013 13:19:29 +0200 -Subject: [PATCH] Backport ipfilter extraction fixes from master branch to 4.3 - branch - -BUG: 315239 ---- - ChangeLog | 3 +++ - plugins/ipfilter/downloadandconvertjob.cpp | 22 +++++----------------- - 2 files changed, 8 insertions(+), 17 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index c5ae9da..42c48ff 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,6 @@ -+Changes in 4.3.2: -+- Backport ipfilter extraction fixes from master branch (315239) -+ - Changes in 4.3.1: - - Fix new custom groups not appearing in add to group submenu (307230) - - Fix crash when right clicking on some locations in the GroupView due to 0 pointer (307160) -diff --git a/plugins/ipfilter/downloadandconvertjob.cpp b/plugins/ipfilter/downloadandconvertjob.cpp -index d3092ac..4080c2a 100644 ---- a/plugins/ipfilter/downloadandconvertjob.cpp -+++ b/plugins/ipfilter/downloadandconvertjob.cpp -@@ -114,12 +114,13 @@ namespace kt - - //now determine if it's ZIP or TXT file - KMimeType::Ptr ptr = KMimeType::findByPath(temp); -+ Out(SYS_IPF|LOG_NOTICE) << "Mimetype: " << ptr->name() << endl; - if (ptr->name() == "application/zip") - { - active_job = KIO::file_move(temp,QString(kt::DataDir() + QLatin1String("level1.zip")),-1,KIO::HideProgressInfo|KIO::Overwrite); - connect(active_job,SIGNAL(result(KJob*)),this,SLOT(extract(KJob*))); - } -- else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip") -+ else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip" || ptr->name() == "application/gzip") - { - active_job = new bt::DecompressFileJob(temp,QString(kt::DataDir() + "level1.txt")); - connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); -@@ -174,23 +175,10 @@ namespace kt - } - - QString destination = kt::DataDir() + "level1.txt"; -- if (zip->directory()->entries().contains("splist.txt")) -+ QStringList entries = zip->directory()->entries(); -+ if (entries.count() >= 1) - { -- active_job = new bt::ExtractFileJob(zip,"splist.txt",destination); -- connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); -- unzip = true; -- active_job->start(); -- } -- else if (zip->directory()->entries().contains("level1.txt")) -- { -- active_job = new bt::ExtractFileJob(zip,"level1.txt",destination); -- connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); -- unzip = true; -- active_job->start(); -- } -- else if (zip->directory()->entries().contains("ipfilter.dat")) -- { -- active_job = new bt::ExtractFileJob(zip,"ipfilter.dat",destination); -+ active_job = new bt::ExtractFileJob(zip,entries.front(),destination); - connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); - unzip = true; - active_job->start(); --- -1.8.3.2 - diff --git a/net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch b/net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch deleted file mode 100644 index 84e6fa7..00000000 --- a/net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3ef62c439027acc0a166101419fff4bc0c69013d Mon Sep 17 00:00:00 2001 -From: Christoph Feck <[email protected]> -Date: Fri, 19 Oct 2012 10:56:22 +0200 -Subject: [PATCH] SVN_SILENT link - ---- - plugins/ipfilter/tests/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/ipfilter/tests/CMakeLists.txt b/plugins/ipfilter/tests/CMakeLists.txt -index 3b40887..90d6d42 100644 ---- a/plugins/ipfilter/tests/CMakeLists.txt -+++ b/plugins/ipfilter/tests/CMakeLists.txt -@@ -1,3 +1,3 @@ - set(ipblocklisttest_SRCS ipblocklisttest.cpp ../ipblocklist.cpp) - kde4_add_unit_test(ipblocklisttest TESTNAME ipblocklisttest ${ipblocklisttest_SRCS}) --target_link_libraries(ipblocklisttest ${QT_QTTEST_LIBRARY} ktorrent) -+target_link_libraries(ipblocklisttest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBKTORRENT_LIBRARIES}) --- -1.8.1.2 - diff --git a/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild deleted file mode 100644 index 8105e55..00000000 --- a/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_SCM="git" -LIBKT_VERSION_MIN="${PV}" -LIBKT_VERSION_MAX="99999999" -if [[ ${PV} != 9999* ]]; then - inherit versionator - # upstream likes to skip that _ in beta releases - MY_PV="${PV/_/}" - LIBKT_VERSION_MIN=$(($(get_major_version)-3)).$(get_version_component_range 2-3 ${PV}) - LIBKT_VERSION_MAX=$(($(get_major_version)-3)).$(($(get_version_component_range 2)+1)) - MY_P="${PN}-${MY_PV}" - KDE_HANDBOOK="optional" - KDE_DOC_DIRS="doc" - - KDE_LINGUAS="ar ast be bg bs ca ca@valencia cs da de el en_GB eo es et eu - fi fr ga gl hi hne hr hu is it ja km ku lt lv mai ms nb nds nl nn oc - pl pt pt_BR ro ru se si sk sl sq sr sr@ijekavian sr@ijekavianlatin - sr@latin sv tr ug uk zh_CN zh_TW" - SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.bz2"; - S="${WORKDIR}"/"${MY_P}" - - KEYWORDS="amd64 x86" -else - LIBKT_VERSION_MIN="${PV}" - LIBKT_VERSION_MAX="99999999" -fi - -inherit kde4-base - -DESCRIPTION="A BitTorrent program for KDE" -HOMEPAGE="http://ktorrent.pwsp.net/"; - -LICENSE="GPL-2" -SLOT="4" -IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +logviewer -+magnetgenerator +mediaplayer rss +scanfolder +search +stats +upnp webinterface -+zeroconf" - -COMMONDEPEND=" - <net-libs/libktorrent-${LIBKT_VERSION_MAX}:4 - >=net-libs/libktorrent-${LIBKT_VERSION_MIN}:4 - infowidget? ( dev-libs/geoip ) - mediaplayer? ( >=media-libs/taglib-1.5 ) - rss? ( $(add_kdeapps_dep kdepimlibs) ) - search? ( - dev-qt/qtwebkit:4 - kde-frameworks/kdelibs:4[webkit] - ) -" -DEPEND="${COMMONDEPEND} - dev-libs/boost - sys-devel/gettext -" -RDEPEND="${COMMONDEPEND} - ipfilter? ( - app-arch/bzip2 - app-arch/unzip - $(add_kdeapps_dep kdebase-kioslaves) - ) -" - -PATCHES=( - "${FILESDIR}/${P}-ipfilter.patch" - "${FILESDIR}/${P}-underlinking.patch" -) - -src_prepare() { - sed -i \ - -e "s:add_subdirectory(plasma):#nada:g" \ - CMakeLists.txt || die "Failed to make plasmoid optional" - - kde4-base_src_prepare -} - -src_configure() { - mycmakeargs=( - -DENABLE_SHUTDOWN_PLUGIN=OFF - -DENABLE_SCRIPTING_PLUGIN=OFF - $(cmake-utils_use_enable bwscheduler BWSCHEDULER_PLUGIN) - $(cmake-utils_use_enable downloadorder DOWNLOADORDER_PLUGIN) - $(cmake-utils_use_enable infowidget INFOWIDGET_PLUGIN) - $(cmake-utils_use_with infowidget SYSTEM_GEOIP) - $(cmake-utils_use_enable ipfilter IPFILTER_PLUGIN) - $(cmake-utils_use_enable logviewer LOGVIEWER_PLUGIN) - $(cmake-utils_use_enable magnetgenerator MAGNETGENERATOR_PLUGIN) - $(cmake-utils_use_enable mediaplayer MEDIAPLAYER_PLUGIN) - $(cmake-utils_use_enable rss SYNDICATION_PLUGIN) - $(cmake-utils_use_enable scanfolder SCANFOLDER_PLUGIN) - $(cmake-utils_use_enable search SEARCH_PLUGIN) - $(cmake-utils_use_enable stats STATS_PLUGIN) - $(cmake-utils_use_enable upnp UPNP_PLUGIN) - $(cmake-utils_use_enable webinterface WEBINTERFACE_PLUGIN) - $(cmake-utils_use_enable zeroconf ZEROCONF_PLUGIN) - ) - kde4-base_src_configure -} diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml index bb13b27..b9c2ba1 100644 --- a/net-p2p/ktorrent/metadata.xml +++ b/net-p2p/ktorrent/metadata.xml @@ -9,16 +9,11 @@ <flag name="bwscheduler">Schedule upload and download limits over a period of a week</flag> <flag name="downloadorder">Specify the download order of a multi-file torrent</flag> <flag name="infowidget">Displays general information about a torrent in several tabs</flag> - <flag name="ipfilter">Filter IP addresses through a blocklist</flag> <flag name="logviewer">Displays the logging output</flag> <flag name="magnetgenerator">Generates magnet URI's</flag> <flag name="mediaplayer">Phonon-based media player</flag> - <flag name="rss">Syndication plugin for KTorrent, supporting RSS and Atom feeds</flag> - <flag name="scanfolder">Scan folders for torrent files and load them</flag> - <flag name="search">Search for torrents</flag> <flag name="shutdown">Shutdown when done</flag> <flag name="stats">Shows statistics about torrents in several graphs</flag> - <flag name="webinterface">Allows control of KTorrent via a web interface</flag> <flag name="zeroconf">Discover peers on the local network using the Zeroconf protocol</flag> </use> </pkgmetadata>
