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

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

13 files changed, 12 insertions, 689 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index d683e57a9229..c88dab18647c 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/anjuta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.132 2011/03/22 19:04:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.133 2011/03/31 04:11:10 ssuominen Exp $
+
+  31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> anjuta-2.32.1.1.ebuild:
+  sparc stable wrt #353436, Comment #29. Thanks to Alex Buell for testing.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> anjuta-2.32.1.1.ebuild:
   Marking anjuta-2.32.1.1 ppc stable for bug 353436
diff --git a/dev-util/anjuta/anjuta-2.28.2.0.ebuild b/dev-util/anjuta/anjuta-2.28.2.0.ebuild
deleted file mode 100644
index 27b2b7280c64..000000000000
--- a/dev-util/anjuta/anjuta-2.28.2.0.ebuild
+++ /dev/null
@@ -1,111 +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/anjuta/anjuta-2.28.2.0.ebuild,v 1.9 2011/03/16 10:18:55 nirbheek Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2 flag-o-matic
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="http://www.anjuta.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="debug devhelp doc glade +sourceview subversion +symbol-db test"
-
-# FIXME: Anjuta has some CRITICAL and WARNINGS messages, that would be nice to fix them and/or report on upstream
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.14:2
-	>=gnome-base/orbit-2.6:2
-	>=gnome-base/gconf-2.12:2
-	>=x11-libs/vte-0.13.1:0
-	>=dev-libs/libxml2-2.4.23:2
-	>=dev-libs/gdl-2.27.1:1
-	>=dev-libs/libunique-1:1
-
-	dev-libs/libxslt
-	>=dev-lang/perl-5
-	dev-perl/Locale-gettext
-	sys-devel/autogen
-
-	devhelp? (
-		>=dev-util/devhelp-0.22
-		net-libs/webkit-gtk:2 )
-	glade? ( >=dev-util/glade-3.6.0:3 )
-	subversion? (
-		>=dev-vcs/subversion-1.5.0
-		>=net-libs/neon-0.28.2
-		>=dev-libs/apr-1
-		>=dev-libs/apr-util-1 )
-	sourceview? ( >=x11-libs/gtksourceview-2.4:2.0 )
-	symbol-db? (
-		gnome-extra/libgda:4
-		dev-util/ctags )"
-DEPEND="${RDEPEND}
-	!!dev-libs/gnome-build
-	>=sys-devel/gettext-0.14
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.20
-	>=app-text/scrollkeeper-0.3.14-r2
-	>=app-text/gnome-doc-utils-0.3.2
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	test? (
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.5 )"
-
-DOCS="AUTHORS ChangeLog FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
-pkg_setup() {
-	if ! use symbol-db; then
-		ewarn "You have disabled symbol-db, which will disallow using projects"
-	fi
-
-	if ! use sourceview; then
-		ewarn "You have disabled sourceview, which means you now have no editor"
-	fi
-
-	G2CONF="${G2CONF}
-		--docdir=/usr/share/doc/${PF}
-		$(use_enable debug)
-		$(use_enable devhelp plugin-devhelp)
-		$(use_enable glade plugin-glade)
-		$(use_enable sourceview plugin-sourceview)
-		$(use_enable subversion plugin-subversion)
-		$(use_enable symbol-db plugin-symbol-db)"
-
-	# Conflics wiht -pg in a plugin, bug #266777
-	filter-flags -fomit-frame-pointer
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Make Symbol DB optional
-	epatch "${FILESDIR}/${PN}-2.28.1.0-symbol-db-optional.patch"
-
-	# Do not force the debugging mode when --disable-debug
-	# is given on the command line.
-	epatch "${FILESDIR}/${PN}-2.28.1.0-debug-mode.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	# Anjuta uses a custom rule to install DOCS, get rid of it
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/${PN} || die "rm failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ebeep 1
-	elog ""
-	elog "Some project templates may require additional development"
-	elog "libraries to function correctly. It goes beyond the scope"
-	elog "of this ebuild to provide them."
-	epause 5
-}
diff --git a/dev-util/anjuta/anjuta-2.30.2.1.ebuild b/dev-util/anjuta/anjuta-2.30.2.1.ebuild
deleted file mode 100644
index f8fa13470f43..000000000000
--- a/dev-util/anjuta/anjuta-2.30.2.1.ebuild
+++ /dev/null
@@ -1,116 +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/anjuta/anjuta-2.30.2.1.ebuild,v 1.10 2011/03/16 10:18:55 nirbheek Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2 flag-o-matic multilib
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="http://www.anjuta.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="sparc"
-IUSE="debug devhelp doc glade +sourceview subversion +symbol-db test"
-
-# FIXME: Anjuta has some CRITICAL and WARNINGS messages, that would be nice to fix them and/or report on upstream
-# FIXME: vala support is automagic
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.17.10:2
-	>=dev-libs/dbus-glib-0.70
-	>=gnome-base/orbit-2.6:2
-	>=gnome-base/gconf-2.12:2
-	>=x11-libs/vte-0.13.1:0
-	>=dev-libs/libxml2-2.4.23:2
-	>=dev-libs/gdl-2.27.1:1
-	>=dev-libs/libunique-1:1
-
-	dev-libs/libxslt
-	>=dev-lang/perl-5
-	dev-perl/Locale-gettext
-	sys-devel/autogen
-
-	devhelp? (
-		>=dev-util/devhelp-0.22
-		net-libs/webkit-gtk:2 )
-	glade? ( >=dev-util/glade-3.6.0:3 )
-	subversion? (
-		>=dev-vcs/subversion-1.5.0
-		>=net-libs/neon-0.28.2
-		>=dev-libs/apr-1
-		>=dev-libs/apr-util-1 )
-	sourceview? ( >=x11-libs/gtksourceview-2.9.7:2.0 )
-	symbol-db? (
-		gnome-extra/libgda:4
-		dev-util/ctags )"
-DEPEND="${RDEPEND}
-	!!dev-libs/gnome-build
-	>=sys-devel/gettext-0.14
-	>=dev-util/intltool-0.40.1
-	>=dev-util/pkgconfig-0.20
-	>=app-text/scrollkeeper-0.3.14-r2
-	>=app-text/gnome-doc-utils-0.3.2
-	dev-util/gtk-doc-am
-	gnome-base/gnome-common
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	test? (
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.5 )"
-
-DOCS="AUTHORS ChangeLog FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
-pkg_setup() {
-	if ! use symbol-db; then
-		ewarn "You have disabled symbol-db, which will disallow using projects"
-	fi
-
-	if ! use sourceview; then
-		ewarn "You have disabled sourceview, which means you now have no editor"
-	fi
-
-	G2CONF="${G2CONF}
-		--docdir=/usr/share/doc/${PF}
-		$(use_enable debug)
-		$(use_enable devhelp plugin-devhelp)
-		$(use_enable glade plugin-glade)
-		$(use_enable sourceview plugin-sourceview)
-		$(use_enable subversion plugin-subversion)
-		$(use_enable symbol-db plugin-symbol-db)"
-
-	# Conflics wiht -pg in a plugin, bug #266777
-	filter-flags -fomit-frame-pointer
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Make Symbol DB optional
-	epatch "${FILESDIR}/${PN}-2.30.2.0-symbol-db-optional.patch"
-
-	# Do not force the debugging mode when --disable-debug
-	# is given on the command line.
-	epatch "${FILESDIR}/${PN}-2.30.2.0-debug-mode.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	# Anjuta uses a custom rule to install DOCS, get rid of it
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/${PN} || die "rm failed"
-	find "${D}/usr/$(get_libdir)/${PN}/" -name "*.la" -delete \
-		|| die "Could not remove *.la files"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ebeep 1
-	elog ""
-	elog "Some project templates may require additional development"
-	elog "libraries to function correctly. It goes beyond the scope"
-	elog "of this ebuild to provide them."
-	epause 5
-}
diff --git a/dev-util/anjuta/anjuta-2.32.1.1.ebuild b/dev-util/anjuta/anjuta-2.32.1.1.ebuild
index d6f4c9a0c5aa..b386dc346406 100644
--- a/dev-util/anjuta/anjuta-2.32.1.1.ebuild
+++ b/dev-util/anjuta/anjuta-2.32.1.1.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/anjuta/anjuta-2.32.1.1.ebuild,v 1.7 2011/03/22 19:04:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-2.32.1.1.ebuild,v 1.8 2011/03/31 04:11:10 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 IUSE="debug devhelp doc glade graphviz +introspection +sourceview subversion test vala"
 
 RDEPEND=">=dev-libs/glib-2.25.15:2
diff --git a/dev-util/anjuta/files/anjuta-2.28.1.0-debug-mode.patch b/dev-util/anjuta/files/anjuta-2.28.1.0-debug-mode.patch
deleted file mode 100644
index ce8f0bb773fd..000000000000
--- a/dev-util/anjuta/files/anjuta-2.28.1.0-debug-mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Mon, 26 Oct 2009 11:12:22 +0100
-Subject: [PATCH] Fix the forced debugging mode even if --disable-debug is given on the command line
-
----
- configure.in |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 5f4c4bc..611faaa 100644
---- a/configure.in
-+++ b/configure.in
-@@ -80,7 +80,9 @@ AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
- dnl Enable debugging mode
- AC_ARG_ENABLE(debug,
-   AC_HELP_STRING([--enable-debug],[Enable debug messages]),
--  AM_CFLAGS="$AM_CFLAGS -DDEBUG")
-+  [if test "x$enableval" = "xyes"; then
-+      AM_CFLAGS="$AM_CFLAGS -DDEBUG"
-+   fi])
- AC_SUBST(AM_CFLAGS)
- 
- ANJUTA_LDFLAGS="-no-undefined"
--- 
-1.6.5.1
-
diff --git a/dev-util/anjuta/files/anjuta-2.28.1.0-symbol-db-optional.patch b/dev-util/anjuta/files/anjuta-2.28.1.0-symbol-db-optional.patch
deleted file mode 100644
index 1a7e8aa8f6e4..000000000000
--- a/dev-util/anjuta/files/anjuta-2.28.1.0-symbol-db-optional.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 62ed030d66574884c7d716c436e9e20ce6da829b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 25 Oct 2009 20:58:15 +0100
-Subject: [PATCH] Allow disabling symbol-db plugin
-
----
- configure.in                  |   32 ++++++++++++++++++++++++++++++--
- plugins/symbol-db/Makefile.am |    4 ++++
- 2 files changed, 34 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 197cafd..e7c5445 100644
---- a/configure.in
-+++ b/configure.in
-@@ -230,6 +230,29 @@ fi
- 
- AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$gladeui_found = xyes])
- 
-+dnl Plugin Symbol DB
-+dnl -------------------------------------------------------------
-+
-+AC_ARG_ENABLE(plugin-symbol-db,
-+	AC_HELP_STRING([--disable-plugin-symbol-db],[libgda-4 based symbol DB]),
-+	[ if test "$enableval" = "yes"; then
-+		user_disabled_symbol_db=1
-+	  fi ],
-+	[ user_disabled_symbol_db=0 ])
-+
-+AC_MSG_CHECKING(if symbol db plugin is disabled)
-+if test "$user_disabled_symbol_db" = 1; then
-+	AC_MSG_RESULT(no)
-+	symbol_db="yes"
-+
-+	PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
-+			[libgda-4.0 >= $GDA_REQUIRED])
-+else
-+	AC_MSG_RESULT(yes)
-+	symbol_db="no"
-+fi
-+AM_CONDITIONAL(HAVE_PLUGIN_SYMBOL_DB, [test x$symbol_db = xyes])
-+
- dnl Build gtksourceview plugin only on gnome 2.14 and gtk 2.10
- dnl -------------------------------------------------------------
- 
-@@ -255,8 +278,6 @@ fi
- 
- AM_CONDITIONAL(HAVE_PLUGIN_SOURCEVIEW, [test x$sourceview = xyes])
- 
--PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
--		[libgda-4.0 >= $GDA_REQUIRED])
- 
- dnl Setup Anjuta Library flags
- dnl --------------------------
-@@ -862,6 +883,13 @@ else
-        echo "        Requires devhelp >= 0.22"
- fi
- 
-+if [ test x$symbol_db = xyes ]; then
-+        echo "Building Symbol DB plugin: .............................YES"
-+else
-+        echo "Building Symbol DB plugin: .............................NO"
-+	echo "		Requires libgda-4"
-+fi
-+
- if [ test x$sourceview = xyes ]; then
-         echo "Building GtkSourceView based editor: ...................YES"
- else
-diff --git a/plugins/symbol-db/Makefile.am b/plugins/symbol-db/Makefile.am
-index 9b94b6d..07aad96 100644
---- a/plugins/symbol-db/Makefile.am
-+++ b/plugins/symbol-db/Makefile.am
-@@ -1,3 +1,5 @@
-+if HAVE_PLUGIN_SYMBOL_DB
-+
- SUBDIRS = images benchmark anjuta-tags test-queries
- 
- symbol_db_datadir = $(anjuta_data_dir)
-@@ -82,6 +84,8 @@ libanjuta_symbol_db_la_LIBADD = \
- prefs_ui_files = anjuta-symbol-db.ui
- include $(top_srcdir)/scripts/build-schemas.mk
- 
-+endif
-+
- EXTRA_DIST = \
- 	$(plugin_in_files) \
- 	$(symbol_db_plugin_DATA) \
--- 
-1.6.5.rc1
-
diff --git a/dev-util/anjuta/files/anjuta-2.30.2.0-debug-mode.patch b/dev-util/anjuta/files/anjuta-2.30.2.0-debug-mode.patch
deleted file mode 100644
index da1dbe191d31..000000000000
--- a/dev-util/anjuta/files/anjuta-2.30.2.0-debug-mode.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: [PATCH] Fix the forced debugging mode even if --disable-debug is given on the command line
---- configure.in~	2010-06-05 12:00:40.000000000 +0200
-+++ configure.in	2010-06-13 16:56:42.000000000 +0200
-@@ -84,7 +84,9 @@
- dnl Enable debugging mode
- AC_ARG_ENABLE(debug,
-   AC_HELP_STRING([--enable-debug],[Enable debug messages]),
--  AM_CFLAGS="$AM_CFLAGS -DDEBUG"
-+  [if test "x$enableval" = "xyes"; then
-+      AM_CFLAGS="$AM_CFLAGS -DDEBUG"
-+  fi]
-   AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG")
- AC_SUBST(AM_CFLAGS)
- AC_SUBST(AM_CXXFLAGS)
diff --git a/dev-util/anjuta/files/anjuta-2.30.2.0-symbol-db-optional.patch b/dev-util/anjuta/files/anjuta-2.30.2.0-symbol-db-optional.patch
deleted file mode 100644
index cb9eea76bc80..000000000000
--- a/dev-util/anjuta/files/anjuta-2.30.2.0-symbol-db-optional.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 25 Oct 2009 20:58:15 +0100
-Subject: [PATCH] Allow disabling symbol-db plugin
-From: Pacho Ramos <pacho@gentoo.org>
-Date: Thu, 17 Jun 2010 19:33:10 +0100
-Subject: Port to 2.30
---- configure.in.orig	2010-06-17 19:27:35.000000000 +0200
-+++ configure.in	2010-06-17 19:42:15.000000000 +0200
-@@ -246,6 +246,29 @@
- 
- AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$gladeui_found = xyes])
- 
-+dnl Plugin Symbol DB
-+dnl -------------------------------------------------------------
-+
-+AC_ARG_ENABLE(plugin-symbol-db,
-+	AC_HELP_STRING([--disable-plugin-symbol-db],[libgda-4 based symbol DB]),
-+	[ if test "$enableval" = "yes"; then
-+		user_disabled_symbol_db=1
-+	fi ],
-+	[ user_disabled_symbol_db=0 ])
-+
-+AC_MSG_CHECKING(if symbol db plugin is disabled)
-+if test "$user_disabled_symbol_db" = 1; then
-+	AC_MSG_RESULT(no)
-+	symbol_db="yes"
-+
-+	PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
-+		[libgda-4.0 >= $GDA_REQUIRED])
-+else
-+	AC_MSG_RESULT(yes)
-+	symbol_db="no"
-+fi
-+AM_CONDITIONAL(HAVE_PLUGIN_SYMBOL_DB, [test x$symbol_db = xyes])
-+
- dnl Check for gtksourceview
- dnl -------------------------------------------------------------
- 
-@@ -286,9 +309,6 @@
- 
- AM_CONDITIONAL(ENABLE_VALA, [test x$enable_vala = xyes])
- 
--PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
--		[libgda-4.0 >= $GDA_REQUIRED])
--
- dnl Setup Anjuta Library flags
- dnl --------------------------
- LIBANJUTA_CFLAGS='$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
-@@ -917,6 +937,13 @@
-        echo "        Requires devhelp >= 0.22"
- fi
- 
-+if [ test x$symbol_db = xyes ]; then
-+	echo "Building Symbol DB plugin: .............................YES"
-+else
-+	echo "Building Symbol DB plugin: .............................NO"
-+	echo "          Requires libgda-4"
-+fi
-+
- if [ test x$sourceview = xyes ]; then
-         echo "Building GtkSourceView based editor: ...................YES"
- else
---- plugins/symbol-db/Makefile.am.orig	2010-06-17 19:46:26.000000000 +0200
-+++ plugins/symbol-db/Makefile.am	2010-06-17 19:46:58.000000000 +0200
-@@ -1,3 +1,5 @@
-+if HAVE_PLUGIN_SYMBOL_DB
-+
- SUBDIRS = . anjuta-tags images benchmark
- 
- symbol_db_datadir = $(anjuta_data_dir)
-@@ -83,6 +85,8 @@
- prefs_ui_files = anjuta-symbol-db.ui
- include $(top_srcdir)/scripts/build-schemas.mk
- 
-+endif
-+
- EXTRA_DIST = \
- 	$(plugin_in_files) \
- 	$(symbol_db_plugin_DATA) \
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