remove old ebuilds.

Package-Manager: portage-2.0.51.19

7 files changed, 7 insertions, 385 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 01c4c3f3a332..55bdcc611ca0 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.98 2005/03/31 13:33:52 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.99 2005/03/31 13:36:12 hattya Exp $
+
+  31 Mar 2005; Akinori Hattori <hattya@gentoo.org>
+  -files/sylpheed-1.9.2-references.diff, -sylpheed-1.9.5.ebuild,
+  -sylpheed-1.9.6.ebuild:
+  remove old ebuilds.
 
 *sylpheed-1.9.7 (31 Mar 2005)
 
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 6f3bd394d566..6fd6b6ea3b2d 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,15 +1,10 @@
-MD5 4a34a9d344796f22b2b8699ffe0678c3 ChangeLog 22021
+MD5 2aa6337572b47fae60699769805ac97d ChangeLog 22186
 MD5 126ca8f672f0296d2f1e6830e6729a91 metadata.xml 231
 MD5 79126d7061a31b9aa5c2b0663137a57c sylpheed-1.0.3.ebuild 1610
 MD5 b24edf1dd3b5d0347d0798e571c9bb87 sylpheed-1.0.4.ebuild 1610
-MD5 be77a46270c7b556dbfddd12c5fe20ce sylpheed-1.9.5.ebuild 1485
-MD5 bc51518bdbb48fbd6e0baff96268aced sylpheed-1.9.6.ebuild 1485
 MD5 76ff1180f253663c71b719a03e9eddcc sylpheed-1.9.7.ebuild 1485
 MD5 cdbd74d02e21e89ef0a94ee91dbab75c files/digest-sylpheed-1.0.3 68
 MD5 a362fe1639f77a7898dfeab021cf9ca2 files/digest-sylpheed-1.0.4 68
-MD5 27f6f6d2b688f8a5a197eae7d319daa1 files/digest-sylpheed-1.9.5 68
-MD5 ead030bfd70c22a18c117bc77b1f1429 files/digest-sylpheed-1.9.6 68
 MD5 c32e55c4438d6725d6ed2fe2ef2f5800 files/digest-sylpheed-1.9.7 68
-MD5 28f6e562e3c547daedea86c235dd15a3 files/sylpheed-1.9.2-references.diff 6489
 MD5 4cbec71671b7349c904f860a12fee5d9 files/sylpheed-namespace.diff 550
 MD5 f4242298cfab21456442bfe52505d2b8 files/sylpheed-procmime.diff 1119
diff --git a/mail-client/sylpheed/files/digest-sylpheed-1.9.5 b/mail-client/sylpheed/files/digest-sylpheed-1.9.5
deleted file mode 100644
index 06e217746335..000000000000
--- a/mail-client/sylpheed/files/digest-sylpheed-1.9.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f74bb535d0e81cf0dd9b96a77e2cde4 sylpheed-1.9.5.tar.bz2 2224169
diff --git a/mail-client/sylpheed/files/digest-sylpheed-1.9.6 b/mail-client/sylpheed/files/digest-sylpheed-1.9.6
deleted file mode 100644
index 92ff1945f16a..000000000000
--- a/mail-client/sylpheed/files/digest-sylpheed-1.9.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1cdee69bd724f20786e5390891eb4c23 sylpheed-1.9.6.tar.bz2 2226203
diff --git a/mail-client/sylpheed/files/sylpheed-1.9.2-references.diff b/mail-client/sylpheed/files/sylpheed-1.9.2-references.diff
deleted file mode 100644
index 7805ff703c56..000000000000
--- a/mail-client/sylpheed/files/sylpheed-1.9.2-references.diff
+++ /dev/null
@@ -1,230 +0,0 @@
-Index: trunk/src/procheader.c
-===================================================================
---- trunk/src/procheader.c	(revision 107)
-+++ trunk/src/procheader.c	(working copy)
-@@ -507,7 +507,7 @@
- 	MsgInfo *msginfo;
- 	gchar buf[BUFFSIZE], tmp[BUFFSIZE];
- 	gchar *reference = NULL;
--	gchar *p;
-+	gchar *p, *q;
- 	gchar *hp;
- 	HeaderEntry *hentry;
- 	gint hnum;
-@@ -573,6 +573,20 @@
- 			msginfo->msgid = g_strdup(hp);
- 			break;
- 		case H_REFERENCES:
-+			p = hp;
-+			while ((p = strchr(p, '<')) != NULL && 
-+			       (q = strchr(p + 1, '>')) != NULL) {
-+				msginfo->references = g_slist_prepend
-+					(msginfo->references, 
-+					 g_strndup(p + 1, q - p - 1));
-+				p = q + 1;						 
-+			}
-+			if (msginfo->references) { 
-+				if (!reference) 
-+					/* use last one as possible in-reply-to replacement*/
-+					reference = g_strdup(msginfo->references->data);
-+			}
-+			break;
- 		case H_IN_REPLY_TO:
- 			if (!reference) {
- 				eliminate_parenthesis(hp, '(', ')');
-Index: trunk/src/procmsg.c
-===================================================================
---- trunk/src/procmsg.c	(revision 107)
-+++ trunk/src/procmsg.c	(working copy)
-@@ -201,7 +201,9 @@
- 	MsgFlags default_flags;
- 	gchar file_buf[BUFFSIZE];
- 	guint32 num;
-+	gint refnum;
- 	FolderType type;
-+	gchar *ref;
- 
- 	g_return_val_if_fail(item != NULL, NULL);
- 	g_return_val_if_fail(item->folder != NULL, NULL);
-@@ -257,6 +259,13 @@
- 		READ_CACHE_DATA(msginfo->msgid, fp);
- 		READ_CACHE_DATA(msginfo->inreplyto, fp);
- 
-+		READ_CACHE_DATA_INT(refnum, fp);
-+		for (; refnum != 0; refnum--) {
-+			READ_CACHE_DATA(ref, fp);
-+			msginfo->references = g_slist_append
-+				(msginfo->references, ref);
-+		}
-+
- 		MSG_SET_PERM_FLAGS(msginfo->flags, default_flags.perm_flags);
- 		MSG_SET_TMP_FLAGS(msginfo->flags, default_flags.tmp_flags);
- 
-@@ -443,6 +452,7 @@
- void procmsg_write_cache(MsgInfo *msginfo, FILE *fp)
- {
- 	MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;
-+	GSList *refs;
- 
- 	WRITE_CACHE_DATA_INT(msginfo->msgnum, fp);
- 	WRITE_CACHE_DATA_INT(msginfo->size, fp);
-@@ -459,6 +469,11 @@
- 	WRITE_CACHE_DATA(msginfo->subject, fp);
- 	WRITE_CACHE_DATA(msginfo->msgid, fp);
- 	WRITE_CACHE_DATA(msginfo->inreplyto, fp);
-+ 
-+ 	WRITE_CACHE_DATA_INT(g_slist_length(msginfo->references), fp);
-+ 	if (g_slist_length(msginfo->references))
-+ 		for (refs = msginfo->references; refs; refs = refs->next) 
-+ 			WRITE_CACHE_DATA(((gchar *)refs->data), fp);
- }
- 
- void procmsg_write_flags(MsgInfo *msginfo, FILE *fp)
-@@ -752,6 +767,7 @@
- 	GHashTable *table;
- 	MsgInfo *msginfo;
- 	const gchar *msgid;
-+	GSList *reflist;
- 
- 	root = g_node_new(NULL);
- 	table = g_hash_table_new(g_str_hash, g_str_equal);
-@@ -762,7 +778,16 @@
- 
- 		if (msginfo->inreplyto) {
- 			parent = g_hash_table_lookup(table, msginfo->inreplyto);
--			if (parent == NULL)
-+			
-+			/* check references */			
-+			if (!parent && msginfo->references)
-+				for (reflist = msginfo->references; 
-+				     reflist != NULL; 
-+				     reflist = reflist->next)
-+					if ((parent = g_hash_table_lookup
-+						(table, reflist->data))) 
-+						break;
-+			if (parent == NULL) 
- 				parent = root;
- 		}
- 		node = g_node_insert_data_before
-@@ -777,16 +802,28 @@
- 	for (node = root->children; node != NULL; ) {
- 		next = node->next;
- 		msginfo = (MsgInfo *)node->data;
--		if (msginfo->inreplyto) {
-+		parent = NULL;
-+
-+		/* check in reply to */
-+		if (msginfo->inreplyto)
- 			parent = g_hash_table_lookup(table, msginfo->inreplyto);
--			/* node should not be the parent, and node should not
--			   be an ancestor of parent (circular reference) */
--			if (parent && parent != node &&
--			    !g_node_is_ancestor(node, parent)) {
--				g_node_unlink(node);
--				g_node_insert_before
--					(parent, parent->children, node);
--			}
-+
-+		/* check references */			
-+		if (!parent && msginfo->references)
-+			for (reflist = msginfo->references; 
-+			     reflist != NULL; 
-+			     reflist = reflist->next)
-+				if ((parent = g_hash_table_lookup
-+					(table, reflist->data))) 
-+					break;
-+		
-+		/* node should not be the parent, and node should not
-+		   be an ancestor of parent (circular reference) */
-+		if (parent && parent != node &&
-+		    !g_node_is_ancestor(node, parent)) {
-+			g_node_unlink(node);
-+			g_node_insert_before
-+				(parent, parent->children, node);
- 		}
- 		node = next;
- 	}
-@@ -1419,10 +1456,19 @@
- 	return full_msginfo;
- }
- 
-+static void free_references(gpointer data, gpointer user)
-+{
-+	g_free(data);
-+}
-+
- void procmsg_msginfo_free(MsgInfo *msginfo)
- {
- 	if (msginfo == NULL) return;
- 
-+	g_slist_foreach(msginfo->references, 
-+		       free_references, NULL);
-+	g_slist_free(msginfo->references);
-+
- 	g_free(msginfo->xface);
- 
- 	g_free(msginfo->fromname);
-Index: trunk/src/procmsg.h
-===================================================================
---- trunk/src/procmsg.h	(revision 107)
-+++ trunk/src/procmsg.h	(working copy)
-@@ -180,6 +180,7 @@
- 	gchar *subject;
- 	gchar *msgid;
- 	gchar *inreplyto;
-+	GSList *references;
- 
- 	FolderItem *folder;
- 	FolderItem *to_folder;
-Index: trunk/src/summaryview.c
-===================================================================
---- trunk/src/summaryview.c	(revision 107)
-+++ trunk/src/summaryview.c	(working copy)
-@@ -3033,6 +3033,7 @@
- 	GtkCTreeNode *next;
- 	GtkCTreeNode *parent;
- 	MsgInfo *msginfo;
-+	GSList *reflist;
- 
- 	summary_lock(summaryview);
- 
-@@ -3053,6 +3054,17 @@
- 		if (msginfo && msginfo->inreplyto) {
- 			parent = g_hash_table_lookup(summaryview->msgid_table,
- 						     msginfo->inreplyto);
-+						     
-+			/* check references */			
-+			if (!parent && msginfo->references)
-+				for (reflist = msginfo->references; 
-+				     reflist != NULL; 
-+				     reflist = reflist->next)
-+					if ((parent = g_hash_table_lookup
-+						(summaryview->msgid_table, 
-+						 reflist->data))) 
-+						break;
-+						
- 			if (parent && parent != node) {
- 				gtk_ctree_move(ctree, node, parent, NULL);
- 				gtk_ctree_expand(ctree, node);
-Index: trunk/src/defs.h
-===================================================================
---- trunk/src/defs.h	(revision 107)
-+++ trunk/src/defs.h	(working copy)
-@@ -63,7 +63,7 @@
- #define FOLDER_LIST		"folderlist.xml"
- #define CACHE_FILE		".sylpheed_cache"
- #define MARK_FILE		".sylpheed_mark"
--#define CACHE_VERSION		0x20
-+#define CACHE_VERSION		0x1024
- #define MARK_VERSION		2
- 
- #define DEFAULT_SIGNATURE	".signature"
-@@ -105,4 +105,7 @@
- 
- #define DEFAULT_MESSAGE_FONT	"Sans 14"
- 
-+#undef CACHE_VERSION
-+#define CACHE_VERSION			0x1024
-+
- #endif /* __DEFS_H__ */
-
diff --git a/mail-client/sylpheed/sylpheed-1.9.5.ebuild b/mail-client/sylpheed/sylpheed-1.9.5.ebuild
deleted file mode 100644
index a5753127f1c4..000000000000
--- a/mail-client/sylpheed/sylpheed-1.9.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-1.9.5.ebuild,v 1.1 2005/03/07 12:46:03 hattya Exp $
-
-inherit eutils
-
-IUSE="crypt gnome ipv6 ldap nls pda ssl xface"
-
-DESCRIPTION="A lightweight email client and newsreader"
-HOMEPAGE="http://sylpheed.good-day.net/"
-SRC_URI="http://sylpheed.good-day.net/${PN}/v${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-
-PROVIDE="virtual/sylpheed"
-
-DEPEND=">=x11-libs/gtk+-2.2
-	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
-	crypt? ( >=app-crypt/gpgme-0.4.5 )
-	ldap? ( >=net-nds/openldap-2.0.11 )
-	pda? ( app-pda/jpilot )
-	ssl? ( dev-libs/openssl )
-	xface? ( >=media-libs/compface-1.4 )"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-namespace.diff
-	epatch ${FILESDIR}/${PN}-procmime.diff
-
-}
-
-src_compile() {
-
-	econf \
-		`use_enable nls` \
-		`use_enable ssl` \
-		`use_enable crypt gpgme` \
-		`use_enable pda jpilot` \
-		`use_enable ldap` \
-		`use_enable ipv6` \
-		`use_enable xface compface` \
-		|| die
-
-	emake || die
-
-}
-
-src_install() {
-
-	einstall
-
-	dodir /usr/share/pixmaps
-	insinto /usr/share/pixmaps
-	doins *.png
-
-	if use gnome
-	then
-		dodir /usr/share/gnome/apps/Internet
-		insinto /usr/share/gnome/apps/Internet
-		doins sylpheed.desktop
-	fi
-
-	dodoc [A-Z][A-Z]* ChangeLog*
-
-}
diff --git a/mail-client/sylpheed/sylpheed-1.9.6.ebuild b/mail-client/sylpheed/sylpheed-1.9.6.ebuild
deleted file mode 100644
index 7ed0913a97b5..000000000000
--- a/mail-client/sylpheed/sylpheed-1.9.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-1.9.6.ebuild,v 1.1 2005/03/21 14:50:44 hattya Exp $
-
-inherit eutils
-
-IUSE="crypt gnome ipv6 ldap nls pda ssl xface"
-
-DESCRIPTION="A lightweight email client and newsreader"
-HOMEPAGE="http://sylpheed.good-day.net/"
-SRC_URI="http://sylpheed.good-day.net/${PN}/v${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-
-PROVIDE="virtual/sylpheed"
-
-DEPEND=">=x11-libs/gtk+-2.2
-	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
-	crypt? ( >=app-crypt/gpgme-0.4.5 )
-	ldap? ( >=net-nds/openldap-2.0.11 )
-	pda? ( app-pda/jpilot )
-	ssl? ( dev-libs/openssl )
-	xface? ( >=media-libs/compface-1.4 )"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-namespace.diff
-	epatch ${FILESDIR}/${PN}-procmime.diff
-
-}
-
-src_compile() {
-
-	econf \
-		`use_enable nls` \
-		`use_enable ssl` \
-		`use_enable crypt gpgme` \
-		`use_enable pda jpilot` \
-		`use_enable ldap` \
-		`use_enable ipv6` \
-		`use_enable xface compface` \
-		|| die
-
-	emake || die
-
-}
-
-src_install() {
-
-	einstall
-
-	dodir /usr/share/pixmaps
-	insinto /usr/share/pixmaps
-	doins *.png
-
-	if use gnome
-	then
-		dodir /usr/share/gnome/apps/Internet
-		insinto /usr/share/gnome/apps/Internet
-		doins sylpheed.desktop
-	fi
-
-	dodoc [A-Z][A-Z]* ChangeLog*
-
-}