old

(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)

11 files changed, 11 insertions, 666 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 0db2ec81d09c..88bfe221fa4f 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.291 2012/06/06 17:45:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.292 2012/06/06 18:59:33 ssuominen Exp $
+
+  06 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/yelp-2.26.0-automagic-lzma.patch,
+  -files/yelp-2.28.1-system-nspr.patch, -files/yelp-2.30.1-fix-toc.patch,
+  -files/yelp-2.30.1-open-link.patch, -yelp-2.30.2-r5.ebuild,
+  -yelp-2.30.2-r6.ebuild, -files/yelp-2.30.2-html-print.patch,
+  -files/yelp-2.30.2-missing-slash.patch,
+  -files/yelp-2.30.2-mozilla-glue-libs.patch,
+  -files/yelp-2.30.2-port-to-xulrunner-2-r2.patch:
+  old
 
   06 Jun 2012; Raúl Porcel <armin76@gentoo.org> yelp-2.30.2-r200.ebuild:
   alpha/ia64/sparc stable wrt #416947
diff --git a/gnome-extra/yelp/files/yelp-2.26.0-automagic-lzma.patch b/gnome-extra/yelp/files/yelp-2.26.0-automagic-lzma.patch
deleted file mode 100644
index 1ace314d2002..000000000000
--- a/gnome-extra/yelp/files/yelp-2.26.0-automagic-lzma.patch
+++ /dev/null
@@ -1,43 +0,0 @@
- configure.in |   21 ++++++++++++++++++---
- 1 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 1908249..bf5d129 100644
---- a/configure.in
-+++ b/configure.in
-@@ -194,10 +194,24 @@ AC_SUBST(Z_LIBS)], AC_MSG_ERROR([*** zlib is required]))
- dnl ====================================
- dnl = lzmadec for help converters
- dnl ====================================
-+
-+AC_ARG_ENABLE([lzma],
-+	AC_HELP_STRING([--enable-lzma],
-+	[Enable lzma support @<:@default=yes@:>@]),
-+	enable_lzma=$enableval, enable_lzma=yes)
-+
- LZMADEC_LIBS=
--AC_CHECK_LIB(lzmadec, lzmadec_open, [LZMADEC_LIBS=-llzmadec 
--				     AC_DEFINE(HAVE_LIBLZMADEC, 1, [Compile with liblzmadec support])])
--AC_SUBST(LZMADEC_LIBS)
-+if test x$enable_lzma = xyes; then
-+   AC_CHECK_LIB(lzmadec, lzmadec_open, 
-+   [LZMADEC_LIBS=-llzmadec 
-+   AC_DEFINE(HAVE_LIBLZMADEC, 1, [Compile with liblzmadec support])])
-+	
-+   if test x$LZMADEC_LIBS != x-llzmadec; then
-+      enable_lzma=no
-+   fi
-+
-+   AC_SUBST(LZMADEC_LIBS)
-+fi
- 
- dnl ====================================
- dnl = Bzip2, for the help converters
-@@ -289,6 +303,7 @@ yelp-$VERSION:
- 	compiler:		  ${CC}
- 
- 	Debug enabled:            ${enable_debug}
-+	lzma  enabled:		  ${enable_lzma}
- 	Search backend:           ${search_backend}
- 	Mozilla version:          ${MOZILLA}
- "
diff --git a/gnome-extra/yelp/files/yelp-2.28.1-system-nspr.patch b/gnome-extra/yelp/files/yelp-2.28.1-system-nspr.patch
deleted file mode 100644
index 1e37f4de7eec..000000000000
--- a/gnome-extra/yelp/files/yelp-2.28.1-system-nspr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Include nspr cflags to prevent build failure
-
-https://bugs.gentoo.org/295016
-
----
---- configure.in
-+++ configure.in
-@@ -78,6 +78,7 @@
- 	libstartup-notification-1.0 >= 0.8
- 	dbus-glib-1
- 	rarian >= 0.7.0
-+	nspr >= 4.7.4
- ])
- AC_SUBST([YELP_CFLAGS])
- AC_SUBST([YELP_LIBS])
diff --git a/gnome-extra/yelp/files/yelp-2.30.1-fix-toc.patch b/gnome-extra/yelp/files/yelp-2.30.1-fix-toc.patch
deleted file mode 100644
index 3d959fc722ce..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.1-fix-toc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 72412557f05822c9f670849300f8f47d91fa5963 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Tue, 18 May 2010 02:20:13 +0000
-Subject: [yelp-toc] Fix TOC title I18N
-
-https://bugzilla.gnome.org/show_bug.cgi?id=615141
----
-diff --git a/src/yelp-toc.c b/src/yelp-toc.c
-index 201cabb..085c47c 100644
---- a/src/yelp-toc.c
-+++ b/src/yelp-toc.c
-@@ -553,7 +553,7 @@ xml_trim_titles (xmlNodePtr node, xmlChar * nodetype)
- 	if (!xmlStrcmp (cur->name, nodetype)) {
- 	    xmlChar *cur_lang = NULL;
- 	    int cur_pri = INT_MAX;
--	    cur_lang = xmlNodeGetLang (cur);
-+	    cur_lang = xmlGetNsProp(cur, BAD_CAST "lang", XML_XML_NAMESPACE);
- 	    if (cur_lang) {
- 		for (j = 0; langs[j]; j++) {
- 		    if (g_str_equal (cur_lang, langs[j])) {
---
-cgit v0.8.3.1
diff --git a/gnome-extra/yelp/files/yelp-2.30.1-open-link.patch b/gnome-extra/yelp/files/yelp-2.30.1-open-link.patch
deleted file mode 100644
index 6cd46748205e..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.1-open-link.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 779e05a0e93c5432deaa714aaea7ae17a950f6fc Mon Sep 17 00:00:00 2001
-From: Shaun McCance <shaunm@gnome.org>
-Date: Tue, 18 May 2010 15:23:09 +0000
-Subject: [src/yelp-window.c] Fix "Open Link in New Window", bug #615457 (Edward Sheldrake)
-
----
-diff --git a/src/yelp-window.c b/src/yelp-window.c
-index 67bfc09..1221ba3 100644
---- a/src/yelp-window.c
-+++ b/src/yelp-window.c
-@@ -2545,14 +2545,32 @@ static void window_copy_link_cb (GtkAction *action, YelpWindow *window)
- static void
- window_open_link_cb (GtkAction *action, YelpWindow *window)
- {
--    yelp_window_load (window, window->priv->uri);
-+    gchar *uri;
-+
-+    if (g_str_has_prefix (window->priv->uri, "xref:"))
-+        uri = g_strconcat (window->priv->base_uri, "#", window->priv->uri + 5, NULL);
-+    else
-+        uri = g_strdup (window->priv->uri);
-+    
-+    yelp_window_load (window, uri);
-+
-+    g_free (uri);
- }
- 
- static void
- window_open_link_new_cb (GtkAction *action, YelpWindow *window)
- {
-+    gchar *uri;
-+
-+    if (g_str_has_prefix (window->priv->uri, "xref:"))
-+        uri = g_strconcat (window->priv->base_uri, "#", window->priv->uri + 5, NULL);
-+    else
-+        uri = g_strdup (window->priv->uri);
-+    
-     g_signal_emit (window, signals[NEW_WINDOW_REQUESTED], 0,
--		   window->priv->uri);
-+		   uri);
-+
-+    g_free (uri);
- }
- 
- /* TODO: This doesn't work... */
---
-cgit v0.8.3.1
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-html-print.patch b/gnome-extra/yelp/files/yelp-2.30.2-html-print.patch
deleted file mode 100644
index a6a7c44a0f4b..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.2-html-print.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit ea6d2b724ae5b868e08b8ba3593ff79666912b81
-Author: Vincent Untz <vuntz@gnome.org>
-Date:   Sun Feb 20 15:55:13 2011 +0100
-
-    Fix crash and infinite loop when printing HTML document
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=642811
-
-diff --git a/src/yelp-window.c b/src/yelp-window.c
-index 1221ba3..abad787 100644
---- a/src/yelp-window.c
-+++ b/src/yelp-window.c
-@@ -1181,6 +1181,8 @@ yelp_window_load (YelpWindow *window, const gchar *uri)
-                                                         (void *) window);
-         g_free (faux_frag_id);
- 	priv->current_document = doc;
-+    } else {
-+	window->priv->current_document = NULL;
-     }
- 
-  Exit:
-@@ -2190,6 +2192,8 @@ window_print_page_cb (GtkAction *action, YelpWindow *window)
- 	 * There are more sinister forces at work...
- 	 */
- 
-+	yelp_html_set_base_uri (html, priv->uri);
-+
- 	switch (priv->current_type) {
- 	case YELP_RRN_TYPE_HTML:
- 	    yelp_html_open_stream (html, "text/html");
-@@ -2204,8 +2208,8 @@ window_print_page_cb (GtkAction *action, YelpWindow *window)
- 	    g_assert_not_reached ();
- 	}
- 
--	while ((g_input_stream_read_all
--	    ((GInputStream *)stream, buffer, BUFFER_SIZE, &n, NULL, NULL))) {
-+	while ((n = g_input_stream_read
-+	    ((GInputStream *)stream, buffer, BUFFER_SIZE, NULL, NULL))) {
- 	    yelp_html_write (html, buffer, n);
- 	}
- 
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-missing-slash.patch b/gnome-extra/yelp/files/yelp-2.30.2-missing-slash.patch
deleted file mode 100644
index 787476f9dcff..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.2-missing-slash.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d8a0c136b10d174beae8fd5cfeeb83ef18e83846 Mon Sep 17 00:00:00 2001
-From: Shaun McCance <shaunm@gnome.org>
-Date: Thu, 18 Nov 2010 16:41:43 +0000
-Subject: [yelp-utils] Use g_build_filename to avoid missing slash problem
-
-We were assuming the results of g_get_system_data_dirs have a trailing
-slash. They might not, if you set XDG_DATA_DIRS without them.
----
-diff --git a/src/yelp-utils.c b/src/yelp-utils.c
-index 7fb79e5..0027e08 100644
---- a/src/yelp-utils.c
-+++ b/src/yelp-utils.c
-@@ -116,15 +116,15 @@ resolve_process_ghelp (char *uri, gchar **result)
-             hash = NULL;
-         }
-         for (i = 0; type != YELP_RRN_TYPE_MAL && dirs[i]; i++) {
--            gchar *path = g_strdup_printf ("%sgnome/help/%s", dirs[i], dir);
-+            gchar *path = g_build_filename (dirs[i], "gnome", "help", dir, NULL);
-             if (g_file_test (path, G_FILE_TEST_IS_DIR)) {
-                 const gchar * const *langs = g_get_language_names ();
-                 gint j;
-                 for (j = 0; type != YELP_RRN_TYPE_MAL && langs[j]; j++) {
--                    gchar *index = g_strdup_printf ("%sgnome/help/%s/%s/index.page", dirs[i], dir, langs[j]);
-+                    gchar *index = g_build_filename (dirs[i], "gnome", "help", dir, langs[j], "index.page", NULL);
-                     if (g_file_test (index, G_FILE_TEST_IS_REGULAR)) {
-                         type = YELP_RRN_TYPE_MAL;
--                        *result = g_strdup_printf ("%sgnome/help/%s/%s/", dirs[i], dir, langs[j]);
-+                        *result = g_build_filename (dirs[i], "gnome", "help", dir, langs[j], NULL);
-                     }
-                     g_free (index);
-                 }
---
-cgit v0.9
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-mozilla-glue-libs.patch b/gnome-extra/yelp/files/yelp-2.30.2-mozilla-glue-libs.patch
deleted file mode 100644
index 29966f272449..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.2-mozilla-glue-libs.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dbe69c1ea82de4028371e0a09ceabf526d95beb6 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 16 Dec 2011 03:41:10 -0500
-Subject: [PATCH] gecko.m4: do not define *_{EXTRA,GLUE}_LIBS if pkgconfig
- file already provides libs
-
-Fixes linking with --as-needed for xulrunner-2.0's libxul-embedding.
-
-https://bugs.gentoo.org/show_bug.cgi?id=392367
----
- m4/gecko.m4 |   12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/m4/gecko.m4 b/m4/gecko.m4
-index 8d2f106..92a45cf 100644
---- a/m4/gecko.m4
-+++ b/m4/gecko.m4
-@@ -115,6 +115,7 @@ if $PKG_CONFIG --exists  ${gecko_cv_gecko}-xpcom; then
- 	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
- 	_GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT"
- 	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
-+	_GECKO_LIBS="`$PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom`"
- 	_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
- 	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
- 	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
-@@ -122,6 +123,7 @@ else
- 	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
- 	_GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`"
- 	_GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
-+	_GECKO_LIBS="`$PKG_CONFIG --libs ${gecko_cv_gecko}` `$PKG_CONFIG --libs ${gecko_cv_gecko}-unstable`"
- 	_GECKO_HOME=$with_gecko_home
- 	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
- 	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
-@@ -364,10 +366,12 @@ gecko_cv_glue_libs=
- gecko_cv_extra_pkg_dependencies=
- 
- if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
--	if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then
--		gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
--	else
--		gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue"
-+	if test -z "$_GECKO_LIBS"; then
-+		if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then
-+			gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxpcomglue"
-+		else
-+			gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue"
-+		fi
- 	fi
- else
- 	gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
--- 
-1.7.8
-
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r2.patch b/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r2.patch
deleted file mode 100644
index 95904eae84d3..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r2.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=330847
-
-Patch by the OpenSUSE folks, found by pacho.
-Updated with https://build.opensuse.org/request/show/69983
-Updated to extend lower bound of greVersion in yelp_gecko_init() down to 1.9a
-
-Index: yelp-2.30.2/m4/gecko.m4
-===================================================================
---- yelp-2.30.2.orig/m4/gecko.m4
-+++ yelp-2.30.2/m4/gecko.m4
-@@ -212,25 +212,6 @@ AC_LANG_PUSH([C++])
- _SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"
- 
--AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
--AC_RUN_IFELSE(
--	[AC_LANG_SOURCE(
--		[[#include <mozilla-config.h>
--		  #include <string.h>
--		  #include <stdlib.h>
--                  int main(void) {
--		    if (strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") == 0 ||
--		        strcmp (MOZ_DEFAULT_TOOLKIT, "cairo-gtk2") == 0)
--			    return EXIT_SUCCESS;
--		
--		    return EXIT_FAILURE;
--		  } ]]
--	)],
--	[result=yes],
--	[AC_MSG_ERROR([[This program needs a gtk 2 gecko build]])],
--        [result=maybe])
--AC_MSG_RESULT([$result])
--
- AC_MSG_CHECKING([[whether we have a gecko debug build]])
- AC_COMPILE_IFELSE(
- 	[AC_LANG_SOURCE(
-@@ -304,7 +285,9 @@ if (!stream) return 126;
- #ifdef MOZILLA_1_8_BRANCH
- version = "1.8.1";
- #else
--if (strncmp (MOZILLA_VERSION, "1.9", strlen ("1.9")) == 0) {
-+if (strncmp (MOZILLA_VERSION, "2.0", strlen ("2.0")) == 0) {
-+	version = "2.0";
-+} else if (strncmp (MOZILLA_VERSION, "1.9", strlen ("1.9")) == 0) {
- 	version = "1.9";
- } else if (strncmp (MOZILLA_VERSION, "1.8", strlen ("1.8")) == 0) {
- 	version = "1.8";
-@@ -328,7 +311,7 @@ AC_LANG_POP([C++])
- 
- gecko_cv_gecko_version_int="$(echo "$gecko_cv_gecko_version" | $AWK -F . '{print [$]1 * 1000000 + [$]2 * 1000 + [$]3}')"
- 
--if test "$gecko_cv_gecko_version_int" -lt "1007000" -o "$gecko_cv_gecko_version_int" -gt "1009000"; then
-+if test "$gecko_cv_gecko_version_int" -lt "1007000" -o "$gecko_cv_gecko_version_int" -gt "2000000"; then
- 	AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!])
- fi
- 
-@@ -350,7 +333,10 @@ if test "$gecko_cv_gecko_version_int" -g
- fi
- 
- if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
--	PKG_CHECK_EXISTS([${gecko_cv_gecko} >= 1.9.1],[gecko_cv_have_gecko_1_9_1=yes gecko_cv_gecko_version="1.9.1" gecko_cv_gecko_version_int=1009001],[gecko_cv_have_gecko_1_9_1=no])
-+	PKG_CHECK_EXISTS([${gecko_cv_gecko} >= 1.9.1],
-+        [ gecko_cv_have_gecko_1_9_1=yes
-+          if test "$gecko_cv_gecko_version_int" -lt "2000000"; then gecko_cv_gecko_version="1.9.1" gecko_cv_gecko_version_int=1009001; fi
-+        ],[gecko_cv_have_gecko_1_9_1=no])
- else
- 	gecko_cv_have_gecko_1_9_1=no
- fi
-@@ -359,6 +345,11 @@ if test "$gecko_cv_have_gecko_1_9_1" = "
-         AC_DEFINE([HAVE_GECKO_1_9_1],[1],[Define if we have gecko 1.9.1])
- fi
- 
-+if test "$gecko_cv_gecko_version_int" -ge "2000000"; then
-+	AC_DEFINE([HAVE_GECKO_2_0],[1],[Define if we have gecko 2.0])
-+	gecko_cv_have_gecko_2_0=yes
-+fi
-+
- fi # if gecko_cv_have_gecko
- 
- $1[]_VERSION=$gecko_cv_gecko_version
-@@ -407,6 +398,7 @@ AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$
- AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"])
- AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"])
- AM_CONDITIONAL([HAVE_GECKO_1_9_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_gecko_1_9_1" = "yes"])
-+AM_CONDITIONAL([HAVE_GECKO_2_0],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_gecko_2_0" = "yes"])
- AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"])
- AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
- AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"])
-Index: yelp-2.30.2/src/yelp-gecko-services.cpp
-===================================================================
---- yelp-2.30.2.orig/src/yelp-gecko-services.cpp
-+++ yelp-2.30.2/src/yelp-gecko-services.cpp
-@@ -32,7 +32,11 @@
- #include <nsIComponentManager.h>
- #include <nsComponentManagerUtils.h>
- #include <nsIComponentRegistrar.h>
-+#ifndef HAVE_GECKO_2_0
- #include <nsIGenericFactory.h>
-+#else
-+#include <nsIFactory.h>
-+#endif
- #include <nsILocalFile.h>
- #include <nsIPrintSettings.h>
- #include <nsServiceManagerUtils.h>
-@@ -418,6 +422,8 @@ PrintListener::SetPrintSettings (YelpPri
- 
- /* component registration */
- 
-+#ifndef HAVE_GECKO_2_0
-+
- NS_GENERIC_FACTORY_CONSTRUCTOR(GPrintingPromptService)
- 
- static const nsModuleComponentInfo sAppComps[] = {
-@@ -462,3 +468,115 @@ yelp_register_printing ()
-     }
-     
- }
-+
-+#else
-+
-+/*
-+ * Adapted from code from ./embedding/browser/activex/src/control/PromptService.cpp in Firefox
-+ */
-+
-+//*****************************************************************************
-+// GPrintingPromptServiceFactory
-+//*****************************************************************************
-+
-+class GPrintingPromptServiceFactory : public nsIFactory
-+{
-+public:
-+    NS_DECL_ISUPPORTS
-+    NS_DECL_NSIFACTORY
-+
-+    GPrintingPromptServiceFactory();
-+    virtual ~GPrintingPromptServiceFactory();
-+};
-+
-+//*****************************************************************************
-+
-+NS_IMPL_ISUPPORTS1(GPrintingPromptServiceFactory, nsIFactory)
-+
-+GPrintingPromptServiceFactory::GPrintingPromptServiceFactory()
-+{
-+}
-+
-+GPrintingPromptServiceFactory::~GPrintingPromptServiceFactory()
-+{
-+}
-+
-+NS_IMETHODIMP GPrintingPromptServiceFactory::CreateInstance(nsISupports *aOuter, const nsIID & aIID, void **aResult)
-+{
-+    NS_ENSURE_ARG_POINTER(aResult);
-+
-+    *aResult = NULL;
-+    GPrintingPromptService *inst = new GPrintingPromptService;
-+    if (!inst)
-+    return NS_ERROR_OUT_OF_MEMORY;
-+
-+    nsresult rv = inst->QueryInterface(aIID, aResult);
-+    if (rv != NS_OK) {
-+        // We didn't get the right interface, so clean up
-+        delete inst;
-+    }
-+
-+    return rv;
-+}
-+
-+NS_IMETHODIMP GPrintingPromptServiceFactory::LockFactory(PRBool lock)
-+{
-+    return NS_OK;
-+}
-+
-+//*****************************************************************************
-+
-+nsresult NS_NewPrintingPromptServiceFactory(nsIFactory** aFactory)
-+{
-+    NS_ENSURE_ARG_POINTER(aFactory);
-+    *aFactory = nsnull;
-+
-+    GPrintingPromptServiceFactory *result = new GPrintingPromptServiceFactory;
-+    if (!result)
-+        return NS_ERROR_OUT_OF_MEMORY;
-+
-+    NS_ADDREF(result);
-+    *aFactory = result;
-+
-+    return NS_OK;
-+}
-+
-+/*
-+ * End of adapted code.
-+ */
-+
-+static NS_DEFINE_CID(kGPrintingPromptServiceCID, G_PRINTINGPROMPTSERVICE_CID);
-+
-+void
-+yelp_register_printing ()
-+{
-+  nsresult rv;
-+  nsCOMPtr<nsIComponentRegistrar> cr;
-+  rv = NS_GetComponentRegistrar(getter_AddRefs(cr));
-+  NS_ENSURE_SUCCESS (rv, );
-+
-+  nsCOMPtr<nsIComponentManager> cm;
-+  rv = NS_GetComponentManager (getter_AddRefs (cm));
-+  NS_ENSURE_SUCCESS (rv, );
-+
-+  nsCOMPtr<nsIFactory> componentFactory;
-+  rv = NS_NewPrintingPromptServiceFactory(getter_AddRefs(componentFactory));
-+
-+  if (NS_FAILED(rv) || !componentFactory)
-+    {
-+      g_warning ("Failed to make a factory for %s\n", G_PRINTINGPROMPTSERVICE_CLASSNAME);
-+      return;
-+    }
-+
-+  rv = cr->RegisterFactory(kGPrintingPromptServiceCID,
-+			   G_PRINTINGPROMPTSERVICE_CLASSNAME,
-+			   G_PRINTINGPROMPTSERVICE_CONTRACTID,
-+			   componentFactory);
-+  if (NS_FAILED(rv))
-+    {
-+      g_warning ("Failed to register %s\n", G_PRINTINGPROMPTSERVICE_CLASSNAME);
-+    }
-+
-+}
-+
-+#endif
-Index: yelp-2.30.2/src/yelp-gecko-utils.cpp
-===================================================================
---- yelp-2.30.2.orig/src/yelp-gecko-utils.cpp
-+++ yelp-2.30.2/src/yelp-gecko-utils.cpp
-@@ -214,7 +214,7 @@ yelp_gecko_init (void)
- #ifdef XPCOM_GLUE
-     static const GREVersionRange greVersion = {
-     "1.9a", PR_TRUE,
--    "2", PR_TRUE
-+    "2.0.*", PR_TRUE
-     };
-     char xpcomLocation[PATH_MAX];
-     rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation));
diff --git a/gnome-extra/yelp/yelp-2.30.2-r5.ebuild b/gnome-extra/yelp/yelp-2.30.2-r5.ebuild
deleted file mode 100644
index eaaecc1f41af..000000000000
--- a/gnome-extra/yelp/yelp-2.30.2-r5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r5.ebuild,v 1.8 2012/05/22 03:18:43 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://projects.gnome.org/yelp/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-# FIXME: lzma/xz support will be fixed in yelp3, bug #314923
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-2:2
-	>=app-text/gnome-doc-utils-0.19.1
-	>=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	>=dev-libs/dbus-glib-0.71
-	net-libs/xulrunner:1.9
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-text/rarian-0.7
-	>=app-text/scrollkeeper-9999"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--with-gecko=libxul-embedding
-		--with-search=basic
-		--disable-lzma"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix automagic lzma support, bug #266128
-	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch"
-
-	# Fix build with xulrunner-1.9.2
-	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"
-
-	# Fix build with xulrunner-2.0 (we really need to get rid of this package)
-#	epatch "${FILESDIR}/${P}-port-to-xulrunner-2-r1.patch"
-
-	# Use g_build_filename to avoid missing slash problem
-	epatch "${FILESDIR}/${P}-missing-slash.patch"
-
-	# Add schemehandler information to the desktop file
-	epatch "${FILESDIR}/${P}-uri-handler.patch"
-
-	# Fix crash when printing a whole document
-	epatch "${FILESDIR}/${P}-print-crash.patch"
-
-	# Fix crash and infinite loop when printing HTML document
-	epatch "${FILESDIR}/${P}-html-print.patch"
-
-	# Fix small freezes when moving window
-	epatch "${FILESDIR}/${P}-freeze-move.patch"
-
-	# Ensure schema is regenerated properly to prevent warnings
-	rm -f data/yelp.schemas || die
-
-	eautoreconf
-
-	# strip stupid options in configure, see bug #196621
-	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed	failed"
-}
diff --git a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild b/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
deleted file mode 100644
index 4668cf707542..000000000000
--- a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.13 2012/05/22 03:18:43 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://projects.gnome.org/yelp/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-# FIXME: lzma/xz support will be fixed in yelp3, bug #314923
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-2:2
-	>=app-text/gnome-doc-utils-0.19.1
-	>=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	>=dev-libs/dbus-glib-0.71
-	net-libs/xulrunner:1.9
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-text/rarian-0.7
-	>=app-text/scrollkeeper-9999"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--with-gecko=libxul-embedding
-		--with-search=basic
-		--disable-lzma"
-}
-
-src_prepare() {
-	# Fix automagic lzma support, bug #266128
-	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch"
-
-	# Fix build with xulrunner-1.9.2
-	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"
-
-	# Fix build with xulrunner-2.0 (we really need to get rid of this package)
-	epatch "${FILESDIR}/${P}-port-to-xulrunner-2-r2.patch"
-
-	# Use g_build_filename to avoid missing slash problem
-	epatch "${FILESDIR}/${P}-missing-slash.patch"
-
-	# Add schemehandler information to the desktop file
-	epatch "${FILESDIR}/${P}-uri-handler.patch"
-
-	# Fix crash when printing a whole document
-	epatch "${FILESDIR}/${P}-print-crash.patch"
-
-	# Fix crash and infinite loop when printing HTML document
-	epatch "${FILESDIR}/${P}-html-print.patch"
-
-	# Fix small freezes when moving window
-	epatch "${FILESDIR}/${P}-freeze-move.patch"
-
-	# Fix -ldl linking problems with xulrunner-2.0 (bug #392367)
-	epatch "${FILESDIR}/${P}-mozilla-glue-libs.patch"
-
-	# Ensure schema is regenerated properly to prevent warnings
-	rm -f data/yelp.schemas || die
-
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# strip stupid options in configure, see bug #196621
-	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed	failed"
-}