Dependency cleanup, bug #301842.

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

4 files changed, 14 insertions, 217 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index ea7465168e2d..0bc0e47fa922 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/anjuta
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.103 2009/12/27 04:26:07 nirbheek Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.104 2010/01/24 23:21:28 eva Exp $
+
+  24 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org> -anjuta-2.24.1.ebuild,
+  -anjuta-2.26.2.0.ebuild, anjuta-2.28.1.0.ebuild:
+  Dependency cleanup, bug #301842.
 
   27 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
   anjuta-2.28.1.0.ebuild:
diff --git a/dev-util/anjuta/anjuta-2.24.1.ebuild b/dev-util/anjuta/anjuta-2.24.1.ebuild
deleted file mode 100644
index 5fb341ae2be1..000000000000
--- a/dev-util/anjuta/anjuta-2.24.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-2.24.1.ebuild,v 1.1 2008/11/24 13:58:14 eva Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="http://www.anjuta.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="debug devhelp doc glade inherit-graph sourceview subversion valgrind"
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=562113
-RESTRICT="test"
-
-# symbol-db plugin depends on libgda-4
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.10.0
-	>=gnome-base/orbit-2.6.0
-	>=gnome-base/libglade-2.3.0
-	>=gnome-base/libgnome-2.12.0
-	>=gnome-base/libgnomeui-2.12.0
-	>=gnome-base/libgnomeprint-2.12.0
-	>=gnome-base/libgnomeprintui-2.12.0
-	>=gnome-base/gnome-vfs-2.12.0
-	>=gnome-base/gconf-2.12.0
-	>=x11-libs/vte-0.13.1
-	>=dev-libs/libxml2-2.4.23
-	>=x11-libs/pango-1.1.1
-	>=dev-libs/gdl-0.7.5
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-libs/gnome-build-0.3.0
-	>=x11-libs/libwnck-2.12
-	>=sys-devel/binutils-2.15.92
-	dev-libs/libxslt
-	sys-devel/autogen
-	devhelp? ( >=dev-util/devhelp-0.13 )
-	glade? ( >=dev-util/glade-3.1.4 )
-	inherit-graph? ( >=media-gfx/graphviz-2.6.0 )
-	sourceview? (
-		>=x11-libs/gtk+-2.10.0
-		>=gnome-base/libgnome-2.14.0
-		>=x11-libs/gtksourceview-2.3.1 )
-	subversion? (
-		>=dev-util/subversion-1.4.0
-		>=net-misc/neon-0.24.5
-		>=dev-libs/apr-1
-		>=dev-libs/apr-util-1 )
-	valgrind? ( dev-util/valgrind )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=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.0 )"
-
-pkg_setup() {
-	# gtk-doc is handled by eclass
-	G2CONF="${G2CONF}
-		$(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 inherit-graph plugin-class-inheritance)"
-}
-
-src_install() {
-	# Install user docs into /usr/share/doc/${PF}/
-	sed -i -e "s:doc/${PN}:doc/${PF}:g" Makefile
-	sed -i -e "s:doc/${PN}:doc/${PF}/html:g" doc/Makefile
-
-	gnome2_src_install
-	prepalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ebeep 1
-	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.26.2.0.ebuild b/dev-util/anjuta/anjuta-2.26.2.0.ebuild
deleted file mode 100644
index 9601ce88dccc..000000000000
--- a/dev-util/anjuta/anjuta-2.26.2.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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.3 2009/06/24 15:33:59 darkside 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 inherit-graph 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 NEWS 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
-}
-
-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.28.1.0.ebuild b/dev-util/anjuta/anjuta-2.28.1.0.ebuild
index 05dafd95248e..d65240031ccb 100644
--- a/dev-util/anjuta/anjuta-2.28.1.0.ebuild
+++ b/dev-util/anjuta/anjuta-2.28.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.28.1.0.ebuild,v 1.2 2009/12/27 04:26:07 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-2.28.1.0.ebuild,v 1.3 2010/01/24 23:21:28 eva Exp $
 
 EAPI="2"
 
@@ -22,12 +22,7 @@ RDEPEND=">=dev-libs/glib-2.16
 	>=x11-libs/vte-0.13.1
 	>=dev-libs/libxml2-2.4.23
 	>=dev-libs/gdl-2.27.1
-	>=app-text/gnome-doc-utils-0.3.2
-	>=x11-libs/libwnck-2.12
 	>=dev-libs/libunique-1
-	symbol-db? (
-		gnome-extra/libgda:4
-		dev-util/ctags )
 
 	dev-libs/libxslt
 	>=dev-lang/perl-5
@@ -38,21 +33,22 @@ RDEPEND=">=dev-libs/glib-2.16
 		>=dev-util/devhelp-0.22
 		>=net-libs/webkit-gtk-1 )
 	glade? ( >=dev-util/glade-3.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 )"
+		>=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? (