New version: 2.10.0. Cleaning old ebuilds/patches.

Package-Manager: portage-2.0.51.22-r1

15 files changed, 68 insertions, 716 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index bf7670beef81..ce897f43d855 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.85 2005/04/08 17:06:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.86 2005/07/13 15:23:18 leonardop Exp $
+
+*yelp-2.10.0 (13 Jul 2005)
+
+  13 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> yelp-2.10.0.ebuild:
+  New version. Added 'firefox' USE flag and updated dependencies.
 
   08 Apr 2005; Markus Rothe <corsair@gentoo.org> yelp-2.6.5.ebuild:
   Stable on ppc64
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 6e7cf93be9d1..47049670e497 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,16 +1,7 @@
-MD5 17c14c0a027c0ec23458a57d5ff754ff ChangeLog 8665
+MD5 21a3cbf4494837667522329efdb5f20b ChangeLog 8837
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 cb8205b8a95d518e0a0407eaf64be335 yelp-2.4.2.ebuild 868
-MD5 586ee65a37cc83ef4222522869f3fd20 yelp-2.6.0.ebuild 845
-MD5 63e467f03b938c45837e479c93d547b0 yelp-2.6.1.ebuild 845
-MD5 d9c28e84565e2965ffd6fa7bafff70fb yelp-2.6.2.ebuild 835
-MD5 b03dae1c44e6c8a337936f18e8bd45e0 yelp-2.6.4.ebuild 928
+MD5 33e46e9b3d5df2568d64de54d97e86ed yelp-2.10.0.ebuild 1318
 MD5 943ea60c165a0c48211e2d9913894134 yelp-2.6.5.ebuild 951
-MD5 5c3187494762706268a83d298ed70ed1 files/digest-yelp-2.4.2 63
-MD5 df2c88704653695b75b2962b83153d05 files/digest-yelp-2.6.0 63
-MD5 8df713e174b2fc332eef4bdc2710a14a files/digest-yelp-2.6.1 63
-MD5 b3f4bb2439f62b72847b6ed744fcffbe files/digest-yelp-2.6.2 63
-MD5 3cc5005ee15816000841f6abfa15e909 files/digest-yelp-2.6.4 63
 MD5 0cf1e0f8c2d2235fc75a784741638f77 files/digest-yelp-2.6.5 63
-MD5 d3fa3016a8d381dc0bd303a75bc88538 files/yelp-2-speed_fix.patch 14137
 MD5 d13c2fbe43ee623230084d6f7bd6ec25 files/yelp-2.6.4-makedepfix.patch 948
+MD5 c4833a2e4e1d587c717ca61ce83cc55b files/digest-yelp-2.10.0 64
diff --git a/gnome-extra/yelp/files/digest-yelp-2.10.0 b/gnome-extra/yelp/files/digest-yelp-2.10.0
new file mode 100644
index 000000000000..d12f1dc3ddb3
--- /dev/null
+++ b/gnome-extra/yelp/files/digest-yelp-2.10.0
@@ -0,0 +1 @@
+MD5 326f85c8c0fd944e782a37b0589036c5 yelp-2.10.0.tar.bz2 790852
diff --git a/gnome-extra/yelp/files/digest-yelp-2.4.2 b/gnome-extra/yelp/files/digest-yelp-2.4.2
deleted file mode 100644
index 060f7a4c11fd..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee89f4d0886f7c3be1b9f6894a57ec1b yelp-2.4.2.tar.bz2 598274
diff --git a/gnome-extra/yelp/files/digest-yelp-2.6.0 b/gnome-extra/yelp/files/digest-yelp-2.6.0
deleted file mode 100644
index 997d6085dd9f..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50c7684b0239f3841e022603a15e4bfa yelp-2.6.0.tar.bz2 512061
diff --git a/gnome-extra/yelp/files/digest-yelp-2.6.1 b/gnome-extra/yelp/files/digest-yelp-2.6.1
deleted file mode 100644
index 160eebeb1223..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 965ab4cb4f40c76554ce850d63281f06 yelp-2.6.1.tar.bz2 515442
diff --git a/gnome-extra/yelp/files/digest-yelp-2.6.2 b/gnome-extra/yelp/files/digest-yelp-2.6.2
deleted file mode 100644
index a37116d16395..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5530d4cb207bba0f019277cd8a4c0d8 yelp-2.6.2.tar.bz2 632824
diff --git a/gnome-extra/yelp/files/digest-yelp-2.6.4 b/gnome-extra/yelp/files/digest-yelp-2.6.4
deleted file mode 100644
index 8be5f55d8053..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 77d919335650ef0d114c951637669bda yelp-2.6.4.tar.bz2 639056
diff --git a/gnome-extra/yelp/files/yelp-2-speed_fix.patch b/gnome-extra/yelp/files/yelp-2-speed_fix.patch
deleted file mode 100644
index 4cfc284b56ff..000000000000
--- a/gnome-extra/yelp/files/yelp-2-speed_fix.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-? yelp-shaunm-030816-0.diff
-Index: src/yelp-cache.c
-===================================================================
-RCS file: /cvs/gnome/yelp/src/yelp-cache.c,v
-retrieving revision 1.2
-diff -u -r1.2 yelp-cache.c
---- src/yelp-cache.c	13 Jun 2003 17:15:00 -0000	1.2
-+++ src/yelp-cache.c	16 Aug 2003 22:04:15 -0000
-@@ -30,11 +30,17 @@
- GHashTable *cache_table;
- GMutex     *cache_mutex;
- 
-+GHashTable *links_table;
-+GMutex     *links_mutex;
-+
- void
- yelp_cache_init (void)
- {
-  	cache_mutex = g_mutex_new ();
-         cache_table = g_hash_table_new (g_str_hash, g_str_equal);
-+
-+	links_mutex = g_mutex_new ();
-+	links_table = g_hash_table_new (g_str_hash, g_str_equal);
- }
- 
- const gchar *
-@@ -51,6 +57,20 @@
-         return ret_val;
- }
- 
-+YelpNavLinks *
-+yelp_cache_lookup_links (const gchar *path)
-+{
-+	YelpNavLinks *ret_val;
-+
-+	g_mutex_lock (links_mutex);
-+
-+	ret_val = (YelpNavLinks *) g_hash_table_lookup (links_table, path);
-+
-+	g_mutex_unlock (links_mutex);
-+
-+	return ret_val;
-+}
-+
- void
- yelp_cache_add (const gchar *path, const gchar *html)
- {
-@@ -59,4 +79,16 @@
-         g_hash_table_insert (cache_table, (gchar *) path, g_strdup (html));
-         
-         g_mutex_unlock (cache_mutex);
-+}
-+
-+void
-+yelp_cache_add_links (const gchar *path, const YelpNavLinks *links)
-+{
-+	YelpNavLinks *new_links;
-+
-+	g_mutex_lock (links_mutex);
-+
-+	g_hash_table_insert (links_table, (gchar *) path, links);
-+
-+	g_mutex_unlock (links_mutex);
- }
-Index: src/yelp-cache.h
-===================================================================
-RCS file: /cvs/gnome/yelp/src/yelp-cache.h,v
-retrieving revision 1.2
-diff -u -r1.2 yelp-cache.h
---- src/yelp-cache.h	13 Jun 2003 17:15:00 -0000	1.2
-+++ src/yelp-cache.h	16 Aug 2003 22:04:15 -0000
-@@ -27,10 +27,31 @@
- 
- #include "yelp-uri.h"
- 
-+typedef struct _YelpNavLinks YelpNavLinks;
-+
-+#define YELP_NAV_LINKS(x) ((YelpNavLinks *) x)
-+
-+struct _YelpNavLinks {
-+	gchar *prev_link_uri;
-+	gchar *next_link_uri;
-+	gchar *prev_link_title;
-+	gchar *next_link_title;
-+	gchar *prev_link_text;
-+	gchar *next_link_text;
-+	gchar *up_link_uri;
-+	gchar *up_link_title;
-+};
-+
- void           yelp_cache_init          (void);
- 
- const gchar *  yelp_cache_lookup        (const gchar *path);
- 
- void           yelp_cache_add           (const gchar *path,
-                                          const gchar *html);
-+
-+YelpNavLinks * yelp_cache_lookup_links  (const gchar        *path);
-+
-+void           yelp_cache_add_links     (const gchar        *path,
-+					 const YelpNavLinks *links);
-+
- #endif /* __YELP_CACHE_H__ */
-Index: src/yelp-db2html.c
-===================================================================
-RCS file: /cvs/gnome/yelp/src/yelp-db2html.c,v
-retrieving revision 1.27
-diff -u -r1.27 yelp-db2html.c
---- src/yelp-db2html.c	24 Jul 2003 06:18:35 -0000	1.27
-+++ src/yelp-db2html.c	16 Aug 2003 22:04:15 -0000
-@@ -66,16 +66,28 @@
- 	const gchar    *params[16 + 1];
- 	gchar          *pathname;
-         gchar          *docpath;
-+	gboolean        gen_links;
- 	db_doc = NULL;
- 
-         putenv ("XML_CATALOG_FILES=" DATADIR "/yelp/catalog");
- 
-         if (argc < 2) {
--                g_print ("Usage 'yelp-db2html url'\n");
-+                g_print ("Usage 'yelp-db2html [-n] url'\n");
-                 exit (1);
-         }
- 
--        docpath = argv[1];
-+	if (!strcmp (argv[1], "-n")) {
-+		if (argc < 3) {
-+			g_print ("Usage 'yelp-db2html [-n] url'\n");
-+			exit (1);
-+		}
-+
-+		docpath = argv[2];
-+		gen_links = FALSE;
-+	} else {
-+		docpath = argv[1];
-+		gen_links = TRUE;
-+	}
- 
- 	if (!g_file_test (docpath, G_FILE_TEST_EXISTS)) {
- 		g_warning ("'%s' doesn't exist.", docpath);
-@@ -126,7 +138,7 @@
-         params[6]  = "yelp_max_chunk_depth";
-         params[7]  = "2";
- 	params[8]  = "yelp_generate_navbar";
--	params[9]  = "1";
-+	params[9]  = (gen_links ? "1" : "0");
- 	params[10] = "yelp_chunk_method";
- 	params[11] = "'yelp'";
-         params[12] = NULL;
-Index: src/yelp-reader.c
-===================================================================
-RCS file: /cvs/gnome/yelp/src/yelp-reader.c,v
-retrieving revision 1.28
-diff -u -r1.28 yelp-reader.c
---- src/yelp-reader.c	8 Jul 2003 12:05:49 -0000	1.28
-+++ src/yelp-reader.c	16 Aug 2003 22:04:17 -0000
-@@ -94,7 +94,7 @@
- static void      reader_th_data_free      (ReaderThreadData    *th_data);
- #endif
- static gchar *   reader_get_chunk            (const gchar         *document,
--					      const gchar         *section);
-+					      YelpURI             *uri);
- static gchar *   
- reader_look_for_cached_help_file             (const gchar         *url);
- 
-@@ -261,9 +261,15 @@
- 		break;
- 	case YELP_URI_TYPE_DOCBOOK_XML:
- 	case YELP_URI_TYPE_DOCBOOK_SGML:
--		command_line = g_strdup_printf ("%s/yelp-db2html %s",
--						SERVERDIR,
--						yelp_uri_get_path (uri));
-+		if (yelp_cache_lookup_links (yelp_uri_to_string (uri))) {
-+			command_line = g_strdup_printf ("%s/yelp-db2html -n %s",
-+							SERVERDIR,
-+							yelp_uri_get_path (uri));
-+		} else {
-+			command_line = g_strdup_printf ("%s/yelp-db2html %s",
-+							SERVERDIR,
-+							yelp_uri_get_path (uri));
-+		}
- 		break;
- 	default:
- 		/* Set error */
-@@ -312,14 +318,7 @@
- 		    yelp_uri_get_type (uri) == YELP_URI_TYPE_DOCBOOK_SGML) {
- 			gchar *chunk;
- 			
--			if (yelp_uri_get_section (uri) &&
--			    strcmp (yelp_uri_get_section (uri), "")) {
--				chunk = reader_get_chunk (q_data->data,
--							  yelp_uri_get_section (uri));
--			} else {
--				chunk = reader_get_chunk (q_data->data,
--							  "toc");
--			}
-+			chunk = reader_get_chunk (q_data->data, uri);
- 
- 			g_free (q_data->data);
- 			q_data->data = chunk;
-@@ -634,25 +633,30 @@
- #endif
- 
- static gchar *
--reader_get_chunk (const gchar *document, const gchar *section)
-+reader_get_chunk (const gchar *document, YelpURI *uri)
- {
--	gchar       *header;
--	gchar       *chunk;
--	const gchar *footer;
--	gchar       *ret_val;
--	const gchar *start;
--	const gchar *end;
--	gchar       *tag;
--	GTimer      *timer;
--	
--/* 	g_print ("%s\n", document); */
--
--	timer = g_timer_new ();
-+	const gchar  *section;
-+	gchar        *header;
-+	gchar        *chunk;
-+	const gchar  *footer;
-+	gchar        *ret_val;
-+	const gchar  *start;
-+	const gchar  *end;
-+	gchar        *tag;
-+	GTimer       *timer;
-+	YelpNavLinks *links;
-+	const gchar  *nav_top;
-+	const gchar  *nav_bottom;
-+
-+	//	timer = g_timer_new ();
-+
-+	section = yelp_uri_get_section (uri);
-+	if (!section || !strcmp (section, ""))
-+		section = "toc";
- 
- 	end = strstr (document, "<!-- End of header -->");
- 	
- 	if (!end) {
--/* 		g_warning ("Wrong type of document\n"); */
- 		return g_strdup (document);
- 	}
- 	
-@@ -663,7 +667,6 @@
- 	g_free (tag);
- 	
- 	if (!start) {
--/* 		g_warning ("Document doesn't include section: '%s'", section); */
- 		g_free (header);
- 
- 		return g_strdup (document);
-@@ -672,8 +675,6 @@
- 	end = strstr (start, "<!-- End of chunk -->");
- 
- 	if (!end) {
--/* 		g_warning ("Document is doesn't contain end tag for section: %s", */
--/* 			   section); */
- 		g_free (header);
- 
- 		return g_strdup (document);
-@@ -684,15 +685,59 @@
- 	footer = strstr (document, "<!-- Start of footer -->");
- 	
- 	if (!footer) {
--/* 		g_warning ("Couldn't find footer in document"); */
- 		g_free (header);
- 		g_free (chunk);
- 
- 		return g_strdup (document);
- 	}
--	 
--	ret_val = g_strconcat (header, chunk, footer, NULL);
--	
-+
-+	links = yelp_cache_lookup_links (yelp_uri_to_string (uri));
-+
-+	if (!links) {
-+		nav_top = "";
-+		nav_bottom = "";
-+	} else {
-+		nav_top = g_strconcat ("<table width='100%'><tr>",
-+				       "<td width='40%' align='left'>",
-+				       "<a accesskey='p' href='",
-+				       links->prev_link_uri, "'>",
-+				       links->prev_link_title,
-+				       "</a></td>",	
-+				       "<td width='40%' align='right'>",
-+				       "<a accesskey='n' href='",
-+				       links->next_link_uri, "'>",
-+				       links->next_link_title,
-+				       "</a></td>",
-+				       "</tr></table>",
-+				       "<hr>",
-+				       NULL);
-+		nav_bottom = g_strconcat ("<hr class='bottom'>",
-+					  "<table width='100%'><tr>",
-+					  "<td width='40%' align='left'>",
-+					  "<a accesskey='p' href='",
-+					  links->prev_link_uri, "'>",
-+					  links->prev_link_title,
-+					  "</a><br>",
-+					  links->prev_link_text,
-+					  "</td>",	
-+					  "<td width='20%' align='center'>",
-+					  "<a accesskey='u' href='",
-+					  links->up_link_uri, "'>",
-+					  links->up_link_title,
-+					  "</a></td>",
-+					  "<td width='40%' align='right'>",
-+					  "<a accesskey='n' href='",
-+					  links->next_link_uri, "'>",
-+					  links->next_link_title,
-+					  "</a><br>",
-+					  links->next_link_text,
-+					  "</td>",
-+					  "</tr></table>",
-+					  NULL);
-+	}
-+
-+	ret_val = g_strconcat (header, nav_top, chunk, nav_bottom, footer, NULL);
-+
- 	g_free (header);
- 	g_free (chunk);
- 
-@@ -902,14 +947,8 @@
- 		} else {
- 			document = read_document;
- 		}
--		
--		if (yelp_uri_get_section (new_uri) &&
--		    strcmp (yelp_uri_get_section (new_uri), "")) {
--			chunk = reader_get_chunk (document,
--						  yelp_uri_get_section (new_uri));
--		} else {
--			chunk = reader_get_chunk (document, "toc");
--		}
-+
-+		chunk = reader_get_chunk (document, new_uri);
- 
- 		g_free (read_document);
- 		yelp_uri_unref (new_uri);
-Index: src/yelp-scrollkeeper.c
-===================================================================
-RCS file: /cvs/gnome/yelp/src/yelp-scrollkeeper.c,v
-retrieving revision 1.34
-diff -u -r1.34 yelp-scrollkeeper.c
---- src/yelp-scrollkeeper.c	13 Jun 2003 17:15:01 -0000	1.34
-+++ src/yelp-scrollkeeper.c	16 Aug 2003 22:04:18 -0000
-@@ -593,6 +593,7 @@
- 	xmlNode *xml_node;
- 	GNode   *tree;
- 	gchar   *full_path;
-+	gchar   *title_path;
-         
-         g_return_val_if_fail (docpath != NULL, NULL);
- 
-@@ -619,11 +620,22 @@
- 	xml_node = doc->xmlRootNode->xmlChildrenNode;
- 
- 	full_path = g_strconcat ("ghelp:", docpath, NULL);
-+	title_path = g_strconcat (full_path, "?title-page", NULL);
-+
-+	g_node_append_data (tree,
-+			    yelp_section_new (YELP_SECTION_DOCUMENT_SECTION,
-+					      _("About This Document"),
-+					      yelp_uri_new (title_path) ));
-+	g_node_append_data (tree,
-+			    yelp_section_new (YELP_SECTION_DOCUMENT_SECTION,
-+					      _("Contents"),
-+					      yelp_uri_new (full_path) ));
- 
- 	for (; xml_node != NULL; xml_node = xml_node->next) {
- 		scrollkeeper_parse_toc_section (tree, xml_node, full_path);
- 	}
- 
-+	g_free (title_path);
- 	g_free (full_path);
- 	
- 	return tree;
-Index: src/yelp-view-content.c
-===================================================================
-RCS file: /cvs/gnome/yelp/src/yelp-view-content.c,v
-retrieving revision 1.42
-diff -u -r1.42 yelp-view-content.c
---- src/yelp-view-content.c	13 Jun 2003 17:15:01 -0000	1.42
-+++ src/yelp-view-content.c	16 Aug 2003 22:04:19 -0000
-@@ -39,6 +39,7 @@
- #include "yelp-scrollkeeper.h"
- #include "yelp-util.h"
- #include "yelp-uri.h"
-+#include "yelp-cache.h"
- #include "yelp-view-content.h"
- 
- #define d(x)
-@@ -73,6 +74,9 @@
- 					       GNode                *node);
- static void content_set_tree                  (YelpViewContent      *content, 
- 					       GNode                *node);
-+gboolean    content_generate_links            (GNode                *node,
-+					       gpointer              data);
-+GNode     * node_last_ancestor                (GNode                *node);
- static void
- content_show_uri                              (YelpView              *view, 
- 					       YelpURI               *uri,
-@@ -420,6 +424,98 @@
- 	}
- }
- 
-+
-+GNode *
-+node_last_ancestor (GNode *node)
-+{
-+	if (node->children)
-+		return node_last_ancestor (g_node_last_child (node));
-+	else
-+		return node;
-+}
-+
-+
-+gboolean
-+content_generate_links (GNode *node, gpointer data)
-+{
-+	GNode        *prev_node;
-+	GNode        *next_node;
-+	GNode        *up_node;
-+	YelpURI      *prev_uri;
-+	YelpURI      *next_uri;
-+	YelpURI      *up_uri;
-+	YelpNavLinks *links = g_new0 (YelpNavLinks, 1);
-+	YelpURI      *uri;
-+
-+	if (!node->data)
-+		return FALSE;
-+
-+	uri = YELP_SECTION (node->data)->uri;
-+
-+	if (yelp_cache_lookup_links (yelp_uri_to_string (uri)))
-+		return FALSE;
-+
-+	if (node->prev)
-+		prev_node = node_last_ancestor (node->prev);
-+	else if (node->parent && node->parent->data)
-+		prev_node = node->parent;
-+	else
-+		prev_node = NULL;
-+
-+	if (node->children)
-+		next_node = node->children;
-+	else if (node->next)
-+		next_node = node->next;
-+	else if (node->parent && node->parent->next)
-+		next_node = node->parent->next;
-+	else
-+		next_node = NULL;
-+
-+	if (yelp_uri_get_section (uri) &&
-+	    strcmp (yelp_uri_get_section (uri), "") &&
-+	    strcmp (yelp_uri_get_section (uri), "toc") &&
-+	    strcmp (yelp_uri_get_section (uri), "title-page"))
-+		up_node = g_node_nth_child (g_node_get_root (node), 1);
-+	else
-+		up_node = NULL;
-+
-+	if (!prev_node) {
-+		links->prev_link_uri = "";
-+		links->prev_link_title = "";
-+		links->prev_link_text = "";
-+	} else {
-+		prev_uri = YELP_SECTION (prev_node->data)->uri;
-+		links->prev_link_uri = yelp_uri_to_string (prev_uri);
-+		links->prev_link_title = _("Previous");
-+		links->prev_link_text = YELP_SECTION (prev_node->data)->name;
-+	}
-+
-+	if (!next_node) {
-+		links->next_link_uri = "";
-+		links->next_link_title = "";
-+		links->next_link_text = "";
-+	} else {
-+		next_uri = YELP_SECTION (next_node->data)->uri;
-+		links->next_link_uri = yelp_uri_to_string (next_uri);
-+		links->next_link_title = _("Next");
-+		links->next_link_text = YELP_SECTION (next_node->data)->name;
-+	}
-+
-+	if (!up_node) {
-+		links->up_link_uri = "";
-+		links->up_link_title = "";
-+	} else {
-+		up_uri = YELP_SECTION (up_node->data)->uri;
-+		links->up_link_uri = yelp_uri_to_string (up_uri);
-+		links->up_link_title = YELP_SECTION (up_node->data)->name;
-+	}
-+
-+	yelp_cache_add_links (yelp_uri_to_string (uri), links);
-+
-+	return FALSE;
-+}
-+
-+
- static void
- content_show_uri (YelpView *view, YelpURI *uri, GError **error)
- {
-@@ -445,7 +541,13 @@
- 				gtk_widget_show (priv->tree_sw);
- 				content_set_tree (YELP_VIEW_CONTENT (view), 
- 						  node);
--				
-+
-+				g_node_traverse (node,
-+						 G_PRE_ORDER,
-+						 G_TRAVERSE_ALL,
-+						 -1,
-+						 (GNodeTraverseFunc) content_generate_links,
-+						 NULL);
- 			} else {
- 				if (gtk_widget_is_focus (priv->tree_sw)) {
- 					reset_focus = TRUE;
diff --git a/gnome-extra/yelp/yelp-2.10.0.ebuild b/gnome-extra/yelp/yelp-2.10.0.ebuild
new file mode 100644
index 000000000000..2cf770b66453
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.10.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.10.0.ebuild,v 1.1 2005/07/13 15:23:18 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="firefox"
+
+RDEPEND=">=gnome-base/orbit-2
+	>=dev-libs/glib-2
+	>=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.1.1
+	>=gnome-base/gnome-vfs-2
+	>=x11-libs/gtk+-2.5.3
+	>=gnome-base/libbonobo-1.108
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.0.2
+	>=gnome-base/libgnomeui-1.103
+	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxslt-1.1.4
+	!firefox? ( >=www-client/mozilla-1.7.3 )
+	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	dev-libs/popt
+	sys-libs/zlib
+	app-arch/bzip2"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.6.4-makedepfix.patch
+}
+
+src_compile() {
+	local myconf="--enable-man --enable-info"
+
+	if use firefox; then
+		myconf="${myconf} --with-mozilla=firefox"
+	else
+		myconf="${myconf} --with-mozilla=mozilla"
+	fi
+
+	G2CONF="${G2CONF} ${myconf}"
+
+	gnome2_src_compile
+}
diff --git a/gnome-extra/yelp/yelp-2.4.2.ebuild b/gnome-extra/yelp/yelp-2.4.2.ebuild
deleted file mode 100644
index 64825e7a14c0..000000000000
--- a/gnome-extra/yelp/yelp-2.4.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.4.2.ebuild,v 1.11 2005/01/08 23:36:25 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Help browser for Gnome"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	=gnome-extra/libgtkhtml-2*
-	>=dev-libs/libxslt-1.0.15
-	>=gnome-base/libglade-2
-	dev-libs/popt
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2-speed_fix.patch
-
-}
diff --git a/gnome-extra/yelp/yelp-2.6.0.ebuild b/gnome-extra/yelp/yelp-2.6.0.ebuild
deleted file mode 100644
index 44c02acc1b80..000000000000
--- a/gnome-extra/yelp/yelp-2.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.6.0.ebuild,v 1.9 2005/01/08 23:36:25 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc alpha hppa amd64 ~ia64 mips"
-
-RDEPEND=">=x11-libs/gtk+-2.3.1
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	=gnome-extra/libgtkhtml-2*
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-base/libglade-2
-	dev-libs/popt
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-extra/yelp/yelp-2.6.1.ebuild b/gnome-extra/yelp/yelp-2.6.1.ebuild
deleted file mode 100644
index c8176ff8e061..000000000000
--- a/gnome-extra/yelp/yelp-2.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.6.1.ebuild,v 1.9 2005/01/08 23:36:25 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc alpha hppa amd64 ~ia64 mips"
-
-RDEPEND=">=x11-libs/gtk+-2.3.1
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	=gnome-extra/libgtkhtml-2*
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-base/libglade-2
-	dev-libs/popt
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-extra/yelp/yelp-2.6.2.ebuild b/gnome-extra/yelp/yelp-2.6.2.ebuild
deleted file mode 100644
index b49b4aa2ee71..000000000000
--- a/gnome-extra/yelp/yelp-2.6.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.6.2.ebuild,v 1.2 2005/01/08 23:36:25 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
-
-RDEPEND=">=x11-libs/gtk+-2.3.1
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	=gnome-extra/libgtkhtml-2*
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-base/libglade-2
-	dev-libs/popt
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/gnome-extra/yelp/yelp-2.6.4.ebuild b/gnome-extra/yelp/yelp-2.6.4.ebuild
deleted file mode 100644
index 5076f5de1fa1..000000000000
--- a/gnome-extra/yelp/yelp-2.6.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.6.4.ebuild,v 1.12 2005/02/13 05:56:52 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.3.1
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	=gnome-extra/libgtkhtml-2*
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-base/libglade-2
-	dev-libs/popt
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makedepfix.patch
-}