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

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

8 files changed, 6 insertions, 438 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) \