Add new version for Gnome 2.30

(Portage version: 2.1.8.3/cvs/Linux x86_64)

6 files changed, 87 insertions, 147 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index f0933067b17a..8ec6c230d78e 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.234 2010/05/24 15:53:04 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.235 2010/06/13 20:04:05 pacho Exp $
+
+*yelp-2.30.1-r1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> -yelp-2.28.0.ebuild,
+  -yelp-2.28.1.ebuild, -yelp-2.28.1-r1.ebuild, +yelp-2.30.1-r1.ebuild,
+  +files/yelp-2.30.1-fix-toc.patch, +files/yelp-2.30.1-open-link.patch:
+  Add new version for Gnome 2.30.
 
   23 May 2010; <nixnut@gentoo.org> yelp-2.28.1-r2.ebuild:
   ppc stable #314015
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
new file mode 100644
index 000000000000..3d959fc722ce
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.30.1-fix-toc.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..6cd46748205e
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.30.1-open-link.patch
@@ -0,0 +1,47 @@
+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/yelp-2.28.0.ebuild b/gnome-extra/yelp/yelp-2.28.0.ebuild
deleted file mode 100644
index d64d1071c3fd..000000000000
--- a/gnome-extra/yelp/yelp-2.28.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.28.0.ebuild,v 1.3 2009/11/23 14:57:46 armin76 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-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 install_qa failure, bug #287132
-	# Won't be needed in 2.28.1
-	epatch "${FILESDIR}/${P}-include-warning-fix.patch"
-
-	# Fix automagic lzma support, bug #266128
-	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.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.28.1.ebuild b/gnome-extra/yelp/yelp-2.28.1.ebuild
deleted file mode 100644
index 499fdd585eff..000000000000
--- a/gnome-extra/yelp/yelp-2.28.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 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.ebuild,v 1.2 2009/11/23 14:57:46 armin76 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-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"
-
-	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.28.1-r1.ebuild b/gnome-extra/yelp/yelp-2.30.1-r1.ebuild
index 605139a88926..ef4f812caf8b 100644
--- a/gnome-extra/yelp/yelp-2.28.1-r1.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2010/01/07 21:40:34 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.1-r1.ebuild,v 1.1 2010/06/13 20:04:06 pacho Exp $
 
 EAPI="2"
 
@@ -11,12 +11,12 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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
+	>=app-text/gnome-doc-utils-0.19.1
+	>=x11-libs/gtk+-2.18
 	>=dev-libs/glib-2.16
 	>=dev-libs/libxml2-2.6.5
 	>=dev-libs/libxslt-1.1.4
@@ -64,6 +64,12 @@ src_prepare() {
 	# Fix build with xulrunner-1.9.2
 	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"
 
+	# Fix TOC title I18N, bgo#615141
+	epatch "${FILESDIR}/${P}-fix-toc.patch"
+
+	# Fix "Open Link in New Window", bgo#615457
+	epatch "${FILESDIR}/${P}-open-link.patch"
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf