Fix DEPEND as we are running eautoreconf (#481386 by Peter Stuge), drop old.

(Portage version: 2.1.13.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 11 insertions, 142 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index e7b95891f33d..de70937e28bd 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/anjuta
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.165 2013/07/28 17:30:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.166 2013/08/23 10:06:18 pacho Exp $
+
+  23 Aug 2013; Pacho Ramos <pacho@gentoo.org> -anjuta-3.8.3.ebuild,
+  anjuta-3.8.4.ebuild:
+  Fix DEPEND as we are running eautoreconf (#481386 by Peter Stuge), drop old.
 
   28 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org> anjuta-3.8.4.ebuild,
   +files/anjuta-3.8.4-librt.patch:
diff --git a/dev-util/anjuta/anjuta-3.8.3.ebuild b/dev-util/anjuta/anjuta-3.8.3.ebuild
deleted file mode 100644
index 9d2f5818cd24..000000000000
--- a/dev-util/anjuta/anjuta-3.8.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.8.3.ebuild,v 1.2 2013/06/30 15:38:41 jlec Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-# libanjuta-language-vala.so links to a specific slot of libvala; we want to
-# avoid automagic behavior.
-VALA_MIN_API_VERSION="0.20"
-VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
-
-inherit eutils gnome2 flag-o-matic multilib readme.gentoo python-single-r1 vala
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="http://projects.gnome.org/anjuta/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="debug devhelp glade +introspection packagekit subversion test vala"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: make python dependency non-automagic
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.4:3
-	>=x11-libs/vte-0.27.6:2.90
-	>=dev-libs/libxml2-2.4.23
-	>=dev-libs/gdl-3.5.5:3=
-	>=x11-libs/gtksourceview-3:3.0
-
-	sys-devel/autogen
-
-	>=gnome-extra/libgda-5:5=
-	dev-util/ctags
-
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	${PYTHON_DEPS}
-
-	devhelp? ( >=dev-util/devhelp-3.7.4:= )
-	glade? ( >=dev-util/glade-3.12:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	subversion? (
-		>=dev-vcs/subversion-1.5.0:=
-		>=net-libs/neon-0.28.2:=
-		>=dev-libs/apr-1:=
-		>=dev-libs/apr-util-1:= )
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!dev-libs/gnome-build
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
-
-	app-text/yelp-tools
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires: gnome-common, gobject-introspection-common, yelp-tools
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use vala; then
-		DISABLE_AUTOFORMATTING="yes"
-		DOC_CONTENTS="To create a generic vala project you will need to specify
-desired valac versioned binary to be used, to do that you
-will need to:
-1. Go to 'Build' -> 'Configure project'
-2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
-'Configure options'."
-	fi
-
-	# COPYING is used in Anjuta's help/about entry
-	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
-	# Conflicts with -pg in a plugin, bug #266777
-	filter-flags -fomit-frame-pointer
-
-	# python2.7-configure in Fedora vs. python-configure in Gentoo
-	sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
-		-i plugins/am-project/tests/anjuta.lst || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable debug) \
-		$(use_enable devhelp plugin-devhelp) \
-		$(use_enable glade plugin-glade) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable subversion plugin-subversion) \
-		$(use_enable vala)
-}
-
-src_install() {
-	# COPYING is used in Anjuta's help/about entry
-	docompress -x "/usr/share/doc/${PF}/COPYING"
-
-	# 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"
-
-	use vala && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use vala && readme.gentoo_print_elog
-}
diff --git a/dev-util/anjuta/anjuta-3.8.4.ebuild b/dev-util/anjuta/anjuta-3.8.4.ebuild
index ebf5cb50d887..3594a9117d85 100644
--- a/dev-util/anjuta/anjuta-3.8.4.ebuild
+++ b/dev-util/anjuta/anjuta-3.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.8.4.ebuild,v 1.3 2013/07/28 17:30:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.8.4.ebuild,v 1.4 2013/08/23 10:06:18 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -18,7 +18,7 @@ HOMEPAGE="http://projects.gnome.org/anjuta/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 IUSE="debug devhelp glade +introspection packagekit subversion test vala"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -68,12 +68,11 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/docbook-xml-dtd:4.5 )
+	app-text/yelp-tools
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
 "
-#	app-text/yelp-tools
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-#"
-# Above are required by eautoreconf 
+# yelp-tools, gi-common and gnome-common are required by eautoreconf 
 
 pkg_setup() {
 	python-single-r1_pkg_setup