Pin gtksourceview dependency to slot 2. Clean up old revisions.

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

4 files changed, 10 insertions, 192 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index 77b87a80e182..66193e43c196 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,11 @@
 # 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.126 2010/12/31 18:58:21 pacho Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.127 2011/01/24 15:51:47 eva Exp $
+
+  24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/anjuta-2.24.2-fix-build-with-graphviz-2.22.patch,
+  -anjuta-2.32.1.0.ebuild, anjuta-2.32.1.1.ebuild:
+  Pin gtksourceview dependency to slot 2. Clean up old revisions.
 
 *anjuta-2.32.1.1 (31 Dec 2010)
 
diff --git a/dev-util/anjuta/anjuta-2.32.1.0.ebuild b/dev-util/anjuta/anjuta-2.32.1.0.ebuild
deleted file mode 100644
index cf1dbca43ce5..000000000000
--- a/dev-util/anjuta/anjuta-2.32.1.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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.32.1.0.ebuild,v 1.2 2010/12/05 17:55:49 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="2"
-
-inherit autotools eutils gnome2 flag-o-matic multilib python
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="http://www.anjuta.org"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-	>=x11-libs/gtk+-2.20.0:2
-	>=dev-libs/dbus-glib-0.70
-	>=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
-
-	>=gnome-extra/libgda-4.1.6:4
-	dev-util/ctags
-
-	x11-libs/libXft
-	x11-libs/libXrender
-
-	devhelp? (
-		>=dev-util/devhelp-0.22
-		>=net-libs/webkit-gtk-1 )
-	glade? ( >=dev-util/glade-3.6.7 )
-	graphviz? ( >=media-gfx/graphviz-2.6 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.6 )
-	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 )
-	vala? ( >=dev-lang/vala-0.9.5:0.10 )"
-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 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
-	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 graphviz)
-		$(use_enable introspection)
-		$(use_enable sourceview plugin-sourceview)
-		$(use_enable subversion plugin-subversion)
-		$(use_enable vala)"
-
-	if use vala; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.10)"
-	fi
-
-	# Conflics wiht -pg in a plugin, bug #266777
-	filter-flags -fomit-frame-pointer
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Needed to preserve introspection configure option, see bgo#633730
-	# eautoreconf needs introspection.m4
-	cp "${WORKDIR}"/introspection.m4 . || die
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	AT_M4DIR="." eautoreconf
-}
-
-src_install() {
-	# Anjuta uses a custom rule to install DOCS, get rid of it
-	gnome2_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	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."
-}
diff --git a/dev-util/anjuta/anjuta-2.32.1.1.ebuild b/dev-util/anjuta/anjuta-2.32.1.1.ebuild
index c595910e4ca5..9644bd3ba92e 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-2010 Gentoo Foundation
+# 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.1 2010/12/31 18:58:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-2.32.1.1.ebuild,v 1.2 2011/01/24 15:51:47 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -48,7 +48,7 @@ RDEPEND=">=dev-libs/glib-2.25.15:2
 		>=net-libs/neon-0.28.2
 		>=dev-libs/apr-1
 		>=dev-libs/apr-util-1 )
-	sourceview? ( >=x11-libs/gtksourceview-2.9.7 )
+	sourceview? ( >=x11-libs/gtksourceview-2.9.7:2.0 )
 	vala? ( >=dev-lang/vala-0.9.5:0.10 )"
 DEPEND="${RDEPEND}
 	!!dev-libs/gnome-build
diff --git a/dev-util/anjuta/files/anjuta-2.24.2-fix-build-with-graphviz-2.22.patch b/dev-util/anjuta/files/anjuta-2.24.2-fix-build-with-graphviz-2.22.patch
deleted file mode 100644
index 070c950114b9..000000000000
--- a/dev-util/anjuta/files/anjuta-2.24.2-fix-build-with-graphviz-2.22.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From badf2dbc86ea694d64d593b31cb4e5d4ccb5bc2d Mon Sep 17 00:00:00 2001
-From: Massimo Cora <mcora@src.gnome...>
-Date: Sat, 21 Mar 2009 11:54:34 +0000
-Subject: fixed #576057 – doesn't build with graphviz 2.22.2 (backport from trunk)
-
-	* plugins/class-inheritance/class-inherit.c
-	(cls_inherit_draw_graph):
-	* plugins/profiler/gprof-function-call-chart-view.c
-	(async_draw_graph):
-	fixed #576057 – doesn't build with graphviz 2.22.2 (backport from trunk)
-
-svn path=/branches/gnome-2-26/; revision=4886
-
-Backported to 2.24 for node => graph_node renaming change in 2.26
----
-diff --git a/plugins/class-inheritance/class-inherit.c b/plugins/class-inheritance/class-inherit.c
-index d7346f1..88a3004 100644
---- a/plugins/class-inheritance/class-inherit.c
-+++ b/plugins/class-inheritance/class-inherit.c
-@@ -815,9 +815,18 @@ cls_inherit_draw_graph (AnjutaClassInheritance *plugin)
- 		gdouble node_width;
- 		gdouble node_height;
- 		point node_pos;
-+#ifndef ND_coord_i
-+		pointf node_posf;
-+#endif
- 		
- 		/* get some infos from the node */
-+#ifdef ND_coord_i
- 		node_pos = ND_coord_i(node);
-+#else
-+		node_posf = ND_coord(node);
-+		PF2P(node_posf,node_pos);
-+#endif
-+		
- 		node_width = ND_width (node);
- 		node_height = ND_height (node);
- 
-diff --git a/plugins/profiler/gprof-function-call-chart-view.c b/plugins/profiler/gprof-function-call-chart-view.c
-index 315cee2..3070d46 100644
---- a/plugins/profiler/gprof-function-call-chart-view.c
-+++ b/plugins/profiler/gprof-function-call-chart-view.c
-@@ -530,6 +530,9 @@ async_draw_graph (gpointer user_data)
- 	Agedge_t *current_edge;
- 	Agraph_t *current_graph;
- 	point node_pos;
-+#ifndef ND_coord_i	
-+	pointf node_posf;
-+#endif	
- 	gdouble node_width;
- 	gdouble node_height;
- 	
-@@ -541,7 +544,13 @@ async_draw_graph (gpointer user_data)
- 		
- 		if (self->priv->current_node)
- 		{
-+#ifdef ND_coord_i			
- 			node_pos = ND_coord_i (self->priv->current_node);
-+#else
-+			node_posf = ND_coord (self->priv->current_node);
-+			PF2P(node_posf,node_pos);
-+#endif			
-+			
- 			node_pos.y += self->priv->y_offset;
- 			node_width = ND_width (self->priv->current_node);
- 			node_height = ND_height (self->priv->current_node);
---
-cgit v0.8.2