5 files changed, 87 insertions, 12 deletions
diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index b4a4dac3863b..355773629ca0 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.74 2008/01/06 22:44:24 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.75 2008/01/29 02:19:23 tgurr Exp $
+
+*ktorrent-2.2.5 (29 Jan 2008)
+
+  29 Jan 2008; Timo Gurr <tgurr@gentoo.org>
+  +files/ktorrent-2.2.5-avahi-check.patch, -ktorrent-2.2.2.ebuild,
+  +ktorrent-2.2.5.ebuild:
+  Add ktorrent-2.2.5.ebuild and clean out old.
 
   06 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
   ktorrent-2.2.4.ebuild:
diff --git a/net-p2p/ktorrent/files/digest-ktorrent-2.2.2 b/net-p2p/ktorrent/files/digest-ktorrent-2.2.2
deleted file mode 100644
index 5d0ca767803e..000000000000
--- a/net-p2p/ktorrent/files/digest-ktorrent-2.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-ktorrent-2.2.5 b/net-p2p/ktorrent/files/digest-ktorrent-2.2.5
new file mode 100644
index 000000000000..185888bd6c2c
--- /dev/null
+++ b/net-p2p/ktorrent/files/digest-ktorrent-2.2.5
@@ -0,0 +1,3 @@
+MD5 070e84112b8dd146c1ad403c5403f076 ktorrent-2.2.5.tar.bz2 2593138
+RMD160 2fb07708045baca340574849cb315136cbb7c38a ktorrent-2.2.5.tar.bz2 2593138
+SHA256 7d4e05b03ac6b58fe7cba452276c3e038e52b415828e5846224f7bf2aea36be6 ktorrent-2.2.5.tar.bz2 2593138
diff --git a/net-p2p/ktorrent/files/ktorrent-2.2.5-avahi-check.patch b/net-p2p/ktorrent/files/ktorrent-2.2.5-avahi-check.patch
new file mode 100644
index 000000000000..c0f13d53e93d
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-2.2.5-avahi-check.patch
@@ -0,0 +1,55 @@
+diff -Naur ktorrent-2.2.5/configure.in.in ktorrent-2.2.5.new/configure.in.in
+--- ktorrent-2.2.5/configure.in.in	2008-01-27 13:06:11.000000000 +0100
++++ ktorrent-2.2.5.new/configure.in.in	2008-01-29 02:05:00.766380548 +0100
+@@ -179,26 +179,31 @@
+ 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)]))
+ 
+-PKG_CHECK_MODULES( AVAHI_QT3,  avahi-qt3 >= 0.6.10, 
+-[ 
+-	AC_SUBST(AVAHI_QT3_CFLAGS)
+-	AC_SUBST(AVAHI_QT3_LIBS)
+-	avahi=true
+-],
+-[
+-	missing_avahi_warning=yes
+-	avahi=false
+-])
++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
++	])
++
++	PKG_CHECK_MODULES( AVAHI_QT3,  avahi-qt3 >= 0.6.10, 
++	[ 
++		AC_SUBST(AVAHI_QT3_CFLAGS)
++		AC_SUBST(AVAHI_QT3_LIBS)
++		avahi=true
++	],
++	[
++		missing_avahi_warning=yes
++		avahi=false
++	])
++fi
+ 
+ AM_CONDITIONAL(COMPILE_ZEROCONF, test x$avahi = xtrue)
diff --git a/net-p2p/ktorrent/ktorrent-2.2.2.ebuild b/net-p2p/ktorrent/ktorrent-2.2.5.ebuild
index 923e3f16d0d6..3b72b967fafc 100644
--- a/net-p2p/ktorrent/ktorrent-2.2.2.ebuild
+++ b/net-p2p/ktorrent/ktorrent-2.2.5.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2.ebuild,v 1.7 2007/11/17 14:02:30 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.5.ebuild,v 1.1 2008/01/29 02:19:23 tgurr 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"
+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"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="avahi geoip kdeenablefinal"
 
 DEPEND="dev-libs/gmp
@@ -23,6 +21,8 @@ DEPEND="dev-libs/gmp
 RDEPEND="${DEPEND}
 		|| ( kde-base/kdebase kde-base/kdebase-kioslaves )"
 
+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
@@ -32,6 +32,19 @@ 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
 
@@ -44,8 +57,8 @@ src_unpack() {
 
 	cd "${S}"
 	# Fix automagic dependencies on avahi and geoip
-	epatch "${FILESDIR}/${P}-avahi-check.patch"
-	epatch "${FILESDIR}/${P}-geoip-check.patch"
+	epatch "${FILESDIR}/${PN}-2.2.5-avahi-check.patch"
+	epatch "${FILESDIR}/${PN}-2.2.2-geoip-check.patch"
 
 	rm -f "${S}/configure"
 }