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

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

6 files changed, 15 insertions, 228 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/Manifest b/gnome-extra/yelp/Manifest
index 7930e028b9fa..1cf51fdc0c82 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -2,23 +2,19 @@
 Hash: SHA1
 
 AUX yelp-2.26.0-automagic-lzma.patch 1326 RMD160 9913b5dba53c1dcbc046e790327339e366e10acd SHA1 9992c4e197a502ab2937f8dcef5bf492b0e128df SHA256 1f5686f0d5ddf716dd7ae9844447344bc19750a695d09b3b4e4580178e18c44f
-AUX yelp-2.28.0-include-warning-fix.patch 703 RMD160 ebf02c008cb26130774b1b99137a7ea97e3b9227 SHA1 91f51645b0fd7540c7a581665f181eac7b468798 SHA256 8f8b22c17a8f88a04e44c1b49c009bca21fe9f5ba5726dd6ae4a32084ebdd81c
 AUX yelp-2.28.1-system-nspr.patch 271 RMD160 2933a00fc9e627d20d7d62617a19effa4c0f1566 SHA1 804726aec12d8ffde5c5ea379d2ffcf30a70edb2 SHA256 9d3c5c2a906909596050f8afd762f929c9a4a3d51be14944ccab48149cf9b274
-AUX yelp-2.28.1-xul192-compat.patch 3645 RMD160 64e635662702dae237f5e4d8fd3b4d2cc9ed892e SHA1 b1509be9ac3ea04bba06d0223d6f6aa0c39b9d76 SHA256 004648d03f24b40d162ace2b38f836e989abd1f8d7e17f26d7240c0d043c5939
 AUX yelp-2.30.1-fix-toc.patch 769 RMD160 8fbae215912342a2e8dced497a2e45df352634cb SHA1 acc801f48a1fc3379d26ee85c327a563b0aa1eb8 SHA256 0dbf1a19551ac99c0ab3aafc0122524f8662659a3ec855fdcfecd346c0d0ed85
 AUX yelp-2.30.1-open-link.patch 1364 RMD160 341a95d078d260d45baafb3f9518b5c760c67464 SHA1 9cb1da0c8576c9a546c37d2eddf68ecf2600833c SHA256 6a59b2fd5e0d8c85f24743cc1fc8677687bf62d1ace44aafa581ff5a1950a212
-DIST yelp-2.28.1.tar.bz2 1136184 RMD160 0cac3a3504065fece952390a05b9612cfe180f11 SHA1 260719600148490effaba2e78a9d536f251f5b66 SHA256 860cfb348cbe199bca64203c82858d012fe505194573f8290be7a85de6c80a22
 DIST yelp-2.30.1.tar.bz2 1139961 RMD160 a8529e8cbdb021690bcc8a399a1d1b14b0e964ad SHA1 941b4c3aecd379ea2ff26d12a37efe32afbf0ab1 SHA256 4b453e994f8e57bc5c4637dba2c315536f30e90741b74b0bee218cbb436eb20c
 DIST yelp-2.30.2.tar.bz2 1159521 RMD160 a92fde9f64489c5dee6a249964245b087aab5981 SHA1 b36d36449ff19844a429b4e2bd5eaad0a7537281 SHA256 5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165
-EBUILD yelp-2.28.1-r2.ebuild 1903 RMD160 f5728f986d34f571cd1ea38b18b1190a942e95f7 SHA1 99258310b0f41d4af0d615cc47e7a26c17744fa1 SHA256 1f4a280db6ed405c1691a03dd0208d110ec939a978d4cff0bbb22d447561847c
 EBUILD yelp-2.30.1-r1.ebuild 1973 RMD160 85452f06ca5eaa813e58d39580d1411c2f3ccd0f SHA1 38f1c660b1ddfbb9931f4956a6e6d29220bc2318 SHA256 3daef8e5f31614d4b3bae1539e4fb62c01627fbf8895fbaff6693f9c8ad1c210
-EBUILD yelp-2.30.2.ebuild 1812 RMD160 ff8db9a163027e3e7a35565491b9df4b96da1bd2 SHA1 f4d63d702cab4634432d606ec005491ec49b787a SHA256 21b105e2290d6a0bf2a97ceb504627322a9ef93be23e43fb119a7d3c70b78385
-MISC ChangeLog 30273 RMD160 b835e26325962c3823cc4f37365d1cbf704d697c SHA1 23c1f8505927bcc4b8443c7b0aee36189432fbe3 SHA256 d6c73afc24ed89c66a7616fb7d3b4d41d1637c5bc6c371cd830bf028c5a4710a
+EBUILD yelp-2.30.2.ebuild 1811 RMD160 7a01beb084a6be1e2781f83c5322c8e5cfc996ce SHA1 c751d8accbe0723facc206e4358724c5a81de915 SHA256 851d145a09e48bc982425773152e6a305d7c5fc1e4f4f4b36bff18e3b6008ca3
+MISC ChangeLog 30503 RMD160 20a4059f1cb06e18e0ce965a797f819bc6e18b80 SHA1 ab287b96c53e396a58edeb00de5b7c9f991b1fe9 SHA256 2d3b21f25e21fc2d44a0bb5b1e082683636f35cc8219e34b9f48fca14b00da41
 MISC metadata.xml 364 RMD160 b8d1a4cb0331c368c94ba6f8b72b52396b1728da SHA1 99cf408c018565500005654707a4bd1b1ab28334 SHA256 7f315cc2f1c8d303ba2dfa5c2542ba3b9b65635a3d1b978032f114ce6ebc5a4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk03VrMACgkQ9/cejkQaxBAhuQCePV1ThIkkHOyQ+oRyNRFX8epb
-6cIAn37nOiejZ6r7wdA2UPG4u2UlZBI6
-=eGQK
+iEYEARECAAYFAk09phEACgkQ1fmVwcYIWAY6TgCbBoPmPGW/qpgN/DVc7qrxLwtf
+9qgAn0/YSgK0hn72GSzlyA/DIW71P25t
+=AprW
 -----END PGP SIGNATURE-----
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)"