clean up old revisions and fix bug #193496

(Portage version: 2.1.4_rc14)

8 files changed, 6 insertions, 211 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 2426f9ff93a0..d96f0795bc21 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.135 2008/01/11 12:53:56 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.136 2008/01/14 14:39:41 eva Exp $
+
+  14 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gtkhtml-fix_preedit.patch, -gtkhtml-3.0.10-r1.ebuild,
+  -gtkhtml-3.2.4.ebuild, -gtkhtml-3.16.0.ebuild:
+  cleanup old revisions and fix bug #193496
 
   11 Jan 2008; Ferris McCormick <fmccor@gentoo.org> ChangeLog:
   Fix digests for 2.11.1
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1
deleted file mode 100644
index af50c0fdbf8c..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b05b8551f7803f32ecfcf505a6310f3f gtkhtml-3.0.10.tar.bz2 1074973
-RMD160 28804d3bab14f2d76ce15c1f441fe873e5a607ba gtkhtml-3.0.10.tar.bz2 1074973
-SHA256 47492876466dcbcd82e371264c6a1422f82feb80e40fe25a42ccc1fb7897180c gtkhtml-3.0.10.tar.bz2 1074973
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.16.0 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.16.0
deleted file mode 100644
index 024a20ca9d8c..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.16.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0b3b2d27671671ec0680984fe5d8ab9b gtkhtml-3.16.0.tar.bz2 1300137
-RMD160 d4e68c56bb0c69d0f4e350d5394b4bf2ca2737e1 gtkhtml-3.16.0.tar.bz2 1300137
-SHA256 2bf4955cca26322b8c3b44831e39c21f6da9eabe2e49f704290372894e1fe767 gtkhtml-3.16.0.tar.bz2 1300137
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4
deleted file mode 100644
index 4c0b0834f8ce..000000000000
--- a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1978a1ef8f376593e579ab3ad9f48426 gtkhtml-3.2.4.tar.bz2 1311427
-RMD160 04ce25f1bb45a1b686c5c16841417126e831babf gtkhtml-3.2.4.tar.bz2 1311427
-SHA256 b815adcabac35c1ccf2fd04c3c09d911b0fe257faf765e40425ea7b8c2397706 gtkhtml-3.2.4.tar.bz2 1311427
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch b/gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch
deleted file mode 100644
index 96c2af2db9e2..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- 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/gtkhtml-3.0.10-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
deleted file mode 100644
index 76684afab0f6..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 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.4 2008/01/09 21:18:52 eva 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"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.16.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.16.0.ebuild
deleted file mode 100644
index 39071199e68e..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.16.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.16.0.ebuild,v 1.1 2007/10/12 08:03:24 remi Exp $
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="static"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=gnome-base/gail-1.1
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/orbit-2
-	>=gnome-base/libbonobo-2
-	>=net-libs/libsoup-2.1.6"
-
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/intltool-0.35.5
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="$(use_enable static) --enable-file-chooser"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
deleted file mode 100644
index 056fa00a0f90..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.2.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 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.7 2008/01/09 21:18:52 eva 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 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/gtkhtml-3.1.19
-	!=gnome-extra/gtkhtml-3.1.20"
-
-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"
-}