Version bump with assorted UI improvements, better autotools support, and vala-0.16 support. Drop old.

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

3 files changed, 49 insertions, 26 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index 0f7e17147c1c..71952fd7ab4e 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/anjuta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.141 2012/05/04 17:51:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.142 2012/05/07 04:49:52 tetromino Exp $
+
+*anjuta-3.4.1 (07 May 2012)
+
+  07 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -anjuta-3.2.1.ebuild, +anjuta-3.4.1.ebuild:
+  Version bump with assorted UI improvements, better autotools support, and
+  vala-0.16 support. Drop old.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> anjuta-2.32.1.1.ebuild,
   anjuta-3.2.1.ebuild, anjuta-3.2.2.ebuild:
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index cb37952744ef..01c6a91369d5 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST anjuta-2.32.1.1.tar.bz2 10171972 RMD160 2f1ae061e75761e60e0a83943ec1e31ee8b43cbf SHA1 de058e76d918a8338e9f71860cc8c0b8f13ca0a6 SHA256 f2b67609890a45d907ab5b42fd5963ba7cb41193d4a0dd2543584eca2ec5db58
-DIST anjuta-3.2.1.tar.xz 5763900 RMD160 4605c5096d1def4f3504fa08a543cc6fa848f6b7 SHA1 76467dfbc06d941aafc4e2ddfab7fad924863169 SHA256 1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613
 DIST anjuta-3.2.2.tar.xz 5791124 RMD160 cc2c68a9924294ac47d2895d1fed97c229b69a24 SHA1 a42827d2d6d322ae37f3add7859010860971d687 SHA256 909fee6af9b86192eecac47e417f1de8bd8c759dfd2bf3ee288bb146a575683e
+DIST anjuta-3.4.1.tar.xz 6151140 RMD160 5a643e17bf317aad12912762b22e2b9af8cc6a56 SHA1 4d3a30ab389609e51bf7ccc12bc90a276269fbe8 SHA256 92edd96d7b7df178405cd229ff72d284c5499ad4496702f4efac7178e2d84369
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 EBUILD anjuta-2.32.1.1.ebuild 3635 RMD160 19466f8a963a461b4c0e25deee14060f6fc488d0 SHA1 e9a51119d3de6a2bc320cc0c6b985adf3b2e998c SHA256 200ca872435e643130d32afb06aeaa893461daf9d97ca478c7b47b763b501428
-EBUILD anjuta-3.2.1.ebuild 3677 RMD160 0613c481f6f15b5610cda27d7cf1dec37f7ef12b SHA1 cbb8a869149d4731c67dd00e084d56fa0bb564ab SHA256 cd8711892e0847c4ebb56427af4615ece0d5ccf2fe7d86072483b572dda5f594
 EBUILD anjuta-3.2.2.ebuild 3675 RMD160 cfdd0761562a0899b76d4f9950fc371b038f5f0c SHA1 d9bd90cf409fac25ab87da260b1e8da60c0f860f SHA256 8e3e8539cc26793d85053e8c283289a83e1e4f6b60c76ac7a800bb7d98359b43
-MISC ChangeLog 21278 RMD160 9fdf5a65a08a476a3f622b442b848a04f9e6060c SHA1 46ad92de863b62b3feba39460ba2a379440e28ae SHA256 c379e99c2c84af0563f5ad1fabaa9e7fec7373ff708f478779d0cabebe2e0d98
+EBUILD anjuta-3.4.1.ebuild 3701 RMD160 1a9ce99f2cce9db3b02732bf31c38bb82d5639c6 SHA1 0590c48166a691579c8f1dab8a4478b5d8c333ef SHA256 89e078db6df68e9cb731b33c79d0e618b6937df26c8b9c63cf32170fd658397f
+MISC ChangeLog 21523 RMD160 e181c843e5147b876fa0ecca99935815e622ff1a SHA1 9e4f3147fbe31d21570375a0e6c19f316e211d72 SHA256 715819c9d6ad4b9853d3273ee01914500370f1c3c65faa00b5cb27d7092a5f68
 MISC metadata.xml 639 RMD160 408eedb9b9ee96986f7af335ff13e8f7089ca32d SHA1 c20964f99ccbced19c9b52552557a84824740af1 SHA256 8a7e316034145b08192abc6ea862b2e779c8cf0c7053cbc742879b4962293794
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPp1R1AAoJEJ0WA1zPCt1hmfoIAIvXxshu7J3OBLlRlj6Fo0jk
+Yki/7Nudnuq7XY6+nHR69tVu/GP0pCdz+UNJffVDG1oyufs633eRZJLfw+pVCd8F
+lPGI/6Aeiaqg6e00Cs763biyxzSQMelInWwEwmphBywNUseW+2FReNvpg+UX0a9H
+R5sAwnFEVRxM/QmBGlMDcEQu39taREai6CRYY0cIuNNvpUqrRR4EvDrO2KBxHqiQ
+odPuiQIGhLlX4Cu0KdmHn4ecX1Ps/ZksXEGH5hiKfvk2lnT9TOD0EyZKt6vh6Blt
+jez0Sw55qvNJJzPJJQ7DfES41TsLIb8oxguY8L6A+AiSZjAF+EDkTEgqiIEz2vY=
+=Yjxl
+-----END PGP SIGNATURE-----
diff --git a/dev-util/anjuta/anjuta-3.2.1.ebuild b/dev-util/anjuta/anjuta-3.4.1.ebuild
index c5ae5eb2affd..40d063412a96 100644
--- a/dev-util/anjuta/anjuta-3.2.1.ebuild
+++ b/dev-util/anjuta/anjuta-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.2.1.ebuild,v 1.2 2012/05/04 17:51:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.4.1.ebuild,v 1.1 2012/05/07 04:49:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,7 +11,6 @@ inherit 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"
@@ -41,7 +40,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.2:2
 	x11-libs/libXrender
 
 	devhelp? ( >=dev-util/devhelp-3.0.0 )
-	glade? ( >=dev-util/glade-3.9.2:3.10 )
+	glade? ( >=dev-util/glade-3.11:3.10 )
 	graphviz? ( >=media-gfx/graphviz-2.6 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	subversion? (
@@ -49,28 +48,28 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.2:2
 		>=net-libs/neon-0.28.2
 		>=dev-libs/apr-1
 		>=dev-libs/apr-util-1 )
-	vala? ( >=dev-lang/vala-0.13.3:0.14 )"
+	vala? ( dev-lang/vala:0.16 )"
 RDEPEND="${COMMON_DEPEND}
 	packagekit? ( app-admin/packagekit-base )"
 DEPEND="${COMMON_DEPEND}
+	>=app-text/gnome-doc-utils-0.18
+	>=app-text/scrollkeeper-0.3.14-r2
 	>=dev-lang/perl-5
-	!!dev-libs/gnome-build
-	>=sys-devel/gettext-0.17
 	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.3.14-r2
-	>=app-text/gnome-doc-utils-0.18
-	dev-util/gtk-doc-am
-	gnome-base/gnome-common
 	sys-devel/bison
 	sys-devel/flex
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	!!dev-libs/gnome-build
 	doc? ( >=dev-util/gtk-doc-1.4 )
 	test? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/docbook-xml-dtd:4.5 )"
+# eautoreconf requires: gtk-doc-am, gnome-common, gobject-introspection-common
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
+	# COPYING is used in Anjuta's help/about entry
+	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
 
 	G2CONF="${G2CONF}
 		--disable-static
@@ -86,7 +85,7 @@ pkg_setup() {
 		$(use_enable vala)"
 
 	if use vala; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
+		G2CONF="${G2CONF} VALAC=$(type -P valac-0.16)"
 	fi
 
 	# Conflicts with -pg in a plugin, bug #266777
@@ -96,19 +95,22 @@ pkg_setup() {
 	python_pkg_setup
 }
 
-#src_prepare() {
-	# Needed to preserve introspection configure option, see bgo#633730
-	# eautoreconf needs introspection.m4
-	#
-	# Looks to not be needed for this version, but, if introspection configure
-	# option is lost again, revisit this.
-#	cp "${WORKDIR}"/introspection.m4 . || die
+src_prepare() {
 #	intltoolize --force --copy --automake || die "intltoolize failed"
 #	AT_M4DIR="." eautoreconf
-#	gnome2_src_prepare
-#}
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=675584
+	# avoid autoreconf
+	sed -e 's:valac:$(VALAC):' \
+		-i plugins/language-support-vala/Makefile.{am,in} || die "sed failed"
+
+	gnome2_src_prepare
+}
 
 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"