Pin glib/gtk+ to slot 2. Drop old revision.

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

5 files changed, 10 insertions, 219 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 8834675a692c..13a36f280910 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.248 2011/01/19 21:26:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.249 2011/01/24 16:17:15 eva Exp $
+
+  24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/yelp-2.28.0-include-warning-fix.patch, -yelp-2.28.1-r2.ebuild,
+  -files/yelp-2.28.1-xul192-compat.patch, yelp-2.30.2.ebuild:
+  Pin glib/gtk+ to slot 2. Drop old revision.
 
   19 Jan 2011; Markos Chandras <hwoarang@gentoo.org> yelp-2.30.2.ebuild:
   Stable on amd64 wrt bug #348987
diff --git a/gnome-extra/yelp/files/yelp-2.28.0-include-warning-fix.patch b/gnome-extra/yelp/files/yelp-2.28.0-include-warning-fix.patch
deleted file mode 100644
index aa850968d4a3..000000000000
--- a/gnome-extra/yelp/files/yelp-2.28.0-include-warning-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-bug 287132 -- gnome-extra/yelp-2.28.0 dies install_qa
-
-Has been committed upstream, won't be needed in 2.28.1
-https://bugzilla.gnome.org/show_bug.cgi?id=596903
----
-From fb76b4e570cb144c5e06bd707a268615b69a9b34 Mon Sep 17 00:00:00 2001
-From: Xake <xake@rymdraket.net>
-Date: Wed, 30 Sep 2009 20:02:48 +0200
-Subject: [PATCH] Forgotten include, fix warning.
-
----
- tests/test-uri.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/tests/test-uri.c b/tests/test-uri.c
-index 73f44df..5715874 100644
---- a/tests/test-uri.c
-+++ b/tests/test-uri.c
-@@ -25,6 +25,7 @@
- #include <string.h>
- 
- #include <gio/gio.h>
-+#include <gio/gunixoutputstream.h>
- 
- #include "yelp-uri.h"
- 
--- 
-1.6.5.rc1
-
diff --git a/gnome-extra/yelp/files/yelp-2.28.1-xul192-compat.patch b/gnome-extra/yelp/files/yelp-2.28.1-xul192-compat.patch
deleted file mode 100644
index 90fcf01940bb..000000000000
--- a/gnome-extra/yelp/files/yelp-2.28.1-xul192-compat.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From a5588114ed94d00ca64913aa5b248e09a5e13edc Mon Sep 17 00:00:00 2001
-From: Shaun McCance <shaunm@gnome.org>
-Date: Mon, 25 Jan 2010 20:21:10 +0000
-Subject: Fixing issues introduced by xulrunner 1.9.2
-
-API changes in a stable release are not fun.  With 1.9.2, setting the base
-URI when opening a stream causes a uri_selected callback.  So we compare
-the URI to what we know we're loading to prevent an infinite loop.
-
-Also, #fragment links no longer trigger a uri_selected callback.  So I've
-halfway backported the xref: method used in the yelp-3-0 branch.  It's not
-pervasive.  We rewrite it pretty much immediately.  So we still use the
-slash hack, instead of the nicer method in yelp-3-0.  This should be enough
-to keep 2.x alive.
----
-diff --git a/src/yelp-html.cpp b/src/yelp-html.cpp
-index edd8788..aa9371d 100644
---- a/src/yelp-html.cpp
-+++ b/src/yelp-html.cpp
-@@ -24,6 +24,8 @@
- #include <mozilla-config.h>
- #include <config.h>
- 
-+#include <string.h>
-+
- #include "yelp-gecko-services.h"
- #include "yelp-gecko-utils.h"
- #include "yelp-marshal.h"
-@@ -90,13 +92,20 @@ static gint
- html_open_uri (GtkMozEmbed *embed, const gchar *uri)
- {
-     YelpHtml *html = YELP_HTML (embed);
--    gboolean block_load;
-+    gboolean block_load = FALSE;
- 
-     g_return_val_if_fail (uri != NULL, FALSE);
- 
-     debug_print (DB_FUNCTION, "entering\n");
-     debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
- 
-+    if (g_str_equal (html->priv->base_uri, uri)) {
-+	/* As of xulrunner 1.6.2, open_uri is called in response
-+	   to the base URI we pass in.
-+	 */
-+	return FALSE;
-+    }
-+
-     if (!html->priv->frames_enabled) {
- 	g_signal_emit (html, signals[URI_SELECTED], 0, uri, FALSE);
- 	block_load = TRUE;
-diff --git a/src/yelp-window.c b/src/yelp-window.c
-index d436f24..401e059 100644
---- a/src/yelp-window.c
-+++ b/src/yelp-window.c
-@@ -1849,14 +1849,21 @@ html_uri_selected_cb (YelpHtml  *html,
- 		      gboolean   handled,
- 		      gpointer   user_data)
- {
-+    gchar *new_uri = uri;
-     YelpWindow *window = YELP_WINDOW (user_data);
- 
-     debug_print (DB_FUNCTION, "entering\n");
-     debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
- 
-+    if (g_str_has_prefix (uri, "xref:"))
-+        new_uri = g_strconcat (window->priv->base_uri, "#", uri + 5, NULL);
-+
-     if (!handled) {
--	yelp_window_load (window, uri);
-+	yelp_window_load (window, new_uri);
-     }
-+
-+    if (new_uri != uri)
-+        g_free (new_uri);
- }
- 
- static gboolean
-diff --git a/stylesheets/db2html.xsl.in b/stylesheets/db2html.xsl.in
-index 1ebf44e..b68f153 100644
---- a/stylesheets/db2html.xsl.in
-+++ b/stylesheets/db2html.xsl.in
-@@ -68,7 +68,7 @@ FIXME: yelp:cache no longer works
- <!-- == db.xref.target == -->
- <xsl:template name="db.xref.target">
-   <xsl:param name="linkend"/>
--  <xsl:value-of select="concat('#', $linkend)"/>
-+  <xsl:value-of select="concat('xref:', $linkend)"/>
- </xsl:template>
- 
- <!-- == db2html.css.custom == -->
-diff --git a/stylesheets/mal2html.xsl.in b/stylesheets/mal2html.xsl.in
-index 37560a7..9a55fcc 100644
---- a/stylesheets/mal2html.xsl.in
-+++ b/stylesheets/mal2html.xsl.in
-@@ -44,10 +44,10 @@
-     <xsl:when test="contains($xref, '#')">
-       <xsl:variable name="pageid" select="substring-before($xref, '#')"/>
-       <xsl:variable name="sectionid" select="substring-after($xref, '#')"/>
--      <xsl:value-of select="concat('#', $pageid, '/', $sectionid)"/>
-+      <xsl:value-of select="concat('xref:', $pageid, '/', $sectionid)"/>
-     </xsl:when>
-     <xsl:otherwise>
--      <xsl:value-of select="concat('#', $xref)"/>
-+      <xsl:value-of select="concat('xref:', $xref)"/>
-     </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
---
-cgit v0.8.3.1
diff --git a/gnome-extra/yelp/yelp-2.28.1-r2.ebuild b/gnome-extra/yelp/yelp-2.28.1-r2.ebuild
deleted file mode 100644
index e310db53558c..000000000000
--- a/gnome-extra/yelp/yelp-2.28.1-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.28.1-r2.ebuild,v 1.7 2010/07/20 02:55:43 jer Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="beagle lzma"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.17.2
-	>=x11-libs/gtk+-2.10
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	>=dev-libs/dbus-glib-0.71
-	beagle? ( || (
-		>=dev-libs/libbeagle-0.3.0
-		=app-misc/beagle-0.2* ) )
-	net-libs/xulrunner:1.9
-	sys-libs/zlib
-	app-arch/bzip2
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma-utils ) )
-	>=app-text/rarian-0.7
-	>=app-text/scrollkeeper-9999"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gecko=libxul-embedding
-		$(use_enable lzma)"
-
-	if use beagle; then
-		G2CONF="${G2CONF} --with-search=beagle"
-	else
-		G2CONF="${G2CONF} --with-search=basic"
-	fi
-}
-
-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 issues introduced by xulrunner 1.9.2, bug 301831.
-	epatch "${FILESDIR}/${P}-xul192-compat.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	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.ebuild b/gnome-extra/yelp/yelp-2.30.2.ebuild
index 47cfd9c32b89..4b159561ec9e 100644
--- a/gnome-extra/yelp/yelp-2.30.2.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.ebuild,v 1.3 2011/01/19 21:26:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2.ebuild,v 1.4 2011/01/24 16:17:15 eva Exp $
 
 EAPI="2"
 
@@ -16,8 +16,8 @@ IUSE="beagle lzma"
 
 RDEPEND=">=gnome-base/gconf-2
 	>=app-text/gnome-doc-utils-0.19.1
-	>=x11-libs/gtk+-2.18
-	>=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.18:2
+	>=dev-libs/glib-2.16:2
 	>=dev-libs/libxml2-2.6.5
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
@@ -41,9 +41,8 @@ DEPEND="${RDEPEND}
 # If eautoreconf:
 #	gnome-base/gnome-common
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--with-gecko=libxul-embedding
 		$(use_enable lzma)"