sparc stable wrt #353436, Comment #29. Thanks to Alex Buell for testing.

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

5 files changed, 6 insertions, 251 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index da5dd6b84aa2..499ea4714adb 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.123 2011/03/22 19:05:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.124 2011/03/31 04:13:01 ssuominen Exp $
+
+  31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> devhelp-2.32.0.ebuild:
+  sparc stable wrt #353436, Comment #29. Thanks to Alex Buell for testing.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> devhelp-2.32.0.ebuild:
   Marking devhelp-2.32.0 ppc stable for bug 353436
diff --git a/dev-util/devhelp/devhelp-2.30.1.ebuild b/dev-util/devhelp/devhelp-2.30.1.ebuild
deleted file mode 100644
index bd45f02903c3..000000000000
--- a/dev-util/devhelp/devhelp-2.30.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-2.30.1.ebuild,v 1.7 2011/03/16 10:20:29 nirbheek Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils toolchain-funcs gnome2 python
-
-DESCRIPTION="An API documentation browser for GNOME 2"
-HOMEPAGE="http://live.gnome.org/devhelp"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-2.6:2
-	>=x11-libs/gtk+-2.10:2
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/libwnck-2.10:1
-	>=net-libs/webkit-gtk-1.1.13:2
-	>=dev-libs/libunique-1:1"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		G2CONF="${G2CONF} --with-compile-warnings=no"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	rm py-compile
-	ln -s $(type -P true) py-compile
-
-	# Fix build with older libunique, bug #286890
-	sed -e 's/-DG.*_SINGLE_INCLUDES//' \
-		-e 's/-DG.*_DEPRECATED//' \
-		-i src/Makefile.am src/Makefile.in || die "sed 2 failed"
-}
-
-src_install() {
-	gnome2_src_install
-	# Internal library, punt .la file
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins/devhelp
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins/devhelp
-}
diff --git a/dev-util/devhelp/devhelp-2.32.0.ebuild b/dev-util/devhelp/devhelp-2.32.0.ebuild
index d8a71bd04bf2..dd9c59997ec6 100644
--- a/dev-util/devhelp/devhelp-2.32.0.ebuild
+++ b/dev-util/devhelp/devhelp-2.32.0.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/dev-util/devhelp/devhelp-2.32.0.ebuild,v 1.7 2011/03/22 19:05:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-2.32.0.ebuild,v 1.8 2011/03/31 04:13:01 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/devhelp"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=gnome-base/gconf-2.6:2
diff --git a/dev-util/devhelp/files/devhelp-0.21-xulrunner19.patch b/dev-util/devhelp/files/devhelp-0.21-xulrunner19.patch
deleted file mode 100644
index 3fcd70fd5fe4..000000000000
--- a/dev-util/devhelp/files/devhelp-0.21-xulrunner19.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# https://bugs.gentoo.org/show_bug.cgi?id=250306
-# Allow to build xulrunner with libxul in place of libxul-embedding
---- a/configure.in	2008-09-22 16:43:15.000000000 +0300
-+++ b/configure.in	2009-03-16 20:32:14.000000000 +0200
-@@ -88,13 +88,16 @@
- *) AC_MSG_ERROR([$gecko_cv_gecko is not supported])
- esac
- 
--if test $GECKO = libxul-embedding; then
--	GECKO_CFLAGS=`pkg-config --cflags libxul-embedding '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`
--	GECKO_LIBS=`pkg-config --libs libxul-embedding '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`
--else
--	GECKO_CFLAGS=`pkg-config --cflags ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`
--	GECKO_LIBS=`pkg-config --libs ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`
--fi
-+case "$GECKO" in
-+libxul*)
-+	GECKO_CFLAGS=`pkg-config --cflags ${GECKO} '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`;
-+	GECKO_LIBS=`pkg-config --libs ${GECKO} '>=' $gecko_min_version $gecko_cv_extra_pkg_dependencies`;
-+	;;
-+*)
-+	GECKO_CFLAGS=`pkg-config --cflags ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`;
-+	GECKO_LIBS=`pkg-config --libs ${GECKO}-xpcom '>=' $gecko_min_version $GECKO_EXTRA_PKG_DEPENDENCIES`;
-+	;;
-+esac
- 
- AC_SUBST([GECKO_CFLAGS])
- AC_SUBST([GECKO_LIBS])
diff --git a/dev-util/devhelp/files/devhelp-0.23-fix-anchor-links.patch b/dev-util/devhelp/files/devhelp-0.23-fix-anchor-links.patch
deleted file mode 100644
index 52173fff531f..000000000000
--- a/dev-util/devhelp/files/devhelp-0.23-fix-anchor-links.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From af67fbedccab5044808a489a9f3a5540d42adcf2 Mon Sep 17 00:00:00 2001
-From: Enrico Tröge <enrico.troeger@uvena.de>
-Date: Thu, 19 Feb 2009 10:02:43 +0000
-Subject: Use file: URIs instead of local paths, fixes use with more recent webkit
-
-2009-02-19  Enrico Tröge  <enrico.troeger@uvena.de>
-
-	* src/dh-assistant-view.c: (assistant_view_set_link):
-	* src/dh-book-tree.c: (book_tree_find_uri_foreach):
-	* src/dh-link.c: (link_free), (dh_link_new):
-	* src/dh-link.h: Use file: URIs instead of local paths, fixes use
-	with more recent webkit versions.
-
-svn path=/trunk/; revision=1265
----
-Gentoo bug 272886
----
---- a/src/dh-assistant-view.c
-+++ b/src/dh-assistant-view.c
-@@ -169,6 +169,7 @@ assistant_view_set_link (DhAssistantView *view,
-         gsize                length;
-         gchar               *key;
-         gsize                key_length;
-+        gsize                offset = 0;
-         const gchar         *start;
-         const gchar         *end;
- 
-@@ -203,7 +204,10 @@ assistant_view_set_link (DhAssistantView *view,
-                 return;
-         }
- 
--        file = g_mapped_file_new (filename, FALSE, NULL);
-+        if (g_str_has_prefix (filename, "file://"))
-+            offset = 7;
-+        
-+        file = g_mapped_file_new (filename + offset, FALSE, NULL);
-         if (!file) {
-                 g_free (filename);
-                 return;
-@@ -326,7 +330,7 @@ assistant_view_set_link (DhAssistantView *view,
-                  * anchor links are handled internally in webkit.
-                  */
-                 tmp = g_path_get_dirname (filename);
--                base = g_strconcat ("file://", tmp, "/fake", NULL);
-+                base = g_strconcat (tmp, "/fake", NULL);
-                 g_free (tmp);
- 
-                 webkit_web_view_load_html_string (
---- a/src/dh-book-tree.c
-+++ b/src/dh-book-tree.c
-@@ -245,22 +245,14 @@ book_tree_find_uri_foreach (GtkTreeModel *model,
- 			    FindURIData  *data)
- {
- 	DhLink      *link;
--	const gchar *uri;
-         gchar       *link_uri;
- 
- 	gtk_tree_model_get (model, iter,
- 			    COL_LINK, &link,
- 			    -1);
- 
--	/* A bit hackish, could be made more generic. */
--	if (g_str_has_prefix (data->uri, "file://")) {
--		uri = data->uri + 7;
--	} else {
--		uri = data->uri;
--	}
--
-         link_uri = dh_link_get_uri (link);
--	if (g_str_has_prefix (uri, link_uri)) {
-+	if (g_str_has_prefix (data->uri, link_uri)) {
- 		data->found = TRUE;
- 		data->iter = *iter;
- 		data->path = gtk_tree_path_copy (path);
-diff --git a/src/dh-link.c b/src/dh-link.c
-index 230af73..f320daa 100644
---- a/src/dh-link.c
-+++ b/src/dh-link.c
-@@ -33,7 +33,7 @@ struct _DhLink {
-         gchar       *base;
- 
-         gchar       *name;
--        gchar       *uri;
-+        gchar       *filename;
- 
-         DhLink      *book;
-         DhLink      *page;
-@@ -64,7 +64,7 @@ link_free (DhLink *link)
- 	g_free (link->base);
- 	g_free (link->id);
- 	g_free (link->name);
--	g_free (link->uri);
-+	g_free (link->filename);
- 
-         if (link->book) {
-                 dh_link_unref (link->book);
-@@ -83,12 +83,12 @@ dh_link_new (DhLinkType   type,
- 	     const gchar *name,
- 	     DhLink      *book,
- 	     DhLink      *page,
--	     const gchar *uri)
-+	     const gchar *filename)
- {
- 	DhLink *link;
- 
- 	g_return_val_if_fail (name != NULL, NULL);
--	g_return_val_if_fail (uri != NULL, NULL);
-+	g_return_val_if_fail (filename != NULL, NULL);
- 
-         if (type == DH_LINK_TYPE_BOOK) {
-                 g_return_val_if_fail (base != NULL, NULL);
-@@ -110,7 +110,7 @@ dh_link_new (DhLinkType   type,
-         }
- 
- 	link->name = g_strdup (name);
--	link->uri = g_strdup (uri);
-+	link->filename = g_strdup (filename);
- 
- 	if (book) {
-                 link->book = dh_link_ref (book);
-@@ -205,11 +205,16 @@ dh_link_get_book_id (DhLink *link)
- gchar *
- dh_link_get_uri (DhLink *link)
- {
--        if (link->type == DH_LINK_TYPE_BOOK) {
--                return g_strconcat (link->base, "/", link->uri, NULL);
--        }
-+	gchar *base, *uri;
-+
-+        if (link->type == DH_LINK_TYPE_BOOK)
-+                base = link->base;
-+        else
-+                base = link->book->base;
-+
-+	uri = g_strconcat ("file://", base, "/", link->filename, NULL, NULL);
- 
--        return g_strconcat (link->book->base, "/", link->uri, NULL);
-+	return uri;
- }
- 
- DhLinkType
---- a/src/dh-link.h
-+++ b/src/dh-link.h
-@@ -51,7 +51,7 @@ DhLink *     dh_link_new                (DhLinkType     type,
- 					 const gchar   *name,
-                                          DhLink        *book,
-                                          DhLink        *page,
--					 const gchar   *uri);
-+					 const gchar   *filename);
- void         dh_link_free               (DhLink        *link);
- gint         dh_link_compare            (gconstpointer  a,
- 					 gconstpointer  b);
---
-cgit v0.8.2