Pruning obsolete ebuilds

Package-Manager: portage-2.0.51.16

13 files changed, 15 insertions, 660 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index a6575ccd69f5..b196615437f1 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.293 2005/02/04 23:48:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.294 2005/02/07 16:53:34 rizzo Exp $
+
+  07 Feb 2005; Don Seiler <rizzo@gentoo.org> -files/gaim-1.0.3-gcc2.patch,
+  -files/gaim-1.0.3cvs-ircbuddylist.patch, -gaim-1.0.2-r1.ebuild,
+  -gaim-1.0.3-r2.ebuild, -gaim-1.1.0.ebuild, -gaim-1.1.1.ebuild:
+  Pruning obsolete ebuilds
 
   05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> gaim-1.1.2.ebuild:
   Stable on alpha, bug 79623.
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 05ba364fa084..be2675ad75bf 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,15 +1,5 @@
-MD5 cbdf78735e978004f531f1b898905093 ChangeLog 44377
-MD5 d3eb790f6e35bed8787b508b3ee31be5 gaim-1.0.2-r1.ebuild 3717
-MD5 aa9da4cfd1f76b7a3b1c12a0420b830a gaim-1.0.3-r2.ebuild 3747
+MD5 9d5e25dbea48a9e4ed6db6edf6f8049c ChangeLog 44610
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 3f61bfc37925fd51bb156374c9a48f79 gaim-1.1.0.ebuild 3697
-MD5 58a546df36b8d82d96bbd36efe25e675 gaim-1.1.1.ebuild 3700
 MD5 96102421b173a9c52e01c6d00696d60b gaim-1.1.2.ebuild 3581
-MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2-r1 64
-MD5 3c880530528d7d9a72baa22afc76736d files/digest-gaim-1.0.3-r2 64
-MD5 1174abb3ad652e16b24889e7fe0a36db files/digest-gaim-1.1.0 64
-MD5 5a965d7dbdfe4f077deabcee9695526b files/gaim-1.0.3cvs-ircbuddylist.patch 4051
-MD5 b7ca30984d2853ae2978ca94668ef7b5 files/gaim-1.0.3-gcc2.patch 546
-MD5 d9d9991c2859e5009a31407e68e3578a files/digest-gaim-1.1.1 64
-MD5 63540ba1527c8935186ff9fd54d166a5 files/digest-gaim-1.1.2 64
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
+MD5 63540ba1527c8935186ff9fd54d166a5 files/digest-gaim-1.1.2 64
diff --git a/net-im/gaim/files/digest-gaim-1.0.2-r1 b/net-im/gaim/files/digest-gaim-1.0.2-r1
deleted file mode 100644
index 3245e384dee3..000000000000
--- a/net-im/gaim/files/digest-gaim-1.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80fbe23c6206ca6c0c62c30d5091d7e4 gaim-1.0.2.tar.bz2 4809084
diff --git a/net-im/gaim/files/digest-gaim-1.0.3-r2 b/net-im/gaim/files/digest-gaim-1.0.3-r2
deleted file mode 100644
index 4698ff1ad2c8..000000000000
--- a/net-im/gaim/files/digest-gaim-1.0.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0c40cbb57a80813fd495d3ffc6259df gaim-1.0.3.tar.bz2 4810182
diff --git a/net-im/gaim/files/digest-gaim-1.1.0 b/net-im/gaim/files/digest-gaim-1.1.0
deleted file mode 100644
index b4ca40153b48..000000000000
--- a/net-im/gaim/files/digest-gaim-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 231f30505d7377bbdde0f350a4bcb838 gaim-1.1.0.tar.bz2 4849702
diff --git a/net-im/gaim/files/digest-gaim-1.1.1 b/net-im/gaim/files/digest-gaim-1.1.1
deleted file mode 100644
index 4cbd8cc09d7e..000000000000
--- a/net-im/gaim/files/digest-gaim-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5d554be5ccb2064a5b3d43117c7d6d4b gaim-1.1.1.tar.bz2 5163396
diff --git a/net-im/gaim/files/gaim-1.0.3-gcc2.patch b/net-im/gaim/files/gaim-1.0.3-gcc2.patch
deleted file mode 100644
index af0c46b480d4..000000000000
--- a/net-im/gaim/files/gaim-1.0.3-gcc2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gaim-1.0.3/src/log.c~	2004-11-11 14:11:43 -0500
-+++ gaim-1.0.3/src/log.c	2004-11-16 22:41:18 -0500
-@@ -74,11 +74,12 @@ void gaim_log_free(GaimLog *log)
- void gaim_log_write(GaimLog *log, GaimMessageFlags type,
- 		    const char *from, time_t time, const char *message)
- {
-+	struct _gaim_logsize_user *lu;
-+
- 	g_return_if_fail(log);
- 	g_return_if_fail(log->logger);
- 	g_return_if_fail(log->logger->write);
- 
--	struct _gaim_logsize_user *lu;
- 	(log->logger->write)(log, type, from, time, message);
- 
- 	lu = g_new(struct _gaim_logsize_user, 1);
diff --git a/net-im/gaim/files/gaim-1.0.3cvs-ircbuddylist.patch b/net-im/gaim/files/gaim-1.0.3cvs-ircbuddylist.patch
deleted file mode 100644
index 5825a875e453..000000000000
--- a/net-im/gaim/files/gaim-1.0.3cvs-ircbuddylist.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-? AUTHORS.recv
-? NEWS.stu
-? gaim-1.0.0.tar.gz
-? gaim-1.0.1cvs.tar.gz
-? gaim.bin.rcv
-? gaim.rcv-foo-blah
-? stugen.sh
-? plugins/newline.c
-? plugins/yahoo_im_buzz.c
-Index: plugins/statenotify.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/plugins/statenotify.c,v
-retrieving revision 1.21.2.1
-diff -u -p -r1.21.2.1 statenotify.c
---- plugins/statenotify.c	3 Sep 2004 21:34:04 -0000	1.21.2.1
-+++ plugins/statenotify.c	10 Nov 2004 16:41:38 -0000
-@@ -18,6 +18,7 @@ write_status(GaimBuddy *buddy, const cha
- 	GaimConversation *conv;
- 	const char *who;
- 	char buf[256];
-+	char *escaped;
- 
- 	conv = gaim_find_conversation_with_account(buddy->name, buddy->account);
- 
-@@ -25,8 +26,10 @@ write_status(GaimBuddy *buddy, const cha
- 		return;
- 
- 	who = gaim_buddy_get_alias(buddy);
-+	escaped = g_markup_escape_text(who, -1);
- 
--	g_snprintf(buf, sizeof(buf), message, who);
-+	g_snprintf(buf, sizeof(buf), message, escaped);
-+	g_free(escaped);
- 
- 	gaim_conversation_write(conv, NULL, buf, GAIM_MESSAGE_SYSTEM, time(NULL));
- }
-Index: src/gtkdialogs.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.c,v
-retrieving revision 1.11.2.11
-diff -u -p -r1.11.2.11 gtkdialogs.c
---- src/gtkdialogs.c	23 Oct 2004 15:25:33 -0000	1.11.2.11
-+++ src/gtkdialogs.c	10 Nov 2004 16:41:40 -0000
-@@ -874,15 +874,18 @@ static void
- gaim_gtkdialogs_remove_chat_cb(GaimChat *chat)
- {
- 	char *name = NULL;
-+	GaimAccount *account;
- 	GaimConversation *conv = NULL;
- 
--	if (GAIM_PLUGIN_PROTOCOL_INFO(chat->account->gc->prpl)->get_chat_name != NULL)
--		name = GAIM_PLUGIN_PROTOCOL_INFO(chat->account->gc->prpl)->get_chat_name(chat->components);
-+	account = chat->account;
-+
-+	if (GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl)->get_chat_name != NULL)
-+		name = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl)->get_chat_name(chat->components);
- 
- 	gaim_blist_remove_chat(chat);
- 
- 	if (name != NULL) {
--		conv = gaim_find_conversation_with_account(name, chat->account);
-+		conv = gaim_find_conversation_with_account(name, account);
- 		g_free(name);
- 	}
- 
-Index: src/gtkpounce.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkpounce.c,v
-retrieving revision 1.60
-diff -u -p -r1.60 gtkpounce.c
---- src/gtkpounce.c	30 Aug 2004 01:40:07 -0000	1.60
-+++ src/gtkpounce.c	10 Nov 2004 16:41:40 -0000
-@@ -948,6 +948,9 @@ pounce_cb(GaimPounce *pounce, GaimPounce
- 	{
- 		char tmp[1024];
- 		const char *name_shown;
-+		char *escaped;
-+
-+		escaped = g_markup_escape_text(alias, -1);
- 
- 		/*
- 		 * Here we place the protocol name in the pounce dialog to lessen
-@@ -971,7 +974,9 @@ pounce_cb(GaimPounce *pounce, GaimPounce
- 				   (events & GAIM_POUNCE_AWAY) ?
- 				   _("%s has gone away. (%s)") :
- 				   _("Unknown pounce event. Please report this!"),
--				   alias, gaim_account_get_protocol_name(account));
-+				   escaped, gaim_account_get_protocol_name(account));
-+
-+		g_free(escaped);
- 
- 		/*
- 		 * Ok here is where I change the second argument, title, from
-Index: src/gtkprefs.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
-retrieving revision 1.204.2.3
-diff -u -p -r1.204.2.3 gtkprefs.c
---- src/gtkprefs.c	2 Oct 2004 00:11:54 -0000	1.204.2.3
-+++ src/gtkprefs.c	10 Nov 2004 16:41:40 -0000
-@@ -636,7 +636,7 @@ gint gaim_sort_smileys (GtkTreeModel	*mo
- 						gpointer		userdata)
- {
- 	gint ret = 0;
--	gchar *name1, *name2;
-+	gchar *name1 = NULL, *name2 = NULL;
- 
- 	gtk_tree_model_get(model, a, 3, &name1, -1);
- 	gtk_tree_model_get(model, b, 3, &name2, -1);
-@@ -645,8 +645,11 @@ gint gaim_sort_smileys (GtkTreeModel	*mo
- 		if (!(name1 == NULL && name2 == NULL))
- 			ret = (name1 == NULL) ? -1: 1;
- 	} else if (!g_ascii_strcasecmp(name1, "none")) {
--		/* Sort name1 first */
--		ret = -1;
-+		if (!g_utf8_collate(name1, name2))
-+			ret = 0;
-+		else
-+			/* Sort name1 first */
-+			ret = -1;
- 	} else if (!g_ascii_strcasecmp(name2, "none")) {
- 		/* Sort name2 first */
- 		ret = 1;
diff --git a/net-im/gaim/gaim-1.0.2-r1.ebuild b/net-im/gaim/gaim-1.0.2-r1.ebuild
deleted file mode 100644
index 8c6a56c96cb1..000000000000
--- a/net-im/gaim/gaim-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.2-r1.ebuild,v 1.3 2005/01/14 19:25:44 rizzo Exp $
-
-inherit flag-o-matic eutils gcc debug
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86"
-#IUSE="nls perl spell nas crypt cjk gnutls silc eds debug"
-IUSE="nls perl spell nas crypt cjk gnutls silc debug"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	dev-util/pkgconfig
-	sys-devel/gettext
-	media-libs/libao
-	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.8.2-r1
-			!<dev-perl/ExtUtils-MakeMaker-6.17 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
-	dev-libs/nss
-	gnutls? ( net-libs/gnutls )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )"
-	#eds? ( gnome-extra/evolution-data-server )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.32 )"
-
-# List of plugins
-#	net-im/gaim-blogger
-#	net-im/gaim-meanwhile
-#	net-im/gaim-snpp
-#	x11-plugins/autoprofile
-#	x11-plugins/gaim-encryption
-#	x11-plugins/gaim-extprefs
-#	x11-plugins/gaim-rhythmbox
-#	x11-plugins/gaim-xmms-remote
-#	x11-plugins/gaimosd
-#	x11-plugins/guifications
-
-
-print_gaim_warning() {
-	ewarn
-	ewarn "If you are merging ${P} from an earlier version, you will 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
-	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-	einfo
-	ewarn
-	ewarn "If you receive errors due to NSS, please re-emerge"
-	ewarn "dev-libs/nss and then emerge gaim again."
-	ewarn
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-	epatch ${FILESDIR}/gaim-1.0.3cvs-ircbuddylist.patch
-}
-
-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
-	use debug && myconf="${myconf} --enable-debug"
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-	myconf="${myconf} --disable-gevolution"
-	#use eds || myconf="${myconf} --disable-gevolution"
-
-	if use gnutls ; then
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/lib"
-	else
-		myconf="${myconf} --enable-gnutls=no"
-	fi
-
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-	myconf="${myconf} --with-nspr-libs=/usr/lib"
-	myconf="${myconf} --with-nss-libs=/usr/lib/nss"
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "Install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
-	print_gaim_warning
-}
diff --git a/net-im/gaim/gaim-1.0.3-r2.ebuild b/net-im/gaim/gaim-1.0.3-r2.ebuild
deleted file mode 100644
index 61b64068df21..000000000000
--- a/net-im/gaim/gaim-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.3-r2.ebuild,v 1.4 2005/01/14 19:25:44 rizzo Exp $
-
-inherit flag-o-matic eutils gcc debug
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
-#IUSE="nls perl spell nas crypt cjk gnutls silc eds debug"
-IUSE="nls perl spell nas crypt cjk gnutls silc debug"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	dev-util/pkgconfig
-	sys-devel/gettext
-	media-libs/libao
-	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.8.2-r1
-			!<dev-perl/ExtUtils-MakeMaker-6.17 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.9.2-r2 )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )"
-	#eds? ( gnome-extra/evolution-data-server )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.32-r1 )"
-
-# List of plugins
-#	net-im/gaim-blogger
-#	net-im/gaim-meanwhile
-#	net-im/gaim-snpp
-#	x11-plugins/autoprofile
-#	x11-plugins/gaim-encryption
-#	x11-plugins/gaim-extprefs
-#	x11-plugins/gaim-rhythmbox
-#	x11-plugins/gaim-xmms-remote
-#	x11-plugins/gaimosd
-#	x11-plugins/guifications
-
-
-print_gaim_warning() {
-	ewarn
-	ewarn "If you are merging ${P} from an earlier version, you will 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
-	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-	einfo
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-	epatch ${FILESDIR}/gaim-1.0.3-gcc2.patch
-}
-
-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
-	use debug && myconf="${myconf} --enable-debug"
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-	myconf="${myconf} --disable-gevolution"
-	#use eds || myconf="${myconf} --disable-gevolution"
-
-	if use gnutls ; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf="${myconf} --enable-nss=no"
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/lib"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf="${myconf} --enable-gnutls=no"
-		myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-		myconf="${myconf} --with-nss-includes=/usr/include/nss"
-		myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
-		myconf="${myconf} --with-nss-libs=/usr/lib/nss"
-	fi
-
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "Install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
-	print_gaim_warning
-}
diff --git a/net-im/gaim/gaim-1.1.0.ebuild b/net-im/gaim/gaim-1.1.0.ebuild
deleted file mode 100644
index e4d9bd5cba60..000000000000
--- a/net-im/gaim/gaim-1.1.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.1.0.ebuild,v 1.7 2005/01/14 19:25:44 rizzo Exp $
-
-inherit flag-o-matic eutils gcc debug
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc sparc x86 ppc64"
-#IUSE="nls perl spell nas crypt cjk gnutls silc eds debug"
-IUSE="nls perl spell nas crypt cjk gnutls silc debug"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	dev-util/pkgconfig
-	sys-devel/gettext
-	media-libs/libao
-	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.8.2-r1
-			!<dev-perl/ExtUtils-MakeMaker-6.17 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.9.2-r2 )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )"
-	#eds? ( gnome-extra/evolution-data-server )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.32-r1 )"
-
-# List of plugins
-#	net-im/gaim-blogger
-#	net-im/gaim-meanwhile
-#	net-im/gaim-snpp
-#	x11-plugins/autoprofile
-#	x11-plugins/gaim-encryption
-#	x11-plugins/gaim-extprefs
-#	x11-plugins/gaim-rhythmbox
-#	x11-plugins/gaim-xmms-remote
-#	x11-plugins/gaimosd
-#	x11-plugins/guifications
-
-
-print_gaim_warning() {
-	ewarn
-	ewarn "If you are merging ${P} from an earlier version, you will 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
-	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-	einfo
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-}
-
-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
-	use debug && myconf="${myconf} --enable-debug"
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-	myconf="${myconf} --disable-gevolution"
-	#use eds || myconf="${myconf} --disable-gevolution"
-
-	if use gnutls ; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf="${myconf} --enable-nss=no"
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/lib"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf="${myconf} --enable-gnutls=no"
-		myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-		myconf="${myconf} --with-nss-includes=/usr/include/nss"
-		myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
-		myconf="${myconf} --with-nss-libs=/usr/lib/nss"
-	fi
-
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "Install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
-	print_gaim_warning
-}
diff --git a/net-im/gaim/gaim-1.1.1.ebuild b/net-im/gaim/gaim-1.1.1.ebuild
deleted file mode 100644
index a1b0e39e37a8..000000000000
--- a/net-im/gaim/gaim-1.1.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.1.1.ebuild,v 1.4 2005/01/25 21:15:30 gmsoft Exp $
-
-inherit flag-o-matic eutils gcc debug
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc sparc x86 ~ppc64"
-#IUSE="nls perl spell nas crypt cjk gnutls silc eds debug"
-IUSE="nls perl spell nas crypt cjk gnutls silc debug"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	dev-util/pkgconfig
-	sys-devel/gettext
-	media-libs/libao
-	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.8.2-r1
-			!<dev-perl/ExtUtils-MakeMaker-6.17 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.9.2-r2 )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )"
-	#eds? ( gnome-extra/evolution-data-server )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.32-r1 )"
-
-# List of plugins
-#	net-im/gaim-blogger
-#	net-im/gaim-meanwhile
-#	net-im/gaim-snpp
-#	x11-plugins/autoprofile
-#	x11-plugins/gaim-encryption
-#	x11-plugins/gaim-extprefs
-#	x11-plugins/gaim-rhythmbox
-#	x11-plugins/gaim-xmms-remote
-#	x11-plugins/gaimosd
-#	x11-plugins/guifications
-
-
-print_gaim_warning() {
-	ewarn
-	ewarn "If you are merging ${P} from an earlier version, you will 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
-	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-	einfo
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-}
-
-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
-	use debug && myconf="${myconf} --enable-debug"
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-	myconf="${myconf} --disable-gevolution"
-	#use eds || myconf="${myconf} --disable-gevolution"
-
-	if use gnutls ; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf="${myconf} --enable-nss=no"
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/lib"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf="${myconf} --enable-gnutls=no"
-		myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-		myconf="${myconf} --with-nss-includes=/usr/include/nss"
-		myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
-		myconf="${myconf} --with-nss-libs=/usr/lib/nss"
-	fi
-
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "Install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
-	print_gaim_warning
-}
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index c60c781828c6..d8b0472e6ab1 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 936e0494d02e57db642f6620e2e40050 ChangeLog 5638
+MD5 732a8d9cffa4715f4e55ea571e1867be ChangeLog 5813
 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
-MD5 8935777a4eb06dc0a52e24cf834a3476 skype-1.0.0.1.ebuild 2970
+MD5 5abd98bf10978b25ebcac66ca16ec300 skype-1.0.0.1-r1.ebuild 2808
+MD5 490d9786a4b7f47ac25c634478813094 skype-1.0.0.1.ebuild 2973
 MD5 e6709e950ddd3c742688173433ea3a8b files/digest-skype-1.0.0.1 209
+MD5 e6709e950ddd3c742688173433ea3a8b files/digest-skype-1.0.0.1-r1 209
 MD5 3ebd302142d17df643fa2055d99d0fc7 files/sDaemonWrapper 1740
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCApqR8zY1VwezZiERAp2zAJ9ucc9F8BbrL47oByUDZMhvt+3XDgCbBbUR
-liWN/YAL7dE1KXu1a8ukgrk=
-=Xvje
+iD8DBQFCB54e8zY1VwezZiERAqP7AKCPofU+aKCMG4rv5hedOf3i9fO1/QCgmTuf
++WHzYGBKRHEKX8DnXYCgVHc=
+=6F09
 -----END PGP SIGNATURE-----