Removed the obsolete versions 2.1.3 and 2.2.1.

Version bump to 2.2.2 as per bug 190806.

Package-Manager: portage-2.1.3.7

9 files changed, 117 insertions, 79 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/Manifest b/net-p2p/ktorrent/Manifest
index 1692a41c2561..cf8f19cc44c2 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,14 +1,21 @@
+-----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
-DIST ktorrent-2.1.3.tar.gz 3622588 RMD160 6c85512c9a69f2f1743febed356a6d9964a79850 SHA1 119ad7b0b41f9061988aeba76191b96311b493d3 SHA256 ee73a3cf28cf39e521ddffd8a4cdeda69bf8408086afc1eb9d2605aac1574f2e
+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
+SHA256 9565dec0c236fdb25da46117650c4ad35379227130fd763336c3625523b80c75 files/ktorrent-2.2.2-avahi-check.patch 893
+AUX ktorrent-2.2.2-geoip-check.patch 577 RMD160 d4f0c141225c7ed793fa81ecd5a9d10d17a0d525 SHA1 19e26f12aa793892fd3b6a6374220f45eb277312 SHA256 1db09db76d876aa75ca9e9be1128ce060d8409d27470c2df7d8595b7ea2aa74d
+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
-EBUILD ktorrent-2.1.3.ebuild 1090 RMD160 7fb6d3c76f341ae5dcbabd5fcd3de13f4e27a063 SHA1 639e526847244957942b98551cd58199424dfe49 SHA256 cb23bb66eb44f84d0cb3b4b34de51493e86c2e6d1d3f8ab02027d581f7cb1f03
-MD5 986b89597dc3d58f5b057e7e45c345cf ktorrent-2.1.3.ebuild 1090
-RMD160 7fb6d3c76f341ae5dcbabd5fcd3de13f4e27a063 ktorrent-2.1.3.ebuild 1090
-SHA256 cb23bb66eb44f84d0cb3b4b34de51493e86c2e6d1d3f8ab02027d581f7cb1f03 ktorrent-2.1.3.ebuild 1090
+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
@@ -17,27 +24,31 @@ EBUILD ktorrent-2.2.1-r1.ebuild 1198 RMD160 74741d2061d33271dd76f91241e2a63f67ab
 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
-EBUILD ktorrent-2.2.1.ebuild 1089 RMD160 644df5201dae422ad15869a78129485d13880004 SHA1 7b8bc68d3ec58a96ff7da144a0dde7f1dd960316 SHA256 a2c5d9c6faac60afede4e3762938728d8b57327a765974060f35a6ab9273d01d
-MD5 75076b87813d18329d1dfb44830df6c8 ktorrent-2.2.1.ebuild 1089
-RMD160 644df5201dae422ad15869a78129485d13880004 ktorrent-2.2.1.ebuild 1089
-SHA256 a2c5d9c6faac60afede4e3762938728d8b57327a765974060f35a6ab9273d01d ktorrent-2.2.1.ebuild 1089
-MISC ChangeLog 8640 RMD160 89c156661785d65050a7c67ca26492960178b490 SHA1 d71f343dc6706f9886d3e03d063c07b7684821d4 SHA256 76351e362c0dc66dd73946dceff5299dcd8d05324ea82f3d10bd7f41d720a41a
-MD5 d9abb0590d0aed48e665593a76caf853 ChangeLog 8640
-RMD160 89c156661785d65050a7c67ca26492960178b490 ChangeLog 8640
-SHA256 76351e362c0dc66dd73946dceff5299dcd8d05324ea82f3d10bd7f41d720a41a ChangeLog 8640
+EBUILD ktorrent-2.2.2.ebuild 1693 RMD160 04cc2d3e5f712cc7cfc83a5eb0333e69900e0f2b SHA1 c165a98aebc34f4d4812e0785e9f32f55028941c SHA256 d44897943433adc453cef796193e85621a264f7a0a97f2cee72e32be5ea19019
+MD5 d6125cf478043d3799aa0f1921e7d67b ktorrent-2.2.2.ebuild 1693
+RMD160 04cc2d3e5f712cc7cfc83a5eb0333e69900e0f2b ktorrent-2.2.2.ebuild 1693
+SHA256 d44897943433adc453cef796193e85621a264f7a0a97f2cee72e32be5ea19019 ktorrent-2.2.2.ebuild 1693
+MISC ChangeLog 8896 RMD160 dcadebf0b617fceb7b96212592d6437cd0f5ccec SHA1 fb0179dbcb3628041276d8872bd39938172b04d6 SHA256 48681e195ddcb796ca85a39ae01eb643b870640c734605646bb08b4204e5ab66
+MD5 72e41484061d069e5ef0fd58f67f7417 ChangeLog 8896
+RMD160 dcadebf0b617fceb7b96212592d6437cd0f5ccec ChangeLog 8896
+SHA256 48681e195ddcb796ca85a39ae01eb643b870640c734605646bb08b4204e5ab66 ChangeLog 8896
 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 b7d5c0b0725df1212d6cbec8fbf66ba3 files/digest-ktorrent-2.1.3 247
-RMD160 339ebd49383d6d5daf3f3d5f873285488d34e090 files/digest-ktorrent-2.1.3 247
-SHA256 8ea8fd72a30f1e437fe323e5995cc9e4c19950b5a1d5cf5023d2e7ff9ddb8be5 files/digest-ktorrent-2.1.3 247
 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 247
-RMD160 7026a970640e1e6862f67c977ce4076cdafb72df files/digest-ktorrent-2.2.1 247
-SHA256 b0ff92094488199b1179e1a9a518ca611e4c3e99224c82c88be49c453b2f416e files/digest-ktorrent-2.2.1 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.6 (GNU/Linux)
+
+iD8DBQFG2YIMCkvF58q80IkRAjq8AKCnctckOdMmKp8CQjixR4T/cIxepwCeKT0E
+vF6Tb5+YTy8mFGKZ99W62ds=
+=10z/
+-----END PGP SIGNATURE-----
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
 }