Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: better vala support, autotools backend bugfixes, UI improvements.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

4 files changed, 45 insertions, 41 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index a0686799947d..5cd6aee6ba8e 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/anjuta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.135 2011/08/15 12:57:19 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.136 2011/11/16 02:12:25 tetromino Exp $
+
+*anjuta-3.2.1 (16 Nov 2011)
+
+  16 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -anjuta-3.0.3.0.ebuild, +anjuta-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: better vala
+  support, autotools backend bugfixes, UI improvements.
 
 *anjuta-3.0.3.0 (15 Aug 2011)
 
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 0b8d7a2157be..3b36bb39c12f 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,27 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST anjuta-2.32.1.1.tar.bz2 10171972 RMD160 2f1ae061e75761e60e0a83943ec1e31ee8b43cbf SHA1 de058e76d918a8338e9f71860cc8c0b8f13ca0a6 SHA256 f2b67609890a45d907ab5b42fd5963ba7cb41193d4a0dd2543584eca2ec5db58
-DIST anjuta-3.0.3.0.tar.xz 8342476 RMD160 ad81d7633f4654cb379aca03d7ad1b0152feef90 SHA1 5e7d5b201fc96b85c56bcd42373368184d0d98da SHA256 1615e7a86602fd4d775e8a7d4701260a80caeb8758559197574ccb27a3339368
+DIST anjuta-3.2.1.tar.xz 5763900 RMD160 4605c5096d1def4f3504fa08a543cc6fa848f6b7 SHA1 76467dfbc06d941aafc4e2ddfab7fad924863169 SHA256 1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 EBUILD anjuta-2.32.1.1.ebuild 3641 RMD160 1d1ca8cbc8cdd72bdd4de4e161cc6296044e4623 SHA1 5b4b69db08a1fa2b27bd79c1ea0d10981fa647cc SHA256 a50cdb42884472f9b3f3df9caa7f9d8b523d4b644fff5e3ed10aa555bad45d5d
-EBUILD anjuta-3.0.3.0.ebuild 3583 RMD160 652501f98a2069004ef06dd1fc7f757d06a3e220 SHA1 a3585ffd76a0954da194c930942acf1737b0ade0 SHA256 e6ce5880a57d96389f29450b805e8b6f3ebc320a4e14a0a4face89b8b41ac8d9
-MISC ChangeLog 20476 RMD160 1aae4dccb106c45e34f3c2cd6a9e5a0edbccee01 SHA1 4bb424e0caf2472bd678dd6e086cc4f98d342848 SHA256 1ca3d0a288206a898c77209fb1b4a2f7add83b7c4f460dd19981cf73c04a77c3
-MISC metadata.xml 564 RMD160 3991f32902fd098a545f71d56ee7e679c374ebbd SHA1 1b7cd27d02118a1aaf6323e5e36fe3c89508708a SHA256 242c92582192517a1ea85d0496eecd844a3abf911d0f65e74698a37d1fe16cd4
+EBUILD anjuta-3.2.1.ebuild 3688 RMD160 85d849138bdc5ae8ed7c47feac45fd3178911c2c SHA1 4f021ed35f4b7740d0a10a218eb20a813e95bfb3 SHA256 8311e8af9f8c330a463d634bb805e943b0c05c2e21e23ff098ea37a50d41b2fa
+MISC ChangeLog 20749 RMD160 2d32f1eae0d50ec8bd7dc77f3fe4aa9dfbe83684 SHA1 ef9c9d23c338cb705890ec4dd8dc37e63d89c8ef SHA256 0f6814ace674f261fdcb2af8f5681954e1823fcbfcdd16db20a73248ba74150c
+MISC metadata.xml 639 RMD160 408eedb9b9ee96986f7af335ff13e8f7089ca32d SHA1 c20964f99ccbced19c9b52552557a84824740af1 SHA256 8a7e316034145b08192abc6ea862b2e779c8cf0c7053cbc742879b4962293794
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOSRe1AAoJEO/kOhxWD91kbNAP/1L4CNTNG24Yy1/1VxZzJZfy
-GMIXKEhCyE+1MPPJNV/26JilFd/eXNZREj8F7aVsdjBdte+vaOLDuKNrZOqKPdx4
-mDKWODx/5G1sc5EE8Eqzo8TKwRzzDHcH7WOCFLEClssh+t0OfR67lethNtl5GBNZ
-A2+bFJ8uy7QDnHvb9cLxxFR7lXMfUsmqD2WZbwvUSs2GdbtAoZobjSgICb8EElR+
-i993NTMMGc7z0DzVoapmT59OAovIW8uynWxDiut09NSzs6WSsdhdinTrgv9iEOiV
-nbsGBfFdI3YyixdranHo6XanqcByG8GQONGBH0D+Q98yCEBmZjKQdcASAKgcHzc1
-BQXAte55a5JjhuVSnlogWC65ErwDPT3KCuWwcPMUQlGDjMX31UzFkx/xXI55Lfy2
-7OS2CCh4/NgmOb23ukiBEkheDEgcVk4vCazZgVHaoUwVHJ/O5sRk8WMskGhRpkJP
-OD1ifvNtdhMklLdBO55ZMylkywWDy3Pbily6L6dvPo4hNeAcJ2p+5z0Ptk9MqZuV
-8jiLMmcIci2occKsPGeAf0qvBWQ2grBObyK0F9wjTzuYva+LkTMbpPELVX/YK0nJ
-bZBQgCTYGCa1sjtb3JRSh0bLM/Gp5l0RgG0Mo7OCIXPA+Ki0AKW37koTkyXtucJJ
-JtzkA2HLM82xSyJmN0q6
-=KSUM
+iF4EAREIAAYFAk7DHBIACgkQdjK8w9WeBnBADgEAi6PELtnVVY7pyex6GkdmANWI
+LE128/C2Etlpzovs1VkA/AoneoXCidXDJo/RttbDO+dGivUWznXumWas6SzQpTa+
+=4E5E
 -----END PGP SIGNATURE-----
diff --git a/dev-util/anjuta/anjuta-3.0.3.0.ebuild b/dev-util/anjuta/anjuta-3.2.1.ebuild
index 4057b0e85569..b6c2bee38c15 100644
--- a/dev-util/anjuta/anjuta-3.0.3.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.2.1.ebuild
@@ -1,9 +1,8 @@
 # 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-3.0.3.0.ebuild,v 1.1 2011/08/15 12:57:19 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.2.1.ebuild,v 1.1 2011/11/16 02:12:28 tetromino Exp $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
@@ -17,9 +16,15 @@ 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 subversion test vala"
+IUSE="debug devhelp doc glade graphviz +introspection packagekit subversion test vala"
 
-RDEPEND=">=dev-libs/glib-2.28.0:2
+# FIXME: tests are fragile and may require a specific set of USE flags
+#RESTRICT="test"
+
+# FIXME: documentation fails to build when USE=test. But why?
+REQUIRED_USE="test? ( !doc )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.29.2:2
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.0.0:3
 	>=x11-libs/vte-0.27.6:2.90
@@ -29,7 +34,7 @@ RDEPEND=">=dev-libs/glib-2.28.0:2
 
 	sys-devel/autogen
 
-	>=gnome-extra/libgda-4.2.0:4
+	>=gnome-extra/libgda-4.99.0:5
 	dev-util/ctags
 
 	x11-libs/libXext
@@ -44,8 +49,10 @@ RDEPEND=">=dev-libs/glib-2.28.0:2
 		>=net-libs/neon-0.28.2
 		>=dev-libs/apr-1
 		>=dev-libs/apr-util-1 )
-	vala? ( >=dev-lang/vala-0.11.2:0.12 )"
-DEPEND="${RDEPEND}
+	vala? ( >=dev-lang/vala-0.13.3:0.14 )"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )"
+DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	!!dev-libs/gnome-build
 	>=sys-devel/gettext-0.17
@@ -55,12 +62,12 @@ DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.18
 	dev-util/gtk-doc-am
 	gnome-base/gnome-common
-	virtual/yacc
+	sys-devel/bison
 	sys-devel/flex
 	doc? ( >=dev-util/gtk-doc-1.4 )
 	test? (
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.5 )"
+		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"
@@ -74,24 +81,22 @@ pkg_setup() {
 		$(use_enable glade plugin-glade)
 		$(use_enable graphviz)
 		$(use_enable introspection)
+		$(use_enable packagekit)
 		$(use_enable subversion plugin-subversion)
-		$(use_enable vala)
-		VALAC=$(type -P valac-0.12)"
+		$(use_enable vala)"
+
+	if use vala; then
+		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
+	fi
 
-	# Conflics with -pg in a plugin, bug #266777
+	# Conflicts with -pg in a plugin, bug #266777
 	filter-flags -fomit-frame-pointer
 
 	python_set_active_version 2
-
-	# FIXME: documentation fails to build when USE=test. But why?
-	# FIXME: change this to REQUIRED_USE when python.eclass allows EAPI4 <-- NO!
-	use test && use doc &&
-		die "For ${P}, doc USE flag must be disabled when FEATURES=test"
+	python_pkg_setup
 }
 
 #src_prepare() {
-#	gnome2_src_prepare
-
 	# Needed to preserve introspection configure option, see bgo#633730
 	# eautoreconf needs introspection.m4
 	#
@@ -100,6 +105,7 @@ pkg_setup() {
 #	cp "${WORKDIR}"/introspection.m4 . || die
 #	intltoolize --force --copy --automake || die "intltoolize failed"
 #	AT_M4DIR="." eautoreconf
+#	gnome2_src_prepare
 #}
 
 src_install() {
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index 1b05673808e5..01c5d4dd19c7 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -7,6 +7,7 @@
     <flag name="glade">Build glade plugin for anjuta</flag>
     <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
     	for introspection</flag>
+	<flag name="packagekit">Use packagekit to search for missing tools</flag>
     <flag name="sourceview">Build sourceview editing plugin for anjuta</flag>
     <flag name='vala'>Enable support for the Vala programming
     	language</flag>