Add new version for Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

7 files changed, 102 insertions, 152 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/Manifest b/gnome-extra/yelp/Manifest
index aa80675a6384..09f7af180a6c 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,17 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.24.0.tar.bz2 1023876 RMD160 dad1fe1c4d0adcfff15e6c538f6cfb6b8cf082f5 SHA1 18082b28de342c170978c8433a2ce544361598b2 SHA256 7566177d23c3cac7725981f2d04de22923499318a067044158cff17f43957a0a
 DIST yelp-2.26.0.tar.bz2 1021362 RMD160 5f6f3f7b504d7522a39ba9e55e22cf2ca75589d7 SHA1 c1c3262d77d4515a0fd0a7840307533fda9ed0ea SHA256 0c5a91a206b26ef714e9929404f1711caadcee481299566011b4ae4232d151d0
-DIST yelp-2.28.0.tar.bz2 1099965 RMD160 d175584e7ef345137e43293171cf657016a39e5e SHA1 e22c1f80662e9450990c20fc9a42441280925dbc SHA256 a4f74dda9e4fb09e7b7a870055173e1c21593592b702139bf1f27e5c804dea78
 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
 EBUILD yelp-2.24.0-r10.ebuild 1598 RMD160 773023751a83291be3a3ef97d8348f89299ab730 SHA1 3b0a6dacae4c40181a08d0faaa4e17b433ac657f SHA256 b55735f533db7be32f849f18579f6e2782bdf031a6431d1f3b73ccf714029da8
 EBUILD yelp-2.24.0.ebuild 1719 RMD160 d841447645f6f603b58a85cb35b2e6d82f2a5e69 SHA1 b4172c1c245a0cd5e0331a9abc302165a511faba SHA256 a2ff71708370efb4657134d8c1092f08cc6fdacfbb6ccb76f4ad91dfabf2c4e5
 EBUILD yelp-2.26.0.ebuild 1703 RMD160 6f07e357e1090406e3d3fc28916dfb971f8f3691 SHA1 def086d1c36e31640ec7cd424b8a26effac964b5 SHA256 af6fc324406dea3830d6eb71a0a6660981ed2b32332936d17426ab945b84dc8e
-EBUILD yelp-2.28.0.ebuild 1797 RMD160 0033d713f85a159a3be789ba28c868be4bca56ef SHA1 a58b12191e7a19450016176c60de13f412c05ca8 SHA256 9f8b6d5a9ea867b0fe2816883876b310f3765bc0406c1f535e6db8aec612e2ce
-EBUILD yelp-2.28.1-r1.ebuild 1814 RMD160 2f72401a2e24df054f9f09b12f3e06eb51e01aeb SHA1 3f704d63b6001adb0c34eddefd7a583eea5839d3 SHA256 02f5dad1e93fe22154089be5a3d8c7c08d9149fe6ee2f96e48de372c8091111e
 EBUILD yelp-2.28.1-r2.ebuild 1913 RMD160 bb2ee399e857a6ca27d982806d196b7402b04150 SHA1 6978dc04a93a0d904105406ee276fa3bf1a4ea68 SHA256 38372bd5e952bf947922066c3309f104a586112e5a5f5b4b3c3330c45fa11edd
-EBUILD yelp-2.28.1.ebuild 1675 RMD160 bcb59580d6364c3e8304b131a4b1eb8523033e47 SHA1 1de9f87bfb042026a271f624e831dd24c53bc29a SHA256 8b046a14b9bc9959fbbd40e503034d0e957182ed2a6b7d7cb0fa73fbcb7b5048
-MISC ChangeLog 28349 RMD160 71e1a60ed8cde82a2b99265849fd50663346bd22 SHA1 b748d06a6920aa665ed1a4213898296766ea7599 SHA256 bae8282a5ab06ef43b7143d32d1341509f57995f8859edff1ce068030b0711d6
+EBUILD yelp-2.30.1-r1.ebuild 1985 RMD160 6f26616fc2e659023028dcf7d243abb31827613d SHA1 e9b2f5d7bef9f33df535d663f6c83e63e81be298 SHA256 e7941b3928fdf35c3c0f5f585eaad39d8d679ca208859ac32950126efdfa1b8b
+MISC ChangeLog 28624 RMD160 3ccb6d9da0c2e4f6a6f98fde864952815d39c143 SHA1 76dbf258a7755e2aaf41ae59bd5ac28e755439ad SHA256 3851a549c8f9df02a5badec34a106be045f39f9b41f766867eb56aed36ea1373
 MISC metadata.xml 364 RMD160 b8d1a4cb0331c368c94ba6f8b72b52396b1728da SHA1 99cf408c018565500005654707a4bd1b1ab28334 SHA256 7f315cc2f1c8d303ba2dfa5c2542ba3b9b65635a3d1b978032f114ce6ebc5a4c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwVObsACgkQCaWpQKGI+9QaqwCfep38vjevMrRcXPlu1JBqLW4u
+dmQAn0Sp/4TLKCrPMDo/DP5NLoTU6kDz
+=jtqG
+-----END PGP SIGNATURE-----
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