8 files changed, 87 insertions, 60 deletions
diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index db2c2c9e642a..a7c871daae17 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,13 @@
 # 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.60 2007/08/17 13:41:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.61 2007/09/01 15:15:17 philantrop Exp $
+
+*ktorrent-2.2.2 (31 Aug 2007)
+
+  31 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  -ktorrent-2.1.3.ebuild, -ktorrent-2.2.1.ebuild, +ktorrent-2.2.2.ebuild:
+  Removed the obsolete versions 2.1.3 and 2.2.1.
+  Version bump to 2.2.2 as per bug 190806.
 
   17 Aug 2007; Markus Rothe <corsair@gentoo.org> ktorrent-2.1.4.ebuild:
   Stable on ppc64; bug #188823
diff --git a/net-p2p/ktorrent/files/digest-ktorrent-2.1.3 b/net-p2p/ktorrent/files/digest-ktorrent-2.1.3
deleted file mode 100644
index d8c075f09922..000000000000
--- a/net-p2p/ktorrent/files/digest-ktorrent-2.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b131cd51f697f7bc539f47e73a6a2ca5 ktorrent-2.1.3.tar.gz 3622588
-RMD160 6c85512c9a69f2f1743febed356a6d9964a79850 ktorrent-2.1.3.tar.gz 3622588
-SHA256 ee73a3cf28cf39e521ddffd8a4cdeda69bf8408086afc1eb9d2605aac1574f2e ktorrent-2.1.3.tar.gz 3622588
diff --git a/net-p2p/ktorrent/files/digest-ktorrent-2.2.1 b/net-p2p/ktorrent/files/digest-ktorrent-2.2.1
deleted file mode 100644
index 95d70a1cf841..000000000000
--- a/net-p2p/ktorrent/files/digest-ktorrent-2.2.1
+++ /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.2 b/net-p2p/ktorrent/files/digest-ktorrent-2.2.2
new file mode 100644
index 000000000000..5d0ca767803e
--- /dev/null
+++ b/net-p2p/ktorrent/files/digest-ktorrent-2.2.2
@@ -0,0 +1,3 @@
+MD5 f3bd4cdcb45cefcd85599907781c6e21 ktorrent-2.2.2.tar.gz 3820959
+RMD160 afdc0b3f62c03f5594fe21ebf8c35e19b8b49b48 ktorrent-2.2.2.tar.gz 3820959
+SHA256 1be155d62b4533386dccb12de8dc3a28c1020c08c7c25223e1d31856d8b5e16b ktorrent-2.2.2.tar.gz 3820959
diff --git a/net-p2p/ktorrent/files/ktorrent-2.2.2-avahi-check.patch b/net-p2p/ktorrent/files/ktorrent-2.2.2-avahi-check.patch
new file mode 100644
index 000000000000..8cebc5958886
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-2.2.2-avahi-check.patch
@@ -0,0 +1,34 @@
+diff -Naur ktorrent-2.2.2.orig/configure.in.in ktorrent-2.2.2/configure.in.in
+--- ktorrent-2.2.2.orig/configure.in.in	2007-08-28 19:31:57.000000000 +0200
++++ ktorrent-2.2.2/configure.in.in	2007-09-01 15:34:25.000000000 +0200
+@@ -179,15 +179,20 @@
+ m4_pattern_allow(PKG_CONFIG_MIN_VERSION)
+ PKG_PROG_PKG_CONFIG
+ 
+-PKG_CHECK_MODULES( AVAHI,  avahi-client >= 0.6.10, 
+-[ 
+-	AC_SUBST(AVAHI_CFLAGS)
+-	AC_SUBST(AVAHI_LIBS)
+-	avahi=true
+-],
+-[
+-	missing_avahi_warning=yes
+-	avahi=false
+-])
++AC_ARG_WITH([avahi], AS_HELP_STRING([--without-avahi], [Build without avahi/ZeroConf support (default: test)]))
++
++avahi=false
++if test "x$with_avahi" != "xno"; then
++	PKG_CHECK_MODULES( AVAHI,  avahi-client >= 0.6.10, 
++	[ 
++		AC_SUBST(AVAHI_CFLAGS)
++		AC_SUBST(AVAHI_LIBS)
++		avahi=true
++	],
++	[
++		missing_avahi_warning=yes
++		avahi=false
++	])
++fi
+ 
+ AM_CONDITIONAL(COMPILE_ZEROCONF, test x$avahi = xtrue)
diff --git a/net-p2p/ktorrent/files/ktorrent-2.2.2-geoip-check.patch b/net-p2p/ktorrent/files/ktorrent-2.2.2-geoip-check.patch
new file mode 100644
index 000000000000..81a669ea0673
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-2.2.2-geoip-check.patch
@@ -0,0 +1,12 @@
+diff -Naur ktorrent-2.2.2.orig/configure.in.in ktorrent-2.2.2/configure.in.in
+--- ktorrent-2.2.2.orig/configure.in.in	2007-09-01 15:51:27.000000000 +0200
++++ ktorrent-2.2.2/configure.in.in	2007-09-01 16:11:59.000000000 +0200
+@@ -134,7 +134,7 @@
+              else
+                 AC_MSG_ERROR(cannot enable system geoip. GeoIP library headers were not found on your system)
+              fi ;;
+-        no) system_geoip=true ;;
++        no) system_geoip=false ;;
+         *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-geoip) ;;
+     esac],[system_geoip=false])
+ 
diff --git a/net-p2p/ktorrent/ktorrent-2.1.3.ebuild b/net-p2p/ktorrent/ktorrent-2.1.3.ebuild
deleted file mode 100644
index a1454d5e0bfc..000000000000
--- a/net-p2p/ktorrent/ktorrent-2.1.3.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.3.ebuild,v 1.7 2007/07/13 05:52:07 mr_bones_ 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.ebuild b/net-p2p/ktorrent/ktorrent-2.2.2.ebuild
index 4dcb3c3d1f02..cfabf2e4bb15 100644
--- a/net-p2p/ktorrent/ktorrent-2.2.1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2007/07/25 19:07:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.2.ebuild,v 1.1 2007/09/01 15:15:18 philantrop Exp $
 
 inherit kde
 
@@ -15,14 +15,17 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdeenablefinal"
+IUSE="avahi geoip kdeenablefinal"
 
-DEPEND="dev-libs/gmp"
+DEPEND="dev-libs/gmp
+		avahi? ( >=net-dns/avahi-0.6.16-r1 )
+		geoip? ( >=dev-libs/geoip-1.4.0-r1 )"
+RDEPEND="${DEPEND}"
 
-need-kde 3.4
+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 nds nl pa pl pt pt_BR ru rw sk sr sr@Latn sv tr uk zh_CN zh_TW"
+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}"
@@ -36,11 +39,31 @@ src_unpack() {
 	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
+
+	cd "${S}"
+	# Fix automagic dependencies on avahi and geoip
+	epatch "${FILESDIR}/${P}-avahi-check.patch"
+	epatch "${FILESDIR}/${P}-geoip-check.patch"
+
+	rm -f "${S}/configure"
 }
 
 src_compile(){
-	local myconf="--enable-knetwork"
+	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
 }