Apply patch to ktorrent-2.2.8 bug 255068

Version bump to ktorrent-3.2 (KDE4)
Remove old versions
(Portage version: 2.2_rc23/cvs/Linux x86_64)

7 files changed, 61 insertions, 157 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 16ddb275d8c0..70df9e3d46f1 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,15 @@
 # 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.105 2009/02/05 22:10:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.106 2009/02/16 20:47:00 tampakrap Exp $
+
+*ktorrent-3.2 (16 Feb 2009)
+
+  16 Feb 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  +files/ktorrent-2.2.8-lograce.patch, metadata.xml, -ktorrent-2.2.7.ebuild,
+  ktorrent-2.2.8.ebuild, -ktorrent-3.1.5-r2.ebuild,
+  -ktorrent-3.2_rc1.ebuild, +ktorrent-3.2.ebuild:
+  Apply patch to ktorrent-2.2.8 bug 255068 Version bump to ktorrent-3.2
+  (KDE4) Remove old versions
 
   05 Feb 2009; Brent Baude <ranger@gentoo.org> ktorrent-3.1.6.ebuild:
   marking ktorrent-3.1.6 ~ppc64 to fix kde tree breakage
diff --git a/net-p2p/ktorrent/files/ktorrent-2.2.8-lograce.patch b/net-p2p/ktorrent/files/ktorrent-2.2.8-lograce.patch
new file mode 100644
index 000000000000..5675fce4f54c
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-2.2.8-lograce.patch
@@ -0,0 +1,11 @@
+--- ktorrent-2.2.8/libktorrent/util/autorotatelogjob.cpp	2008-11-01 17:12:33.000000000 +0200
++++ ktorrent-2.2.8.new/libktorrent/util/autorotatelogjob.cpp	2009-02-16 22:04:17.000000000 +0200
+@@ -62,8 +62,6 @@
+ 			
+ 		if (cnt == 1)
+ 		{
+-				// move current log to 1 and zip it
+-			bt::Move(file,file + "-1",true);
+ 			KIO::Job* sj = KIO::file_move(KURL::fromPathOrURL(file),KURL::fromPathOrURL(file + "-1"),-1,true,false,false);
+ 			connect(sj,SIGNAL(result(KIO::Job*)),this,SLOT(moveJobDone(KIO::Job* )));
+ 		}
diff --git a/net-p2p/ktorrent/ktorrent-2.2.7.ebuild b/net-p2p/ktorrent/ktorrent-2.2.7.ebuild
deleted file mode 100644
index baece0409da3..000000000000
--- a/net-p2p/ktorrent/ktorrent-2.2.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.7.ebuild,v 1.5 2008/07/17 19:11:48 corsair Exp $
-
-inherit kde
-
-MY_P="${P/_/}"
-MY_PV="${PV/_/}"
-DESCRIPTION="A BitTorrent program for KDE."
-HOMEPAGE="http://ktorrent.org/"
-SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi kdeenablefinal"
-
-DEPEND="dev-libs/gmp
-	>=dev-libs/geoip-1.4.0-r1
-	avahi? ( >=net-dns/avahi-0.6.16-r1 )"
-RDEPEND="${DEPEND}
-	|| ( =kde-base/kdebase-kioslaves-3.5* =kde-base/kdebase-3.5* )"
-
-S="${WORKDIR}/${MY_P}"
-
-need-kde 3.5
-
-LANGS="ar bg br ca cs cy da de el en_GB es et fa fr gl hu it ja ka lt
-ms nb nds nl pa pl pt pt_BR ru rw sk sr sr@Latn sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	if use avahi && ! built_with_use net-dns/avahi qt3 ; then
-		echo
-		eerror "In order to use ktorrents zeroconf plugin you need to have"
-		eerror "net-dns/avahi emerged with \"qt3\" in your USE flag. Please add"
-		eerror "that flag, re-emerge avahi, and then emerge ktorrent again."
-		echo
-		die "net-dns/avahi not built with \"qt3\" support."
-	fi
-
-	kde_pkg_setup
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	local MAKE_LANGS
-	cd "${WORKDIR}/${MY_P}/translations"
-	for X in ${LANGS} ; do
-		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}"
-	done
-	sed -i -e "s:SUBDIRS=.*:SUBDIRS=${MAKE_LANGS}:" Makefile.am
-
-	cd "${S}"
-	# Fix automagic dependencies on avahi
-	epatch "${FILESDIR}/${PN}-2.2.5-avahi-check.patch"
-
-	rm -f "${S}/configure"
-}
-
-src_compile(){
-	local myconf="${myconf}
-		$(use_with avahi)
-		--enable-builtin-country-flags
-		--enable-knetwork
-		--enable-system-geoip
-		--enable-torrent-mimetype
-		--disable-geoip"
-
-	kde_src_compile
-}
diff --git a/net-p2p/ktorrent/ktorrent-2.2.8.ebuild b/net-p2p/ktorrent/ktorrent-2.2.8.ebuild
index 543a88b2f275..4325e1cb220a 100644
--- a/net-p2p/ktorrent/ktorrent-2.2.8.ebuild
+++ b/net-p2p/ktorrent/ktorrent-2.2.8.ebuild
@@ -1,6 +1,6 @@
 # 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-2.2.8.ebuild,v 1.5 2009/01/06 02:48:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.8.ebuild,v 1.6 2009/02/16 20:47:00 tampakrap Exp $
 
 inherit kde
 
@@ -58,6 +58,7 @@ src_unpack() {
 	cd "${S}"
 	# Fix automagic dependencies on avahi
 	epatch "${FILESDIR}/${PN}-2.2.5-avahi-check.patch"
+	epatch "${FILESDIR}/${P}-lograce.patch"
 
 	rm -f "${S}/configure"
 }
diff --git a/net-p2p/ktorrent/ktorrent-3.1.5-r2.ebuild b/net-p2p/ktorrent/ktorrent-3.1.5-r2.ebuild
deleted file mode 100644
index 478db1b3dbdb..000000000000
--- a/net-p2p/ktorrent/ktorrent-3.1.5-r2.ebuild
+++ /dev/null
@@ -1,48 +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.5-r2.ebuild,v 1.2 2009/01/29 13:14:01 scarabeus Exp $
-
-EAPI="2"
-
-NEED_KDE="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}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~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_rc1.ebuild b/net-p2p/ktorrent/ktorrent-3.2.ebuild
index bfa225cc177a..a716ac45760a 100644
--- a/net-p2p/ktorrent/ktorrent-3.2_rc1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-3.2.ebuild
@@ -1,43 +1,47 @@
 # 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_rc1.ebuild,v 1.2 2009/01/31 16:06:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-3.2.ebuild,v 1.1 2009/02/16 20:47:00 tampakrap Exp $
 
 EAPI="2"
 
 KDE_MINIMAL="4.2"
-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"
+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
 
-MY_PV="${PV/_/}"
-MY_P="${P/_/}"
-
 DESCRIPTION="A BitTorrent program for KDE."
 HOMEPAGE="http://ktorrent.org/"
-SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.bz2"
+SRC_URI="http://ktorrent.org/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="3"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +mediaplayer +plasma +rss +scanfolder +search +stats +upnp webinterface"
+IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +mediaplayer plasma rss +scanfolder +search +stats +upnp webinterface +zeroconf"
 
 DEPEND="app-crypt/qca:2
 	dev-libs/gmp
 	sys-devel/gettext
 	!kdeprefix? ( !net-p2p/ktorrent:0 )
-	plasma? ( kde-base/plasma-workspace )
-	!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.
+	plasma? ( >=kde-base/libtaskmanager-${KDE_MINIMAL}[kdeprefix=] )
+	rss? (
+		dev-libs/boost
+		>=kde-base/kdepimlibs-${KDE_MINIMAL}[kdeprefix=] )"
 RDEPEND="${DEPEND}
-	infowidget? ( >=dev-libs/geoip-1.4.4 )"
+	infowidget? ( >=dev-libs/geoip-1.4.4 )
+	ipfilter? ( >=kde-base/kdebase-kioslaves-${KDE_MINIMAL}[kdeprefix=] )"
 
-S="${WORKDIR}"/${MY_P}
+src_prepare() {
+	if ! use plasma; then
+		sed -i -e 's/add_subdirectory([[:space:]]*plasma[[:space:]]*)//' \
+		CMakeLists.txt || die "Failed to make plasmoid optional"
+	fi
 
-src_configure() {
-	local mycmakeargs
+	kde4-base_src_prepare
+}
 
+src_configure() {
 	mycmakeargs="${mycmakeargs}
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
 		-DENABLE_DHT_SUPPORT=ON
 		$(cmake-utils_use_enable bwscheduler BWSCHEDULER_PLUGIN)
 		$(cmake-utils_use_enable downloadorder DOWNLOADORDER_PLUGIN)
@@ -52,6 +56,7 @@ src_configure() {
 		$(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 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 98c8e730a983..02a4e7081d33 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <herd>net-p2p</herd>
-  <maintainer>
-    <email>deathwing00@gentoo.org</email>
-    <name>deathwing00</name>
-  </maintainer>
-  <use>
+<herd>kde</herd>
+<herd>net-p2p</herd>
+<maintainer>
+	<email>deathwing00@gentoo.org</email>
+	<name>deathwing00</name>
+</maintainer>
+<use>
 	<flag name="bwscheduler">Enable the bwscheduler plugin</flag>
 	<flag name="downloadorder">Enable plugin for user selected download order</flag>
-    <flag name="infowidget">Enable the infowidget plugin</flag>
+	<flag name="infowidget">Enable the infowidget plugin</flag>
 	<flag name="ipfilter">Enable the ipfilter plugin</flag>
 	<flag name="kross">Enable kross scripting support</flag>
-    <flag name="logviewer">Enable the logviewer plugin</flag>
+	<flag name="logviewer">Enable the logviewer plugin</flag>
 	<flag name="mediaplayer">Enable the mediaplayer plugin</flag>
-    <flag name="scanfolder">Enable the scanfolder plugin</flag>
-    <flag name="search">Enable the search plugin</flag>
-    <flag name="stats">Enable the statistics plugin</flag>
-    <flag name="upnp">Enable the uphp plugin</flag>
-    <flag name="webinterface">Enable the webinterface plugin</flag>
-  </use>
+	<flag name="scanfolder">Enable the scanfolder plugin</flag>
+	<flag name="search">Enable the search plugin</flag>
+	<flag name="stats">Enable the statistics plugin</flag>
+	<flag name="upnp">Enable the uphp plugin</flag>
+	<flag name="webinterface">Enable the webinterface plugin</flag>
+	<flag name="zeroconf">Discover peers on the local network using the Zeroconf protocol</flag>
+</use>
 </pkgmetadata>