Add new version to fix security bug #194278 (CVE CVE-2007-4996), remove old potentially vulnerable versions

Package-Manager: portage-2.1.3.9

10 files changed, 29 insertions, 570 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index f5b1224f6116..07c219a78854 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.31 2007/09/20 20:11:42 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.32 2007/09/30 16:10:10 tester Exp $
+
+*pidgin-2.2.1 (30 Sep 2007)
+
+  30 Sep 2007; Olivier Crête <tester@gentoo.org>
+  -files/pidgin-2.2.0-proxy.patch, -pidgin-2.1.1.ebuild,
+  -pidgin-2.2.0.ebuild, -pidgin-2.2.0-r1.ebuild, +pidgin-2.2.1.ebuild:
+  Add new version to fix security bug #194278 (CVE CVE-2007-4996), remove old
+  potentially vulnerable versions
 
 *pidgin-2.2.0-r1 (20 Sep 2007)
 
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index b27bfedf5b40..92129970ab9d 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,33 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pidgin-2.2.0-proxy.patch 931 RMD160 38b355ecfc2fa2b175af93e882b68c07c7dbe68e SHA1 fbbf37e464d13e0499bd5ead7c3161d5d714e488 SHA256 c7a3c3449f18c26c81cc6d9984d3caa98e7c4dadcc721acee6daf393f8674512
-MD5 127f42b06b602651201559bbb8d39b86 files/pidgin-2.2.0-proxy.patch 931
-RMD160 38b355ecfc2fa2b175af93e882b68c07c7dbe68e files/pidgin-2.2.0-proxy.patch 931
-SHA256 c7a3c3449f18c26c81cc6d9984d3caa98e7c4dadcc721acee6daf393f8674512 files/pidgin-2.2.0-proxy.patch 931
 DIST pidgin-2.1.0.tar.bz2 7772942 RMD160 d04437251fbea8a1902621ebdf98f6fdc826a6d4 SHA1 33f78d07c3c7797a710bb7d2032a8d0bd89a6ab3 SHA256 79be69cccca6cb25d6c1ba0360864da8a0c043f5ded55babcd99dc5b8e15a5f8
-DIST pidgin-2.1.1.tar.bz2 7829592 RMD160 77a9f06446c1056c3ad54018e78e450cda3ac66e SHA1 da6b7dda67b14aa1837ca48895eedcee215f0818 SHA256 cfeb66d224acc574d9545eb52af685c43e0627db5abc2df04089245d181440de
-DIST pidgin-2.2.0.tar.bz2 8101465 RMD160 7b99cee79cfcd3cd1536636f381830cc18d0b8f9 SHA1 b6762d5d7865587bfe0d87f95285d60cd8c667a1 SHA256 4cb6c1b1b4d3e3b792ef5c4770df4a70585a4c593171e1b0a7e66a21598b3aba
+DIST pidgin-2.2.1.tar.bz2 8882043 RMD160 6fa217ad5d55ea8e5c5f06322528c5c06e3b8faa SHA1 2dc920b156a2ba559108042ac2178f3bb8282e8e SHA256 6efbefe325f6eab711a5fbdc4b758b4585a4cda68c98dd2e11ccfc8d98075823
 EBUILD pidgin-2.1.0.ebuild 7473 RMD160 6fd306ec5adc4975914fb6827c92d4551ca5a223 SHA1 b2ed75bc63147e160361258f10cb5049ceaba77e SHA256 77be799a40922ef781daf4e69cab3e9e6a7ebaf1ebf31a10b3c32feda68f5d38
 MD5 ffcfe62a8f5456c22dedea21439c118d pidgin-2.1.0.ebuild 7473
 RMD160 6fd306ec5adc4975914fb6827c92d4551ca5a223 pidgin-2.1.0.ebuild 7473
 SHA256 77be799a40922ef781daf4e69cab3e9e6a7ebaf1ebf31a10b3c32feda68f5d38 pidgin-2.1.0.ebuild 7473
-EBUILD pidgin-2.1.1.ebuild 6984 RMD160 7a3a2b2eaa2051c632e20455c2546ce3d5c24d22 SHA1 8cc63f4e85c4577a74afe188a1428512396e00b2 SHA256 c3d92b3b3b0d41090f85bd11ff534f3d104506b6355e6f4a067ee2ed2313fc41
-MD5 fba0ab60a3d6ff7f7bd5a03c5e5162f6 pidgin-2.1.1.ebuild 6984
-RMD160 7a3a2b2eaa2051c632e20455c2546ce3d5c24d22 pidgin-2.1.1.ebuild 6984
-SHA256 c3d92b3b3b0d41090f85bd11ff534f3d104506b6355e6f4a067ee2ed2313fc41 pidgin-2.1.1.ebuild 6984
-EBUILD pidgin-2.2.0-r1.ebuild 7047 RMD160 a427caf33dd5a6954f47bb3ff632156bf39ce969 SHA1 64d27b2697cc4ce896a482173763875407a18197 SHA256 55a80f77a115cda89ada8ce5050f54ebd73cc5fc0b71a117649484b58da2c0a7
-MD5 77cddcdb9b5d2d496b96f94e43d6b1e4 pidgin-2.2.0-r1.ebuild 7047
-RMD160 a427caf33dd5a6954f47bb3ff632156bf39ce969 pidgin-2.2.0-r1.ebuild 7047
-SHA256 55a80f77a115cda89ada8ce5050f54ebd73cc5fc0b71a117649484b58da2c0a7 pidgin-2.2.0-r1.ebuild 7047
-EBUILD pidgin-2.2.0.ebuild 6991 RMD160 7001f380e6a25a7ad54c4547d4f812110d84cdaa SHA1 8dddd1bc2920fd1bbe79f69c794a078ecf9c1ad6 SHA256 c9b2a3bc59e6ffdd76ae8aa58d4982ab53fa80e87a0d7ac6c7f4c8cd9c85d352
-MD5 7fef71df0c6769aab94e7fe0718c4668 pidgin-2.2.0.ebuild 6991
-RMD160 7001f380e6a25a7ad54c4547d4f812110d84cdaa pidgin-2.2.0.ebuild 6991
-SHA256 c9b2a3bc59e6ffdd76ae8aa58d4982ab53fa80e87a0d7ac6c7f4c8cd9c85d352 pidgin-2.2.0.ebuild 6991
-MISC ChangeLog 4670 RMD160 8510643ab71a6db786e0e0caef1afa5835e20af9 SHA1 d1b31a397ae984933577db1e65f494f6bca28625 SHA256 9c2d09a88bf459ed4ef114858bf081ab7158064f7c9f3133b9bd264b0dff151c
-MD5 0aceea929486a5a024cf13557c6e7789 ChangeLog 4670
-RMD160 8510643ab71a6db786e0e0caef1afa5835e20af9 ChangeLog 4670
-SHA256 9c2d09a88bf459ed4ef114858bf081ab7158064f7c9f3133b9bd264b0dff151c ChangeLog 4670
+EBUILD pidgin-2.2.1.ebuild 6818 RMD160 b7f965af33995310d40b7c7e61f44fa79a3f9996 SHA1 844ddd81bea35d42e1c80135fb511295250bffb7 SHA256 d278ec0f52defda7e00b0b8e90e9859b97eb565d976f5021cc95f5d8d479b515
+MD5 8e51a5390e472688d0759bf277574003 pidgin-2.2.1.ebuild 6818
+RMD160 b7f965af33995310d40b7c7e61f44fa79a3f9996 pidgin-2.2.1.ebuild 6818
+SHA256 d278ec0f52defda7e00b0b8e90e9859b97eb565d976f5021cc95f5d8d479b515 pidgin-2.2.1.ebuild 6818
+MISC ChangeLog 4990 RMD160 a87c9248d26c9a9c3cd7229c9964d12a31156e1b SHA1 b4550133b5b8a0a9e45d56118d0afde999603701 SHA256 3ac8df5f09656afedcfbf90956e75c4e51652bfc2e02a403ecc927f3fd77d130
+MD5 a637115c85fce54ab867e818fb2219c6 ChangeLog 4990
+RMD160 a87c9248d26c9a9c3cd7229c9964d12a31156e1b ChangeLog 4990
+SHA256 3ac8df5f09656afedcfbf90956e75c4e51652bfc2e02a403ecc927f3fd77d130 ChangeLog 4990
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 MD5 bba7b9e682937ac5182b872b00b19d93 metadata.xml 458
 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd metadata.xml 458
@@ -35,19 +22,13 @@ SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9 metadata
 MD5 04dff9a5dba46adcbf2b44ec303833fd files/digest-pidgin-2.1.0 244
 RMD160 a8781e42e65cef1475de205b50bce09002e323f9 files/digest-pidgin-2.1.0 244
 SHA256 5dee037d90f0e13e1a9c2995d0a8ea52774390806556bac19bfe9c954797b098 files/digest-pidgin-2.1.0 244
-MD5 5dcf5b507a82d0cc88669a0dac91904e files/digest-pidgin-2.1.1 244
-RMD160 c0984ecbdaec90bcf0d0c6c52dcd392c7750bbe3 files/digest-pidgin-2.1.1 244
-SHA256 0a3d5ab03c4a5242d59126e3a25a885b6a2477c0441aac396afc77ea52bcfa24 files/digest-pidgin-2.1.1 244
-MD5 c842bc61c600b3dc788cff34079567da files/digest-pidgin-2.2.0 244
-RMD160 3eb711a2f27611a432a6686bed945f9286bbc6eb files/digest-pidgin-2.2.0 244
-SHA256 0ef5865238ca7eb4cea37dc0b532d6c444b5c991c2b9e596b73ba50e77e130cc files/digest-pidgin-2.2.0 244
-MD5 c842bc61c600b3dc788cff34079567da files/digest-pidgin-2.2.0-r1 244
-RMD160 3eb711a2f27611a432a6686bed945f9286bbc6eb files/digest-pidgin-2.2.0-r1 244
-SHA256 0ef5865238ca7eb4cea37dc0b532d6c444b5c991c2b9e596b73ba50e77e130cc files/digest-pidgin-2.2.0-r1 244
+MD5 cf5fffa8400e6da6545132c325acd60c files/digest-pidgin-2.2.1 244
+RMD160 6908eb2a0c01063e7508ba0fb47345429faf5baf files/digest-pidgin-2.2.1 244
+SHA256 33180f12ffafd6dd923f9a65940cfef0fec856e5f139a123edd8e5358d04a7b2 files/digest-pidgin-2.2.1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG8tQFjJyKLBkBVroRAp20AKC0UwBzUUVjiQoMxrFRtUHCRQEc1wCfXAtC
-eF2p/WFIJjYwqDCh5iFNDtI=
-=E7Zx
+iD8DBQFG/8pr+IXOQtHLm/gRAlSqAJ0SBiZnfz3VQzAEjbOOHwkHvdhnQwCcCnxA
+qswh4ZurAlmlhE0dIcNDX3I=
+=r2A2
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/digest-pidgin-2.1.1 b/net-im/pidgin/files/digest-pidgin-2.1.1
deleted file mode 100644
index 1833ee3bf74b..000000000000
--- a/net-im/pidgin/files/digest-pidgin-2.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb29fecb2f3a6d4790f47ce8e658c07c pidgin-2.1.1.tar.bz2 7829592
-RMD160 77a9f06446c1056c3ad54018e78e450cda3ac66e pidgin-2.1.1.tar.bz2 7829592
-SHA256 cfeb66d224acc574d9545eb52af685c43e0627db5abc2df04089245d181440de pidgin-2.1.1.tar.bz2 7829592
diff --git a/net-im/pidgin/files/digest-pidgin-2.2.0 b/net-im/pidgin/files/digest-pidgin-2.2.0
deleted file mode 100644
index 4968a942ef6c..000000000000
--- a/net-im/pidgin/files/digest-pidgin-2.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d71cd4de6ef1459ba9b504d0c06d8d04 pidgin-2.2.0.tar.bz2 8101465
-RMD160 7b99cee79cfcd3cd1536636f381830cc18d0b8f9 pidgin-2.2.0.tar.bz2 8101465
-SHA256 4cb6c1b1b4d3e3b792ef5c4770df4a70585a4c593171e1b0a7e66a21598b3aba pidgin-2.2.0.tar.bz2 8101465
diff --git a/net-im/pidgin/files/digest-pidgin-2.2.0-r1 b/net-im/pidgin/files/digest-pidgin-2.2.0-r1
deleted file mode 100644
index 4968a942ef6c..000000000000
--- a/net-im/pidgin/files/digest-pidgin-2.2.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d71cd4de6ef1459ba9b504d0c06d8d04 pidgin-2.2.0.tar.bz2 8101465
-RMD160 7b99cee79cfcd3cd1536636f381830cc18d0b8f9 pidgin-2.2.0.tar.bz2 8101465
-SHA256 4cb6c1b1b4d3e3b792ef5c4770df4a70585a4c593171e1b0a7e66a21598b3aba pidgin-2.2.0.tar.bz2 8101465
diff --git a/net-im/pidgin/files/digest-pidgin-2.2.1 b/net-im/pidgin/files/digest-pidgin-2.2.1
new file mode 100644
index 000000000000..6bb36d84b3b0
--- /dev/null
+++ b/net-im/pidgin/files/digest-pidgin-2.2.1
@@ -0,0 +1,3 @@
+MD5 f1703430d4b8ffc96b493fc36cd46131 pidgin-2.2.1.tar.bz2 8882043
+RMD160 6fa217ad5d55ea8e5c5f06322528c5c06e3b8faa pidgin-2.2.1.tar.bz2 8882043
+SHA256 6efbefe325f6eab711a5fbdc4b758b4585a4cda68c98dd2e11ccfc8d98075823 pidgin-2.2.1.tar.bz2 8882043
diff --git a/net-im/pidgin/files/pidgin-2.2.0-proxy.patch b/net-im/pidgin/files/pidgin-2.2.0-proxy.patch
deleted file mode 100644
index 1ab3041b05d7..000000000000
--- a/net-im/pidgin/files/pidgin-2.2.0-proxy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libpurple/proxy.c	fa08e3c184837ae16e5f4bb65aaec0ab56096c93
-+++ libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
-@@ -1992,6 +1992,13 @@ purple_proxy_init(void)
- 		proxy_pref_cb, NULL);
- 	purple_prefs_connect_callback(handle, "/purple/proxy/password",
- 		proxy_pref_cb, NULL);
-+
-+	/* Load the initial proxy settings */
-+	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
-+	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
-+	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
-+	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
-+	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
- }
-
- void
diff --git a/net-im/pidgin/pidgin-2.1.1.ebuild b/net-im/pidgin/pidgin-2.1.1.ebuild
deleted file mode 100644
index 799b1359d640..000000000000
--- a/net-im/pidgin/pidgin-2.1.1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.1.1.ebuild,v 1.3 2007/08/27 11:31:43 armin76 Exp $
-
-WANT_AUTOMAKE=1.9
-
-inherit flag-o-matic eutils toolchain-funcs multilib autotools perl-app gnome2
-
-MY_PV=${P/_beta/beta}
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bonjour dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc tcl tk spell qq gadu"
-IUSE="${IUSE} gtk sasl ncurses groupwise prediction zephyr" # mono"
-
-RDEPEND="
-	bonjour? ( net-dns/avahi )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/dbus-0.90
-		>=dev-lang/python-2.4 )
-	gtk? (
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		>=x11-libs/gtk+-2.0
-		>=x11-libs/startup-notification-0.5
-		x11-libs/libXScrnSaver
-		eds? ( gnome-extra/evolution-data-server ) 	)
-	>=dev-libs/glib-2.0
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		     =media-libs/gst-plugins-good-0.10* )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	doc? ( app-doc/doxygen )
-	dev-libs/libxml2
-	networkmanager? ( net-misc/networkmanager )
-	prediction? ( =dev-db/sqlite-3* )"
-	#mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_PV}"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple,msn"
-
-# List of plugins yet to be ported (will be removed at some point)
-#   net-im/gaim-bnet
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-xfire
-#   x11-plugins/gaim-galago
-#   x11-themes/gaim-smileys (get liquidx to fix it)
-
-# Abandonned
-#   x11-plugins/ignorance
-#   x11-plugins/bangexec
-#   x11-plugins/gaim-assistant
-# Last release in 2004
-#   net-im/gaim-blogger
-#   x11-plugins/gaimosd
-# Last release in 2005
-#   app-accessibility/festival-gaim
-# Merged into something else
-#   net-im/gaim-meanwhile (integrated in gaim)
-#   net-im/gaim-snpp (merged into the plugin pack)
-#   x11-plugins/gaim-slashexec (integrated into plugin pack)
-
-# List of plugins
-#   net-im/librvp
-#   x11-plugins/guifications
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgin-libnotify
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-
-print_pidgin_warning() {
-	ewarn
-	ewarn "We strongly recommend that you backup your ~/.gaim directory"
-	ewarn "before running Pidgin for the first time. Things you should be"
-	ewarn "on the lookout for include problems with preferences being lost"
-	ewarn "or forgotten, buddy icons not working as you expect, plugins or"
-	ewarn "other external files not properly being found."
-	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version of gaim,"
-	ewarn "you may need to re-merge any plugins like gaim-encryption."
-	ewarn
-	ewarn "If you experience problems with pidgin, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with pidgin's bug tracker, and by all means DO NOT"
-	ewarn "seek help in #pidgin."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://developer.pidgin.im/wiki/GetABacktrace for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the pidgin FAQ at http://developer.pidgin.im/wiki/FAQ"
-	ewarn
-}
-
-pkg_setup() {
-	print_pidgin_warning
-
-	if use gadu && built_with_use net-libs/libgadu ssl ; then
-	eerror
-	eerror "You need to rebuild net-libs/libgadu with USE=-ssl in order"
-	eerror "enable gadu gadu support in pidgin."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use ncurses &&  ! built_with_use sys-libs/ncurses unicode; then
-		eerror
-		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
-		eerror "to build finch the console client of pidgin."
-		eerror
-		die "Configure failed"
-	fi
-
-	if ! use gtk && ! use ncurses ; then
-		einfo
-		elog "As you did not pick gtk or ncurses use flag, building"
-		elog "console only."
-		einfo
-	fi
-
-	if use zephyr && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-		eerror
-		eerror "You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to"
-		eerror "enable krb4 support for the zephyr protocol in pidgin"
-		eerror
-		die "Configure failed"
-	fi
-
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[[ "`gcc-version`" == "3.2" ]] && filter-flags -msse2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	if use silc; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc"
-	fi
-
-	if use qq; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq"
-	fi
-
-	if use meanwhile; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime"
-	fi
-
-	if use bonjour; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour"
-	fi
-
-	if use groupwise; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
-	fi
-
-	if use zephyr; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},zephyr"
-	fi
-
-	if use gnutls ; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf="${myconf} --enable-nss=no --enable-gnutls=yes"
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
-	fi
-
-	if ! use ncurses && ! use gtk; then
-		myconf="${myconf} --enable-consoleui --disable-gtkui"
-	else
-		myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable gtk startup-notification) \
-		$(use_enable gtk screensaver) \
-		$(use_enable gtk sm) \
-		$(use_enable tcl) \
-		$(use_enable spell gtkspell) \
-		$(use_enable tk) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable eds gevolution) \
-		$(use_enable gstreamer) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable prediction cap) \
-		$(use_enable networkmanager nm) \
-		$(use_with zephyr krb4) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes=/usr/include/X11 \
-		${myconf} || die "Configuration failed"
-		#$(use_enable mono) \
-
-		emake || die "make failed"
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS COPYING HACKING INSTALL NEWS README ChangeLog
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	print_pidgin_warning
-}
diff --git a/net-im/pidgin/pidgin-2.2.0.ebuild b/net-im/pidgin/pidgin-2.2.0.ebuild
deleted file mode 100644
index c375a170c041..000000000000
--- a/net-im/pidgin/pidgin-2.2.0.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.2.0.ebuild,v 1.2 2007/09/16 18:51:46 tester Exp $
-
-WANT_AUTOMAKE=1.9
-
-inherit flag-o-matic eutils toolchain-funcs multilib autotools perl-app gnome2
-
-MY_PV=${P/_beta/beta}
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bonjour dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc tcl tk spell qq gadu"
-IUSE="${IUSE} gtk sasl ncurses groupwise prediction zephyr" # mono"
-
-RDEPEND="
-	bonjour? ( net-dns/avahi )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/dbus-0.90
-		>=dev-lang/python-2.4 )
-	gtk? (
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		>=x11-libs/gtk+-2.0
-		>=x11-libs/startup-notification-0.5
-		x11-libs/libXScrnSaver
-		eds? ( gnome-extra/evolution-data-server ) 	)
-	>=dev-libs/glib-2.0
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		     =media-libs/gst-plugins-good-0.10* )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	doc? ( app-doc/doxygen )
-	dev-libs/libxml2
-	networkmanager? ( net-misc/networkmanager )
-	prediction? ( =dev-db/sqlite-3* )"
-	#mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_PV}"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple,msn,myspace"
-
-# List of plugins yet to be ported (will be removed at some point)
-#   net-im/gaim-bnet
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-xfire
-#   x11-plugins/gaim-galago
-#   x11-themes/gaim-smileys (get liquidx to fix it)
-
-# Abandonned
-#   x11-plugins/ignorance
-#   x11-plugins/bangexec
-#   x11-plugins/gaim-assistant
-# Last release in 2004
-#   net-im/gaim-blogger
-#   x11-plugins/gaimosd
-# Last release in 2005
-#   app-accessibility/festival-gaim
-# Merged into something else
-#   net-im/gaim-meanwhile (integrated in gaim)
-#   net-im/gaim-snpp (merged into the plugin pack)
-#   x11-plugins/gaim-slashexec (integrated into plugin pack)
-
-# List of plugins
-#   net-im/librvp
-#   x11-plugins/guifications
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgin-libnotify
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-
-print_pidgin_warning() {
-	ewarn
-	ewarn "We strongly recommend that you backup your ~/.gaim directory"
-	ewarn "before running Pidgin for the first time. Things you should be"
-	ewarn "on the lookout for include problems with preferences being lost"
-	ewarn "or forgotten, buddy icons not working as you expect, plugins or"
-	ewarn "other external files not properly being found."
-	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version of gaim,"
-	ewarn "you may need to re-merge any plugins like gaim-encryption."
-	ewarn
-	ewarn "If you experience problems with pidgin, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with pidgin's bug tracker, and by all means DO NOT"
-	ewarn "seek help in #pidgin."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://developer.pidgin.im/wiki/GetABacktrace for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the pidgin FAQ at http://developer.pidgin.im/wiki/FAQ"
-	ewarn
-}
-
-pkg_setup() {
-	print_pidgin_warning
-
-	if use gadu && built_with_use net-libs/libgadu ssl ; then
-	eerror
-	eerror "You need to rebuild net-libs/libgadu with USE=-ssl in order"
-	eerror "enable gadu gadu support in pidgin."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use ncurses &&  ! built_with_use sys-libs/ncurses unicode; then
-		eerror
-		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
-		eerror "to build finch the console client of pidgin."
-		eerror
-		die "Configure failed"
-	fi
-
-	if ! use gtk && ! use ncurses ; then
-		einfo
-		elog "As you did not pick gtk or ncurses use flag, building"
-		elog "console only."
-		einfo
-	fi
-
-	if use zephyr && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-		eerror
-		eerror "You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to"
-		eerror "enable krb4 support for the zephyr protocol in pidgin"
-		eerror
-		die "Configure failed"
-	fi
-
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[[ "`gcc-version`" == "3.2" ]] && filter-flags -msse2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	if use silc; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc"
-	fi
-
-	if use qq; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq"
-	fi
-
-	if use meanwhile; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime"
-	fi
-
-	if use bonjour; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour"
-	fi
-
-	if use groupwise; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
-	fi
-
-	if use zephyr; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},zephyr"
-	fi
-
-	if use gnutls ; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf="${myconf} --enable-nss=no --enable-gnutls=yes"
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
-	fi
-
-	if ! use ncurses && ! use gtk; then
-		myconf="${myconf} --enable-consoleui --disable-gtkui"
-	else
-		myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable gtk startup-notification) \
-		$(use_enable gtk screensaver) \
-		$(use_enable gtk sm) \
-		$(use_enable tcl) \
-		$(use_enable spell gtkspell) \
-		$(use_enable tk) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable eds gevolution) \
-		$(use_enable gstreamer) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable prediction cap) \
-		$(use_enable networkmanager nm) \
-		$(use_with zephyr krb4) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes=/usr/include/X11 \
-		${myconf} || die "Configuration failed"
-		#$(use_enable mono) \
-
-		emake || die "make failed"
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS COPYING HACKING INSTALL NEWS README ChangeLog
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	print_pidgin_warning
-}
diff --git a/net-im/pidgin/pidgin-2.2.0-r1.ebuild b/net-im/pidgin/pidgin-2.2.1.ebuild
index a91c6fa42f8c..e8e1a6be78df 100644
--- a/net-im/pidgin/pidgin-2.2.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.2.1.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-im/pidgin/pidgin-2.2.0-r1.ebuild,v 1.1 2007/09/20 20:11:42 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.2.1.ebuild,v 1.1 2007/09/30 16:10:10 tester Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2
 
@@ -99,9 +99,6 @@ print_pidgin_warning() {
 	ewarn "or forgotten, buddy icons not working as you expect, plugins or"
 	ewarn "other external files not properly being found."
 	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version of gaim,"
-	ewarn "you may need to re-merge any plugins like gaim-encryption."
-	ewarn
 	ewarn "If you experience problems with pidgin, file them as bugs with"
 	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
 	ewarn "as bugs with pidgin's bug tracker, and by all means DO NOT"
@@ -151,13 +148,6 @@ pkg_setup() {
 
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-proxy.patch
-}
-
 src_compile() {
 	# Stabilize things, for your own good
 	strip-flags