Version bump for Gnome 2.30

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

5 files changed, 221 insertions, 6 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index 2cf747301f53..254ce0e86908 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/anjuta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.111 2010/04/21 22:06:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.112 2010/06/17 18:54:08 pacho Exp $
+
+*anjuta-2.30.2.0 (17 Jun 2010)
+
+  17 Jun 2010; Pacho Ramos <pacho@gentoo.org> +anjuta-2.30.2.0.ebuild,
+  +files/anjuta-2.30.2.0-debug-mode.patch,
+  +files/anjuta-2.30.2.0-symbol-db-optional.patch:
+  Version bump for Gnome 2.30
 
   21 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -files/anjuta-1.2.4-gtk-fix.patch, -files/anjuta-2.1.0-sandbox-fix.patch,
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index da68836a7c22..e6286bd459de 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -4,16 +4,20 @@ Hash: SHA1
 AUX anjuta-2.24.2-fix-build-with-graphviz-2.22.patch 2165 RMD160 30187892047f728b6b708ab7461a5e665da23e57 SHA1 3373e55321098716b20c678824f6704746381ec9 SHA256 6eb726dfc2a4f6b1fb2f9432bd7f7e9fc51612a91830c805b7ce3f5c16df5469
 AUX anjuta-2.28.1.0-debug-mode.patch 725 RMD160 aba1c9e2d52ddf51b74456a0d7cb088bc6649500 SHA1 b90000983a3aa362b47e480e678382cbc0b1d757 SHA256 1b52dc746e6bb5e2c2799789c5e69f8319d841cf7025d38c4208edda9b1a3429
 AUX anjuta-2.28.1.0-symbol-db-optional.patch 2559 RMD160 5254d3d2d278ecc0f69ce45b5f40eb691e9f5f56 SHA1 b4ab7b0db209f15ffdcccdd4331588d3c46f2435 SHA256 1f8a14362a608d0a01e3834dab1754ae67c917a9f841fe105fbedea64e2de5b4
+AUX anjuta-2.30.2.0-debug-mode.patch 538 RMD160 4d6231dd65c9acc59f0b83a37d0681af5c8d37dd SHA1 3e8d374314f7f368baeb1f278b7711e54ed6f713 SHA256 28bacbf3c985c47442cb66b12650799a318f9930e0907d5b9a082792ee187e2c
+AUX anjuta-2.30.2.0-symbol-db-optional.patch 2544 RMD160 48fdd9ce11ef5d33adc6f949db9cf7438fbb3602 SHA1 213797ec3e880b9186c03a8af73f678bf6e05230 SHA256 430a7ccfdfde7b2bf0a4598196e3fb301213e067afe83aa2b8548be41f249365
 DIST anjuta-2.24.2.tar.bz2 6713913 RMD160 1f1a7b2820b8f7c10e05f7da0a51727f497dcb75 SHA1 bcbab37d362f36bf1811bcd5c62c26c4fd31ec3e SHA256 7b60753b98a12c5ae85b7fee126d280385ac67dd94a855ab50c17de862df6c68
 DIST anjuta-2.28.2.0.tar.bz2 7521022 RMD160 088b87ed3dd2f6c070727a6e4db228f51e61e0d4 SHA1 ea008d7d55d0c7d075e5c3cf028607ce58a9a473 SHA256 6d8216fb1fe2541e7a3080c0ffb62bc0527c296ce97a1bd25d2064a8522f664a
+DIST anjuta-2.30.2.0.tar.bz2 9410951 RMD160 732c6decf11a20837466cfcfb5993daf7361c67b SHA1 f656a1426f12e08ccc47801c63247d56c8610092 SHA256 a281fe303fce08026407b24e8a676f4458031bc6dd6b2799c028494d22dcd34b
 EBUILD anjuta-2.24.2.ebuild 2628 RMD160 d4fd47719024f276acdf57cd7476510d0200d361 SHA1 ea7444310601fe4cfe2b607f22ac6659ba6ab194 SHA256 2c7b2577917393e0371e3f8ccf9fb1fd344329d24ec235c6f01db240ce81a58a
 EBUILD anjuta-2.28.2.0.ebuild 2944 RMD160 0c8ceb67bd2e8bb591a1325497d9bb40156e6b5f SHA1 82150e9d1a823241f240dba9d05d7fea48a07a87 SHA256 71f533536770a77993c97cbf64638236c4255c324194ff81524c1e06f251a287
-MISC ChangeLog 15695 RMD160 71d4821af2322014318e57f18a80d2bcbdf243d2 SHA1 d0bc7d36279115f6fe84c1395046ede5874a27a8 SHA256 97a473d44900d879012b94f03813728a7a91457678082d5deb52265db2c80b03
+EBUILD anjuta-2.30.2.0.ebuild 2949 RMD160 1842f59a94fa5add1fa84299bee604220f18ee9f SHA1 654d1d455793f7f4f61a2cfc02077d3162630d0d SHA256 f7e6944bee23fcbcde2d40778e7d2121e20df05ead352e92f4e1c0d69a49d592
+MISC ChangeLog 15925 RMD160 dc81b1c1eca899bf416d93a59e287a7252b7faf3 SHA1 83cfe4da1a8464b850706dc11fdf35ed7dc5b3e1 SHA256 bbb36de3381cf2a3e05ee19a7c1f18d8b876377c66ade4ea16a78e1d6fbb008f
 MISC metadata.xml 598 RMD160 e43dba80e7eaa729577a12dfc5638456be322569 SHA1 620afa68d2d84483351c3b2bc19038696601db0d SHA256 b8f5ae31cae3d6087fdc909cc78410fd037273dc036ef89ffd18a9d36b8cf628
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvPduMACgkQ1fmVwcYIWAbl8ACgk59rEZt8ci47y9JxDIbJIYsb
-OPsAoKCAJmCriHkY8GnulIu4jZ/unJRM
-=phK7
+iEYEARECAAYFAkwab1YACgkQCaWpQKGI+9S99gCfaiJHm2ryh3KgaCH2cefoSfYe
+nVMAn2nDjWGI4fQUHU6xzg4QzYVlwUJS
+=o2qF
 -----END PGP SIGNATURE-----
diff --git a/dev-util/anjuta/anjuta-2.30.2.0.ebuild b/dev-util/anjuta/anjuta-2.30.2.0.ebuild
new file mode 100644
index 000000000000..443d21fee6cd
--- /dev/null
+++ b/dev-util/anjuta/anjuta-2.30.2.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2010 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.0.ebuild,v 1.1 2010/06/17 18:54:08 pacho 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 ~x86-fbsd"
+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.18
+	>=x11-libs/gtk+-2.17.10
+	>=gnome-base/orbit-2.6
+	>=gnome-base/gconf-2.12
+	>=x11-libs/vte-0.13.1
+	>=dev-libs/libxml2-2.4.23
+	>=dev-libs/gdl-2.27.1
+	>=dev-libs/libunique-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-1 )
+	glade? ( >=dev-util/glade-3.6.0 )
+	subversion? (
+		>=dev-util/subversion-1.5.0
+		>=net-misc/neon-0.28.2
+		>=dev-libs/apr-1
+		>=dev-libs/apr-util-1 )
+	sourceview? ( >=x11-libs/gtksourceview-2.4 )
+	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.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"
+}
+
+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.30.2.0-debug-mode.patch b/dev-util/anjuta/files/anjuta-2.30.2.0-debug-mode.patch
new file mode 100644
index 000000000000..da1dbe191d31
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-2.30.2.0-debug-mode.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..cb9eea76bc80
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-2.30.2.0-symbol-db-optional.patch
@@ -0,0 +1,79 @@
+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) \