Add patches from the new maintainer, Phil Pennock #125132. Yank ~alpha and

~ia64 since this depends on gnome-applets-1 which isn't available on those
platforms.
Package-Manager: portage-2.1_pre5-r4

7 files changed, 230 insertions, 9 deletions

diff --git a/mail-client/gbuffy/ChangeLog b/mail-client/gbuffy/ChangeLog
index e68c7243a445..41cda6edcb2f 100644
--- a/mail-client/gbuffy/ChangeLog
+++ b/mail-client/gbuffy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/gbuffy
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/ChangeLog,v 1.1 2004/11/02 16:00:07 agriffis Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/ChangeLog,v 1.2 2006/03/25 06:19:52 agriffis Exp $
+
+*gbuffy-0.2.6-r1 (25 Mar 2006)
+
+  25 Mar 2006; Aron Griffis <agriffis@gentoo.org> +files/gbuffy-1.patch,
+  +files/gbuffy-search-3.patch, gbuffy-0.2.6.ebuild,
+  +gbuffy-0.2.6-r1.ebuild:
+  Add patches from the new maintainer, Phil Pennock #125132.  Yank ~alpha and
+  ~ia64 since this depends on gnome-applets-1 which isn't available on those
+  platforms.
 
 *gbuffy-0.2.6 (02 Nov 2004)
 
diff --git a/mail-client/gbuffy/Manifest b/mail-client/gbuffy/Manifest
index 2725a9374de5..cd18c907b1ed 100644
--- a/mail-client/gbuffy/Manifest
+++ b/mail-client/gbuffy/Manifest
@@ -1,4 +1,34 @@
-MD5 7561f08683fb3a9a1cc12dea88d4afa0 ChangeLog 388
-MD5 4de6f6b48aa8b039815fe85da3f1234a gbuffy-0.2.6.ebuild 948
-MD5 d63336743d9d619c6136df13bbf1e01f metadata.xml 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9945f0ce5b6585768d38e3af5ad6664e ChangeLog 742
+RMD160 33429ce159947a41a64d7eced72227937d4c500f ChangeLog 742
+SHA256 988f562cae6da078fbdb865ae1079da5066b933b6fd2bf45487785039838cf29 ChangeLog 742
 MD5 f0146dde50719d5b824f9c71540f4402 files/digest-gbuffy-0.2.6 63
+RMD160 69d7ead447abae23baeb2bfeec53150dc7ff7852 files/digest-gbuffy-0.2.6 63
+SHA256 acd579f4fb001a42e432c3524c14715964420e3153a5a36f62b99b66c1d316b1 files/digest-gbuffy-0.2.6 63
+MD5 2724b5b7339ccb38fe9c3b54d91d1c65 files/digest-gbuffy-0.2.6-r1 235
+RMD160 0933b9a23e08e5f0ef73f1810531d12a378e7db8 files/digest-gbuffy-0.2.6-r1 235
+SHA256 d0eb72bf0a1cb5c50b7dd5dba1ca61e98957ad53f7b94d82b9d1853fe4f84c4a files/digest-gbuffy-0.2.6-r1 235
+MD5 2af9e0bd5c888f5ccdf27603fa1e89f3 files/gbuffy-1.patch 883
+RMD160 de227873e5af2f52a071f5ba129de5daa8a97d22 files/gbuffy-1.patch 883
+SHA256 0c805080cafe6a8f5c6019b4446ce9ab5c6d7c8c4bdd6ed410dfa9506548f621 files/gbuffy-1.patch 883
+MD5 41f153dea74651b47427838e81d259f7 files/gbuffy-search-3.patch 3016
+RMD160 568c932e97bb2e23eb75cb53356f579eb4d1f950 files/gbuffy-search-3.patch 3016
+SHA256 8e1db320f60e42695985495ec43897bb5e8fe1d9c7e446ae9776b8c3549656f5 files/gbuffy-search-3.patch 3016
+MD5 376bfdeca0ee9f2edb94fee38541fc17 gbuffy-0.2.6-r1.ebuild 1049
+RMD160 5a7400aa26a776a1228bee6c94952bf0dada2a15 gbuffy-0.2.6-r1.ebuild 1049
+SHA256 3faa660db31ff286ba4bd566398c062df62995e04ec68665dea940a525a429e6 gbuffy-0.2.6-r1.ebuild 1049
+MD5 45c5cfc5654ee97cbb054e08c226f9b6 gbuffy-0.2.6.ebuild 929
+RMD160 cc8d675970e91112794bcf3ca2a83b24a57d46fe gbuffy-0.2.6.ebuild 929
+SHA256 4937b25f24ea8481916fdb4b426635cca4b264cc419d66b319733a9ea070f1ea gbuffy-0.2.6.ebuild 929
+MD5 d63336743d9d619c6136df13bbf1e01f metadata.xml 225
+RMD160 b0b2bb07e5fcc6e20b786f6704f2535996b0dcab metadata.xml 225
+SHA256 4281b8450548cd4295d0d76f760a0c3c3c11e85ea2fd881d84b9fbb12d5ca72c metadata.xml 225
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEJOESJrHF4yAQTrARAp0bAJ45iutJCDxnve9homSHSae1y9vlcACggYm3
+7ImUDRC8W8MP8tSYQusBVNE=
+=73Df
+-----END PGP SIGNATURE-----
diff --git a/mail-client/gbuffy/files/digest-gbuffy-0.2.6-r1 b/mail-client/gbuffy/files/digest-gbuffy-0.2.6-r1
new file mode 100644
index 000000000000..59bdeeb70dff
--- /dev/null
+++ b/mail-client/gbuffy/files/digest-gbuffy-0.2.6-r1
@@ -0,0 +1,3 @@
+MD5 e56ac9ac248bd6eee1b96543b8f921fc gbuffy-0.2.6.tar.gz 87486
+RMD160 939e5a94d2f25c12ce71217ee1f923d6c2270756 gbuffy-0.2.6.tar.gz 87486
+SHA256 56f0832cfdc93cbb6c91454a4c79774ae86b31dfdd2c182dfa88b32d1f0d3440 gbuffy-0.2.6.tar.gz 87486
diff --git a/mail-client/gbuffy/files/gbuffy-1.patch b/mail-client/gbuffy/files/gbuffy-1.patch
new file mode 100644
index 000000000000..4b8b8f2e0833
--- /dev/null
+++ b/mail-client/gbuffy/files/gbuffy-1.patch
@@ -0,0 +1,23 @@
+diff -ur gbuffy-0.2.6/imap.c gbuffy-tinker/imap.c
+--- gbuffy-0.2.6/imap.c	2003-10-10 11:06:53.000000000 +0200
++++ gbuffy-tinker/imap.c	2005-03-16 12:56:10.000000000 +0100
+@@ -437,7 +437,7 @@
+ 
+   /* Open mailbox (EXAMINE) and find the first UNSEEN message */
+   imap_make_sequence (seq, sizeof (seq));
+-  snprintf (buf, sizeof (buf), "%s EXAMINE %s\r\n", seq, ibox->path);
++  snprintf (buf, sizeof (buf), "%s EXAMINE \"%s\"\r\n", seq, ibox->path);
+   msocket_write (conn, buf);
+ 
+   do 
+@@ -529,7 +529,7 @@
+    * think we want that, so use UNSEEN instead */
+   /* Go back to using RECENT, as it shouldn't be updated on EXAMINE */
+   imap_make_sequence (seq, sizeof (seq));
+-  snprintf (buf, sizeof (buf), "%s STATUS %s (MESSAGES RECENT)\r\n", seq, 
++  snprintf (buf, sizeof (buf), "%s STATUS \"%s\" (MESSAGES RECENT)\r\n", seq, 
+       ibox->path);
+ 
+   msocket_write (conn, buf);
+
+
diff --git a/mail-client/gbuffy/files/gbuffy-search-3.patch b/mail-client/gbuffy/files/gbuffy-search-3.patch
new file mode 100644
index 000000000000..124546871592
--- /dev/null
+++ b/mail-client/gbuffy/files/gbuffy-search-3.patch
@@ -0,0 +1,111 @@
+--- imap.c.old	2006-01-23 13:07:04.000000000 +0100
++++ imap.c	2006-01-23 13:45:14.000000000 +0100
+@@ -310,13 +310,8 @@
+ }
+ #endif
+ 
+-/* Ok, now fetch all the headers from the first UNSEEN through the
+- * end of the mailbox.  This could be lower bandwidth (maybe) by first
+- * fetching all of the flags, and then only fetching the headers of
+- * the messages which are new, but there is a lot of protocol crap
+- * which would probably negate the lower bandwidth */
+-static int parse_fetch (BOX_INFO *ibox, CONNECTION *conn, GList *headers, 
+-    int unseen)
++/* Ok, now fetch all the headers from the supplied range */
++static int parse_fetch_range (CONNECTION *conn, GList *headers, char *range)
+ {
+   char from[LONG_STRING] = "";
+   char subject[LONG_STRING] = "";
+@@ -328,7 +323,7 @@
+ 
+ 
+   imap_make_sequence (seq, sizeof (seq));
+-  snprintf (buf, sizeof (buf), "%s FETCH %d:%d (FLAGS BODY.PEEK[HEADER.FIELDS (FROM SUBJECT X-FACE)])\r\n", seq, unseen, ibox->num_messages);
++  snprintf (buf, sizeof (buf), "%s FETCH %s (FLAGS BODY.PEEK[HEADER.FIELDS (FROM SUBJECT X-FACE)])\r\n", seq, range);
+   msocket_write (conn, buf);
+ 
+   do 
+@@ -428,6 +423,83 @@
+   return 0;
+ }
+ 
++/* Fetch only recent unseen information, since X-Face is unlikely to be cached
++ * and any mailbox with multiple threads may have people reading sub-ranges,
++ * leaving large gaps in the sequence range.  */
++static int parse_fetch (BOX_INFO *ibox, CONNECTION *conn, GList *headers, 
++    int unseen)
++{
++  char buf[LONG_STRING];
++  char seq[8];
++  char *s, *t, *commacopy, csave;
++  size_t len, slen, tlen;
++  int ret, line;
++
++  imap_make_sequence (seq, sizeof (seq));
++  snprintf (buf, sizeof (buf), "%s SEARCH RECENT UNSEEN\r\n", seq);
++  msocket_write (conn, buf);
++
++  commacopy = NULL;
++  do 
++  {
++    if (msocket_read_line_d (buf, sizeof (buf), conn) < 0)
++    {
++      conn->uses = 0;
++      return (-1);
++    }
++    line = 1;
++
++    while (line--)
++    {
++      if (buf[0] != '*')
++	continue;
++
++      s = imap_next_word (buf);
++      if (strncasecmp ("SEARCH", s, 6) != 0)
++	continue;
++      s = imap_next_word (s);
++
++      t = s + strcspn (s, "\r\n");
++      csave = *t;
++      *t = '\0';
++
++      if (commacopy)
++      {
++	len = strlen (commacopy);
++	slen = strlen (s);
++	tlen = len + slen + 2;
++	safe_realloc ((void **) &commacopy, tlen);
++	commacopy[len] = ' ';
++	strfcpy (commacopy + len + 1, s, slen);
++      }
++      else
++	commacopy = safe_strdup (s);
++
++      *t = csave;
++      t += strspn (t, "\r\n");
++      if (*t != '\0')
++	++line;
++    }
++  }
++  while ((strncmp (buf, seq, SEQLEN) != 0));
++
++  s = commacopy;
++  /* First character guaranteed not whitespace by imap_next_word */
++  while (*++s)
++  {
++    if (isspace(*s))
++      *s = ',';
++  }
++  while (*--s == ',')
++    *s = '\0';
++
++  ret = parse_fetch_range (conn, headers, commacopy);
++
++  safe_free ((void **) &commacopy);
++
++  return ret;
++}
++
+ static int imap_fetch_new_headers (BOX_INFO *ibox, CONNECTION *conn, GList *headers)
+ {
+   char buf[LONG_STRING];
diff --git a/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild b/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild
new file mode 100644
index 000000000000..e3cc6041af9c
--- /dev/null
+++ b/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild,v 1.1 2006/03/25 06:19:52 agriffis Exp $
+
+inherit eutils
+
+DESCRIPTION="A multi-mailbox biff-like monitor"
+HOMEPAGE="http://www.fiction.net/blong/programs/gbuffy/"
+SRC_URI="http://www.fiction.net/blong/programs/${PN}/${P}/${P}.tar.gz"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="gnome ssl"
+
+DEPEND="x11-libs/libPropList
+	media-libs/compface
+	>=x11-libs/gtk+-1.1.11
+	gnome? ( =gnome-base/gnome-applets-1* )
+	ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gbuffy-1.patch
+	epatch ${FILESDIR}/gbuffy-search-3.patch
+}
+
+src_compile() {
+	if use gnome; then
+		econf --enable-applet || die
+		emake || die
+		mv gbuffy gbuffy_applet
+		make clean
+	fi
+	econf --disable-applet || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc ChangeLog CHANGES GBuffy LICENSE README ToDo
+	doman gbuffy.1
+	use gnome && dobin gbuffy_applet
+}
diff --git a/mail-client/gbuffy/gbuffy-0.2.6.ebuild b/mail-client/gbuffy/gbuffy-0.2.6.ebuild
index 41236288e4e7..b3dca6a649d4 100644
--- a/mail-client/gbuffy/gbuffy-0.2.6.ebuild
+++ b/mail-client/gbuffy/gbuffy-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/gbuffy-0.2.6.ebuild,v 1.2 2004/11/03 10:05:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/gbuffy-0.2.6.ebuild,v 1.3 2006/03/25 06:19:52 agriffis Exp $
 
 inherit eutils
 
@@ -9,14 +9,14 @@ HOMEPAGE="http://www.fiction.net/blong/programs/gbuffy/"
 SRC_URI="http://www.fiction.net/blong/programs/${PN}/${P}/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ia64"
+KEYWORDS="~x86"
 
 IUSE="gnome ssl"
 
 DEPEND="x11-libs/libPropList
 	media-libs/compface
 	>=x11-libs/gtk+-1.1.11
-	gnome? ( >=gnome-base/gnome-panel-2.4.0-r1 )
+	gnome? ( =gnome-base/gnome-applets-1* )
 	ssl? ( dev-libs/openssl )"
 
 src_compile() {