Moving gnome-extra/libgtkhtml to gnome-extra/gtkhtml

Package-Manager: portage-2.1_pre3-r1

28 files changed, 664 insertions, 2 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index a7e0f031149f..d31f95788a27 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.46 2006/01/12 18:31:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.47 2006/01/12 22:34:20 compnerd Exp $
+
+*gtkhtml-3.8.2 (12 Jan 2006)
+*gtkhtml-3.8.1 (12 Jan 2006)
+*gtkhtml-3.6.2 (12 Jan 2006)
+*gtkhtml-3.6.1 (12 Jan 2006)
+*gtkhtml-3.2.5 (12 Jan 2006)
+*gtkhtml-3.2.4 (12 Jan 2006)
+*gtkhtml-3.0.10-r1 (12 Jan 2006)
+*gtkhtml-3.0.10 (12 Jan 2006)
+*gtkhtml-2.6.3 (12 Jan 2006)
+*gtkhtml-2.6.0 (12 Jan 2006)
+
+  12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/libgtkhtml-2.2.0-alpha.patch, +files/gtkhtml-3.0.7-libtool.patch,
+  +files/gtkhtml-3.0.10-no-extern-cluealigned.diff,
+  +files/gtkhtml-3.2-i18n.patch, +files/gtkhtml-3.6.2-fbsd.patch,
+  +files/gtkhtml-fix_preedit.patch, +gtkhtml-2.6.0.ebuild,
+  +gtkhtml-2.6.3.ebuild, +gtkhtml-3.0.10.ebuild, +gtkhtml-3.0.10-r1.ebuild,
+  +gtkhtml-3.2.4.ebuild, +gtkhtml-3.2.5.ebuild, +gtkhtml-3.6.1.ebuild,
+  +gtkhtml-3.6.2.ebuild, +gtkhtml-3.8.1.ebuild, +gtkhtml-3.8.2.ebuild:
+  Moving all gnome-extra/libgtkhtml to gnome-extra/gtkhtml
 
   12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   gtkhtml-1.1.10-r1.ebuild:
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 0a092461126d..e634a64180b2 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,6 +1,32 @@
-MD5 67f44da1abf531b1d8c7f9c53012ff3e ChangeLog 6385
+MD5 0300ac188091140bab488a0e6e69de46 ChangeLog 7267
 MD5 beee6dc1f9b01326aec9a28c8959c395 files/digest-gtkhtml-1.1.10-r1 68
+MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-gtkhtml-2.6.0 69
+MD5 9b8c5022b2135422ff58e52a18662863 files/digest-gtkhtml-2.6.3 69
+MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-gtkhtml-3.0.10 68
+MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-gtkhtml-3.0.10-r1 68
+MD5 714aa2ab68649c7292585791ef3b2cf8 files/digest-gtkhtml-3.2.4 67
+MD5 8ad22906ca369e77ef84242fd95d1900 files/digest-gtkhtml-3.2.5 67
+MD5 1fefab12ccd22babef0f9cf0178a8dec files/digest-gtkhtml-3.6.1 67
+MD5 dec731b7d8ca685be1de143a447a827f files/digest-gtkhtml-3.6.2 67
+MD5 90c59d0d5d58451a570c4345cf208b9e files/digest-gtkhtml-3.8.1 67
+MD5 c4c5b2e02d7197fcd7479da233defb9a files/digest-gtkhtml-3.8.2 67
+MD5 ccd71f8847f9cd60a587dd91fa691341 files/gtkhtml-3.0.10-no-extern-cluealigned.diff 423
+MD5 c802878860f7a2692df330e54e635c0c files/gtkhtml-3.0.7-libtool.patch 656
+MD5 b954bf799749526cc35e4d73e5ebbaba files/gtkhtml-3.2-i18n.patch 1411
+MD5 c90554e1679e74f013b1c8a914c26a48 files/gtkhtml-3.6.2-fbsd.patch 319
+MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/gtkhtml-fix_preedit.patch 2439
 MD5 bc6bf91c4d69c7c6933885588f46eab3 files/gtkhtml-gcc34.patch 484
 MD5 9ccd59aedc67c72d6991971b74de2d6a files/gtkhtml-gcc4.patch 485
+MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
 MD5 4cbc2db34c1804721de8a9be5f304459 gtkhtml-1.1.10-r1.ebuild 4348
+MD5 d70a61e71c0aca8a1900f6bfba8d8d60 gtkhtml-2.6.0.ebuild 1116
+MD5 c9d6c94050b218e764a289a113d713a0 gtkhtml-2.6.3.ebuild 1124
+MD5 c8ca35f866ac80896c8692fd77557009 gtkhtml-3.0.10-r1.ebuild 1216
+MD5 076591720c419377c9922b04c13c83e9 gtkhtml-3.0.10.ebuild 1120
+MD5 43a447e7ddd77a4777207e95e6e1c5db gtkhtml-3.2.4.ebuild 1045
+MD5 e312ab5d55e16d6ee2354078fddd6747 gtkhtml-3.2.5.ebuild 1068
+MD5 71d231ccad060ca6dbd9b45ea384afc1 gtkhtml-3.6.1.ebuild 909
+MD5 a127b7da1ffe89cc140c8a87263748d6 gtkhtml-3.6.2.ebuild 1083
+MD5 1738729d9974cf21de2092f2cffe59b9 gtkhtml-3.8.1.ebuild 955
+MD5 d5adcad2164507a318108b285499cbc7 gtkhtml-3.8.2.ebuild 955
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0 b/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0
new file mode 100644
index 000000000000..3c620b2dbac2
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0
@@ -0,0 +1 @@
+MD5 100d747ee9dce852e313c4f9fa202813 libgtkhtml-2.6.0.tar.bz2 426126
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.3 b/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.3
new file mode 100644
index 000000000000..c0525274c535
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.3
@@ -0,0 +1 @@
+MD5 c77789241d725e189ffc0391eda94361 libgtkhtml-2.6.3.tar.bz2 392127
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10
new file mode 100644
index 000000000000..1533aceb51d9
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10
@@ -0,0 +1 @@
+MD5 b05b8551f7803f32ecfcf505a6310f3f gtkhtml-3.0.10.tar.bz2 1074973
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1
new file mode 100644
index 000000000000..1533aceb51d9
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1
@@ -0,0 +1 @@
+MD5 b05b8551f7803f32ecfcf505a6310f3f gtkhtml-3.0.10.tar.bz2 1074973
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4
new file mode 100644
index 000000000000..f8b455572697
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4
@@ -0,0 +1 @@
+MD5 1978a1ef8f376593e579ab3ad9f48426 gtkhtml-3.2.4.tar.bz2 1311427
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5
new file mode 100644
index 000000000000..5da267fcd81e
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5
@@ -0,0 +1 @@
+MD5 86e1ce32fed536bce5b2d6e8d41b0c65 gtkhtml-3.2.5.tar.bz2 1315567
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1
new file mode 100644
index 000000000000..6f17c00f66bf
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1
@@ -0,0 +1 @@
+MD5 df30dbbd12b6a3f1355a9a82aa430781 gtkhtml-3.6.1.tar.bz2 1356878
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2
new file mode 100644
index 000000000000..f049928dbe78
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2
@@ -0,0 +1 @@
+MD5 37465fde0f1e1d7ba2284c5a4fd06fe7 gtkhtml-3.6.2.tar.bz2 1416041
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.1
new file mode 100644
index 000000000000..82db427a79f5
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.1
@@ -0,0 +1 @@
+MD5 4c66f0eb30d6c26a09ee2c8d60d9c520 gtkhtml-3.8.1.tar.bz2 1527241
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2
new file mode 100644
index 000000000000..9f2c8adf3a77
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2
@@ -0,0 +1 @@
+MD5 4455e24142cc914f00f1e8b81940df68 gtkhtml-3.8.2.tar.bz2 1247395
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
new file mode 100644
index 000000000000..ba6875c22afa
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-3.0.10-no-extern-cluealigned.diff
@@ -0,0 +1,11 @@
+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.0.7-libtool.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch
new file mode 100644
index 000000000000..4839a3f1f2ab
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch
@@ -0,0 +1,20 @@
+--- libtool~	2003-07-11 10:21:31.000000000 +0100
++++ libtool	2003-07-11 10:22:33.000000000 +0100
+@@ -1859,7 +1859,7 @@
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 	    tmp_libs=
+ 	    # PKGW 
+-	    dependency_libs=
++	    #dependency_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+ 	      case "$tmp_libs " in
+@@ -1976,7 +1976,7 @@
+ 
+ 	  tmp_libs=
+ 	  #PKGW
+-	  dependency_libs=
++	  #dependency_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    case $deplib in
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch
new file mode 100644
index 000000000000..e4ad9a3f8123
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch
@@ -0,0 +1,45 @@
+--- 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
new file mode 100644
index 000000000000..df4fac948548
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-3.6.2-fbsd.patch
@@ -0,0 +1,10 @@
+--- 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@
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch b/gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch
new file mode 100644
index 000000000000..96c2af2db9e2
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch
@@ -0,0 +1,82 @@
+--- gtkhtml.c	Sat Jun 28 16:40:03 2003
++++ gtkhtml_new.c	Sat Jun 28 15:54:30 2003
+@@ -789,10 +790,17 @@
+ void
+ gtk_html_im_reset (GtkHTML *html)
+ {
++	/* I don't know why this is called for every keypress, but it f***s up the preedit totally.
++	   gtk_im_context_reset() should only be called if we really want to do a reset,
++	   e.g. a selection is made with somewhere else in the text. 
++	   Adding a character to the text shouldn't trigger this. => FIXME
++	*/
++	/* 
+ 	if (html->priv->need_im_reset) {
+ 		html->priv->need_im_reset = FALSE;
+-		gtk_im_context_reset (html->priv->im_context);
++		gtk_im_context_reset (html->priv->im_context); 
+ 	}
++	*/
+ }
+ 
+ static gint
+@@ -2662,16 +2670,57 @@
+ 	}
+ }
+ 
++static gint last_length; /* FIXME: put these somewhere else */
++static gint last_pos;
++static void 
++gtk_html_delete_preedit(GtkHTML *html)
++{
++	/* delete previous preedit string */
++	if ((last_pos - last_length >= 0) && (last_length > 0)) {
++		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, last_pos - last_length);
++		html_engine_set_mark (html->engine);
++		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, last_pos);
++		html_engine_delete (html->engine);
++	}
++}
++
+ static void
+ gtk_html_im_commit_cb (GtkIMContext *context, const gchar *str, GtkHTML *html)
+ {
++	gint orig_position = html->engine->cursor->position;
++	gtk_html_delete_preedit(html);
++
+ 	html_engine_paste_text (html->engine, str, -1);
++	last_length = 0;
++	last_pos = html->engine->cursor->position;
+ }
+ 
+ static void
+ gtk_html_im_preedit_changed_cb (GtkIMContext *context, GtkHTML *html)
+ {
+-	g_warning ("preedit changed callback: implement me");
++	gint position;
++	gchar *str;
++	PangoAttrList *attribs;
++	gint preedit_cursor_position;
++
++	gtk_im_context_get_preedit_string (context, &str, &attribs, &preedit_cursor_position);
++
++	gtk_html_delete_preedit(html);
++
++	last_length = g_utf8_strlen(str, -1); /* store new string length */
++
++	position = html->engine->cursor->position + preedit_cursor_position;
++	
++	/* FIXME: Apply the pango attributes to the string */
++	html_engine_insert_text (html->engine, str, -1);
++	last_pos = html->engine->cursor->position;
++
++	/* Move the cursor inside the preedit string as requested */
++	if (position >= 0) html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, position);
++	
++	pango_attr_list_unref (attribs);
++	g_free (str);
++
+ }
+ 
+ static gchar *
+
+
diff --git a/gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch b/gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch
new file mode 100644
index 000000000000..488c1b116f75
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch
@@ -0,0 +1,11 @@
+--- libgtkhtml-2.2.0/libgtkhtml/layout/htmlboxtable.c.old	2003-01-06 11:06:15.000000000 -0500
++++ libgtkhtml-2.2.0/libgtkhtml/layout/htmlboxtable.c	2003-02-24 18:17:59.000000000 -0500
+@@ -503,7 +503,7 @@
+ 		for (i=0; i< table->cols; i++) {
+ 			if (table->col_info[i].style_width.type == type) {
+ 				/* Make the space added proportional against the max width of the column */
+-				gint to_add = (gint)((float) table->col_info[i].max / (float) max_width * (float)tmp);
++				gint to_add = max_width ? (gint)((float) table->col_info[i].max / (float) max_width * (float)tmp) : 0; // don't div by zero on alpha
+ 				if (to_add == 0)
+ 					to_add = 1;
+ 				
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.6.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.6.0.ebuild
new file mode 100644
index 000000000000..f46fb9bf6758
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-2.6.0.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/gnome-extra/gtkhtml/gtkhtml-2.6.0.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit eutils gnome2 versionator
+
+MY_P="lib${P}"
+MY_PN="lib${PN}"
+MY_MAJ_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="a Gtk+ based HTML rendering library"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86"
+IUSE="accessibility"
+
+# FIXME : seems only testapps need gnomevfs
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=dev-libs/libxml2-2.4.16
+	>=gnome-base/gnome-vfs-2
+	accessibility? ( >=gnome-base/gail-1.3 )"
+
+DEPEND="${RDEPEND}
+	 >=dev-util/pkgconfig-0.12.0"
+
+G2CONF="${G2CONF} $(use_enable accessibility)"
+
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS  README TODO docs/IDEAS"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	if use alpha; then
+		epatch ${FILESDIR}/${MY_PN}-2.2.0-alpha.patch || die
+	fi
+
+}
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild
new file mode 100644
index 000000000000..2844374a5955
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-2.6.3.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/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit eutils gnome2 versionator
+
+MY_P="lib${P}"
+MY_PN="lib${PN}"
+MY_MAJ_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="a Gtk+ based HTML rendering library"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="accessibility"
+
+# FIXME : seems only testapps need gnomevfs
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=dev-libs/libxml2-2.4.16
+	>=gnome-base/gnome-vfs-2
+	accessibility? ( >=gnome-base/gail-1.3 )"
+
+DEPEND="${RDEPEND}
+	 >=dev-util/pkgconfig-0.12.0"
+
+G2CONF="${G2CONF} $(use_enable accessibility)"
+
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS  README TODO docs/IDEAS"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	if use alpha; then
+		epatch ${FILESDIR}/${MY_PN}-2.2.0-alpha.patch || die
+	fi
+
+}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
new file mode 100644
index 000000000000..45471c2b8877
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="=gnome-extra/gal-1.99.11*
+	>=net-libs/libsoup-1.99.28
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/orbit-2.5.6
+	>=gnome-base/gnome-vfs-2.1
+	>=gnome-base/gail-1.1
+	>=dev-libs/libxml2-2.5"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+
+	# bug 101970
+	epatch ${FILESDIR}/${P}-no-extern-cluealigned.diff
+
+	# bug 54244, patch for cjk input methods
+	epatch ${FILESDIR}/${PN}-fix_preedit.patch
+}
+
+src_compile() {
+	gnome2_src_configure
+
+	EPATCH_OPTS="${S}/libtool"
+	epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch
+
+	emake || die "make failed"
+}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild
new file mode 100644
index 000000000000..ccf54992486d
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="=gnome-extra/gal-1.99.11*
+	>=net-libs/libsoup-1.99.28
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/orbit-2.5.6
+	>=gnome-base/gnome-vfs-2.1
+	>=gnome-base/gail-1.1
+	>=dev-libs/libxml2-2.5"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# bug 101970
+	epatch ${FILESDIR}/${P}-no-extern-cluealigned.diff
+}
+
+src_compile() {
+	gnome2_src_configure
+
+	EPATCH_OPTS="${S}/libtool"
+	epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch
+
+	emake || die "make failed"
+}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
new file mode 100644
index 000000000000..85b763a371b6
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.2"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=net-libs/libsoup-2.2.1
+	>=x11-libs/gtk+-2.2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=x11-themes/gnome-icon-theme-1.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/gail-1
+	!=gnome-extra/libgtkhtml-3.1*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# bug 101970
+	epatch ${FILESDIR}/${PN}-3.0.10-no-extern-cluealigned.diff
+	epatch ${FILESDIR}/${PN}-3.2-i18n.patch
+}
+
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
new file mode 100644
index 000000000000..05647cb83d91
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=net-libs/libsoup-2.2.1
+	>=x11-libs/gtk+-2.2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=x11-themes/gnome-icon-theme-1.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/gail-1
+	!=gnome-extra/libgtkhtml-3.1*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# bug 101970
+	epatch ${FILESDIR}/${PN}-3.0.10-no-extern-cluealigned.diff
+	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
+}
+
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild
new file mode 100644
index 000000000000..96e442fdecd8
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.1.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit gnome2
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.6"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=net-libs/libsoup-2.2.1
+	>=x11-libs/gtk+-2.2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomeprint-2.8
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=x11-themes/gnome-icon-theme-1.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/gail-1
+	>=net-libs/libsoup-2.1.6
+	!=gnome-extra/libgtkhtml-3.1*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
new file mode 100644
index 000000000000..fbcc8a6ba1b5
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.6.2.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.6"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="static"
+
+RDEPEND=">=net-libs/libsoup-2.1.6
+	>=x11-libs/gtk+-2.2
+	>=gnome-base/libgnomeui-1.112.1
+	>=gnome-base/libgnomeprint-2.8
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=x11-themes/gnome-icon-theme-1.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/orbit-2
+	>=gnome-base/gail-0.13
+	!=gnome-extra/libgtkhtml-3.1*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	dev-util/pkgconfig"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+G2CONF="${G2CONF} $(use_enable static)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-fbsd.patch
+}
+
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.8.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.8.1.ebuild
new file mode 100644
index 000000000000..51f5dd6d8808
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.8.1.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit gnome2
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+RDEPEND=">=gnome-base/gail-1.1
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	>=net-libs/libsoup-2.1.6
+	>=x11-libs/gtk+-2.4
+	>=x11-themes/gnome-icon-theme-1.2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	>=dev-util/pkgconfig-0.9"
+
+USE_DESTDIR="1"
+ELTCONF="--reverse-deps"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+
+pkg_setup() {
+	G2CONF="$(use_enable static)"
+}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.8.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.8.2.ebuild
new file mode 100644
index 000000000000..9829bfd48757
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.8.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.8.2.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $
+
+inherit gnome2
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+RDEPEND=">=gnome-base/gail-1.1
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	>=net-libs/libsoup-2.1.6
+	>=x11-libs/gtk+-2.4
+	>=x11-themes/gnome-icon-theme-1.2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	>=dev-util/pkgconfig-0.9"
+
+USE_DESTDIR="1"
+ELTCONF="--reverse-deps"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+
+pkg_setup() {
+	G2CONF="$(use_enable static)"
+}