8 files changed, 11 insertions, 297 deletions
diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 53cc57262750..b58d950a6631 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,15 @@
 # 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.91 2008/11/15 18:03:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.92 2008/11/27 20:54:37 scarabeus Exp $
+
+*ktorrent-2.2.8 (27 Nov 2008)
+
+  27 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  -files/ktorrent-2.2.2-avahi-check.patch,
+  -files/ktorrent-2.2.2-geoip-check.patch, -ktorrent-2.2.4.ebuild,
+  -ktorrent-2.2.5-r1.ebuild, -ktorrent-2.2.6.ebuild, +ktorrent-2.2.8.ebuild,
+  -ktorrent-3.1.3.ebuild, -ktorrent-3.1.4.ebuild:
+  Remove old with security issues. Bump new.
 
 *ktorrent-3.1.5 (15 Nov 2008)
 
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
deleted file mode 100644
index 8cebc5958886..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-2.2.2-avahi-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 81a669ea0673..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-2.2.2-geoip-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.2.4.ebuild b/net-p2p/ktorrent/ktorrent-2.2.4.ebuild
deleted file mode 100644
index 2c0b05b348ea..000000000000
--- a/net-p2p/ktorrent/ktorrent-2.2.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.4.ebuild,v 1.7 2008/02/19 02:03:09 ingmar 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-3.5* =kde-base/kdebase-kioslaves-3.5* )"
-
-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
-}
diff --git a/net-p2p/ktorrent/ktorrent-2.2.5-r1.ebuild b/net-p2p/ktorrent/ktorrent-2.2.5-r1.ebuild
deleted file mode 100644
index 60467ac53821..000000000000
--- a/net-p2p/ktorrent/ktorrent-2.2.5-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.5-r1.ebuild,v 1.2 2008/02/19 02:03:09 ingmar Exp $
-
-inherit kde
-
-MY_P="${P/_/}"
-MY_PV="${PV/_/}"
-DESCRIPTION="A BitTorrent program for KDE."
-HOMEPAGE="http://ktorrent.org/"
-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"
-IUSE="avahi kdeenablefinal"
-
-DEPEND="dev-libs/gmp
-	>=dev-libs/geoip-1.4.0-r1
-	avahi? ( >=net-dns/avahi-0.6.16-r1 )"
-RDEPEND="${DEPEND}
-	|| ( =kde-base/kdebase-kioslaves-3.5* =kde-base/kdebase-3.5* )"
-
-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
-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
-
-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
-
-	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
-	epatch "${FILESDIR}/${PN}-2.2.5-avahi-check.patch"
-
-	rm -f "${S}/configure"
-}
-
-src_compile(){
-	local myconf="${myconf}
-		$(use_with avahi)
-		--enable-builtin-country-flags
-		--enable-knetwork
-		--enable-system-geoip
-		--enable-torrent-mimetype
-		--disable-geoip"
-
-	kde_src_compile
-}
diff --git a/net-p2p/ktorrent/ktorrent-2.2.6.ebuild b/net-p2p/ktorrent/ktorrent-2.2.8.ebuild
index 9a5fd9c4ee11..5c7111439d37 100644
--- a/net-p2p/ktorrent/ktorrent-2.2.6.ebuild
+++ b/net-p2p/ktorrent/ktorrent-2.2.8.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2008/04/25 15:30:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.8.ebuild,v 1.1 2008/11/27 20:54:37 scarabeus Exp $
 
 inherit kde
 
diff --git a/net-p2p/ktorrent/ktorrent-3.1.3.ebuild b/net-p2p/ktorrent/ktorrent-3.1.3.ebuild
deleted file mode 100644
index 8a592b707733..000000000000
--- a/net-p2p/ktorrent/ktorrent-3.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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-3.1.3.ebuild,v 1.1 2008/10/15 00:38:42 jmbsvicetto Exp $
-
-EAPI="2"
-
-NEED_KDE=":4.1"
-KDE_LINGUAS="ar be bg ca da de el en_GB eo es et eu fi fr ga gl hi hu it ja km
-lt lv nb nds nl nn oc pl pt pt_BR ro ru se sk sl sv tr uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="A BitTorrent program for KDE."
-HOMEPAGE="http://ktorrent.org/"
-SRC_URI="http://ktorrent.org/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4.1"
-IUSE="+bwscheduler +infowidget +ipfilter +logviewer +mediaplayer +scanfolder +search +stats +upnp webinterface zeroconf"
-
-DEPEND="app-crypt/qca:2
-	app-misc/strigi
-	dev-libs/gmp
-	sys-devel/gettext
-	!kdeprefix? ( !net-p2p/ktorrent:0 )"
-RDEPEND="${DEPEND}
-	infowidget? ( >=dev-libs/geoip-1.4.4 )
-	ipfilter? (
-		|| ( kde-base/kdebase-kioslaves:${SLOT}
-			kde-base/kdelibs:${SLOT} ) )
-	zeroconf? ( kde-base/kdnssd:${SLOT} )"
-
-src_configure() {
-	local mycmakeargs
-
-	mycmakeargs="${mycmakeargs}
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
-		-DENABLE_DHT_SUPPORT=ON
-		$(cmake-utils_use_enable bwscheduler BWSCHEDULER_PLUGIN)
-		$(cmake-utils_use_enable infowidget INFOWIDGET_PLUGIN)
-		$(cmake-utils_use_with infowidget SYSTEM_GEOIP)
-		$(cmake-utils_use_enable ipfilter IPFILTER_PLUGIN)
-		$(cmake-utils_use_enable logviewer LOGVIEWER_PLUGIN)
-		$(cmake-utils_use_enable scanfolder SCANFOLDER_PLUGIN)
-		$(cmake-utils_use_enable search SEARCH_PLUGIN)
-		$(cmake-utils_use_enable stats STATS_PLUGIN)
-		$(cmake-utils_use_enable upnp UPNP_PLUGIN)
-		$(cmake-utils_use_enable webinterface WEBINTERFACE_PLUGIN)
-		$(cmake-utils_use_enable zeroconf ZEROCONF_PLUGIN)
-		$(cmake-utils_use_enable mediaplayer MEDIAPLAYER_PLUGIN)"
-	kde4-base_src_configure
-}
diff --git a/net-p2p/ktorrent/ktorrent-3.1.4.ebuild b/net-p2p/ktorrent/ktorrent-3.1.4.ebuild
deleted file mode 100644
index e1bbdfd784cd..000000000000
--- a/net-p2p/ktorrent/ktorrent-3.1.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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-3.1.4.ebuild,v 1.1 2008/10/23 23:17:13 jmbsvicetto Exp $
-
-EAPI="2"
-
-NEED_KDE=":4.1"
-KDE_LINGUAS="ar be bg ca da de el en_GB eo es et eu fi fr ga gl hi hu it ja km
-lt lv nb nds nl nn oc pl pt pt_BR ro ru se sk sl sv tr uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="A BitTorrent program for KDE."
-HOMEPAGE="http://ktorrent.org/"
-SRC_URI="http://ktorrent.org/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4.1"
-IUSE="+bwscheduler +infowidget +ipfilter +logviewer +mediaplayer +scanfolder +search +stats +upnp webinterface zeroconf"
-
-DEPEND="app-crypt/qca:2
-	app-misc/strigi
-	dev-libs/gmp
-	sys-devel/gettext
-	!kdeprefix? ( !net-p2p/ktorrent:0 )"
-RDEPEND="${DEPEND}
-	infowidget? ( >=dev-libs/geoip-1.4.4 )
-	ipfilter? (
-		|| ( kde-base/kdebase-kioslaves:${SLOT}
-			kde-base/kdelibs:${SLOT} ) )
-	zeroconf? ( kde-base/kdnssd:${SLOT} )"
-
-src_configure() {
-	local mycmakeargs
-
-	mycmakeargs="${mycmakeargs}
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
-		-DENABLE_DHT_SUPPORT=ON
-		$(cmake-utils_use_enable bwscheduler BWSCHEDULER_PLUGIN)
-		$(cmake-utils_use_enable infowidget INFOWIDGET_PLUGIN)
-		$(cmake-utils_use_with infowidget SYSTEM_GEOIP)
-		$(cmake-utils_use_enable ipfilter IPFILTER_PLUGIN)
-		$(cmake-utils_use_enable logviewer LOGVIEWER_PLUGIN)
-		$(cmake-utils_use_enable scanfolder SCANFOLDER_PLUGIN)
-		$(cmake-utils_use_enable search SEARCH_PLUGIN)
-		$(cmake-utils_use_enable stats STATS_PLUGIN)
-		$(cmake-utils_use_enable upnp UPNP_PLUGIN)
-		$(cmake-utils_use_enable webinterface WEBINTERFACE_PLUGIN)
-		$(cmake-utils_use_enable zeroconf ZEROCONF_PLUGIN)
-		$(cmake-utils_use_enable mediaplayer MEDIAPLAYER_PLUGIN)"
-	kde4-base_src_configure
-}