[net-p2p/ktorrent] this reverts 65ad7fc65dbc2c1f4a5a0b2316f89761fdf8df1b and 08b6188c5017ce52b44db415e67e46fbcb73fa53

3 files changed, 8 insertions, 72 deletions

diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 09cef7c1b2d..5ae84873653 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,5 +1,3 @@
-DIST ktorrent-3.2.2.tar.bz2 2616748 RMD160 1510b83bca42ae1227027a5fc6864f1525a90fa2 SHA1 fa1b1877ade6ed601181ae889eef6ae53353259d SHA256 caccd898791888ed382a58ba41f7f5d3aaba4da022ad3716fa6a37fe644a3c78
-EBUILD ktorrent-3.2.2.ebuild 2267 RMD160 2cf5ec393e11253e7edc4400d750689009e574a1 SHA1 8a7248f7594d50c3b92b849f51cd924ce5207e47 SHA256 5607048cc147ec8a4b1e4c19364d632a4486c4cb3e6c5e564be9592ff483b65f
-EBUILD ktorrent-9999.ebuild 2289 RMD160 2b55d52b7b3f89a74d403069a0dbfe12b2e827a9 SHA1 90fb3016ee559356eec8907793760229a7911d93 SHA256 8dfe8e123ecbc241776bd3af11fb9e483f313dac59c121de360bb46a2e60fd2e
+EBUILD ktorrent-9999.ebuild 2330 RMD160 0f14bf137184cd4252aa5b1e64e3e79026bb0487 SHA1 671be9b18a8820d7f819e04ca9d531f2a2596193 SHA256 ab6e5a310771cb6c02b034ca63f441ab30b12e90a3d3cb096287c05ab99ffa90
 MISC ChangeLog 981 RMD160 0747b1e72d207feb040ae3468c2b6a63f87ad7a5 SHA1 150b06bbf8615fbc7c424b5ada1633c834004763 SHA256 df6f43b15f94440a7da0aed7ba63a0c4950b8b680088735c36d0db3382d6e583
 MISC metadata.xml 1316 RMD160 ebab5f7e686bc42aad936e4c0cc17e8102564502 SHA1 e78a5b62d7ac2181d4b6dd5f951f36442ccd841c SHA256 78fd475d8646e7a5fc595c768af448992a32e264d0dfa9b7ef33d7a5667c3652
diff --git a/net-p2p/ktorrent/ktorrent-3.2.2.ebuild b/net-p2p/ktorrent/ktorrent-3.2.2.ebuild
deleted file mode 100644
index d8cc9b7c428..00000000000
--- a/net-p2p/ktorrent/ktorrent-3.2.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-3.2.1-r1.ebuild,v 1.1 2009/05/17 12:00:24 scarabeus Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="ar be bg ca cs da de el en_GB es et fr ga gl hi it ja
-	km lt lv nb nds nl nn oc pl pt pt_BR ro ru se sk sl sr sv
-	tr uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="A BitTorrent program for KDE."
-HOMEPAGE="http://ktorrent.org/"
-SRC_URI="http://ktorrent.org/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-SLOT="3"
-IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +mediaplayer plasma rss +scanfolder +search +stats +upnp webinterface +zeroconf"
-
-COMMONDEPEND="app-crypt/qca:2
-	dev-libs/gmp
-	mediaplayer? ( >=media-libs/taglib-1.5 )
-	plasma? ( >=kde-base/libtaskmanager-${KDE_MINIMAL} )
-	rss? (
-		dev-libs/boost
-		>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	)"
-DEPEND="${COMMONDEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMONDEPEND}
-	infowidget? ( >=dev-libs/geoip-1.4.4 )
-	ipfilter? ( >=kde-base/kdebase-kioslaves-${KDE_MINIMAL} )"
-
-src_prepare() {
-	if ! use plasma; then
-		sed -i \
-			-e "s:add_subdirectory(plasma):#nada:g" \
-			CMakeLists.txt || die "Failed to make plasmoid optional"
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DENABLE_DHT_SUPPORT=ON
-		-DWITH_SYSTEM_GEOIP=ON
-		$(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 kross SCRIPTING_PLUGIN)
-		$(cmake-utils_use_enable logviewer LOGVIEWER_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/ktorrent-9999.ebuild b/net-p2p/ktorrent/ktorrent-9999.ebuild
index 0efcc3865ef..196494cc9c0 100644
--- a/net-p2p/ktorrent/ktorrent-9999.ebuild
+++ b/net-p2p/ktorrent/ktorrent-9999.ebuild
@@ -19,20 +19,24 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 SLOT="3"
 IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +mediaplayer plasma rss +scanfolder +search +stats +upnp webinterface +zeroconf"
 
-COMMONDEPEND="app-crypt/qca:2
+COMMONDEPEND="
+	app-crypt/qca:2
 	dev-libs/gmp
 	mediaplayer? ( >=media-libs/taglib-1.5 )
 	plasma? ( >=kde-base/libtaskmanager-${KDE_MINIMAL} )
 	rss? (
 		dev-libs/boost
 		>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	)"
+	)
+"
 DEPEND="${COMMONDEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMONDEPEND}
+	!kdeprefix? ( !net-p2p/ktorrent:0 )
 	infowidget? ( >=dev-libs/geoip-1.4.4 )
-	ipfilter? ( >=kde-base/kdebase-kioslaves-${KDE_MINIMAL} )"
+	ipfilter? ( >=kde-base/kdebase-kioslaves-${KDE_MINIMAL} )
+"
 
 src_prepare() {
 	if ! use plasma; then