Version bump. Remove old.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 16 insertions, 61 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 8fcb72740767..a679cbb7dbff 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.110 2009/03/19 14:29:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.111 2009/04/06 11:32:41 scarabeus Exp $
+
+*ktorrent-3.2.1 (06 Apr 2009)
+
+  06 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> -ktorrent-3.1.6.ebuild,
+  -ktorrent-3.2.ebuild, +ktorrent-3.2.1.ebuild:
+  Version bump. Remove old.
 
   19 Mar 2009; Brent Baude <ranger@gentoo.org> ktorrent-3.2.ebuild:
   Marking ktorrent-3.2 ~ppc for bug 259689
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 148e30533740..7bbc2c6b7337 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,10 +1,8 @@
 AUX ktorrent-2.2.5-avahi-check.patch 1263 RMD160 f184a508351a90e376b5bbf4642551e445f6dd1e SHA1 e0763c7e361a802105495810422745ce03ae2011 SHA256 2e7d7be8a6ca23ee75bf9f3745ef246d6f8990e8eb550170257a5a1b126fff06
 AUX ktorrent-2.2.8-lograce.patch 511 RMD160 f4bf80f0ce29b5f793a366556d3e5d7e0d1355ad SHA1 021e5b61551adbad921c2de59a794a9bf5826042 SHA256 fb94516c16d22fdcb4de8076d74345c50e7a8d82fc36a5343dc654f929cf8bb9
 DIST ktorrent-2.2.8.tar.bz2 2715406 RMD160 eda2304caf3407ec8bc85cd358dfa7a9b854ddc3 SHA1 c816700e776d219432f20e7116c8e9f4f1af681a SHA256 33bdcb57a906694c6f83cfeebfa569846b52ab089bbd6d5e80e8bda74161f783
-DIST ktorrent-3.1.6-5.tar.bz2 2710256 RMD160 5865d3e91e330077c1a42908bfa0a49063447cc4 SHA1 690298ea9fa1e5239713358475237632ab2a4411 SHA256 df05a040bb0b08744d7cff74f04622e7b729ace456db78e05d5e258c2d29a9ee
-DIST ktorrent-3.2.tar.bz2 2562541 RMD160 e04cf261b22f191f6bda4bccb8b56fdcd734b944 SHA1 7cc7c50f8860ef31aca3c93f65eee131cc84c968 SHA256 27c92f06b5d40341770f34e4e77a2080b08377726df51cd91184d74af5cb4e4a
+DIST ktorrent-3.2.1.tar.bz2 2626480 RMD160 e6e3dd0f8e8f28c386492d464236978c0fad5975 SHA1 b12ee99bde77f0da424ce04907522cbe873d816c SHA256 e37324519fdd04cad2a489fb772cbe628d8ff9f578e2bb913b18a1404dd7c4eb
 EBUILD ktorrent-2.2.8.ebuild 1570 RMD160 823058ed088da4a255940bf87dad17ee12bf326f SHA1 a5f1c928b5f5530229a63a9fc582682fd8e06949 SHA256 9d00b3c95dd82ed67c94ac7b4d89cb31c6a5525bb72553f4c48ee32ca008b465
-EBUILD ktorrent-3.1.6.ebuild 1758 RMD160 55e211c7420f7592ebeba07e80b3e68ff425d910 SHA1 e5cb0860a56f1eddeadcb559a6985c303c84212a SHA256 c86840a2ace36a3dcd349fd635fef76285b64df4d28e86f4dca030ac9133cd7d
-EBUILD ktorrent-3.2.ebuild 2250 RMD160 b9a50e69e6c2e6eb6cebdf3d980608c951598a99 SHA1 423d0ab1fe62a6fd08b7fb32961caebfd929198d SHA256 a4b77168a9f8b7df04d9dd964ec9a782dc2462e57d6afe89361f1c5ad8be3ca7
-MISC ChangeLog 16896 RMD160 ff2875119f068a9b8743e1df7c2e04e2df3a80c5 SHA1 73f10c8545cf1cc33c98aca70ebca52e4a50e4d4 SHA256 2086affdf9839174195ea483f3a88ba3f3d2782da978b0bbf6d82e0e818acbde
+EBUILD ktorrent-3.2.1.ebuild 2186 RMD160 0d2f603128d63b3c0e2c922a527efeea0321103a SHA1 116f2f7593c69bc3baaad01f22085d4607681754 SHA256 dbb55925df57c5f290ae767d670f94b693c8597ce43e4a9c1e7d02158892087e
+MISC ChangeLog 17083 RMD160 51487f399c9a8bc37a4f35e341cc129b0ec92523 SHA1 005df6b812017783a2287b8c58c59dd39aeadbf0 SHA256 7841c10c5ed47b9f7bc8196bce06e6a5bf74c8bf3b14969556a80eec6b9a85c8
 MISC metadata.xml 1103 RMD160 6e5e5ce7562f37783f9e7635ddd6bf6a00e658fe SHA1 6c7341bba781239d3e99ee62be13650d524ae2fe SHA256 6d6cdff924b8f6bd565352dc8488f64f2f1aa57c83d58caf2c0fd4c31ce93f70
diff --git a/net-p2p/ktorrent/ktorrent-3.1.6.ebuild b/net-p2p/ktorrent/ktorrent-3.1.6.ebuild
deleted file mode 100644
index b0a69460c420..000000000000
--- a/net-p2p/ktorrent/ktorrent-3.1.6.ebuild
+++ /dev/null
@@ -1,49 +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.1.6.ebuild,v 1.4 2009/02/05 22:10:25 ranger Exp $
-
-EAPI="2"
-
-KDE_MINIMAL="4.1"
-KDE_LINGUAS="ca cs da de el es et fr gl it ja lv nb nds nl nn pl pt pt_BR ru sv 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}-5.tar.bz2"
-# -5 is for revision :(
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="3"
-IUSE="+bwscheduler +infowidget +ipfilter +logviewer +mediaplayer +scanfolder +search +stats +upnp webinterface"
-
-DEPEND="app-crypt/qca:2
-	dev-libs/gmp
-	sys-devel/gettext
-	!kdeprefix? ( !net-p2p/ktorrent:0 )
-	!net-p2p/ktorrent:4.1"
-# 4.1 blocker is due to slot change. We wont slot based on kde version but based
-# on application version. This was stupid mistake.
-RDEPEND="${DEPEND}
-	infowidget? ( >=dev-libs/geoip-1.4.4 )"
-
-src_configure() {
-	local mycmakeargs
-
-	mycmakeargs="${mycmakeargs}
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
-		-DENABLE_DHT_SUPPORT=ON
-		$(cmake-utils_use_enable bwscheduler BWSCHEDULER_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 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 mediaplayer MEDIAPLAYER_PLUGIN)"
-	kde4-base_src_configure
-}
diff --git a/net-p2p/ktorrent/ktorrent-3.2.ebuild b/net-p2p/ktorrent/ktorrent-3.2.1.ebuild
index 195c1d668436..bcab487e777e 100644
--- a/net-p2p/ktorrent/ktorrent-3.2.ebuild
+++ b/net-p2p/ktorrent/ktorrent-3.2.1.ebuild
@@ -1,10 +1,9 @@
 # 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.ebuild,v 1.4 2009/03/19 14:29:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-3.2.1.ebuild,v 1.1 2009/04/06 11:32:41 scarabeus Exp $
 
 EAPI="2"
 
-KDE_MINIMAL="4.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"
@@ -22,14 +21,15 @@ IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer
 DEPEND="app-crypt/qca:2
 	dev-libs/gmp
 	sys-devel/gettext
-	!kdeprefix? ( !net-p2p/ktorrent:0 )
-	plasma? ( >=kde-base/libtaskmanager-${KDE_MINIMAL}[kdeprefix=] )
+	plasma? ( >=kde-base/libtaskmanager-${KDE_MINIMAL} )
 	rss? (
 		dev-libs/boost
-		>=kde-base/kdepimlibs-${KDE_MINIMAL}[kdeprefix=] )"
+		>=kde-base/kdepimlibs-${KDE_MINIMAL}
+	)"
 RDEPEND="${DEPEND}
+	!net-p2p/ktorrent:0
 	infowidget? ( >=dev-libs/geoip-1.4.4 )
-	ipfilter? ( >=kde-base/kdebase-kioslaves-${KDE_MINIMAL}[kdeprefix=] )"
+	ipfilter? ( >=kde-base/kdebase-kioslaves-${KDE_MINIMAL} )"
 
 src_prepare() {
 	if ! use plasma; then