Add ktorrent-2.2.5.ebuild and clean out old.

Package-Manager: portage-2.1.4

6 files changed, 103 insertions, 24 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/Manifest b/net-p2p/ktorrent/Manifest
index d917dab93531..b5baa8e87a90 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -6,27 +6,31 @@ 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.2.2.tar.gz 3820959 RMD160 afdc0b3f62c03f5594fe21ebf8c35e19b8b49b48 SHA1 a9f780bca529e7628e5a9aeba8d22dcfde0a46e6 SHA256 1be155d62b4533386dccb12de8dc3a28c1020c08c7c25223e1d31856d8b5e16b
+AUX ktorrent-2.2.5-avahi-check.patch 1263 RMD160 f184a508351a90e376b5bbf4642551e445f6dd1e SHA1 e0763c7e361a802105495810422745ce03ae2011 SHA256 2e7d7be8a6ca23ee75bf9f3745ef246d6f8990e8eb550170257a5a1b126fff06
+MD5 444e5772967f39423967fd415028fe70 files/ktorrent-2.2.5-avahi-check.patch 1263
+RMD160 f184a508351a90e376b5bbf4642551e445f6dd1e files/ktorrent-2.2.5-avahi-check.patch 1263
+SHA256 2e7d7be8a6ca23ee75bf9f3745ef246d6f8990e8eb550170257a5a1b126fff06 files/ktorrent-2.2.5-avahi-check.patch 1263
 DIST ktorrent-2.2.4.tar.gz 3843873 RMD160 5f5e6456c194f327d4c7fcf3cb11abec197f5a6b SHA1 f0451984d2e9c9c76f84ce360e6427ececc29531 SHA256 5a75a9955124b5f02c387318737a0e8720132d939980557148c2686914354e9e
-EBUILD ktorrent-2.2.2.ebuild 1741 RMD160 b114dd9c320311dfae5e1aa4188f2fc3e3e96049 SHA1 62e8b6b9bcf6cc62cee8ce573ddd7ec5f4eb9afd SHA256 dbb2f1c2c622995ef11dc3d0928adae95fe2cb8bdcc281a947f4c5031da156dc
-MD5 301fd464ac9e8267d82304091b491752 ktorrent-2.2.2.ebuild 1741
-RMD160 b114dd9c320311dfae5e1aa4188f2fc3e3e96049 ktorrent-2.2.2.ebuild 1741
-SHA256 dbb2f1c2c622995ef11dc3d0928adae95fe2cb8bdcc281a947f4c5031da156dc ktorrent-2.2.2.ebuild 1741
+DIST ktorrent-2.2.5.tar.bz2 2593138 RMD160 2fb07708045baca340574849cb315136cbb7c38a SHA1 c47be6fde49c4b60ba749abccaf686345e593e20 SHA256 7d4e05b03ac6b58fe7cba452276c3e038e52b415828e5846224f7bf2aea36be6
 EBUILD ktorrent-2.2.4.ebuild 1755 RMD160 cb5dc0315179e5b9dda4c556220b83f3a83c12f0 SHA1 b3fed70f265f2743688b6b48cf113d8848cb426d SHA256 378327870df4e0eb23d5169d6d7ab162604eebb2a2a368cf211cda59a0c1ba5e
 MD5 16b452be39834416deed186dbc25d2ef ktorrent-2.2.4.ebuild 1755
 RMD160 cb5dc0315179e5b9dda4c556220b83f3a83c12f0 ktorrent-2.2.4.ebuild 1755
 SHA256 378327870df4e0eb23d5169d6d7ab162604eebb2a2a368cf211cda59a0c1ba5e ktorrent-2.2.4.ebuild 1755
-MISC ChangeLog 10642 RMD160 dcc2f7bb4a1f80aeccdbab168c84465286d34939 SHA1 f11938bda7bf2c56d71dfbb33969712fa88cd406 SHA256 ae5bd73a0f250550edbb8aeed32000cb1e1b3f72f1f18c1cd2cc53ef11a15954
-MD5 383436c27c665424cc75028e0fd039e6 ChangeLog 10642
-RMD160 dcc2f7bb4a1f80aeccdbab168c84465286d34939 ChangeLog 10642
-SHA256 ae5bd73a0f250550edbb8aeed32000cb1e1b3f72f1f18c1cd2cc53ef11a15954 ChangeLog 10642
+EBUILD ktorrent-2.2.5.ebuild 2136 RMD160 9ee5dfc187f8d062c0ed7e81395734f56a193824 SHA1 0438d755f23b30101427fb1a7f569005f4da8db1 SHA256 9f0d1eca5ad05784f5ab53e9c49574fd3b57e8b0cfb4645b5b93f0518c0db219
+MD5 1bb4843c44123f7b8d8c5a16a29cc694 ktorrent-2.2.5.ebuild 2136
+RMD160 9ee5dfc187f8d062c0ed7e81395734f56a193824 ktorrent-2.2.5.ebuild 2136
+SHA256 9f0d1eca5ad05784f5ab53e9c49574fd3b57e8b0cfb4645b5b93f0518c0db219 ktorrent-2.2.5.ebuild 2136
+MISC ChangeLog 10853 RMD160 f3e53cc685f7fe5acd0b4f3e652a1b8940711611 SHA1 045a1698c7a6ce3ce9095e931ae97b693860e4c8 SHA256 eecf199e8ba5043485abc02491445231ad52f193d8ef314d5fe8780dcf850af7
+MD5 42431dc43965d3f066a38011c063b15e ChangeLog 10853
+RMD160 f3e53cc685f7fe5acd0b4f3e652a1b8940711611 ChangeLog 10853
+SHA256 eecf199e8ba5043485abc02491445231ad52f193d8ef314d5fe8780dcf850af7 ChangeLog 10853
 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 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
 MD5 ffd01a8c4eccb540754ba6c14d6e1faf files/digest-ktorrent-2.2.4 247
 RMD160 3b936f8a2f0433880e82fb3a487c368484e6ef1c files/digest-ktorrent-2.2.4 247
 SHA256 2bd5e67c710cd290d9a764a7aad24739d3694525e37cf0f6dea8d9d58792929d files/digest-ktorrent-2.2.4 247
+MD5 aadafa0634b8869fce3714c101a99616 files/digest-ktorrent-2.2.5 250
+RMD160 5ce44ded3eb12f38239b054b12425dfeeed824e0 files/digest-ktorrent-2.2.5 250
+SHA256 70183aa9ebe1da93466c0b9b742f87de329c90bdf786220e84e39d777ca0cfa0 files/digest-ktorrent-2.2.5 250
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"
 }