New version for GNOME 2.26. Drop libgnomeprint and gnome-vfs dependency. Merge gnome-build into anjuta. Still bundle scintilla at version 1.77.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 193 insertions, 2 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index a2e4bae99fa5..1794995626e8 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/anjuta
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.92 2009/05/26 10:52:53 leio Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.93 2009/06/01 21:03:22 eva Exp $
+
+*anjuta-2.26.2.0 (01 Jun 2009)
+
+  01 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/anjuta-2.26.0.0-symbol-db-optional.patch, +anjuta-2.26.2.0.ebuild,
+  metadata.xml:
+  New version for GNOME 2.26. Drop libgnomeprint and gnome-vfs dependency.
+  Merge gnome-build into anjuta. Still bundle scintilla at version 1.77.
 
   26 May 2009; Mart Raudsepp <leio@gentoo.org>
   +files/anjuta-2.24.2-fix-build-with-graphviz-2.22.patch,
diff --git a/dev-util/anjuta/anjuta-2.26.2.0.ebuild b/dev-util/anjuta/anjuta-2.26.2.0.ebuild
new file mode 100644
index 000000000000..29e60a76dfdd
--- /dev/null
+++ b/dev-util/anjuta/anjuta-2.26.2.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-2.26.2.0.ebuild,v 1.1 2009/06/01 21:03:22 eva 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="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug devhelp doc glade graphviz sourceview subversion +symbol-db valgrind test"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.12.10
+	>=gnome-base/orbit-2.6
+	>=gnome-base/libglade-2.3
+	>=gnome-base/libgnome-2.12
+	>=gnome-base/libgnomeui-2.12
+	>=gnome-base/gconf-2.12
+	>=x11-libs/vte-0.13.1
+	>=dev-libs/libxml2-2.4.23
+	>=dev-libs/gdl-2.26
+	>=app-text/gnome-doc-utils-0.3.2
+	>=x11-libs/libwnck-2.12
+	>=sys-devel/binutils-2.15.92
+	>=dev-libs/libunique-1
+	symbol-db? (
+		gnome-extra/libgda:4
+		dev-util/ctags )
+
+	dev-libs/libxslt
+	>=dev-lang/perl-5
+	sys-devel/autogen
+
+	devhelp? (
+		>=dev-util/devhelp-0.22
+		>=net-libs/webkit-gtk-1 )
+	glade? ( >=dev-util/glade-3.6.0 )
+	inherit-graph? ( >=media-gfx/graphviz-2.6.0 )
+	sourceview? (
+		>=x11-libs/gtk+-2.10
+		>=gnome-base/libgnome-2.14
+		>=x11-libs/gtksourceview-2.4 )
+	subversion? (
+		>=dev-util/subversion-1.5.0
+		>=net-misc/neon-0.28.2
+		>=dev-libs/apr-1
+		>=dev-libs/apr-util-1 )
+	valgrind? ( dev-util/valgrind )"
+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
+	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 README ROADMAP THANKS TODO"
+
+pkg_setup() {
+	if ! use symbol-db; then
+		elog "You disabled symbol-db which will disallow using projects."
+	fi
+
+	G2CONF="${G2CONF}
+		--docdir=/usr/share/doc/${PF}
+		$(use_enable debug)
+		$(use_enable devhelp plugin-devhelp)
+		$(use_enable glade plugin-glade)
+		$(use_enable valgrind plugin-valgrind)
+		$(use_enable sourceview plugin-sourceview)
+		$(use_enable !sourceview plugin-scintilla)
+		$(use_enable subversion plugin-subversion)
+		$(use_enable symbol-db plugin-symbol-db)
+		$(use_enable graphviz)" # Toggles inherit-plugin and performance-plugin
+
+	# 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.26.0.0-symbol-db-optional.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+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/files/anjuta-2.26.0.0-symbol-db-optional.patch b/dev-util/anjuta/files/anjuta-2.26.0.0-symbol-db-optional.patch
new file mode 100644
index 000000000000..b091ebeac07b
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-2.26.0.0-symbol-db-optional.patch
@@ -0,0 +1,75 @@
+diff -Naur anjuta-2.25.903.0.orig/configure.in anjuta-2.25.903.0/configure.in
+--- anjuta-2.25.903.0.orig/configure.in	2009-03-03 00:22:52.000000000 +0530
++++ anjuta-2.25.903.0/configure.in	2009-03-14 20:36:35.677136513 +0530
+@@ -312,6 +312,29 @@
+ 	AC_DEFINE(HAVE_GRAPHVIZ, [], [Define if we have GraphViz >= 2.6.0])
+ fi
+ 
++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 -------------------------------------------------------------
+ 
+@@ -357,9 +380,6 @@
+ fi
+ AM_CONDITIONAL(HAVE_PLUGIN_SCINTILLA, [test x$scintilla = xyes])
+ 
+-PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
+-		[libgda-4.0 >= $GDA_REQUIRED])
+-
+ dnl Valgrind plugin
+ dnl check for libbfd
+ dnl -------------------------------------------------------------
+@@ -1071,6 +1091,13 @@
+ 	 echo "        Requires graphviz (>= 2.6.0); http://graphviz.org"
+ 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$valgrind = xyes ]; then
+         echo "Building Valgrind debugger plugin: .....................YES"
+ else
+diff -Naur anjuta-2.25.903.0.orig/plugins/symbol-db/Makefile.am anjuta-2.25.903.0/plugins/symbol-db/Makefile.am
+--- anjuta-2.25.903.0.orig/plugins/symbol-db/Makefile.am	2009-02-17 02:28:39.000000000 +0530
++++ anjuta-2.25.903.0/plugins/symbol-db/Makefile.am	2009-03-14 20:33:18.573135840 +0530
+@@ -1,3 +1,5 @@
++if HAVE_PLUGIN_SYMBOL_DB
++
+ SUBDIRS = images test 
+ 
+ symbol_db_datadir = $(anjuta_data_dir)
+@@ -77,6 +79,8 @@
+ prefs_glade_files = anjuta-symbol-db.glade
+ include $(top_srcdir)/scripts/build-schemas.mk
+ 
++endif
++
+ EXTRA_DIST = \
+ 	$(plugin_in_files) \
+ 	$(symbol_db_plugin_DATA) \
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index df9429d4406f..8127d87edaf8 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="glade">Build glade plugin for anjuta</flag>
     <flag name="inherit-graph">Build inheritance graphing plugin for anjuta</flag>
     <flag name="sourceview">Build sourceview editing plugin for anjuta</flag>
+	<flag name="symbol-db">Enable symbol database plugin for anjuta</flag>
     <flag name="valgrind">Build valgrind plugin for anjuta</flag>
   </use>
 </pkgmetadata>