Version bump as per bug 199285. Corrected dependencies to fix bug 198945. Removed obsolete versions.

(Portage version: 2.1.3.19)

8 files changed, 82 insertions, 159 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 3d56cec5933c..302bc64acd72 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.66 2007/10/20 21:05:36 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.67 2007/11/16 23:48:32 philantrop Exp $
+
+*ktorrent-2.2.3 (16 Nov 2007)
+
+  16 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  -files/ktorrent-2.2.1-fix-wait-job-crash.patch, -ktorrent-2.1.4.ebuild,
+  -ktorrent-2.2.1-r1.ebuild, +ktorrent-2.2.3.ebuild:
+  Version bump as per bug 199285. Corrected dependencies to fix bug 198945.
+  Removed obsolete versions.
 
   20 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
   ktorrent-2.2.2.ebuild:
diff --git a/net-p2p/ktorrent/files/digest-ktorrent-2.1.4 b/net-p2p/ktorrent/files/digest-ktorrent-2.1.4
deleted file mode 100644
index 993324092289..000000000000
--- a/net-p2p/ktorrent/files/digest-ktorrent-2.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 69d3d7df6200710181594da19ab8c248 ktorrent-2.1.4.tar.gz 3631999
-RMD160 8286012e5fbc0bd827d5cb70c7895e5460f21a0b ktorrent-2.1.4.tar.gz 3631999
-SHA256 d492f75801c180202e99ca9c9cdff0b54e2f5d8e4ae2dddccbf1aac218276c48 ktorrent-2.1.4.tar.gz 3631999
diff --git a/net-p2p/ktorrent/files/digest-ktorrent-2.2.1-r1 b/net-p2p/ktorrent/files/digest-ktorrent-2.2.1-r1
deleted file mode 100644
index 95d70a1cf841..000000000000
--- a/net-p2p/ktorrent/files/digest-ktorrent-2.2.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 229a0615d9252510d9387079dd5bd86d ktorrent-2.2.1.tar.gz 3763678
-RMD160 329b6e0556a11875d7ce36d669c5c25370552936 ktorrent-2.2.1.tar.gz 3763678
-SHA256 cd5f7ca8d9a06a317c4adf6336328dc79bdf6c7f7d31588af691ba202ef267f3 ktorrent-2.2.1.tar.gz 3763678
diff --git a/net-p2p/ktorrent/files/digest-ktorrent-2.2.3 b/net-p2p/ktorrent/files/digest-ktorrent-2.2.3
new file mode 100644
index 000000000000..55ccccc15a8f
--- /dev/null
+++ b/net-p2p/ktorrent/files/digest-ktorrent-2.2.3
@@ -0,0 +1,3 @@
+MD5 7ff467ee9443f9fa63769cd8a640932e ktorrent-2.2.3.tar.gz 3842249
+RMD160 ce8a6e16fd8d4828194ef60da45fec521f4f99ad ktorrent-2.2.3.tar.gz 3842249
+SHA256 241accfa094c464063cc0f17e27f3cd2bcb8f6f46df92f4ca8eac5f9064e8fc2 ktorrent-2.2.3.tar.gz 3842249
diff --git a/net-p2p/ktorrent/files/ktorrent-2.2.1-fix-wait-job-crash.patch b/net-p2p/ktorrent/files/ktorrent-2.2.1-fix-wait-job-crash.patch
deleted file mode 100644
index 155337f059ed..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-2.2.1-fix-wait-job-crash.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naru ktorrent_old/apps/ktorrent/ktorrentcore.cpp ktorrent_new/apps/ktorrent/ktorrentcore.cpp
---- ktorrent_old/apps/ktorrent/ktorrentcore.cpp	2007-07-23 12:43:11.000000000 -0400
-+++ ktorrent_new/apps/ktorrent/ktorrentcore.cpp	2007-08-07 00:44:13.000000000 -0400
-@@ -1,5 +1,5 @@
- /***************************************************************************
-- *   Copyright (C) 2005 by                                                 *
-+ *   copyright (C) 2005 by                                                 *
-  *   Joris Guisson <joris.guisson@gmail.com>                               *
-  *   Ivan Vasic <ivasic@gmail.com>                                         *
-  *                                                                         *
-@@ -593,9 +593,7 @@
- 	qman->onExit(job);
- 	// wait for completion of stopped events
- 	if (job->needToWait())
--	{
- 		WaitJob::execute(job);
--	}
- 	else
- 		delete job;
- 	
-diff -Naru ktorrent_old/libktorrent/pluginmanager.cpp ktorrent_new/libktorrent/pluginmanager.cpp
---- ktorrent_old/libktorrent/pluginmanager.cpp	2007-07-23 12:43:10.000000000 -0400
-+++ ktorrent_new/libktorrent/pluginmanager.cpp	2007-08-07 00:46:55.000000000 -0400
-@@ -125,12 +125,13 @@
- 			p->shutdown(wjob);
- 			if (wjob->needToWait())
- 				bt::WaitJob::execute(wjob);
-+			else
-+			  delete wjob;
- 		}
- 		catch (Error & err)
- 		{
- 			Out(SYS_GEN|LOG_NOTICE) << "Error when unloading plugin: " << err.toString() << endl;
- 		}
--		delete wjob;
- 
- 		gui->removePluginGui(p);
- 		p->unload();
-@@ -174,14 +175,16 @@
- 				p->shutdown(wjob);
- 				i++;
- 			}
-+
- 			if (wjob->needToWait())
- 				bt::WaitJob::execute(wjob);
-+			else
-+			  delete wjob;
- 		}
- 		catch (Error & err)
- 		{
- 			Out(SYS_GEN|LOG_NOTICE) << "Error when unloading all plugins: " << err.toString() << endl;
- 		}
--		delete wjob;
- 		
- 		// then unload them
- 		bt::PtrMap<QString,Plugin>::iterator i = plugins.begin();
diff --git a/net-p2p/ktorrent/ktorrent-2.1.4.ebuild b/net-p2p/ktorrent/ktorrent-2.1.4.ebuild
deleted file mode 100644
index 1e3df7e2de29..000000000000
--- a/net-p2p/ktorrent/ktorrent-2.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.1.4.ebuild,v 1.6 2007/08/17 13:41:46 corsair Exp $
-
-inherit kde
-
-MY_P="${P/_/}"
-MY_PV="${PV/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A BitTorrent program for KDE."
-HOMEPAGE="http://ktorrent.org/"
-SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdeenablefinal"
-
-DEPEND="dev-libs/gmp"
-
-need-kde 3.4
-
-LANGS="bg br ca cs cy da de el en_GB es et eu fr ga gl hu it ja km lt
-mk ms nb 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
-
-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
-	rm -f ${S}/configure
-	sed -i -e "s:SUBDIRS=.*:SUBDIRS=${MAKE_LANGS}:" Makefile.am
-}
-
-src_compile(){
-	local myconf="--enable-knetwork"
-	kde_src_compile
-}
diff --git a/net-p2p/ktorrent/ktorrent-2.2.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-2.2.1-r1.ebuild
deleted file mode 100644
index a82e01467992..000000000000
--- a/net-p2p/ktorrent/ktorrent-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.1-r1.ebuild,v 1.1 2007/08/10 20:05:19 keytoaster Exp $
-
-inherit kde
-
-MY_P="${P/_/}"
-MY_PV="${PV/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A BitTorrent program for KDE."
-HOMEPAGE="http://ktorrent.org/"
-SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdeenablefinal"
-
-DEPEND="dev-libs/gmp"
-
-need-kde 3.4
-
-LANGS="ar bg br ca cs cy da de el en_GB es et fa fr gl hu it ja ka lt
-ms 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
-
-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
-	rm -f ${S}/configure
-	sed -i -e "s:SUBDIRS=.*:SUBDIRS=${MAKE_LANGS}:" Makefile.am
-
-	# Prevent a crash, fixes bug 187977
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fix-wait-job-crash.patch"
-}
-
-src_compile(){
-	local myconf="--enable-knetwork"
-	kde_src_compile
-}
diff --git a/net-p2p/ktorrent/ktorrent-2.2.3.ebuild b/net-p2p/ktorrent/ktorrent-2.2.3.ebuild
new file mode 100644
index 000000000000..6a79787e9d98
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-2.2.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.3.ebuild,v 1.1 2007/11/16 23:48:32 philantrop Exp $
+
+inherit kde
+
+MY_P="${P/_/}"
+MY_PV="${PV/_/}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A BitTorrent program for KDE."
+HOMEPAGE="http://ktorrent.org/"
+SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi geoip kdeenablefinal"
+
+DEPEND="dev-libs/gmp
+		avahi? ( >=net-dns/avahi-0.6.16-r1 )
+		geoip? ( >=dev-libs/geoip-1.4.0-r1 )"
+RDEPEND="${DEPEND}
+		|| ( kde-base/kdebase kde-base/kdebase-kioslaves )"
+
+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
+
+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 and geoip
+	epatch "${FILESDIR}/${PN}-2.2.2-avahi-check.patch"
+	epatch "${FILESDIR}/${PN}-2.2.2-geoip-check.patch"
+
+	rm -f "${S}/configure"
+}
+
+src_compile(){
+	local myconf="--enable-knetwork --enable-builtin-country-flags"
+	myconf="${myconf} --enable-torrent-mimetype"
+
+	if use geoip ; then
+		myconf="${myconf} --enable-system-geoip --disable-geoip"
+	else
+		myconf="${myconf} --disable-geoip --disable-system-geoip"
+	fi
+
+	if use avahi ; then
+		myconf="${myconf} --with-avahi"
+	else
+		myconf="${myconf} --without-avahi"
+	fi
+
+	kde_src_compile
+}