clean up old revisions.

(Portage version: 2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

6 files changed, 7 insertions, 1044 deletions

diff --git a/net-nntp/pan/ChangeLog b/net-nntp/pan/ChangeLog
index 7dff442f23b9..2eb97723693d 100644
--- a/net-nntp/pan/ChangeLog
+++ b/net-nntp/pan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nntp/pan
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.74 2008/10/06 20:23:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.75 2008/10/06 20:45:56 eva Exp $
+
+  06 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/pan-0.132-CVE-2008-2363.patch, -files/pan-0.132-gcc43-fixes.patch,
+  -files/pan-0.132-glib-compat.patch,
+  -files/load-pixbuf-in-1024-byte-chunks.diff, -pan-0.132-r3.ebuild:
+  clean up old revisions.
 
   06 Oct 2008; Markus Meier <maekke@gentoo.org> pan-0.133.ebuild:
   amd64/x86 stable, bug #239378
diff --git a/net-nntp/pan/files/load-pixbuf-in-1024-byte-chunks.diff b/net-nntp/pan/files/load-pixbuf-in-1024-byte-chunks.diff
deleted file mode 100644
index 9faeb4fc6037..000000000000
--- a/net-nntp/pan/files/load-pixbuf-in-1024-byte-chunks.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru pan-0.132/pan/gui/body-pane.cc pan-0.132.hacked/pan/gui/body-pane.cc
---- pan-0.132/pan/gui/body-pane.cc	2007-08-01 12:00:00.000000000 -0500
-+++ pan-0.132.hacked/pan/gui/body-pane.cc	2007-10-09 00:30:43.000000000 -0500
-@@ -815,8 +815,15 @@
-       GMimeStream * mem_stream (g_mime_stream_mem_new ());
-       g_mime_data_wrapper_write_to_stream (wrapper, mem_stream);
-       GByteArray * buffer (GMIME_STREAM_MEM(mem_stream)->buffer);
--      if (buffer->len)
--          gdk_pixbuf_loader_write (l, (guchar*)buffer->data, buffer->len, &err);
-+      size_t c = 0;
-+      size_t left = buffer->len;
-+      while (left > 0)
-+      {
-+        size_t len = left < 1024 ? left : 1024; /* KLUDGE magic number */
-+        gdk_pixbuf_loader_write (l, ((guchar*)buffer->data) + c, len, &err);
-+        left -= len;
-+        c += len;
-+      }
-       g_object_unref (mem_stream);
-       g_object_unref (wrapper);
-     }
diff --git a/net-nntp/pan/files/pan-0.132-CVE-2008-2363.patch b/net-nntp/pan/files/pan-0.132-CVE-2008-2363.patch
deleted file mode 100644
index 6f9b9f0a2b14..000000000000
--- a/net-nntp/pan/files/pan-0.132-CVE-2008-2363.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=224051
-https://bugzilla.gnome.org/show_bug.cgi?id=535413
-https://bugzilla.redhat.com/show_bug.cgi?id=446902
-
---- pan-0.132/pan/data/parts.cc
-+++ pan-0.132/pan/data/parts.cc
-@@ -303,8 +303,7 @@
-   this->n_parts_total = n_parts_total;
-   this->n_parts_found = 0; // they haven't been added yet
- 
--  if (n_parts_found > parts.size())
--    parts.resize (n_parts_found);
-+  parts.clear();
- }
- 
- void
-@@ -312,21 +311,10 @@
-                        const StringView  & mid,
-                        bytes_t             bytes)
- {
--  if (n_parts_found >= parts.size())
--    parts.resize (n_parts_found+1);
--
--  Part& p = *(&parts.front() + n_parts_found++);
--  p.number = number;
--  p.bytes = bytes;
- 
-   Packer packer;
-   pack_message_id (packer, mid, reference_mid);
--  p.len_used = packer.size ();
--  if (p.len_alloced < p.len_used) {
--    delete [] p.packed_mid;
--    p.packed_mid = new char [p.len_used];
--    p.len_alloced = p.len_used;
--  }
-+  Part p(number,bytes,packer.size());
-   packer.pack (p.packed_mid);
-   packed_mids_len += p.len_used;
- 
-@@ -337,8 +325,9 @@
-   assert (mid == tmp);
- #endif
- 
--  if (n_parts_total < n_parts_found)
-+  if (n_parts_total < ++n_parts_found)
-       n_parts_total = n_parts_found;
-+  parts.push_back(p);
- }
- 
- PartBatch :: Part&
-@@ -346,7 +335,7 @@
- {
-   number =  that.number;
-   bytes =  that.bytes;
--  len_used = len_alloced = that.len_used;
-+  len_used = that.len_used;
-   delete [] packed_mid;
-   packed_mid = new char [len_used];
-   memcpy (packed_mid, that.packed_mid, len_used);
-@@ -357,11 +346,17 @@
-   number (that.number),
-   bytes (that.bytes),
-   len_used (that.len_used),
--  len_alloced (that.len_used),
-   packed_mid (new char [len_used])
- {
-   memcpy (packed_mid, that.packed_mid, len_used);
- }
-+PartBatch :: Part :: Part (number_t n, bytes_t b, size_t l):
-+    number(n),
-+    bytes(b),
-+    len_used(l),
-+    packed_mid(new char [len_used])
-+{
-+}
- 
- void
- PartBatch :: sort (void)
---- pan-0.132/pan/data/parts.h
-+++ pan-0.132/pan/data/parts.h
-@@ -141,10 +141,10 @@
-         number_t number;
-         bytes_t bytes;
-         size_t len_used;
--        size_t len_alloced;
-         char * packed_mid;
-         Part(): number(0), bytes(0),
--                len_used(0), len_alloced(0), packed_mid(0) {}
-+                len_used(0), packed_mid(0) {}
-+        Part(number_t n, bytes_t b, size_t l);
-         ~Part() { delete [] packed_mid; }
-         Part (const Part&);
-         Part& operator= (const Part&);
diff --git a/net-nntp/pan/files/pan-0.132-gcc43-fixes.patch b/net-nntp/pan/files/pan-0.132-gcc43-fixes.patch
deleted file mode 100644
index a6f366c90b23..000000000000
--- a/net-nntp/pan/files/pan-0.132-gcc43-fixes.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- pan-0.132/pan/general/file-util.cc
-+++ pan-0.132/pan/general/file-util.cc
-@@ -19,6 +19,7 @@
- 
- #include <config.h>
- 
-+#include <algorithm>
- #include <cassert>
- #include <cerrno>
- #include <cctype>
---- pan-0.132/pan/general/line-reader.cc
-+++ pan-0.132/pan/general/line-reader.cc
-@@ -1,5 +1,6 @@
- #include <config.h>
- #include <cstdio>
-+#include <cstdlib>
- extern "C"{ 
-   #include <glib/gi18n.h>
- }
---- pan-0.132/pan/general/string-view.h
-+++ pan-0.132/pan/general/string-view.h
-@@ -22,6 +22,7 @@
- 
- #include <iosfwd>
- #include <string>
-+#include <cstring>
- 
- namespace pan
- {
---- pan-0.132/pan/gui/prefs.cc
-+++ pan-0.132/pan/gui/prefs.cc
-@@ -22,6 +22,7 @@
- #include <fstream>
- #include <sstream>
- #include <string>
-+#include <cstdlib>
- extern "C" {
-   #include <glib.h>
-   #include <glib/gi18n.h>
---- pan-0.132/pan/tasks/nntp.cc
-+++ pan-0.132/pan/tasks/nntp.cc
-@@ -20,6 +20,7 @@
- #include <config.h>
- #include <cassert>
- #include <cstdarg>
-+#include <cstdlib>
- extern "C" {
-   #include <glib.h>
-   #include <glib/gi18n.h>
---- pan-0.132/pan/tasks/socket-impl-scripted.cc
-+++ pan-0.132/pan/tasks/socket-impl-scripted.cc
-@@ -19,6 +19,7 @@
- 
- #include <config.h>
- #include <cassert>
-+#include <cstdlib>
- #include <pan/general/debug.h>
- #include <pan/general/messages.h>
- #include <pan/general/string-view.h>
---- pan-0.132/pan/usenet-utils/gnksa-test.cc
-+++ pan-0.132/pan/usenet-utils/gnksa-test.cc
-@@ -1,6 +1,7 @@
- #include <config.h>
- #include <iostream>
- #include <string>
-+#include <climits>
- #include <pan/general/string-view.h>
- #include <pan/general/test.h>
- #include "gnksa.h"
---- pan-0.132/pan/usenet-utils/numbers.cc
-+++ pan-0.132/pan/usenet-utils/numbers.cc
-@@ -19,6 +19,7 @@
- 
- #include <config.h>
- #include <cctype>
-+#include <algorithm>
- #include <pan/general/string-view.h>
- #include "numbers.h"
- 
---- pan-0.132/pan/usenet-utils/scorefile.cc
-+++ pan-0.132/pan/usenet-utils/scorefile.cc
-@@ -21,6 +21,8 @@
- #include <iostream>
- #include <sstream>
- #include <string>
-+#include <algorithm>
-+#include <cstdlib>
- extern "C" {
-   #include <glib/gi18n.h>
- }
diff --git a/net-nntp/pan/files/pan-0.132-glib-compat.patch b/net-nntp/pan/files/pan-0.132-glib-compat.patch
deleted file mode 100644
index a10fc00201fd..000000000000
--- a/net-nntp/pan/files/pan-0.132-glib-compat.patch
+++ /dev/null
@@ -1,788 +0,0 @@
-From: Daniel Rahn <drahn@suse.de>
-Subject: abstract glib API
-
-Glib API may change with minor releases. This patch abstracts glib 
-somehow from the various PAN source files to concentrate needed changes
-in a single include file.
-
-Adopting to glib 2.16.1 at the same time.
-
-Signed-off-by: Daniel Rahn <drahn@suse.de>
-Signed-off-by: Duncan <1i5t5.duncan@cox.net>
-
---- 
- data-impl/data-impl.cc        |    2 -
- data-impl/data-io.cc          |    3 --
- data-impl/groups.cc           |    2 -
- data-impl/headers.cc          |    3 --
- data-impl/my-tree.cc          |    2 -
- data-impl/profiles.cc         |    3 --
- data-impl/server.cc           |    3 --
- data-impl/xover.cc            |    2 -
- data/article-cache.cc         |    3 --
- data/article-cache.h          |    2 -
- general/e-util.cc             |    3 --
- general/file-util.cc          |    3 --
- general/file-util.h           |   18 ----------------
- general/glib-compat.h         |   45 ++++++++++++++++++++++++++++++++++++++++++
- general/line-reader.cc        |    2 -
- general/locking.h             |    2 -
- general/text-match.cc         |    3 --
- general/time-elapsed.h        |    4 ---
- general/utf8-utils.cc         |    2 -
- general/worker-pool.cc        |    2 -
- general/worker-pool.h         |    3 --
- gui/actions.cc                |    2 -
- gui/body-pane.cc              |    2 -
- gui/dl-headers-ui.cc          |    3 --
- gui/e-charset-picker.c        |    2 -
- gui/group-pane.cc             |    2 -
- gui/group-prefs-dialog.cc     |    2 -
- gui/gui.cc                    |    2 -
- gui/header-pane.cc            |    2 -
- gui/log-ui.cc                 |    2 -
- gui/pan-file-entry.cc         |    2 -
- gui/pan.cc                    |    2 -
- gui/post-ui.cc                |    2 -
- gui/prefs-ui.cc               |    2 -
- gui/prefs.cc                  |    3 --
- gui/profiles-dialog.cc        |    2 -
- gui/render-bytes.cc           |    2 -
- gui/render-bytes.h            |    2 -
- gui/save-ui.cc                |    2 -
- gui/score-add-ui.cc           |    2 -
- gui/score-view-ui.cc          |    2 -
- gui/server-ui.cc              |    3 --
- gui/task-pane.cc              |    3 --
- gui/url.cc                    |    3 --
- tasks/decoder.cc              |    6 ++---
- tasks/nntp-pool.cc            |    2 -
- tasks/nntp.cc                 |    3 --
- tasks/socket-impl-gio.cc      |    3 --
- tasks/task-article.cc         |    2 -
- tasks/task-groups.cc          |    2 -
- tasks/task-post.cc            |    2 -
- tasks/task-xover.cc           |    2 -
- usenet-utils/filter-info.cc   |    3 --
- usenet-utils/gnksa.cc         |    2 -
- usenet-utils/message-check.cc |    2 -
- usenet-utils/mime-utils.h     |    2 -
- usenet-utils/scorefile.cc     |    2 -
- usenet-utils/text-massager.cc |    3 --
- 58 files changed, 104 insertions(+), 95 deletions(-)
-
---- pan-0.132/pan/data/article-cache.cc	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/data/article-cache.cc	2008-03-29 10:28:09.175341212 +0100
-@@ -27,8 +27,7 @@
-   #include <unistd.h>
-   #include <dirent.h>
- 
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gmime/gmime.h>
- }
- 
---- pan-0.132/pan/data/article-cache.h	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/data/article-cache.h	2008-03-29 10:28:44.560580324 +0100
-@@ -23,7 +23,7 @@
- #include <map>
- #include <vector>
- extern "C" {
--  #include <glib/gtypes.h> // for guint64
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/string-view.h>
- #include <pan/general/quark.h>
---- pan-0.132/pan/data-impl/data-impl.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/data-impl/data-impl.cc	2008-03-29 10:29:13.585596767 +0100
-@@ -23,7 +23,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan-0.132/pan/data-impl/data-io.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/data-impl/data-io.cc	2008-03-29 10:29:37.454432677 +0100
-@@ -27,8 +27,7 @@
-   #include <sys/types.h> // for chmod
-   #include <sys/stat.h> // for chmod
-   #include <unistd.h>
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan-0.132/pan/data-impl/groups.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/data-impl/groups.cc	2008-03-29 10:30:03.735353098 +0100
-@@ -30,7 +30,7 @@
- 
- extern "C" {
-   #include <unistd.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- 
- #include <pan/general/debug.h>
---- pan-0.132/pan/data-impl/headers.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/data-impl/headers.cc	2008-03-29 10:30:31.508325815 +0100
-@@ -27,8 +27,7 @@
- extern "C" {
-   #include <sys/types.h> // for chmod
-   #include <sys/stat.h> // for chmod
--  #include <glib/gi18n.h>
--  #include <glib/gmessages.h> // for g_assert
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
---- pan-0.132/pan/data-impl/my-tree.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/data-impl/my-tree.cc	2008-03-29 10:31:02.341402615 +0100
-@@ -19,7 +19,7 @@
- 
- #include <config.h>
- #include <cassert>
--#include <glib/gmessages.h> // for g_assert
-+#include <pan/general/glib-compat.h>
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
- #include <pan/general/quark.h>
---- pan-0.132/pan/data-impl/profiles.cc	2007-08-01 19:26:18.000000000 +0200
-+++ BUILD/pan-0.132/pan/data-impl/profiles.cc	2008-03-29 10:31:28.674315169 +0100
-@@ -26,8 +26,7 @@
- extern "C" {
-   #include <sys/types.h> // for chmod
-   #include <sys/stat.h> // for chmod
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/string-view.h>
---- pan-0.132/pan/data-impl/server.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/data-impl/server.cc	2008-03-29 10:32:01.547454646 +0100
-@@ -26,8 +26,7 @@
- #include <set>
- #include <vector>
- extern "C" {
--  #include <glib.h> // for GMarkup
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan-0.132/pan/data-impl/xover.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/data-impl/xover.cc	2008-03-29 10:32:27.016337677 +0100
-@@ -21,7 +21,7 @@
- #include <cmath>
- #include <fstream>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gmime/gmime.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/general/e-util.cc	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/general/e-util.cc	2008-03-29 10:24:37.099916303 +0100
-@@ -28,8 +28,7 @@
- #include <ctime>
- extern "C" {
-   #include <ctype.h>
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include "glib-compat.h"
- }
- #include "debug.h"
- #include "e-util.h"
---- pan-0.132/pan/general/file-util.cc	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/general/file-util.cc	2008-03-29 10:24:53.672496427 +0100
-@@ -29,8 +29,7 @@
-   #include <sys/stat.h>
-   #include <sys/types.h>
- 
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include "glib-compat.h"
- }
- 
- #include "debug.h"
---- pan-0.132/pan/general/file-util.h	2008-03-29 11:48:19.034385493 +0100
-+++ BUILD/pan-0.132/pan/general/file-util.h	2008-03-29 11:56:50.316234274 +0100
-@@ -28,26 +28,10 @@
- extern "C" {
-   #include <stddef.h>
-   #include <stdio.h>
--  #include <glib/gtypes.h>
--  #include <glib.h>
-+  #include "glib-compat.h"
- }
- #include <pan/general/string-view.h>
- 
--#if GLIB_CHECK_VERSION(2,6,0)
--extern "C" {
--  #include <glib/gstdio.h>
--}
--#define g_freopen freopen
--#define g_fopen fopen
--#define g_rmdir rmdir
--#define g_remove remove
--#define g_unlink unlink
--#define g_lstat lstat
--#define g_stat stat
--#define g_rename rename
--#define g_open open
--#endif
--
- namespace pan
- {
-   /**
---- pan-0.132/pan/general/glib-compat.h	1970-01-01 01:00:00.000000000 +0100
-+++ BUILD/pan-0.132/pan/general/glib-compat.h	2008-04-07 10:24:10.502546064 +0200
-@@ -0,0 +1,45 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/*
-+ * Pan - A Newsreader for Gtk+
-+ * Copyright (C) 2002-2008  Charles Kerr <charles@rebelbase.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; version 2 of the License.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef __G_LIB_H__
-+#include <glib.h>
-+#endif
-+
-+#include <glib/gmessages.h>
-+#include <glib/gi18n.h>
-+#include <glib/gtypes.h>
-+#include <glib/gunicode.h>
-+#include <glib/gtypes.h>
-+#include <glib/gmain.h>
-+#include <glib/gtimer.h>
-+#include <glib/gthread.h>
-+#include <glib/gthreadpool.h>
-+
-+#if GLIB_CHECK_VERSION(2,6,0)
-+   #include <glib/gstdio.h>
-+   #define g_freopen freopen
-+   #define g_fopen fopen
-+   #define g_rmdir rmdir
-+   #define g_remove remove
-+   #define g_unlink unlink
-+   #define g_lstat lstat
-+   #define g_stat stat
-+   #define g_rename rename
-+   #define g_open open
-+#endif
---- pan-0.132/pan/general/line-reader.cc	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/general/line-reader.cc	2008-03-29 10:25:24.401572142 +0100
-@@ -1,7 +1,7 @@
- #include <config.h>
- #include <cstdio>
- extern "C"{ 
--  #include <glib/gi18n.h>
-+  #include "glib-compat.h"
- }
- #include <cerrno>
- #include "file-util.h"
---- pan-0.132/pan/general/locking.h	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/general/locking.h	2008-03-29 10:25:38.774075290 +0100
-@@ -22,7 +22,7 @@
- #ifndef _Mutex_h_
- #define _Mutex_h_
- 
--#include <glib/gthread.h>
-+#include "glib-compat.h"
- 
- namespace pan
- {
---- pan-0.132/pan/general/text-match.cc	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/general/text-match.cc	2008-03-29 10:25:55.638665696 +0100
-@@ -21,8 +21,7 @@
- extern "C" {
-   #include <ctype.h>
-   #include <pcre.h>
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include "glib-compat.h"
- }
- #include "debug.h"
- #include "log.h"
---- pan-0.132/pan/general/time-elapsed.h	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/general/time-elapsed.h	2008-03-29 10:26:11.999238473 +0100
-@@ -1,9 +1,7 @@
- #ifndef __Time_Elapsed_h__
- #define __Time_Elapsed_h__
- 
--#include <glib/gtypes.h> // for GTimeVal
--#include <glib/gmain.h> // for g_get_current_time
--#include <glib/gtimer.h> // for GUSEC_PER_SEC
-+#include "glib-compat.h" 
- 
- namespace pan
- {
---- pan-0.132/pan/general/utf8-utils.cc	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/general/utf8-utils.cc	2008-03-29 10:26:32.335950476 +0100
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include <glib.h>
- extern "C" {
--#include <glib/gi18n.h>
-+#include "glib-compat.h"
- }
- #include <locale.h>
- #include <gmime/gmime.h>
---- pan-0.132/pan/general/worker-pool.cc	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/general/worker-pool.cc	2008-03-29 10:26:49.336545697 +0100
-@@ -21,7 +21,7 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- #include <cassert>
--#include <glib/gmain.h> // for g_idle_add
-+#include "glib-compat.h"
- #include <pan/general/foreach.h>
- #include "worker-pool.h"
- 
---- pan-0.132/pan/general/worker-pool.h	2007-08-01 19:00:01.000000000 +0200
-+++ BUILD/pan-0.132/pan/general/worker-pool.h	2008-03-29 10:27:08.833228330 +0100
-@@ -24,8 +24,7 @@
- #define _Worker_Pool_H_
- 
- #include <set>
--#include <glib/gtypes.h>
--#include <glib/gthreadpool.h>
-+#include "glib-compat.h"
- 
- namespace pan
- {
---- pan-0.132/pan/gui/actions.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/actions.cc	2008-03-29 10:33:13.569952196 +0100
-@@ -19,7 +19,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/gui/body-pane.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/body-pane.cc	2008-03-29 10:33:57.167464724 +0100
-@@ -22,7 +22,7 @@
- #include <cmath>
- #include <iostream>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
-   #include <gdk/gdkkeysyms.h>
-   #include <gmime/gmime.h>
---- pan-0.132/pan/gui/dl-headers-ui.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/dl-headers-ui.cc	2008-03-29 10:34:25.684454334 +0100
-@@ -19,8 +19,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/foreach.h>
---- pan-0.132/pan/gui/e-charset-picker.c	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/e-charset-picker.c	2008-03-29 11:40:38.814395583 +0100
-@@ -37,7 +37,7 @@
- #include <gtk/gtksignal.h>
- #include <gtk/gtkmessagedialog.h>
- 
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
- 
- typedef enum {
- 	E_CHARSET_UNKNOWN,
---- pan-0.132/pan/gui/group-pane.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/group-pane.cc	2008-03-29 10:34:50.621319878 +0100
-@@ -21,7 +21,7 @@
- #include <cassert>
- #include <deque>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/gui/group-prefs-dialog.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/group-prefs-dialog.cc	2008-03-29 10:35:20.810367936 +0100
-@@ -19,7 +19,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/gui/gui.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/gui.cc	2008-03-29 10:35:39.707024080 +0100
-@@ -24,7 +24,7 @@
- extern "C" {
-   #include <sys/types.h> // for chmod
-   #include <sys/stat.h> // for chmod
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/e-util.h>
---- pan-0.132/pan/gui/header-pane.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/header-pane.cc	2008-03-29 10:35:58.419673922 +0100
-@@ -19,7 +19,7 @@
- 
- extern "C" {
-   #include <config.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <cctype>
---- pan-0.132/pan/gui/log-ui.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/log-ui.cc	2008-03-29 10:36:20.216430978 +0100
-@@ -21,7 +21,7 @@
- #include <ostream>
- #include <fstream>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/foreach.h>
---- pan-0.132/pan/gui/pan.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/pan.cc	2008-03-29 10:36:38.817077115 +0100
-@@ -20,7 +20,7 @@
- #include <config.h>
- #include <signal.h>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
-   #include <gmime/gmime.h>
- }
---- pan-0.132/pan/gui/pan-file-entry.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/pan-file-entry.cc	2008-03-29 11:38:02.264968572 +0100
-@@ -20,7 +20,7 @@
- #include <config.h>
- #include <string>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/file-util.h>
---- pan-0.132/pan/gui/post-ui.cc	2007-08-01 19:27:37.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/post-ui.cc	2008-03-29 10:37:20.826536722 +0100
-@@ -23,7 +23,7 @@
- #include <sstream>
- extern "C" {
-   #include <gmime/gmime.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- #ifdef HAVE_GTKSPELL
-   #include <gtkspell/gtkspell.h>
---- pan-0.132/pan/gui/prefs.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/prefs.cc	2008-03-29 10:37:40.143208016 +0100
-@@ -23,8 +23,7 @@
- #include <sstream>
- #include <string>
- extern "C" {
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
---- pan-0.132/pan/gui/prefs-ui.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/prefs-ui.cc	2008-03-29 10:38:00.299908596 +0100
-@@ -19,7 +19,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/gui/profiles-dialog.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/profiles-dialog.cc	2008-03-29 10:38:21.064630409 +0100
-@@ -24,7 +24,7 @@
- #include <config.h>
- #include <iostream>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/gui/render-bytes.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/render-bytes.cc	2008-03-29 10:38:44.165433544 +0100
-@@ -1,4 +1,4 @@
--#include <glib/gutils.h> // g_snprintf
-+#include <pan/general/glib-compat.h>
- #include "render-bytes.h"
- 
- namespace pan
---- pan-0.132/pan/gui/render-bytes.h	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/render-bytes.h	2008-03-29 10:41:52.299965125 +0100
-@@ -1,6 +1,6 @@
- #ifndef RENDER_BYTES_H
- #define RENDER_BYTES_H
--#include <glib/gtypes.h>
-+#include <pan/general/glib-compat.h>
- namespace pan {
-   extern char* render_bytes (guint64);
- }
---- pan-0.132/pan/gui/save-ui.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/save-ui.cc	2008-03-29 10:39:04.934155706 +0100
-@@ -19,7 +19,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/gui/score-add-ui.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/score-add-ui.cc	2008-03-29 10:39:24.446834281 +0100
-@@ -20,7 +20,7 @@
- #include <config.h>
- #include <cassert>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/text-match.h>
---- pan-0.132/pan/gui/score-view-ui.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/score-view-ui.cc	2008-03-29 10:39:43.603498787 +0100
-@@ -19,7 +19,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/gui/server-ui.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/server-ui.cc	2008-03-29 10:40:05.944273805 +0100
-@@ -21,8 +21,7 @@
- #include <cstdlib>
- #include <cstring>
- extern "C" {
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/foreach.h>
---- pan-0.132/pan/gui/task-pane.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/task-pane.cc	2008-03-29 10:40:30.369121269 +0100
-@@ -19,8 +19,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/gui/url.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/gui/url.cc	2008-03-29 10:40:57.562064958 +0100
-@@ -21,8 +21,7 @@
- #include <iostream>
- #include <string>
- extern "C" {
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- };
- #include <pan/general/log.h>
- #include "url.h"
---- pan-0.132/pan/tasks/decoder.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/tasks/decoder.cc	2008-03-29 10:42:47.169870620 +0100
-@@ -27,9 +27,9 @@
- #include <ostream>
- #include <fstream>
- extern "C" {
--#  define PROTOTYPES
--#  include <uulib/uudeview.h>
--#  include <glib/gi18n.h>
-+	#define PROTOTYPES
-+	#include <uulib/uudeview.h>
-+	#include <pan/general/glib-compat.h>
- };
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan-0.132/pan/tasks/nntp.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/tasks/nntp.cc	2008-03-29 10:43:05.866520075 +0100
-@@ -21,8 +21,7 @@
- #include <cassert>
- #include <cstdarg>
- extern "C" {
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/log.h>
---- pan-0.132/pan/tasks/nntp-pool.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/tasks/nntp-pool.cc	2008-03-29 10:43:46.291920677 +0100
-@@ -19,7 +19,7 @@
- 
- #include <config.h>
- #include <ctime>
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
- #include <pan/general/log.h>
---- pan-0.132/pan/tasks/socket-impl-gio.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/tasks/socket-impl-gio.cc	2008-03-29 10:44:17.172975084 +0100
-@@ -31,8 +31,7 @@
- 
- extern "C" {
-   #include <unistd.h>
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- 
- #include <pan/general/file-util.h>
---- pan-0.132/pan/tasks/task-article.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/tasks/task-article.cc	2008-03-29 10:44:38.725711567 +0100
-@@ -25,7 +25,7 @@
- #include <algorithm>
- #include <cassert>
- extern "C" {
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan-0.132/pan/tasks/task-groups.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/tasks/task-groups.cc	2008-03-29 10:44:59.634426490 +0100
-@@ -20,7 +20,7 @@
- #include <config.h>
- #include <cassert>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
---- pan-0.132/pan/tasks/task-post.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/tasks/task-post.cc	2008-03-29 10:45:21.387170729 +0100
-@@ -19,7 +19,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include "task-post.h"
- #include <pan/general/debug.h>
---- pan-0.132/pan/tasks/task-xover.cc	2007-08-01 19:00:00.000000000 +0200
-+++ BUILD/pan-0.132/pan/tasks/task-xover.cc	2008-03-29 10:45:47.616068719 +0100
-@@ -21,7 +21,7 @@
- #include <cassert>
- #include <cerrno>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
-   #include <gmime/gmime-utils.h>
- }
- #include <pan/general/debug.h>
---- pan-0.132/pan/usenet-utils/filter-info.cc	2007-08-01 18:59:59.000000000 +0200
-+++ BUILD/pan-0.132/pan/usenet-utils/filter-info.cc	2008-03-29 10:46:25.993383793 +0100
-@@ -19,8 +19,7 @@
- 
- #include <config.h>
- extern "C" {
--  #include <glib.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/foreach.h>
- #include "filter-info.h"
---- pan-0.132/pan/usenet-utils/gnksa.cc	2007-08-01 18:59:59.000000000 +0200
-+++ BUILD/pan-0.132/pan/usenet-utils/gnksa.cc	2008-03-29 10:46:59.906547006 +0100
-@@ -36,7 +36,7 @@
- {
-   #include <ctype.h>
-   #include <unistd.h>
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- 
- #include <pan/general/debug.h>
---- pan-0.132/pan/usenet-utils/message-check.cc	2007-08-01 18:59:59.000000000 +0200
-+++ BUILD/pan-0.132/pan/usenet-utils/message-check.cc	2008-03-29 10:47:20.727261653 +0100
-@@ -22,7 +22,7 @@
- #include <string.h>
- #include <glib.h>
- extern "C" {
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
---- pan-0.132/pan/usenet-utils/mime-utils.h	2007-08-01 18:59:59.000000000 +0200
-+++ BUILD/pan-0.132/pan/usenet-utils/mime-utils.h	2008-03-29 10:48:34.309790222 +0100
-@@ -21,7 +21,7 @@
- #define _UtilMime_h_
- 
- #include <vector>
--#include <glib/gtypes.h>
-+#include <pan/general/glib-compat.h>
- #include <gmime/gmime-filter.h>
- #include <gmime/gmime-stream.h>
- #include <gmime/gmime-message.h>
---- pan-0.132/pan/usenet-utils/scorefile.cc	2007-08-01 18:59:59.000000000 +0200
-+++ BUILD/pan-0.132/pan/usenet-utils/scorefile.cc	2008-03-29 10:47:40.255932291 +0100
-@@ -22,7 +22,7 @@
- #include <sstream>
- #include <string>
- extern "C" {
--  #include <glib/gi18n.h>
-+  #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/log.h>
---- pan-0.132/pan/usenet-utils/text-massager.cc	2007-08-01 18:59:59.000000000 +0200
-+++ BUILD/pan-0.132/pan/usenet-utils/text-massager.cc	2008-03-29 10:48:11.144993711 +0100
-@@ -20,9 +20,8 @@
- #include <config.h>
- #include <vector>
- extern "C" {
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
- }
--#include <glib/gunicode.h>
- #include "text-massager.h"
- 
- using namespace pan;
diff --git a/net-nntp/pan/pan-0.132-r3.ebuild b/net-nntp/pan/pan-0.132-r3.ebuild
deleted file mode 100644
index 008815d432e2..000000000000
--- a/net-nntp/pan/pan-0.132-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.132-r3.ebuild,v 1.7 2008/10/04 11:11:38 eva Exp $
-
-inherit eutils
-
-DESCRIPTION="A newsreader for the Gnome2 desktop"
-HOMEPAGE="http://pan.rebelbase.com/"
-SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="spell"
-
-RDEPEND=">=dev-libs/glib-2.4.0
-	>=x11-libs/gtk+-2.4.0
-	>=dev-libs/libpcre-5.0
-	=dev-libs/gmime-2.2*
-	spell? ( >=app-text/gtkspell-2.0.7 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/load-pixbuf-in-1024-byte-chunks.diff
-
-	# Fix compilation with >=glib-2.16, bug #214446
-	epatch "${FILESDIR}"/${P}-glib-compat.patch
-
-	# Fix compilation with gcc-4.3, bug #211670
-	epatch "${FILESDIR}"/${P}-gcc43-fixes.patch
-
-	# Security bug #224051
-	epatch "${FILESDIR}"/${P}-CVE-2008-2363.patch
-}
-
-src_compile() {
-	econf $(use_with spell gtkspell) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-}