Removed vulnerable versions

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

6 files changed, 20 insertions, 540 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index ce96aaed740f..ab57c2eb7103 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.334 2014/02/22 07:31:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.335 2014/02/22 08:35:17 polynomial-c Exp $
+
+  22 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -pidgin-2.10.7-r4.ebuild,
+  -pidgin-2.10.7-r5.ebuild, -files/pidgin-2.10.7-fix-cap.patch,
+  -files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch:
+  Removed vulnerable versions.
 
   22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> pidgin-2.10.9.ebuild:
   Stable for arm, wrt bug #499596
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 659d7912eeda..731032409527 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,34 +2,29 @@
 Hash: SHA256
 
 AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984 WHIRLPOOL 77fdb2855ac8fe3dc163a42d18df1847f849d9fc42cb09565746e70e72f9e2f74f3d33f44c6bc6f8277047d6d05bb9f12507a8f8c16e1c672c201a75c8fa7c8b
-AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
-AUX pidgin-2.10.7-link_sasl_in_irc_plugin.patch 642 SHA256 8f91df48549004c80d5989bfdcc11f7a7805f3770b6aa2a5676d86eb334cf5b8 SHA512 3bc39f994473e01ab532e804481a858b0e1ddc3252a27fc29cb32c550e207699ee39da0057b6e86f4a33870b29f44b701a1614e93ff223930208ef0e8061fed1 WHIRLPOOL 5d0ce684e06fbe8c507310947696fed1910f631f93b0e71fc44610e06c6b1d93b966af89d4def15d8fcaa1b11001ab7066e94c732f58423046bc9e645816a91e
 AUX pidgin-2.10.9-fix-gtkmedia.patch 267 SHA256 c0bc25b05a5cfa8583d97533a9c052dc94bb186053ce11cb52b9e79ca3a0b11c SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd WHIRLPOOL 3cb215078dfbed61f3d49ecd3c3fc1f2739fc02787f2ef3fdf41cde371f5c91ade1d4a6fff28db69878f7ba1995eed14aa8c0b8eb4961650d33dfaa88a3cafe1
 AUX pidgin-2.10.9-python3_fix1.patch 758 SHA256 19f4d173f72158051d1550a5e942badb187dcd633086fbf8e575fda4ec9f6c37 SHA512 381a7b15203844239511f2cf26a6ff0d29b3191146a6868dd210dbfd7ed0d6a0196dd9e93842ca4841453109dcbf5e5ebd5b2e6c61cf451da27d0e30db3ddb07 WHIRLPOOL d2bc452f1029c93ca1433af7351246198d453610ebba0efb78e08f449cafc018742a069d8396d11075d95cfa76c04f5681e61acc9d8dfcac7ccf4236c6a26891
 AUX pidgin-2.10.9-python3_fix2.patch 839 SHA256 8ec9b02317746f842b484ee6bc07dd9fef7e3fc279ccb8e2ed5c31862673f71f SHA512 b2a5515249bd57117b88e47785c5a36a60fda2565421ea657948b468dbb0e5d654b7719f6a091fe348fd8cfe6e7201ccb5f4f8bdebb698973a8f88d248bf6613 WHIRLPOOL cef1dae3f7005931f4c017aec8c184cbd2e34d74e4f665eee5fbf4df267c91ab5b0b542d6fbbaf802808e2f0c5ad3e10c10d103a2474b614f29a4ec32ef0780a
-DIST pidgin-2.10.7.tar.bz2 10069279 SHA256 eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 SHA512 0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 WHIRLPOOL 025a392ab069817e2fea07d0e9e7efeee006eaf4ce2e6571c49b851735309f3346bfdbf34c874f55b440b71fbbba0ac55029da727b1f731175d72efb2e74f3b4
 DIST pidgin-2.10.9.tar.bz2 10093423 SHA256 dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319 SHA512 5f85d072997bf0e8c668b5a7dc6c9791f7f1b03504eb7a875472186cc70b45e19c61573d84c002f9653570731ed2119e3eddfb66d7484cc1205d4b1ee696c63b WHIRLPOOL aa9862ebb8e45ad488049ea27960ddbaa80abe3a535acf09b496b917ae858d799db8f7cc0b1ab034bfabe4b8d3e730cd3d413c18f3552d677f3c563e7482c016
 DIST pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
-EBUILD pidgin-2.10.7-r4.ebuild 7273 SHA256 f856b770a802370c3c9349cc95f5dfb4f79fa39b004535eed8a7866249565137 SHA512 13398dcf9afba20f15127e97fb7a831adf3a6b32095a50d277293924e76b6c1c845351b2dcf2ca8536a39dcf8b6ffa52892c84159460607c2632dca98cfb5809 WHIRLPOOL 2df2aa59c541c8b08fccf03cdd7c08223afb286630a6ce1773bd3744fc22e23527f9f9ffc1f153481843c149fdde901867b1765c215fbeea4e5182d13dfc9405
-EBUILD pidgin-2.10.7-r5.ebuild 7369 SHA256 f4599802d9aa6dfae5bb5cd037f7b7f2853fd992e81096a7d6649173af73f220 SHA512 ef144aae3c2d64db4f2a322c423f31859cfd9d11837d6af9b211d506756bbabd1438c3d5c81b93eb95dbb973afd4a8147fb0c1b9e4cfc42d254e16589c7aaddb WHIRLPOOL d05d44d77059c3181a197e3418470cc5b6361223b57412366c61f7ca598ac5265b2e1b0e7a3455f3c35f53873bb2b2782873d984e22b2347d1d9c32362ce4d44
 EBUILD pidgin-2.10.9-r1.ebuild 7505 SHA256 cf6afd5433a55d76af4252cb8c754a2f82874301f71fb88e3ecf35dd231c250e SHA512 e25d6498de19fd5998345e0781f539c1bd8876c3b7acc9b0ab646483cb470598845045375f0edd947dd96cb0215cd33cc470dd2637c2a4f70cf5f35e911a3608 WHIRLPOOL 3d2a1ba425ba609cd5be49b869bce77530ca96e13bac61cb9b3cea34becae016c8e20daa56187b77fc44093d9c6a259b01db8c6082a410561b523b48fc7afd40
 EBUILD pidgin-2.10.9.ebuild 7386 SHA256 f2f2124da35b17296a80432cc4f40c89bcd00cd040fdcd8213f3f0ea62690006 SHA512 b83a73f43a75d59483d1b64ba2d6aa288215a24d8ac8d57b166abd9a4d83d9d155a0d6250eb1715adccf3b63ef78ee29fea3951184e296287ba09b4e6bfcd95f WHIRLPOOL d196e566d430a56070f6d542bdc9dfd3f0666cc7051f733419bd95b27dba54368b1b17446babe183b161f3932f428931888fa40adbc9e7bf90c15d1f18a070d2
-MISC ChangeLog 47546 SHA256 e5c4cd947fff62e824d9ef5b42817c2ac827e12dbd86aa95ca958fc12587d4a9 SHA512 4f5776554424872bfd0950ed6b94b5432ff856b72f1073e171c18931e659d2a451fb753123ad6f1dbb1167170e20b62c4744794d2b64a504a80e58ae6856ae08 WHIRLPOOL aa357a5d9e335eca093d9e3753e4b69f77697ceb85ca91537e55532b5feef56ae94a1b9d9cd491eada61c89d6164672cd0e6c2a632cbc54a77db4917cb9e3b89
+MISC ChangeLog 47785 SHA256 41e82e4b6a889b39a37c7d92aaccfdee2d496207d44232d8a45e686c4b85d0ac SHA512 9cab7944350d34284aa3d814452c72f16ae849d1b426a99b3cb84a462f5d82061756d43caac923a418703e654a9b13bf356c530771f2d3fdb401e8dec25087b9 WHIRLPOOL ec4529c2573d2757e13fe30dfee4e6f537a461403f06a03d4d79f4200eba1ff153fbe6ab046a913e4c86d3498d3f50a496e16796c463ff2454d420825db1fabb
 MISC metadata.xml 1469 SHA256 5ca9b28465b16f382131076f07b9da546c34979bd8b681e980684ba8df7aabb9 SHA512 30cbf602434bd058632099ed6545a62a9ed476b1cc98f46a5500c61a0c8deb2a2325f74c08cfb7ac486128c5979646308e3c9a1c292e2f0bc9832a413079ccce WHIRLPOOL 745038f3b97b3d3e5adbf7d98292f0effe00553ce5c53f888dde4d02cf73b80fd62901b19acad2d0988902dcbc9813f5953c6d13348f2bb7409bfeeda05ab6af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTCFJGAAoJELp701BxlEWfvWcP/24nrZsK8ei7w/AVMWDk+v4F
-Xb80vd8vEVTKzRj7pnPIN2NWmjw4pNdMsFnvjnW2GQjesg/bD4XOcN6UNDi6svvq
-+c1sMze6HV6X7Ao7B+SP8HUbkS28BqSKcNXsBrue0HC4xQo/4KI/lP89o63mTjCI
-gZeZSC9KF8gfwKrQ0kt5BgQBbK7Oi59tmaoE8Gxzffp2pNuv4csCcUvtdJn72WiS
-chFtuZe6dMEySVYnGac8Xjt5A/Ik4MLE+mfjHKRF//dnjFbL2u/w4jCJKzcO+EHO
-rPhC6LleunjJXkHY2fl3bZGniDMQ3t9kvZ6dsqjDaV2AzTrT/ZJouUbh4LrNhFcy
-EWLG49HIjz6jAPHMHP45v6tNRfgqTnzal7AluYiXtuz9n+EaSkupUIFaTohg9TcQ
-2tcN36tOJo6rKR59uIKyGU3wIsqyR6zDGcLdbCUbYRljdi9cZi5ZamxVakczu0IZ
-/SGfd+Qc9hJ+IhIjfsqP3SDU41FGct74jVAY576q0Q+rqdVTQOW0ttjnwpGJ8OxM
-GlM7JXyB3LmKntMogJvWUa/py4p+zXzYAx25ryLwdw4qbUZQvt7M1k/sSGGVfUXs
-ufAo7BlEFYb5nWwu/zm4buItpa91s71zmL4RdcWb6yA/h4ahIw0z8/RIF+cyHlwG
-M5iycqSgzye/4AZOzx6i
-=ANZ1
+iQIcBAEBCAAGBQJTCGFGAAoJEPiazRVxLXTFCSgQAJBXIK/SkNZ3k8pnNuutdHpz
+SsjJcpj+DDpRpsBaRESS06GL62O62GzB3WZNqRjjqFIZ7YJzmX99tEYLGGaGe5f0
+Ds9hdv8+gdAzAoAGG9bItwT9HKzIxEoJX8fA3mFZgEbxOTreQxKrZHgZR96frwdV
+ZeyAv0hr758VojIEXRPnmF5zAuUYvtwyM01rwXV9WcweavPGRNP9iwtB6N0C3jck
+e8rcET92ao/gM62vJWE1MAsZBA9VZ7NOkDMrBph8jhfMYLEwtIpUtLhQvjKLdqyA
+OXTf9Ip38wGAGCwchhn+o8ST9VNH1FGne5/GaO8qgrxceXsJTrQ7lw2Jzbx5NxBP
+3x0mSj0kzDQA0oypChF1O17w7M6PTksea3Ys76q/3pmfb/tSI1i1URU3MuxdUQLZ
+jpNcIEs9xiLgW9Kt8MlpByAF0budU/DpVvh+yknomxCyJ1NPJf3wtnIruRh98JCp
+LO6sPAlY/06IxRBdLZMpcv0LtBzR1JMr5eM2mghxaTDvFxuY/Q16UDxzOpQI4Xpn
+yntyRPfWMt0EQ9rpQmaMC7bIUa9a6PCfMYH5qmA3hk5fZe9Q4qQbWh1iESIrSo73
+kPJMuZrNZ/I0sUwR8GRyQ8Kd6k3CFVCPC4eNuo/Nanq30km8j0r9WwJDtZoTf/vR
+JhuErgYZzBTfpPfoQBpO
+=vqpd
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch b/net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch
deleted file mode 100644
index 701f3869ec8a..000000000000
--- a/net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Daniel Atallah <datallah@pidgin.im>
-# Date 1360879082 0
-# Node ID a860609d9c9ee20a64ca5284f7b50cbc57ae5c92
-# Parent  75999131f023b369df6d4f5b2001e153b448be13
-Fix from David Walser for a crash in the CAP plugin.
-
-diff --git a/pidgin/plugins/cap/cap.c b/pidgin/plugins/cap/cap.c
---- a/pidgin/plugins/cap/cap.c
-+++ b/pidgin/plugins/cap/cap.c
-@@ -43,7 +43,7 @@
- 	int threshold = purple_prefs_get_int("/plugins/gtk/cap/threshold");
- 	int min_minute = (current_minute - threshold) % 1440;
- 	int max_minute = (current_minute + threshold) % 1440;
--	char *sql, sta_id = NULL;
-+	char *sql, *sta_id = NULL;
- 	sqlite3_stmt *stmt = NULL;
- 	const char *tail = NULL;
- 	int rc;
-
diff --git a/net-im/pidgin/files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch b/net-im/pidgin/files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch
deleted file mode 100644
index 10cc0a0c7357..000000000000
--- a/net-im/pidgin/files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Daniel Atallah <datallah@pidgin.im>
-# Date 1362972661 14400
-# Node ID 944ec96bb1037a24435fcdc487f9568197ff5b1d
-# Parent  12fe7c5bfccf80e145470a5a8a4018c53e75b3d8
-Patch from Evangelos Foutras to link to CyrusSASL from the IRC plugin when needed. Fixes #15517
-
-diff --git a/libpurple/protocols/irc/Makefile.am b/libpurple/protocols/irc/Makefile.am
---- a/libpurple/protocols/irc/Makefile.am
-+++ b/libpurple/protocols/irc/Makefile.am
-@@ -27,7 +27,7 @@
- st =
- pkg_LTLIBRARIES   = libirc.la
- libirc_la_SOURCES = $(IRCSOURCES)
--libirc_la_LIBADD  = $(GLIB_LIBS)
-+libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
- 
- endif
- 
-
diff --git a/net-im/pidgin/pidgin-2.10.7-r4.ebuild b/net-im/pidgin/pidgin-2.10.7-r4.ebuild
deleted file mode 100644
index c4d1da3d918a..000000000000
--- a/net-im/pidgin/pidgin-2.10.7-r4.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.7-r4.ebuild,v 1.2 2013/09/26 11:28:23 polynomial-c Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-IUSE+=" aqua"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? ( sys-libs/ncurses[unicode]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} ) )
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( <gnome-extra/evolution-data-server-3.6 )
-		prediction? ( >=dev-db/sqlite-3.3:3 ) )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		|| ( net-libs/farstream:0.1 net-libs/farsight2 )
-		media-plugins/gst-plugins-meta:0.10
-		media-plugins/gst-plugins-gconf:0.10 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		dev-python/dbus-python )
-	perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
-	gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
-		>=net-libs/libgadu-1.11.0[-ssl] ) )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-1.0.1 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn )
-	!<x11-plugins/pidgin-facebookchat-1.69-r1"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	gtk? ( x11-proto/scrnsaverproto
-		${NLS_DEPEND} )
-	dbus? ( ${PYTHON_DEPS} )
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-		dbus? ( ${PYTHON_REQUIRED_USE} )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-	if use dbus || { use ncurses && use python; }; then
-		python-single-r1_pkg_setup
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
-		"${FILESDIR}/${P}-fix-cap.patch" \
-		"${FILESDIR}/${P}-link_sasl_in_irc_plugin.patch"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	use groupwise && DYNAMIC_PRPLS+=",novell"
-	use silc && DYNAMIC_PRPLS+=",silc"
-	use meanwhile && DYNAMIC_PRPLS+=",sametime"
-	use mxit && DYNAMIC_PRPLS+=",mxit"
-	use zephyr && DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=" --enable-nss=no --enable-gnutls=yes"
-		myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
-		myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=" --enable-gnutls=no --enable-nss=yes"
-	fi
-
-	if use dbus || { use ncurses && use python; }; then
-		myconf+=" --with-python=${PYTHON}"
-	else
-		myconf+=" --without-python"
-	fi
-
-	econf \
-		$(use_enable ncurses consoleui) \
-		$(use_enable gtk gtkui) \
-		$(use_enable gtk sm) \
-		$(use gtk || use_enable nls) \
-		$(use gtk && echo "--enable-nls") \
-		$(use gtk && use_enable xscreensaver screensaver) \
-		$(use gtk && use_enable prediction cap) \
-		$(use gtk && use_enable eds gevolution) \
-		$(use gtk && use_enable spell gtkspell) \
-		$(use_enable perl) \
-		$(use_enable tk) \
-		$(use_enable tcl) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable gstreamer) \
-		$(use_enable gstreamer farstream) \
-		$(use_enable gstreamer vv) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable networkmanager nm) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable idn) \
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes="${EPREFIX}"/usr/include/X11 \
-		${myconf}
-		#$(use_enable mono) \
-}
-
-src_install() {
-	gnome2_src_install
-	if use gtk; then
-		# Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
-		# implementations that are not complient with new hicolor theme yet, #323355
-		local pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null
-		done
-	fi
-	use perl && fixlocalpod
-
-	dodoc finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	prune_libtool_files --all
-}
diff --git a/net-im/pidgin/pidgin-2.10.7-r5.ebuild b/net-im/pidgin/pidgin-2.10.7-r5.ebuild
deleted file mode 100644
index b2a5f36c9a80..000000000000
--- a/net-im/pidgin/pidgin-2.10.7-r5.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.7-r5.ebuild,v 1.4 2013/12/22 16:15:10 jer Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-IUSE+=" aqua"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? ( sys-libs/ncurses[unicode]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} ) )
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6 )
-		prediction? ( >=dev-db/sqlite-3.3:3 ) )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		|| ( net-libs/farstream:0.1 net-libs/farsight2 )
-		media-plugins/gst-plugins-meta:0.10
-		media-plugins/gst-plugins-gconf:0.10 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		dev-python/dbus-python )
-	perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
-	gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
-		>=net-libs/libgadu-1.11.0[-ssl] ) )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-1.0.1 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn )
-	!<x11-plugins/pidgin-facebookchat-1.69-r1"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	gtk? ( x11-proto/scrnsaverproto
-		${NLS_DEPEND} )
-	dbus? ( ${PYTHON_DEPS} )
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-		dbus? ( ${PYTHON_REQUIRED_USE} )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-	if use dbus || { use ncurses && use python; }; then
-		python-single-r1_pkg_setup
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
-		"${FILESDIR}/${P}-fix-cap.patch" \
-		"${FILESDIR}/${P}-link_sasl_in_irc_plugin.patch" \
-		"${WORKDIR}/${PN}-eds-3.6.patch"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	use groupwise && DYNAMIC_PRPLS+=",novell"
-	use silc && DYNAMIC_PRPLS+=",silc"
-	use meanwhile && DYNAMIC_PRPLS+=",sametime"
-	use mxit && DYNAMIC_PRPLS+=",mxit"
-	use zephyr && DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=" --enable-nss=no --enable-gnutls=yes"
-		myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
-		myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=" --enable-gnutls=no --enable-nss=yes"
-	fi
-
-	if use dbus || { use ncurses && use python; }; then
-		myconf+=" --with-python=${PYTHON}"
-	else
-		myconf+=" --without-python"
-	fi
-
-	econf \
-		$(use_enable ncurses consoleui) \
-		$(use_enable gtk gtkui) \
-		$(use_enable gtk sm) \
-		$(use gtk || use_enable nls) \
-		$(use gtk && echo "--enable-nls") \
-		$(use gtk && use_enable xscreensaver screensaver) \
-		$(use gtk && use_enable prediction cap) \
-		$(use gtk && use_enable eds gevolution) \
-		$(use gtk && use_enable spell gtkspell) \
-		$(use_enable perl) \
-		$(use_enable tk) \
-		$(use_enable tcl) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable gstreamer) \
-		$(use_enable gstreamer farstream) \
-		$(use_enable gstreamer vv) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable networkmanager nm) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable idn) \
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes="${EPREFIX}"/usr/include/X11 \
-		${myconf}
-		#$(use_enable mono) \
-}
-
-src_install() {
-	gnome2_src_install
-	if use gtk; then
-		# Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
-		# implementations that are not complient with new hicolor theme yet, #323355
-		local pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null
-		done
-	fi
-	use perl && fixlocalpod
-
-	dodoc finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	prune_libtool_files --all
-}