Remove old version

Package-Manager: portage-2.1.2.2

6 files changed, 14 insertions, 869 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 8cb717d914bb..5f0ff92c1518 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.433 2007/03/23 21:10:55 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.434 2007/05/01 12:47:47 tester Exp $
+
+  01 May 2007; Olivier Crête <tester@gentoo.org>
+  -files/gaim-2.0.0_beta5-dbus.patch, -gaim-2.0.0_beta5-r1.ebuild,
+  -gaim-2.0.0_beta5-r2.ebuild, -gaim-2.0.0_beta5-r3.ebuild:
+  Remove old version
 
   23 Mar 2007; Timothy Redaelli <drizzt@gentoo.org> gaim-2.0.0_beta6.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index fe7d5384ad64..26dbdc279213 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -9,41 +9,24 @@ AUX gaim-1.5.0-privacy.patch 1221 RMD160 ce352e5c06de8d8c52acf22a527413c3f537fc7
 MD5 3850037501be770a23376ce84ba803f1 files/gaim-1.5.0-privacy.patch 1221
 RMD160 ce352e5c06de8d8c52acf22a527413c3f537fc7a files/gaim-1.5.0-privacy.patch 1221
 SHA256 1c089363ca2bd64d12ea366e4c217fa32a602571c18b6c28a7616b42a418fd69 files/gaim-1.5.0-privacy.patch 1221
-AUX gaim-2.0.0_beta5-dbus.patch 2347 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f SHA1 fbf4801f56008641e6de5c8a52c2710302cbb3a2 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd
-MD5 3368d8d7c673a679625f0fd12b535602 files/gaim-2.0.0_beta5-dbus.patch 2347
-RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f files/gaim-2.0.0_beta5-dbus.patch 2347
-SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd files/gaim-2.0.0_beta5-dbus.patch 2347
 AUX gaim-2.0.0_beta6-mono-api-change-update.patch 1569 RMD160 181de7b43a245c44785be6db3974551a73e19c4a SHA1 d42e5fbdf02c9ada25c24c1c0801b93716983c95 SHA256 3afca0431fd73ae91b1a06b5aea2d278107c2374f102008fcb54f0ee5321e942
 MD5 0a052a627c2e577afe31a1acca7cd819 files/gaim-2.0.0_beta6-mono-api-change-update.patch 1569
 RMD160 181de7b43a245c44785be6db3974551a73e19c4a files/gaim-2.0.0_beta6-mono-api-change-update.patch 1569
 SHA256 3afca0431fd73ae91b1a06b5aea2d278107c2374f102008fcb54f0ee5321e942 files/gaim-2.0.0_beta6-mono-api-change-update.patch 1569
 DIST gaim-1.5.0.tar.bz2 6123237 RMD160 13f74e2d2ed69a775a5884b807c365177455ae0e SHA1 a280d005f01be7fa89c9fa210efb86cc6a9eb9c7 SHA256 58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa
-DIST gaim-2.0.0beta5.tar.bz2 6489271 RMD160 5fdb0f16411745033a691c4991e0f36cd31655c5 SHA1 cc897b656b933c60d9557df7f6dfdffc913fb6b6 SHA256 d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db
 DIST gaim-2.0.0beta6.tar.bz2 6667700 RMD160 b741288aeba621fbfeea3fd3ed16a2b4deff3dc9 SHA1 39345fe6e0519f2e126f7f60f7d9905e3460517b SHA256 fea8d9adbb2886ea7accde1d11b6da5fb77e1847fb4054ac55bca30b5b10ce82
 EBUILD gaim-1.5.0.ebuild 4033 RMD160 4ba8b9acf9dd79500d2aed40e3f11184c68134f3 SHA1 35da3f781e22185f77ef49c80df1faf560905b3c SHA256 1895bb1677e92635f563048a2aec47c7d908139a190c1d1da471ee10d2f64405
 MD5 36264b82fbdcd894d7df20df658d48b5 gaim-1.5.0.ebuild 4033
 RMD160 4ba8b9acf9dd79500d2aed40e3f11184c68134f3 gaim-1.5.0.ebuild 4033
 SHA256 1895bb1677e92635f563048a2aec47c7d908139a190c1d1da471ee10d2f64405 gaim-1.5.0.ebuild 4033
-EBUILD gaim-2.0.0_beta5-r1.ebuild 6902 RMD160 6aa4183dcbb06acc97416d47e85967140b1617e0 SHA1 afb7426db5a735ae7b300412e2937ac35becc613 SHA256 67746ac2419475852391db776fefe1f6e7cca82b905ffe95cf6ea87472d59bad
-MD5 7bc324deb6cd9dd1f9e316837e788943 gaim-2.0.0_beta5-r1.ebuild 6902
-RMD160 6aa4183dcbb06acc97416d47e85967140b1617e0 gaim-2.0.0_beta5-r1.ebuild 6902
-SHA256 67746ac2419475852391db776fefe1f6e7cca82b905ffe95cf6ea87472d59bad gaim-2.0.0_beta5-r1.ebuild 6902
-EBUILD gaim-2.0.0_beta5-r2.ebuild 6983 RMD160 6f76e3cd5f027841a554b02988ab535699b4d65a SHA1 fc28875647466d3cd0edbe7214c60c0af94214f2 SHA256 5c6aad5d449b7f6b05f74a516b485a9ddb948d0f34f928b7bb86851c893e14bc
-MD5 169980f172616deb74615d0aa593e553 gaim-2.0.0_beta5-r2.ebuild 6983
-RMD160 6f76e3cd5f027841a554b02988ab535699b4d65a gaim-2.0.0_beta5-r2.ebuild 6983
-SHA256 5c6aad5d449b7f6b05f74a516b485a9ddb948d0f34f928b7bb86851c893e14bc gaim-2.0.0_beta5-r2.ebuild 6983
-EBUILD gaim-2.0.0_beta5-r3.ebuild 6939 RMD160 1a87d609d4f6aa231101d8fb5ee15fe1407a49f5 SHA1 8162077bc8abc8d81a16fd721dc2754d2b01bcd5 SHA256 a1e16e6e9bb444c0780857ff5ca235935481fa85443b54be3a8b73551a3465b8
-MD5 8cfdd53188851b6870bdd4f060bc6df1 gaim-2.0.0_beta5-r3.ebuild 6939
-RMD160 1a87d609d4f6aa231101d8fb5ee15fe1407a49f5 gaim-2.0.0_beta5-r3.ebuild 6939
-SHA256 a1e16e6e9bb444c0780857ff5ca235935481fa85443b54be3a8b73551a3465b8 gaim-2.0.0_beta5-r3.ebuild 6939
 EBUILD gaim-2.0.0_beta6.ebuild 7008 RMD160 0e2f8c3d515d3dfcd3ed1d2a463263d6426e8be6 SHA1 e324847d654ce49aa1d81368bbccc8c31cb39ce6 SHA256 392725ef74bf6b74dfdbda5c8ef4112e674b9509695f3a7ba089d64a8f96e090
 MD5 c949f6d9bca9b82e545ca4e86a034538 gaim-2.0.0_beta6.ebuild 7008
 RMD160 0e2f8c3d515d3dfcd3ed1d2a463263d6426e8be6 gaim-2.0.0_beta6.ebuild 7008
 SHA256 392725ef74bf6b74dfdbda5c8ef4112e674b9509695f3a7ba089d64a8f96e090 gaim-2.0.0_beta6.ebuild 7008
-MISC ChangeLog 63427 RMD160 456b82a95924ca0141d41dff60948e2db24d9505 SHA1 11cbcc5999f396fab86edf7bf547052499440ee4 SHA256 c0ecde7fba14d747f4f630340658f342cf4e590f1ce1c2073323b57640274584
-MD5 0a914244dcbd73c288432de66ab99094 ChangeLog 63427
-RMD160 456b82a95924ca0141d41dff60948e2db24d9505 ChangeLog 63427
-SHA256 c0ecde7fba14d747f4f630340658f342cf4e590f1ce1c2073323b57640274584 ChangeLog 63427
+MISC ChangeLog 63626 RMD160 f60e5a23127f78bdd17151022b0189f5481329fd SHA1 6cbd3664d2e887afcc0a34a2afcd0e7df9c35ef5 SHA256 2efa00e5bef6787af0de61764faa591816afc2dfd14455201c537e2771c9e315
+MD5 a76d62f941cc1c11523b08edafe94b49 ChangeLog 63626
+RMD160 f60e5a23127f78bdd17151022b0189f5481329fd ChangeLog 63626
+SHA256 2efa00e5bef6787af0de61764faa591816afc2dfd14455201c537e2771c9e315 ChangeLog 63626
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -51,22 +34,13 @@ SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f metadata
 MD5 390f6cb2111f1f54bb55da3cb074981e files/digest-gaim-1.5.0 238
 RMD160 565afdbee5ecd1f78913ee6d3d813ff9db8bb185 files/digest-gaim-1.5.0 238
 SHA256 0eeeff6fff0204e03a372c96611f8db0135f38286f7abade6be47aef06463f5b files/digest-gaim-1.5.0 238
-MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5-r1 253
-RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5-r1 253
-SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5-r1 253
-MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5-r2 253
-RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5-r2 253
-SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5-r2 253
-MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5-r3 253
-RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5-r3 253
-SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5-r3 253
 MD5 47b0636df1d92a1958b72b3755a8e64a files/digest-gaim-2.0.0_beta6 253
 RMD160 d55c9a3995a800b409ac253abad54f4d30c10261 files/digest-gaim-2.0.0_beta6 253
 SHA256 6648647e61579dfac661f3decdc8c8924ce23f284dcfa336afed9d3379cabff5 files/digest-gaim-2.0.0_beta6 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGBEJlGDyatLGpTbYRAtfHAJ9kt0hMcvucU9CCjKSi4RKafKjqogCgng4M
-mp3TARYIzEaLdj4NgX2pQRU=
-=aJac
+iD8DBQFGNzgX+IXOQtHLm/gRApmkAJ9D5fpaQsz8WRvfqCqpJ5wPm7DSiACggdCo
+uYWc9uESlweEP1dvadI8XdM=
+=vVCq
 -----END PGP SIGNATURE-----
diff --git a/net-im/gaim/files/gaim-2.0.0_beta5-dbus.patch b/net-im/gaim/files/gaim-2.0.0_beta5-dbus.patch
deleted file mode 100644
index a77178a28f0c..000000000000
--- a/net-im/gaim/files/gaim-2.0.0_beta5-dbus.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nru gaim-2.0.0beta4-old/gtk/Makefile.am gaim-2.0.0beta4/gtk/Makefile.am
---- gaim-2.0.0beta4-old/gtk/Makefile.am	2006-10-18 12:37:48.000000000 -0500
-+++ gaim-2.0.0beta4/gtk/Makefile.am	2006-10-19 12:36:13.000000000 -0500
-@@ -161,6 +161,7 @@
- gaim_LDFLAGS = -export-dynamic
- gaim_LDADD = \
- 	@LIBOBJS@ \
-+	$(GLIB_LIBS) \
- 	$(DBUS_LIBS) \
- 	$(GSTREAMER_LIBS) \
- 	$(STATIC_LINK_LIBS) \
-diff -Nru gaim-2.0.0beta4-old/gtk/Makefile.in gaim-2.0.0beta4/gtk/Makefile.in
---- gaim-2.0.0beta4-old/gtk/Makefile.in	2006-10-18 15:00:12.000000000 -0500
-+++ gaim-2.0.0beta4/gtk/Makefile.in	2006-10-19 12:37:26.000000000 -0500
-@@ -611,6 +611,7 @@
- @ENABLE_GTK_TRUE@gaim_LDFLAGS = -export-dynamic
- @ENABLE_GTK_TRUE@gaim_LDADD = \
- @ENABLE_GTK_TRUE@	@LIBOBJS@ \
-+@ENABLE_GTK_TRUE@	$(GLIB_LIBS) \
- @ENABLE_GTK_TRUE@	$(DBUS_LIBS) \
- @ENABLE_GTK_TRUE@	$(GSTREAMER_LIBS) \
- @ENABLE_GTK_TRUE@	$(STATIC_LINK_LIBS) \
-diff -Nru gaim-2.0.0beta4-old/gtk/gtkmain.c gaim-2.0.0beta4/gtk/gtkmain.c
---- gaim-2.0.0beta4-old/gtk/gtkmain.c	2006-10-18 12:37:48.000000000 -0500
-+++ gaim-2.0.0beta4/gtk/gtkmain.c	2006-10-19 12:42:42.000000000 -0500
-@@ -65,6 +65,7 @@
- #include "gtkutils.h"
- #include "gaimstock.h"
- #include "gtkwhiteboard.h"
-+#include <glib/gthread.h>
- 
- #ifdef HAVE_SIGNAL_H
- # include <signal.h>
-@@ -675,6 +676,16 @@
- 	gtk_rc_add_default_file(search_path);
- 	g_free(search_path);
- 
-+#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE))
-+ /* Since threads can be yanked in all unawares by other libraries,
-+  * and some libraries aren't smart enough to initialize the thread
-+  * subsystem when they need it, we need to do this here.  We also
-+  * threadify dbus when that gets initialized.  Ugh. */
-+        if (!g_thread_supported())
-+               g_thread_init(NULL);
-+	gdk_threads_init();
-+#endif /* Glib has threads */
-+
- 	gui_check = gtk_init_check(&argc, &argv);
- 	if (!gui_check) {
- 		char *display = gdk_get_display();
-diff -Nru gaim-2.0.0beta4-old/libgaim/dbus-server.c gaim-2.0.0beta4/libgaim/dbus-server.c
---- gaim-2.0.0beta4-old/libgaim/dbus-server.c	2006-10-18 12:38:16.000000000 -0500
-+++ gaim-2.0.0beta4/libgaim/dbus-server.c	2006-10-19 12:34:57.000000000 -0500
-@@ -758,6 +758,8 @@
- void
- gaim_dbus_init(void)
- {
-+        if(g_thread_supported())
-+                dbus_g_thread_init();
- 	gaim_dbus_init_ids();
- 
- 	g_free(init_error);
diff --git a/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild
deleted file mode 100644
index 812a0d3eac3c..000000000000
--- a/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild
+++ /dev/null
@@ -1,255 +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/gaim/gaim-2.0.0_beta5-r1.ebuild,v 1.6 2007/01/05 04:30:48 flameeyes Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib mono autotools perl-app gnome2
-
-MY_PV=${P/_beta/beta}
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
-IUSE="${IUSE} gtk sasl console"
-
-RDEPEND="
-	bonjour? ( !avahi? ( net-misc/howl )
-		   avahi? ( net-dns/avahi ) )
-	dbus? ( || (
-				( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 )
-				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
-				)
-		>=dev-lang/python-2.4 )
-	gtk? (
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		>=x11-libs/gtk+-2.0
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		xscreensaver? (	x11-libs/libXScrnSaver )
-		eds? ( gnome-extra/evolution-data-server ) 	)
-	>=dev-libs/glib-2.0
-	gstreamer? ( media-libs/gstreamer
-		     media-libs/gst-plugins-good )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
-	msn? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	mono? ( dev-lang/mono )
-	gstreamer? ( >=media-libs/gstreamer-0.10 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	doc? ( app-doc/doxygen )
-	dev-libs/libxml2"
-
-DEPEND="$RDEPEND
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )"
-
-S="${WORKDIR}/${MY_PV}"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
-
-# List of plugins
-#   app-accessibility/festival-gaim
-#   net-im/gaim-blogger
-#   net-im/gaim-bnet
-#   net-im/gaim-meanwhile
-#   net-im/gaim-snpp
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-assistant
-#   x11-plugins/gaim-encryption
-#   x11-plugins/gaim-extprefs
-#   x11-plugins/gaim-latex
-#   x11-plugins/gaim-otr
-#   x11-plugins/gaim-rhythmbox
-#   x11-plugins/gaim-xmms-remote
-#   x11-plugins/gaimosd
-#   x11-plugins/guifications
-
-
-print_gaim_warning() {
-	ewarn
-	ewarn "This is a beta release!  Please back up everything in your .gaim"
-	ewarn "directory. We're looking for lots of feedback on this release"
-	ewarn "especially what you love about it and what you hate about it."
-	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version, you may need"
-	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
-	ewarn
-	einfo
-	if  use custom-cflags; then
-		einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS."
-		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-cflags"
-		einfo
-	else
-		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-		einfo
-	fi
-}
-
-pkg_setup() {
-	print_gaim_warning
-
-	if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then
-	eerror
-	eerror "You need to rebuild net-dns/avahi with USE=howl-compat in order"
-	eerror  "to enable howl support for the bonjour protocol in gaim."
-	eerror
-	die "Configure failed"
-	fi
-
-	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 gaim."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use console &&  ! 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 the console client of gaim."
-		eerror
-		die "Configure failed"
-	fi
-
-	if ! use gtk && ! use console; then
-		einfo
-		elog "As you did not pick gtk or console use flag, building"
-		elog "console only."
-		einfo
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	if ! use custom-cflags; then
-		strip-flags
-	fi
-	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 msn; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},msn"
-	fi
-
-	if use ssl || use msn ; then
-		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
-	else
-		einfo "No SSL support selected"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=no"
-	fi
-
-	if use xscreensaver ; then
-			myconf="${myconf} --x-includes=/usr/include/X11"
-	fi
-
-	if ! use console && ! use gtk; then
-		myconf="${myconf} --enable-consoleui"
-	else
-		myconf="${myconf} $(use_enable console consoleui) $(use_enable gtk gtkui)"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable startup-notification) \
-		$(use_enable tcl) \
-		$(use_enable gtk sm) \
-		$(use_enable spell gtkspell) \
-		$(use_enable tk) \
-		$(use_enable xscreensaver screensaver) \
-		$(use_enable mono) \
-		$(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) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		${myconf} || die "Configuration failed"
-
-	# This is a tempory fix until Makefile is fixed!!
-	if use mono; then
-		emake -j1
-	else
-		emake
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	print_gaim_warning
-}
diff --git a/net-im/gaim/gaim-2.0.0_beta5-r2.ebuild b/net-im/gaim/gaim-2.0.0_beta5-r2.ebuild
deleted file mode 100644
index d0a6d245351e..000000000000
--- a/net-im/gaim/gaim-2.0.0_beta5-r2.ebuild
+++ /dev/null
@@ -1,259 +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/gaim/gaim-2.0.0_beta5-r2.ebuild,v 1.3 2007/01/05 04:30:48 flameeyes Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib mono autotools perl-app gnome2
-
-MY_PV=${P/_beta/beta}
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
-IUSE="${IUSE} gtk sasl console groupwise"
-
-RDEPEND="
-	bonjour? ( !avahi? ( net-misc/howl )
-		   avahi? ( net-dns/avahi ) )
-	dbus? ( || (
-				( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 )
-				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
-				)
-		>=dev-lang/python-2.4 )
-	gtk? (
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		>=x11-libs/gtk+-2.0
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		xscreensaver? (	x11-libs/libXScrnSaver )
-		eds? ( gnome-extra/evolution-data-server ) 	)
-	>=dev-libs/glib-2.0
-	gstreamer? ( media-libs/gstreamer
-		     media-libs/gst-plugins-good )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
-	msn? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	mono? ( dev-lang/mono )
-	gstreamer? ( >=media-libs/gstreamer-0.10 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	doc? ( app-doc/doxygen )
-	dev-libs/libxml2"
-
-DEPEND="$RDEPEND
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )"
-
-S="${WORKDIR}/${MY_PV}"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
-
-# List of plugins
-#   app-accessibility/festival-gaim
-#   net-im/gaim-blogger
-#   net-im/gaim-bnet
-#   net-im/gaim-meanwhile
-#   net-im/gaim-snpp
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-assistant
-#   x11-plugins/gaim-encryption
-#   x11-plugins/gaim-extprefs
-#   x11-plugins/gaim-latex
-#   x11-plugins/gaim-otr
-#   x11-plugins/gaim-rhythmbox
-#   x11-plugins/gaim-xmms-remote
-#   x11-plugins/gaimosd
-#   x11-plugins/guifications
-
-
-print_gaim_warning() {
-	ewarn
-	ewarn "This is a beta release!  Please back up everything in your .gaim"
-	ewarn "directory. We're looking for lots of feedback on this release"
-	ewarn "especially what you love about it and what you hate about it."
-	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version, you may need"
-	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
-	ewarn
-	einfo
-	if  use custom-cflags; then
-		einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS."
-		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-cflags"
-		einfo
-	else
-		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-		einfo
-	fi
-}
-
-pkg_setup() {
-	print_gaim_warning
-
-	if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then
-	eerror
-	eerror "You need to rebuild net-dns/avahi with USE=howl-compat in order"
-	eerror  "to enable howl support for the bonjour protocol in gaim."
-	eerror
-	die "Configure failed"
-	fi
-
-	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 gaim."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use console &&  ! 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 the console client of gaim."
-		eerror
-		die "Configure failed"
-	fi
-
-	if ! use gtk && ! use console; then
-		einfo
-		elog "As you did not pick gtk or console use flag, building"
-		elog "console only."
-		einfo
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	if ! use custom-cflags; then
-		strip-flags
-	fi
-	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 msn; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},msn"
-	fi
-
-	if use groupwise; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
-	fi
-
-	if use ssl || use msn ; then
-		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
-	else
-		einfo "No SSL support selected"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=no"
-	fi
-
-	if use xscreensaver ; then
-			myconf="${myconf} --x-includes=/usr/include/X11"
-	fi
-
-	if ! use console && ! use gtk; then
-		myconf="${myconf} --enable-consoleui"
-	else
-		myconf="${myconf} $(use_enable console consoleui) $(use_enable gtk gtkui)"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable startup-notification) \
-		$(use_enable tcl) \
-		$(use_enable gtk sm) \
-		$(use_enable spell gtkspell) \
-		$(use_enable tk) \
-		$(use_enable xscreensaver screensaver) \
-		$(use_enable mono) \
-		$(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) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		${myconf} || die "Configuration failed"
-
-	# This is a tempory fix until Makefile is fixed!!
-	if use mono; then
-		emake -j1
-	else
-		emake
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	print_gaim_warning
-}
diff --git a/net-im/gaim/gaim-2.0.0_beta5-r3.ebuild b/net-im/gaim/gaim-2.0.0_beta5-r3.ebuild
deleted file mode 100644
index 7242fea01ba3..000000000000
--- a/net-im/gaim/gaim-2.0.0_beta5-r3.ebuild
+++ /dev/null
@@ -1,258 +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/gaim/gaim-2.0.0_beta5-r3.ebuild,v 1.1 2007/01/06 04:15:29 gothgirl Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib mono autotools perl-app gnome2
-
-MY_PV=${P/_beta/beta}
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
-IUSE="${IUSE} gtk sasl console groupwise"
-
-RDEPEND="
-	bonjour? ( !avahi? ( net-misc/howl )
-		   avahi? ( 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
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		xscreensaver? (	x11-libs/libXScrnSaver )
-		eds? ( gnome-extra/evolution-data-server ) 	)
-	>=dev-libs/glib-2.0
-	gstreamer? ( media-libs/gstreamer
-		     media-libs/gst-plugins-good )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
-	msn? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	mono? ( dev-lang/mono )
-	gstreamer? ( >=media-libs/gstreamer-0.10 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	doc? ( app-doc/doxygen )
-	dev-libs/libxml2"
-
-DEPEND="$RDEPEND
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )"
-
-S="${WORKDIR}/${MY_PV}"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
-
-# List of plugins
-#   app-accessibility/festival-gaim
-#   net-im/gaim-blogger
-#   net-im/gaim-bnet
-#   net-im/gaim-meanwhile
-#   net-im/gaim-snpp
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-assistant
-#   x11-plugins/gaim-encryption
-#   x11-plugins/gaim-extprefs
-#   x11-plugins/gaim-latex
-#   x11-plugins/gaim-otr
-#   x11-plugins/gaim-rhythmbox
-#   x11-plugins/gaim-xmms-remote
-#   x11-plugins/gaimosd
-#   x11-plugins/guifications
-
-
-print_gaim_warning() {
-	ewarn
-	ewarn "This is a beta release!  Please back up everything in your .gaim"
-	ewarn "directory. We're looking for lots of feedback on this release"
-	ewarn "especially what you love about it and what you hate about it."
-	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version, you may need"
-	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
-	ewarn
-	einfo
-	if  use custom-cflags; then
-		einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS."
-		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-cflags"
-		einfo
-	else
-		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-		einfo
-	fi
-}
-
-pkg_setup() {
-	print_gaim_warning
-
-	if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then
-	eerror
-	eerror "You need to rebuild net-dns/avahi with USE=howl-compat in order"
-	eerror  "to enable howl support for the bonjour protocol in gaim."
-	eerror
-	die "Configure failed"
-	fi
-
-	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 gaim."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use console &&  ! 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 the console client of gaim."
-		eerror
-		die "Configure failed"
-	fi
-
-	if ! use gtk && ! use console; then
-		einfo
-		elog "As you did not pick gtk or console use flag, building"
-		elog "console only."
-		einfo
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	if ! use custom-cflags; then
-		strip-flags
-	fi
-	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 msn; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},msn"
-	fi
-
-	if use groupwise; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
-	fi
-
-	if use ssl || use msn ; then
-		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
-	else
-		einfo "No SSL support selected"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=no"
-	fi
-
-	if use xscreensaver ; then
-			myconf="${myconf} --x-includes=/usr/include/X11"
-	fi
-
-	if ! use console && ! use gtk; then
-		myconf="${myconf} --enable-consoleui"
-	else
-		myconf="${myconf} $(use_enable console consoleui) $(use_enable gtk gtkui)"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable startup-notification) \
-		$(use_enable tcl) \
-		$(use_enable gtk sm) \
-		$(use_enable spell gtkspell) \
-		$(use_enable tk) \
-		$(use_enable xscreensaver screensaver) \
-		$(use_enable mono) \
-		$(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) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		${myconf} || die "Configuration failed"
-
-	# This is a tempory fix until Makefile is fixed!!
-	if use mono; then
-		emake -j1
-	else
-		emake
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	print_gaim_warning
-}