3 files changed, 45 insertions, 12 deletions

diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index 05d9b93db066..f05a36e72bce 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ktorrent
-PORTVERSION=	3.2.5
+PORTVERSION=	3.3.1
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${PORTVERSION}/
 
diff --git a/net-p2p/ktorrent/distinfo b/net-p2p/ktorrent/distinfo
index 80306f1b9688..f8af0583bcfd 100644
--- a/net-p2p/ktorrent/distinfo
+++ b/net-p2p/ktorrent/distinfo
@@ -1,3 +1,3 @@
-MD5 (ktorrent-3.2.5.tar.bz2) = 0b0c3ebd2e0125ef65dbf67a584d1295
-SHA256 (ktorrent-3.2.5.tar.bz2) = 9a8094d2b790b6ddb545edf34618ee10f562d02bf3bdbc8f0b1bd7336d6a1991
-SIZE (ktorrent-3.2.5.tar.bz2) = 2679351
+MD5 (ktorrent-3.3.1.tar.bz2) = 6a76e0b3a7ed14966c8096f63fde6e29
+SHA256 (ktorrent-3.3.1.tar.bz2) = 2127dac10b89db412ca3ec478d0cf7d1e043d43329bcb1700955c71e57c29e95
+SIZE (ktorrent-3.3.1.tar.bz2) = 2750435
diff --git a/net-p2p/ktorrent/pkg-plist b/net-p2p/ktorrent/pkg-plist
index 2601ac328f74..58046196efef 100644
--- a/net-p2p/ktorrent/pkg-plist
+++ b/net-p2p/ktorrent/pkg-plist
@@ -7,6 +7,7 @@ include/libbtcore/bcodec/value.h
 include/libbtcore/btcore_export.h
 include/libbtcore/btversion.h
 include/libbtcore/datachecker/datachecker.h
+include/libbtcore/datachecker/datacheckerjob.h
 include/libbtcore/datachecker/datacheckerlistener.h
 include/libbtcore/datachecker/datacheckerthread.h
 include/libbtcore/datachecker/multidatachecker.h
@@ -36,12 +37,12 @@ include/libbtcore/diskio/dndfile.h
 include/libbtcore/diskio/movedatafilesjob.h
 include/libbtcore/diskio/multifilecache.h
 include/libbtcore/diskio/piecedata.h
+include/libbtcore/diskio/preallocationjob.h
 include/libbtcore/diskio/preallocationthread.h
 include/libbtcore/diskio/singlefilecache.h
 include/libbtcore/download/chunkdownload.h
 include/libbtcore/download/chunkselector.h
 include/libbtcore/download/downloader.h
-include/libbtcore/download/httpdownloader.h
 include/libbtcore/download/packet.h
 include/libbtcore/download/piece.h
 include/libbtcore/download/request.h
@@ -58,6 +59,7 @@ include/libbtcore/interfaces/piecedownloader.h
 include/libbtcore/interfaces/queuemanagerinterface.h
 include/libbtcore/interfaces/torrentfileinterface.h
 include/libbtcore/interfaces/torrentinterface.h
+include/libbtcore/interfaces/trackerinterface.h
 include/libbtcore/interfaces/trackerslist.h
 include/libbtcore/interfaces/webseedinterface.h
 include/libbtcore/migrate/cachemigrate.h
@@ -74,6 +76,7 @@ include/libbtcore/net/bufferedsocket.h
 include/libbtcore/net/downloadthread.h
 include/libbtcore/net/networkthread.h
 include/libbtcore/net/portlist.h
+include/libbtcore/net/reverseresolver.h
 include/libbtcore/net/socket.h
 include/libbtcore/net/socketgroup.h
 include/libbtcore/net/socketmonitor.h
@@ -97,6 +100,8 @@ include/libbtcore/peer/utpex.h
 include/libbtcore/torrent/advancedchokealgorithm.h
 include/libbtcore/torrent/choker.h
 include/libbtcore/torrent/globals.h
+include/libbtcore/torrent/job.h
+include/libbtcore/torrent/jobqueue.h
 include/libbtcore/torrent/peersourcemanager.h
 include/libbtcore/torrent/server.h
 include/libbtcore/torrent/statsfile.h
@@ -105,16 +110,21 @@ include/libbtcore/torrent/torrent.h
 include/libbtcore/torrent/torrentcontrol.h
 include/libbtcore/torrent/torrentcreator.h
 include/libbtcore/torrent/torrentfile.h
+include/libbtcore/torrent/torrentstats.h
 include/libbtcore/torrent/uploader.h
 include/libbtcore/tracker/httptracker.h
 include/libbtcore/tracker/tracker.h
+include/libbtcore/tracker/trackermanager.h
 include/libbtcore/tracker/udptracker.h
 include/libbtcore/tracker/udptrackersocket.h
 include/libbtcore/util/array.h
 include/libbtcore/util/autorotatelogjob.h
 include/libbtcore/util/bitset.h
+include/libbtcore/util/compressfilejob.h
 include/libbtcore/util/constants.h
+include/libbtcore/util/decompressfilejob.h
 include/libbtcore/util/error.h
+include/libbtcore/util/extractfilejob.h
 include/libbtcore/util/file.h
 include/libbtcore/util/fileops.h
 include/libbtcore/util/functions.h
@@ -136,6 +146,7 @@ lib/kde4/ktmediaplayerplugin.so
 lib/kde4/ktscanfolderplugin.so
 lib/kde4/ktscriptingplugin.so
 lib/kde4/ktsearchplugin.so
+%%PLASMA%%lib/kde4/ktshutdownplugin.so
 lib/kde4/ktstatsplugin.so
 %%SYNDICATION%%lib/kde4/ktsyndicationplugin.so
 lib/kde4/ktupnpplugin.so
@@ -144,18 +155,17 @@ lib/kde4/ktzeroconfplugin.so
 %%PLASMA%%lib/kde4/plasma_applet_ktorrent.so
 lib/kde4/plasma_engine_ktorrent.so
 lib/libbtcore.so
-lib/libbtcore.so.11
-lib/libbtcore.so.11.3.0
+lib/libbtcore.so.12
+lib/libbtcore.so.12.1.0
 lib/libktcore.so
-lib/libktcore.so.9
-lib/libktcore.so.9.3.0
+lib/libktcore.so.10
+lib/libktcore.so.10.1.0
 lib/libktupnp.so
 lib/libktupnp.so.4
-lib/libktupnp.so.4.0.0
+lib/libktupnp.so.4.1.0
 share/applications/kde4/ktorrent.desktop
 share/apps/cmake/modules/FindBTCore.cmake
 share/apps/ktorrent/FLAGS_LICENCE
-share/apps/ktorrent/GeoIP-LICENSE.txt
 share/apps/ktorrent/ad.png
 share/apps/ktorrent/ae.png
 share/apps/ktorrent/af.png
@@ -234,7 +244,6 @@ share/apps/ktorrent/ga.png
 share/apps/ktorrent/gb.png
 share/apps/ktorrent/gd.png
 share/apps/ktorrent/ge.png
-share/apps/ktorrent/geoip.dat
 share/apps/ktorrent/gf.png
 share/apps/ktorrent/gh.png
 share/apps/ktorrent/gi.png
@@ -280,6 +289,7 @@ share/apps/ktorrent/ktmediaplayerpluginui.rc
 share/apps/ktorrent/ktorrent.notifyrc
 share/apps/ktorrent/ktorrentui.rc
 share/apps/ktorrent/ktsearchpluginui.rc
+%%PLASMA%%share/apps/ktorrent/ktshutdownpluginui.rc
 %%SYNDICATION%%share/apps/ktorrent/ktsyndicationpluginui.rc
 share/apps/ktorrent/kw.png
 share/apps/ktorrent/ky.png
@@ -333,6 +343,7 @@ share/apps/ktorrent/opensearch/bitenova/opensearch.xml
 share/apps/ktorrent/opensearch/bittorrent/opensearch.xml
 share/apps/ktorrent/opensearch/btjunkie/opensearch.xml
 share/apps/ktorrent/opensearch/ktorrents/opensearch.xml
+share/apps/ktorrent/opensearch/legittorrents/opensearch.xml
 share/apps/ktorrent/opensearch/mininova/opensearch.xml
 share/apps/ktorrent/opensearch/thepiratebay/opensearch.xml
 share/apps/ktorrent/pa.png
@@ -357,6 +368,9 @@ share/apps/ktorrent/rw.png
 share/apps/ktorrent/sa.png
 share/apps/ktorrent/sb.png
 share/apps/ktorrent/sc.png
+share/apps/ktorrent/scripts/auto_remove/auto_remove.desktop
+share/apps/ktorrent/scripts/auto_remove/auto_remove.py
+share/apps/ktorrent/scripts/auto_remove/auto_remove.ui
 share/apps/ktorrent/scripts/auto_resume/auto_resume.desktop
 share/apps/ktorrent/scripts/auto_resume/auto_resume.py
 share/apps/ktorrent/scripts/auto_resume/auto_resume.ui
@@ -367,6 +381,20 @@ share/apps/ktorrent/scripts/tracker_groups/tracker_groups.desktop
 share/apps/ktorrent/scripts/tracker_groups/tracker_groups.py
 share/apps/ktorrent/sd.png
 share/apps/ktorrent/se.png
+share/apps/ktorrent/search/home/body-background.jpg
+share/apps/ktorrent/search/home/box-bottom-left.png
+share/apps/ktorrent/search/home/box-bottom-middle.png
+share/apps/ktorrent/search/home/box-bottom-right.png
+share/apps/ktorrent/search/home/box-center.png
+share/apps/ktorrent/search/home/box-middle-left.png
+share/apps/ktorrent/search/home/box-middle-right.png
+share/apps/ktorrent/search/home/box-top-left.png
+share/apps/ktorrent/search/home/box-top-middle.png
+share/apps/ktorrent/search/home/box-top-right.png
+share/apps/ktorrent/search/home/home.css
+share/apps/ktorrent/search/home/home.html
+share/apps/ktorrent/search/home/ktorrent-icon.png
+share/apps/ktorrent/search/home/ktorrent_infopage.css
 share/apps/ktorrent/sg.png
 share/apps/ktorrent/sh.png
 share/apps/ktorrent/si.png
@@ -550,6 +578,7 @@ share/kde4/services/ktmediaplayerplugin.desktop
 share/kde4/services/ktscanfolderplugin.desktop
 share/kde4/services/ktscriptingplugin.desktop
 share/kde4/services/ktsearchplugin.desktop
+%%PLASMA%%share/kde4/services/ktshutdownplugin.desktop
 share/kde4/services/ktstatsplugin.desktop
 %%SYNDICATION%%share/kde4/services/ktsyndicationplugin.desktop
 share/kde4/services/ktupnpplugin.desktop
@@ -617,12 +646,16 @@ share/locale/zh_TW/LC_MESSAGES/ktorrent.mo
 @dirrm share/apps/ktorrent/www/common
 @dirrm share/apps/ktorrent/www/coldmilk
 @dirrm share/apps/ktorrent/www
+@dirrm share/apps/ktorrent/search/home
+@dirrm share/apps/ktorrent/search
 @dirrm share/apps/ktorrent/scripts/tracker_groups
 @dirrm share/apps/ktorrent/scripts/email_notifications
 @dirrm share/apps/ktorrent/scripts/auto_resume
+@dirrm share/apps/ktorrent/scripts/auto_remove
 @dirrm share/apps/ktorrent/scripts
 @dirrm share/apps/ktorrent/opensearch/thepiratebay
 @dirrm share/apps/ktorrent/opensearch/mininova
+@dirrm share/apps/ktorrent/opensearch/legittorrents
 @dirrm share/apps/ktorrent/opensearch/ktorrents
 @dirrm share/apps/ktorrent/opensearch/btjunkie
 @dirrm share/apps/ktorrent/opensearch/bittorrent