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

Package-Manager: portage-2.1.13.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 16 insertions, 153 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/Manifest b/dev-util/anjuta/Manifest
index 436aabbcf4a6..d6de06e8c9a0 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -4,21 +4,15 @@ Hash: SHA256
 AUX anjuta-3.5.91-cxx-check.patch 677 SHA256 ff5181d0c056c74b9716b99d32b977a1d9058f67b4e6d9b01379aaf684658571 SHA512 aa442709abdc079390d466f7339931732d381e3212158c4f2ff493db0d788004c6a319c388cd10cd9a4e4052f3d55d8b713eb3d0d6ad428c3c5e46d948e476a2 WHIRLPOOL 7586ca17396a3ca64908e8ffc3382d303e01efb7671137527646e0272bec9129b080585b34327e2ac0304e1178686f7e09efca5d54cf2c0811bd391e0552e3fa
 AUX anjuta-3.8.4-librt.patch 1384 SHA256 f6c9c436f1406acc7fd55b9d5041b79232fa12ea4b788bb1d8a7b04b6cf37968 SHA512 3f4e2bc743b71767e9373aedf8f781d3aa2f88ceeae9f734abe0f9fed14966dcc739f82e42c13e4486849207e12aac83d8ee6abaac26c68b6e393b75ef7372b2 WHIRLPOOL aa8854fb0febca04d61a305bde4d03249adf9c2b1b1a18240a9761bc15fab2668c166c5f065b8df1fa1d9359e7d2f75d6afa2fbded75bb8e3c5d84664dd8c939
 DIST anjuta-3.6.2.tar.xz 5178068 SHA256 2cf44120dcf22c4f4f25bbc65d3641c206e627776ab0f3a37ff0059844d581a2 SHA512 1c7012b97f51cce056d38c79602da16aab04fa06f24a774f66a78eedfca812ce6ddbb94bcd69fa853a8e2ac4a2abbb5d74006dda6192f379d7ebc9ff5702e711 WHIRLPOOL f013deb02459331128f777fc052901b655c3ce293e1cd321f230862191be4ef8765143100bb4c341eff1a09c857563d824c63c262513a6537518ca3a90584ea6
-DIST anjuta-3.8.3.tar.xz 5181464 SHA256 06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95 SHA512 caae0f45e3f983e3457d50592d66e34fd5476589b4de1b693c937e40e44aeaf2e3b7f9f40588f0a8fbf2c7eec91bc6f75344d42b608f10a87299cfe6e6715dd7 WHIRLPOOL 7fe55633ca80b9f899a8082a477864ff7a882fcd38394e2e04de7651686d59384ba2f1dab078fd9065158a1d5abd62640b72ef03428588cefb46fb86fdb597c7
 DIST anjuta-3.8.4.tar.xz 5322424 SHA256 eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17 SHA512 946afea788851b099e1b8d11e57c89c96c38db2513d44c6ad14d9b4403310cb0071169425749c424bf6699da3c23ca1765328940fcf8cb4b1943a565f1866794 WHIRLPOOL 51ecbb83606e7588cc5d1e2da0771722b293880b5d8d3fe9c14471bb90e9496da9a3f4190af6fd044974f4cede728e3912253ee5069d8a7c4a1cc0102b1bd042
 EBUILD anjuta-3.6.2-r1.ebuild 3730 SHA256 04276382684031e1c86aaa7718ebe6abd22f194c420ddb5f35b049c5e207a55a SHA512 540d572f94f03aadc2cca55a2f12039c96195b542c15cb22e24cde746ae3672820258867f718906904f5789320b971db72806f7b6c163700c4ef649c7b6bee3b WHIRLPOOL b4b07a78ff0096410efb9e3ba61745f27a2f4f49f032729c9a36539bebded470290656f4098a147bbaefdf4999582e0cfe79250d5b6fcdca0cd0295986de5c74
-EBUILD anjuta-3.8.3.ebuild 3538 SHA256 ddf885b1bc0da658bfba7bc782be9ff77daa607f3ef20ca69bb4121a6ead0ac8 SHA512 f349e2318a7c7e28c4d6257b3a4f17b2fc3734d89f4011a382bfe8a2414d5bd317d43b71aecb5539f646a6645936999c2035370a33d86176fc0dac9e33b01f57 WHIRLPOOL e8b00403bdf0c758729eea460df96bc128b4ae7ec2e013129b3f965fdb4a7f7056d85599794af91e25b3dd4443ced89fa404add47f0bb0ca45b92471515402dc
-EBUILD anjuta-3.8.4.ebuild 3671 SHA256 fe4c88d580425af84f7ffa192d63cae32f6333575d4d5dc839995d17baa634c6 SHA512 2d99e9e4b73ce9c80e6d4617a4c88cc15c15e09ba63c5cf0c52a0a90e2a088a21431b0a149bb0c2b8cd88ebbd291f00408ade4cbb275e96fe3f8519b3531ba98 WHIRLPOOL 0368e565d1af4f1c802c917045755bccbd66e432694e605fefba32b50a5b980e2021801834d916e811e7f71c13fcb0266e58229d91b129dfa8d4c62d8380193c
-MISC ChangeLog 24902 SHA256 b70fd7f68ae332ea663ff5ed8c6759e8cda94834460e222d77824e82aa974e8b SHA512 2ed91b52ee8b99a05f63c01c696fee362e4979c5b30b5df940422e966e480d221b40d52668825f3a09186c4131a72c1c08a163d989a902b4b05cd7cee89add7e WHIRLPOOL b0598b8a8a06e848e9ec693e23d3fd54362e8f0f93955c11c8bd67995386a7e005d71edde3f14526d02c66c0541ec7bd8e53077cc563ee5049fe7b71fd98ca14
+EBUILD anjuta-3.8.4.ebuild 3690 SHA256 7ec6986341025c4cfa2bc612d1513ada597d13b04283afb13254b125f87d4469 SHA512 a7d68742f6de625f5a38849fe561290271d1348750f5500da8c525b050a15b9d655d5d2e09b0fc776470b59c57c3e01305e6c51e30eea7f9b5e840b3a8f67d5b WHIRLPOOL acfd32ab5a30977dc499df4be9a57a8ffcb11b40f93665751ea8f6579a0b7f481f95337e6e8d3d35d0000fed60bd71dbc2dad8dcc650217baf0a7dfe522b5895
+MISC ChangeLog 25069 SHA256 b817cb5922ac498c3a622d525e898bae7bc57d7052112ae422c0992f2849e421 SHA512 31cb84bde18fce788504a96ff6b9daf594c2a2a5732c50551e1debe67ce15e5d92b4d8163a065a1514f227121dc59cffd8f43823848879da0045e9df00dcd50e WHIRLPOOL 713bf1f52424984963c4cb4132e8faeb82f72758c860aa56f22987ed8e83e373dc5e53a9f43b8303ef4a4ef3aee4c7ec28e3957716f9772a2c8dcdc1b6d56d60
 MISC metadata.xml 457 SHA256 8f80780fcedc3f018a77b6af83a8643022279ba9d4e1709d3b4b1ecc83a44156 SHA512 b06f36a7da1121e7ddd2c7cfb05637e79c4387ab5ef3d46089261dcbe1cb6a810840256c805e30a9342fbe10f1a470cd471cc48b460714e70a7176c392f34f1d WHIRLPOOL e95ea6995529e5a4b3ced5a7362bf26fe6b331d5b53aa2240e7c104b32be378c4454a00a77cf4a2dc199b048414063f77b22fd9df94f93d26b9287d6aefbb25d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR9VVKAAoJEJ0WA1zPCt1h8s8H/RE/0O9kUBOy4+4rOqDR8HgH
-pEt56mrjIJ+r/zDe0U7mAoNfcApN5NnreYLFx5VaVMAiglJmYLsx89obX0SkkI3U
-k5ARQeXBfwuk+aRWWgUoLhn1VVIKr97Wo3n0/GSIlPE6HzAtQDqfVWbATZyewq/d
-5KAdfvZMxDXBAY3hNkp3oex78/uEQChKdd/GISX/iHbzFAlUQuS0cPAYJRmkbnPE
-ULQ2fdkpU5Ca5AhVzABi1Y6FNywGYdBAo8gA3n7L2AHipdWWlCEN2Fm3nd7nTMVu
-/lDIF1/SjQF3UM9LvqfhZIOy6tCKSosIpF+AsLefcQjLN5qQvwkhnVg6w767UbA=
-=4tfC
+iEYEAREIAAYFAlIXNB8ACgkQCaWpQKGI+9SMHACfQ6jKS4GpUf5p0UN3FFkwDD4Y
+CQoAn3wB/mdPoH0/wKydBIheBmZj3L9j
+=fCk/
 -----END PGP SIGNATURE-----
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