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

Package-Manager: portage-2.1.3.19

9 files changed, 94 insertions, 193 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/Manifest b/net-p2p/ktorrent/Manifest
index 3a5c0d41a074..8555bfcb7233 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,10 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX ktorrent-2.2.1-fix-wait-job-crash.patch 1896 RMD160 ee15d8f0b141b12b958e13c22c8f121d33fe3a0e SHA1 8503274db402198889ae343ac6e2a671d8ca6305 SHA256 cd0e212b9849bcf10399530b722d5e53b9e0c37277f4f1e03d801e62372f3aa1
-MD5 15d92119adf7ff5809242923ba46a6c5 files/ktorrent-2.2.1-fix-wait-job-crash.patch 1896
-RMD160 ee15d8f0b141b12b958e13c22c8f121d33fe3a0e files/ktorrent-2.2.1-fix-wait-job-crash.patch 1896
-SHA256 cd0e212b9849bcf10399530b722d5e53b9e0c37277f4f1e03d801e62372f3aa1 files/ktorrent-2.2.1-fix-wait-job-crash.patch 1896
 AUX ktorrent-2.2.2-avahi-check.patch 893 RMD160 bdf0ed0ab1ef7c254aa31dd258409b876cd76773 SHA1 9f775de8a185772f09e13b46d4b04f9cc6840473 SHA256 9565dec0c236fdb25da46117650c4ad35379227130fd763336c3625523b80c75
 MD5 29ed91f4faef1eac27fd5e66f0593537 files/ktorrent-2.2.2-avahi-check.patch 893
 RMD160 bdf0ed0ab1ef7c254aa31dd258409b876cd76773 files/ktorrent-2.2.2-avahi-check.patch 893
@@ -13,42 +6,27 @@ AUX ktorrent-2.2.2-geoip-check.patch 577 RMD160 d4f0c141225c7ed793fa81ecd5a9d10d
 MD5 14e344337b4b125fa987ab3783c0da85 files/ktorrent-2.2.2-geoip-check.patch 577
 RMD160 d4f0c141225c7ed793fa81ecd5a9d10d17a0d525 files/ktorrent-2.2.2-geoip-check.patch 577
 SHA256 1db09db76d876aa75ca9e9be1128ce060d8409d27470c2df7d8595b7ea2aa74d files/ktorrent-2.2.2-geoip-check.patch 577
-DIST ktorrent-2.1.4.tar.gz 3631999 RMD160 8286012e5fbc0bd827d5cb70c7895e5460f21a0b SHA1 454992ec5f0b4f67e62474cf863a2d66dbd77f28 SHA256 d492f75801c180202e99ca9c9cdff0b54e2f5d8e4ae2dddccbf1aac218276c48
-DIST ktorrent-2.2.1.tar.gz 3763678 RMD160 329b6e0556a11875d7ce36d669c5c25370552936 SHA1 53dd36430fd47b396b16d30d466c45bd87ae40b2 SHA256 cd5f7ca8d9a06a317c4adf6336328dc79bdf6c7f7d31588af691ba202ef267f3
 DIST ktorrent-2.2.2.tar.gz 3820959 RMD160 afdc0b3f62c03f5594fe21ebf8c35e19b8b49b48 SHA1 a9f780bca529e7628e5a9aeba8d22dcfde0a46e6 SHA256 1be155d62b4533386dccb12de8dc3a28c1020c08c7c25223e1d31856d8b5e16b
-EBUILD ktorrent-2.1.4.ebuild 1088 RMD160 e226e0de2d9159a794117f4a22718982dab129b9 SHA1 f41a91dd4e6f4099898adad6b68af18da6aad3fc SHA256 aa8f6df4375b3a317ab708e509cea182a060c86eb9bc76479bead8085d720afc
-MD5 070e041b60fb67b7e6979c5a8f4954d8 ktorrent-2.1.4.ebuild 1088
-RMD160 e226e0de2d9159a794117f4a22718982dab129b9 ktorrent-2.1.4.ebuild 1088
-SHA256 aa8f6df4375b3a317ab708e509cea182a060c86eb9bc76479bead8085d720afc ktorrent-2.1.4.ebuild 1088
-EBUILD ktorrent-2.2.1-r1.ebuild 1198 RMD160 74741d2061d33271dd76f91241e2a63f67ab7297 SHA1 c44b957ee730961ab27962e8500628b5a91f67a8 SHA256 57b136038dab4965eb6eeb9ba9e46a3cfa69566cbbbf22fad8ffd96c20f614bc
-MD5 83a92dd207547cbfaa16e729f2eff041 ktorrent-2.2.1-r1.ebuild 1198
-RMD160 74741d2061d33271dd76f91241e2a63f67ab7297 ktorrent-2.2.1-r1.ebuild 1198
-SHA256 57b136038dab4965eb6eeb9ba9e46a3cfa69566cbbbf22fad8ffd96c20f614bc ktorrent-2.2.1-r1.ebuild 1198
+DIST ktorrent-2.2.3.tar.gz 3842249 RMD160 ce8a6e16fd8d4828194ef60da45fec521f4f99ad SHA1 37aa754d5df409ce987e4b700d3c69b46175d4a8 SHA256 241accfa094c464063cc0f17e27f3cd2bcb8f6f46df92f4ca8eac5f9064e8fc2
 EBUILD ktorrent-2.2.2.ebuild 1688 RMD160 90cedddbfba6eebbfff78e26189a1474042eeac4 SHA1 3cb5f03fcb15716c7bf66a11a3c9767aea514837 SHA256 564e9b710aaa217cf761f674ea2753ae37b58cb3ef125426514d2bfe8c3a55a3
 MD5 5573361f357d73fb9be285da9eca5391 ktorrent-2.2.2.ebuild 1688
 RMD160 90cedddbfba6eebbfff78e26189a1474042eeac4 ktorrent-2.2.2.ebuild 1688
 SHA256 564e9b710aaa217cf761f674ea2753ae37b58cb3ef125426514d2bfe8c3a55a3 ktorrent-2.2.2.ebuild 1688
-MISC ChangeLog 9428 RMD160 ca353d640f2fb80de91eb24dd49cf4ce7944f568 SHA1 b7b5d5e809058b119bf2282ac38efac34efb8e18 SHA256 7fee726aec5efe01cf2a54722a1be7b0b208e5c170da45932eee8a9738646619
-MD5 a6dc3eb0d41d2e1572174c874218bae1 ChangeLog 9428
-RMD160 ca353d640f2fb80de91eb24dd49cf4ce7944f568 ChangeLog 9428
-SHA256 7fee726aec5efe01cf2a54722a1be7b0b208e5c170da45932eee8a9738646619 ChangeLog 9428
+EBUILD ktorrent-2.2.3.ebuild 1760 RMD160 a6a26b7ee7044728093f7388e87aa8fcbac4841f SHA1 31150f86dd2416aae79889e21922ab77c3357964 SHA256 ce87d8f9ffcacf867fd6b1ba39583da53459e3e47ae2a05753ef32c18f23646e
+MD5 503b3c9be5824c980170618794bb6af5 ktorrent-2.2.3.ebuild 1760
+RMD160 a6a26b7ee7044728093f7388e87aa8fcbac4841f ktorrent-2.2.3.ebuild 1760
+SHA256 ce87d8f9ffcacf867fd6b1ba39583da53459e3e47ae2a05753ef32c18f23646e ktorrent-2.2.3.ebuild 1760
+MISC ChangeLog 9747 RMD160 455abc1706614d176ffe2537b136401e1ba78fb7 SHA1 9fabcb80b16206b0b86d8c237bdc702cfdabfed2 SHA256 81a0db680df2215616a4a7828a42f1ae14f885ba33bb70aa7066869e7873d8bc
+MD5 e5d790271f638d98624bccd58c5df419 ChangeLog 9747
+RMD160 455abc1706614d176ffe2537b136401e1ba78fb7 ChangeLog 9747
+SHA256 81a0db680df2215616a4a7828a42f1ae14f885ba33bb70aa7066869e7873d8bc ChangeLog 9747
 MISC metadata.xml 269 RMD160 7ac49ae10cf6775230212b62ee4810db19e2740f SHA1 28b6b27b1bbda5693da38a72f67f5499b3e5ecd7 SHA256 6a7816be18dec42408286fd5db4bff93e2399d553bb236602db4867f7b955ace
 MD5 67934f757f8a583b51d164de1e905468 metadata.xml 269
 RMD160 7ac49ae10cf6775230212b62ee4810db19e2740f metadata.xml 269
 SHA256 6a7816be18dec42408286fd5db4bff93e2399d553bb236602db4867f7b955ace metadata.xml 269
-MD5 b376b6002ec6d559012f80611d362f67 files/digest-ktorrent-2.1.4 247
-RMD160 d4c88ee2126c9a776f31e08d9fd355c819ae7970 files/digest-ktorrent-2.1.4 247
-SHA256 110f7df9c1d47a3ab2b6216ea4f962e1e4d11b4925087ee6e4106f36458e6855 files/digest-ktorrent-2.1.4 247
-MD5 a2d21be654e0eeb70b70fc812ffe05b9 files/digest-ktorrent-2.2.1-r1 247
-RMD160 7026a970640e1e6862f67c977ce4076cdafb72df files/digest-ktorrent-2.2.1-r1 247
-SHA256 b0ff92094488199b1179e1a9a518ca611e4c3e99224c82c88be49c453b2f416e files/digest-ktorrent-2.2.1-r1 247
 MD5 4eae24bedfea9fa0c0bb2daa2d16554c files/digest-ktorrent-2.2.2 247
 RMD160 9795871f26685793cead00929b83be7715cd427f files/digest-ktorrent-2.2.2 247
 SHA256 b6e9625e570db4aaf1ff079169941024089e366dff7831b285d470d86c70702c files/digest-ktorrent-2.2.2 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHGm20CkvF58q80IkRAoLWAJ4+2yupxKWoK23Vb2HEzN2GWX7s9QCgrCYF
-amhNEKqZ4eyaJdXgTZcFP3E=
-=DQJa
------END PGP SIGNATURE-----
+MD5 868263204b6829c6b6c7aa0ee2e50ff9 files/digest-ktorrent-2.2.3 247
+RMD160 0e232c54b8f0045771507c726ba8445e6c0e316a files/digest-ktorrent-2.2.3 247
+SHA256 adb7b390e027275f186cb333ccd0133d4c1c8e3a9d90449c9f6b7f95d8857ac5 files/digest-ktorrent-2.2.3 247
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
+}