Clean up orphaned patches.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

7 files changed, 12 insertions, 165 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 87153142fa34..ee3165436586 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.185 2009/05/03 21:58:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.186 2009/05/03 22:17:27 eva Exp $
+
+  03 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gtkhtml-3.0.10-no-extern-cluealigned.diff,
+  -files/gtkhtml-3.2-gi18n.patch, -files/gtkhtml-3.2-i18n.patch,
+  -files/gtkhtml-3.6.2-fbsd.patch,
+  -files/gtkhtml-3.14.3-get_left_margin-fix.patch:
+  Clean up orphaned patches.
 
 *gtkhtml-3.26.1.1 (03 May 2009)
 
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index f328a6d3bd9f..a3b32669d251 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,12 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gtkhtml-3.0.10-no-extern-cluealigned.diff 423 RMD160 9d1018a40aabae678306c0a62421d2102c9d8c29 SHA1 c542562df8491cd3d90ed1a713bd98fd46919ea0 SHA256 d618e6c7b1fe7bd49a344c8de8b34aee49dbbbd2ea667b2d30bb8d0bfe7aed2c
 AUX gtkhtml-3.12.3-allow-deprecated.patch 3638 RMD160 7d32a2b4ca6f30b3958129e2820181c19c5f8771 SHA1 5d05b9bdb98e4a567cc4e843e38cb17560fccd97 SHA256 dc03e0448604fcf0feb6e8baf9fbd2936c98f2127da763bf4a39380c12fa9d05
-AUX gtkhtml-3.14.3-get_left_margin-fix.patch 921 RMD160 a5ec7fcfc9303d6af2fd678d64b3ff7032123f83 SHA1 fabdf86dc71d36fc293491712ef249da53ba0333 SHA256 31273d61b5488296dba96f70c53fa04048718f82657eb1b8c90a72e803dfc9bc
-AUX gtkhtml-3.2-gi18n.patch 2103 RMD160 7685c7b603d425f47b9d3c4ef89fea7c389048a8 SHA1 5ef8c097e0b52d8ce272a4d73279cd4d75226daf SHA256 c86caa3617685172c775fc084dcb28872b5b660770203e4b76b35f83074fa8ce
-AUX gtkhtml-3.2-i18n.patch 1411 RMD160 27fd26f798c0294da7fee1fa26cef95546afb283 SHA1 d7f9050512d63a3a1ac4be2a3bbcdf553ca5088f SHA256 45c7763730b3a886ba6dd4b69d20cb83dcc5c918385971e48905e7ad6e8849f7
-AUX gtkhtml-3.6.2-fbsd.patch 319 RMD160 32a4d9ef221d1ef745da49ba7ea06ee0b3cdb781 SHA1 078ce82d1c4ee5f80c157c63af6695382508a412 SHA256 3fedc6a04e8de7fa8950e4ce06c2ad8c6685f8071255d71e3d2ee96c7b7dee1b
 AUX gtkhtml-editor.xml 1035 RMD160 2809f2569ed25df3607102fdee641777adc443dc SHA1 6bbdf72e2a38506cc5f3626240b9cd2880de3e33 SHA256 5ae563343abc4a667fc3057ca73e61667f12ca203e4fc270c3906e1a1adeb505
 AUX libgtkhtml-2.2.0-alpha.patch 652 RMD160 db8f1127f1539bc3b44f65d918ae7657a3175000 SHA1 5df0cd9a732ce5ca4f6b3c46ce1b5954b9aa01b3 SHA256 37fc95e6c2443e37b59dee81509f64d1ebca884c3797020f805e5da88a3a72f1
 DIST gtkhtml-3.12.3.tar.bz2 1284704 RMD160 bb138582275ddd43e8fa45d62b841e3bc63fb8fd SHA1 8bdbd9365bdaa482821c5acf6369535e63e31836 SHA256 666849b22375efbaf2ab506b33868ac64126728a8e509f055882ae6940999847
@@ -17,12 +12,12 @@ EBUILD gtkhtml-2.11.1.ebuild 1264 RMD160 2220abb1725e3f8fa7388c7788f5fa103c51438
 EBUILD gtkhtml-3.12.3.ebuild 1363 RMD160 9f54d0d1baffffb777930456eda10ff9146c2dd0 SHA1 f323a7097123e338c6fdbd21a42482e8ca858047 SHA256 2d822594dbd08326428373c4c2acb7e605fae31b763d8dbea067462f71cff475
 EBUILD gtkhtml-3.24.5.ebuild 1836 RMD160 7d44c37e34acdcc008d29c075bdfda776ab5364d SHA1 2d2b3cdd8548b4936f6aa79776b0197eb6bc72db SHA256 bc0bc7702f939dc6293bfeba5997762bd86a5a8c9b3db87b472d287c69c83996
 EBUILD gtkhtml-3.26.1.1.ebuild 1896 RMD160 f6e889e33b18f4c888b53fed4585e9f9f744dfcb SHA1 296aa184a14d2597b9b091d168d2dda0c57bf15e SHA256 c42c781eb287d5429e196740bd0f1f08c7d4c02f9b3698e2b8f322a43f1d17e5
-MISC ChangeLog 25863 RMD160 d1979389a5371c2b8bab810e6434f5c077e7088f SHA1 2a102972252a4da42f64600c4da5d53bb10a0535 SHA256 639481ece1602b403bcc199909591ed0eded59b4f122a3b941a2436e15c4a33a
+MISC ChangeLog 26150 RMD160 bc6f365ad44e418834e8ed22f07d711bff55b400 SHA1 fbe32d4abbdeb3b5d14b2771757869669974dbcf SHA256 dafbd0c264d392acd026827b69c1eb666c83755a3e25b780e8a8d8546fe3f9fd
 MISC metadata.xml 250 RMD160 4e46249cd3426e09b6f462c29ea489724464f51c SHA1 96ab3cf6c39bb44e33d788425a99ddd337a31eeb SHA256 86cd2180b3599ddb2bef78131a9c86a37fa1ee7247aa3245e11e7ff6a239e2e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn+E3cACgkQ1fmVwcYIWAb3/gCcDlF/qQmK1YTMCmz7AI4pmds9
-XgAAnjdckd4pxQhIRuIeWrBzreh77Fz/
-=lyLx
+iEYEARECAAYFAkn+F/wACgkQ1fmVwcYIWAb31ACgtpLJhh5+qNQzCZjXRpxrILCQ
+d2MAnRkdDvwdtIjMWK9CXafjul3e8kcY
+=TORi
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.0.10-no-extern-cluealigned.diff b/gnome-extra/gtkhtml/files/gtkhtml-3.0.10-no-extern-cluealigned.diff
deleted file mode 100644
index ba6875c22afa..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.0.10-no-extern-cluealigned.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN gtkhtml-3.0.10.orig/src/htmlcluealigned.h gtkhtml-3.0.10/src/htmlcluealigned.h
---- gtkhtml-3.0.10.orig/src/htmlcluealigned.h	2005-08-10 00:27:22.000000000 -0400
-+++ gtkhtml-3.0.10/src/htmlcluealigned.h	2005-08-10 08:03:00.000000000 -0400
-@@ -38,7 +38,6 @@
- };
- 
- 
--extern HTMLClueAlignedClass html_cluealigned_class;
- 
- 
- void        html_cluealigned_type_init   (void);
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.14.3-get_left_margin-fix.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.14.3-get_left_margin-fix.patch
deleted file mode 100644
index ed705fcbf30c..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.14.3-get_left_margin-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Patch from Milan Crha  <mcrha@redhat.com> from http://bugzilla.gnome.org/show_bug.cgi?id=426496
-to hopefully fix crashes in html_object_get_left_margin
-
-Index: src/htmlembedded.c
-===================================================================
---- src/htmlembedded.c	(revision 8509)
-+++ src/htmlembedded.c	(working copy)
-@@ -120,6 +120,7 @@
- 			gtk_container_remove (GTK_CONTAINER (element->parent), element->widget);
- 		} else {
- 			g_object_ref_sink (element->widget);
-+			g_object_unref (element->widget);
- 		}
- 	}
- 
-Index: src/gtkhtml.c
-===================================================================
---- src/gtkhtml.c	(revision 8509)
-+++ src/gtkhtml.c	(working copy)
-@@ -4515,7 +4515,7 @@
- {
- 	GtkAdjustment *adj;
- 	gint line_height;
--	gfloat delta;
-+	gfloat delta = 0;
- 
- 	/* we dont want scroll in editable (move cursor instead) */
- 	if (html_engine_get_editable (html->engine) || html->engine->caret_mode)
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.2-gi18n.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.2-gi18n.patch
deleted file mode 100644
index a2e9a6325245..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.2-gi18n.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- gtkhtml-3.2.5/components/html-editor/body.c	2007/09/22 22:24:29	1.1
-+++ gtkhtml-3.2.5/components/html-editor/body.c	2007/09/22 22:24:50
-@@ -23,6 +23,7 @@
- #include <config.h>
- #include <libgnome/gnome-i18n.h>
- #include <string.h>
-+#include <glib/gi18n-lib.h>
- #include "gi-color-combo.h"
- #include "htmlengine-edit.h"
- #include "htmlengine-edit-clueflowstyle.h"
---- gtkhtml-3.2.5/components/html-editor/template.c	2007/09/22 22:41:26	1.1
-+++ gtkhtml-3.2.5/components/html-editor/template.c	2007/09/22 22:41:52
-@@ -24,6 +24,7 @@
- #include <libgnome/gnome-i18n.h>
- #include <string.h>
- #include <glade/glade.h>
-+#include <glib/gi18n-lib.h>
- 
- #include "gtkhtml.h"
- #include "htmlcursor.h"
---- gtkhtml-3.2.5/components/html-editor/toolbar.c	2007/09/22 22:43:24	1.1
-+++ gtkhtml-3.2.5/components/html-editor/toolbar.c	2007/09/22 22:43:35
-@@ -27,6 +27,7 @@
- #include <libgnome/gnome-i18n.h>
- #include <gnome.h>
- #include <bonobo.h>
-+#include <glib/gi18n-lib.h>
- 
- #include "gi-color-combo.h"
- #include "toolbar.h"
---- gtkhtml-3.2.5/components/html-editor/utils.c	2007/09/22 22:44:03	1.1
-+++ gtkhtml-3.2.5/components/html-editor/utils.c	2007/09/22 22:44:16
-@@ -23,6 +23,7 @@
- #include <config.h>
- #include <libgnome/gnome-i18n.h>
- #include <string.h>
-+#include <glib/gi18n-lib.h>
- #include "gtkhtml-compat.h"
- #include "htmlcursor.h"
- #include "htmlengine.h"
---- gtkhtml-3.2.5/components/html-editor/gi-color-palette.c	2007/09/22 22:44:57	1.1
-+++ gtkhtml-3.2.5/components/html-editor/gi-color-palette.c	2007/09/22 22:45:11
-@@ -36,6 +36,7 @@
- #include <libgnomecanvas/gnome-canvas.h>
- #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
- #include <gdk/gdkcolor.h>
-+#include <glib/gi18n-lib.h>
- #include "gi-color-group.h"
- #include "gi-color-palette.h"
- #include "gi-colors.h"
---- gtkhtml-3.2.5/components/html-editor/test-html-editor-control.c	2007/09/22 22:46:35	1.1
-+++ gtkhtml-3.2.5/components/html-editor/test-html-editor-control.c	2007/09/22 22:46:46
-@@ -23,6 +23,7 @@
- 
- #include <config.h>
- #include <libgnome/gnome-i18n.h>
-+#include <glib/gi18n-lib.h>
- 
- #include <gnome.h>
- #include <bonobo.h>
-
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch
deleted file mode 100644
index e4ad9a3f8123..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- gtkhtml-3.2.5/src/gtkhtml.c.orig	2005-03-13 16:04:23.000000000 +0000
-+++ gtkhtml-3.2.5/src/gtkhtml.c	2005-03-13 16:07:42.000000000 +0000
-@@ -27,7 +27,7 @@
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <gtk/gtk.h>
- #include <string.h>
--
-+#include <glib/gi18n-lib.h>
- #include <gnome.h>
- 
- #include "../a11y/factory.h"
---- gtkhtml-3.2.5/src/htmlbutton.c.orig	2005-03-13 16:03:52.000000000 +0000
-+++ gtkhtml-3.2.5/src/htmlbutton.c	2005-03-13 16:08:00.000000000 +0000
-@@ -26,6 +26,7 @@
- #include "htmlform.h"
- #include <string.h>
- #include <libgnome/gnome-i18n.h>
-+#include <glib/gi18n-lib.h>
- 
- HTMLButtonClass html_button_class;
- 
---- gtkhtml-3.2.5/src/htmlengine-print.c.orig	2005-03-13 16:06:27.000000000 +0000
-+++ gtkhtml-3.2.5/src/htmlengine-print.c	2005-03-13 16:09:36.000000000 +0000
-@@ -23,6 +23,8 @@
- #include <gtk/gtk.h>
- #include <libgnome/gnome-i18n.h>
- #include <libgnomeui/gnome-dialog-util.h>
-+#include <glib/gi18n-lib.h>
-+
- #include "gtkhtml.h"
- #include "gtkhtml-private.h"
- #include "gtkhtml-properties.h"
---- gtkhtml-3.2.5/src/test.c.orig	2005-03-13 16:10:20.000000000 +0000
-+++ gtkhtml-3.2.5/src/test.c	2005-03-13 16:12:28.000000000 +0000
-@@ -36,8 +36,10 @@
- #include <gtk/gtkbutton.h>
- #include <gtk/gtksignal.h>
- 
-+#include <config.h>
- #include <libgnome/gnome-i18n.h>
- #include <libgnomeui/gnome-ui-init.h>
-+#include <glib/gi18n-lib.h>
- 
- #include "gtkhtml.h"
- #include "gtkhtmldebug.h"
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.6.2-fbsd.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.6.2-fbsd.patch
deleted file mode 100644
index df4fac948548..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.6.2-fbsd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- po/Makefile.in.in.orig	Tue Nov 23 17:53:53 2004
-+++ po/Makefile.in.in	Tue Nov 23 17:58:38 2004
-@@ -31,6 +31,7 @@
- localedir = $(libdir)/locale
- gnulocaledir = $(datadir)/locale
- gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- subdir = po
- 
- INSTALL = @INSTALL@