Version bump for gnome-3.6. Update license.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

7 files changed, 188 insertions, 14 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index 99a1ddc16bab..40b724d828ba 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.151 2012/11/17 12:31:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.152 2012/12/17 10:19:26 tetromino Exp $
+
+*anjuta-3.6.2-r1 (17 Dec 2012)
+
+  17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> anjuta-3.4.3.ebuild,
+  anjuta-3.4.4.ebuild, +files/anjuta-3.5.91-cxx-check.patch,
+  +anjuta-3.6.2-r1.ebuild, metadata.xml:
+  Version bump for gnome-3.6. Update license.
 
   17 Nov 2012; Pacho Ramos <pacho@gentoo.org> -anjuta-2.32.1.1.ebuild,
   -anjuta-3.2.2.ebuild, anjuta-3.4.4.ebuild, metadata.xml:
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 5cf3872d188e..9ad6305d3c9b 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,16 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX anjuta-3.5.91-cxx-check.patch 677 SHA256 ff5181d0c056c74b9716b99d32b977a1d9058f67b4e6d9b01379aaf684658571 SHA512 aa442709abdc079390d466f7339931732d381e3212158c4f2ff493db0d788004c6a319c388cd10cd9a4e4052f3d55d8b713eb3d0d6ad428c3c5e46d948e476a2 WHIRLPOOL 7586ca17396a3ca64908e8ffc3382d303e01efb7671137527646e0272bec9129b080585b34327e2ac0304e1178686f7e09efca5d54cf2c0811bd391e0552e3fa
 DIST anjuta-3.4.3.tar.xz 6177392 SHA256 17881fb3e965a9d347cc1d3596c6d3ba0fe6c6c2a22025a49b1ab092bf6246d0 SHA512 03337fb1cde1a0e1333bc7ba9d413d2b6e77e5163e36f35385101a79ff34b843082cdf4174089c2d10b4471c45f7afa1ca243b8aa47ed76fac963d8910eac1fa WHIRLPOOL f9c5db64ef1ae52ccb6c02d2dd9fc0587ea0ae871f09a265005a61082c0a830db99af61844c4ad6232acd4e3e1a7f28c95f63e92ba8b88d06596d5d8f5967fba
 DIST anjuta-3.4.4.tar.xz 5940704 SHA256 e97199a6b59bb25f0908018b141b3d6b2dbc23804b84b4be34be669f8556ef7a SHA512 163a05a2562950178b6be1e861664c136ca5c7b29f4cb1c05aab6950957f15ced7afb6c82b28ed8f43eda67f0075b80b5f3ff8ebfc83f22e74ce7bc5f47e402f WHIRLPOOL 07d6142347584fcfea7571352afc715f25ff59820bb3222a989fb58c73ab29ab79010265eb8e9d120e71088fa4d92b07268b879c1590e0e4d3d27d1355ce39b5
-EBUILD anjuta-3.4.3.ebuild 3886 SHA256 9d553b225b3a1dc478f227a9aa60b2c112d5eaffa840c29a4d0e29417e4b1311 SHA512 749a7b1f46f61a62d2ccc140e178e312d63a8b7f098b8f085b2308f1e225cfad915bb41282d9694c99b8829defec9a1d1169d50ad6c41e2f4dec9cc594e4639d WHIRLPOOL e220c1f63f7b5a99cfea2c4965a7e93de29de05992e3cafe312968bbfafbafaae8ccf9c72466194f04679543274d62b4d75da96df633787efc9c3d4152687ed1
-EBUILD anjuta-3.4.4.ebuild 3581 SHA256 f24b97fe5cf29df406b28027443db901dd0b81aec96170980129272ed6cbd6e0 SHA512 f65bae0cedb6d220bc9d5aebaeb5a99c864ed36ca07e73d29bc1308500326c50a3ea1bbabf8e71ade9e6310508ab5e949e0823a65308f4e3b41613c4c5a96794 WHIRLPOOL b4a2c8c794156a61aa2832d97a1dd4fba3e578f925cb216e8b97f1b186abcdefe0eb3efe2c13d50832cbe40c890468ae47a6282ca8945698d350e2d2e0b54663
-MISC ChangeLog 22720 SHA256 3480d0d1553b189c21565c61c5e76030ef836440269022e1494a71ed39118684 SHA512 8545f0378ab0715df9c93976b9e7875b961c073d1a0dc6d97af80be633764c88bb392eb5c81df42620eaf084fec4f63ce7cbb9194673eb57587f485dfb1748c5 WHIRLPOOL 21a928b9eb9e74efe8e4bb5701e7e1ac5095f1804ef96fbba2588995719d4a7aa3c78207ee68e3effc9e79733d14f05bbfe79223ab35f5c677845c098320c993
-MISC metadata.xml 561 SHA256 a40d3d9fec149df69466642836eaac0cf9cb33070b6941d2e602f53f6b928799 SHA512 1770e9916bc14d172b9e90b7a66fe9f5a0247d6a0c8a1de108999ae9d7996794772ba351ea979455c93b9fda1edac41a3df0654a3d068d00e26f83cba40d401f WHIRLPOOL 49363fd048bf7f7928d0485a3d8e0d22911275d18956c140d1a03b38bc4677375f1fbe7a9396c91af5921b12b53aec1d3cd663538425e9b5d6f0b60f6d9a9e57
+DIST anjuta-3.6.2.tar.xz 5178068 SHA256 2cf44120dcf22c4f4f25bbc65d3641c206e627776ab0f3a37ff0059844d581a2 SHA512 1c7012b97f51cce056d38c79602da16aab04fa06f24a774f66a78eedfca812ce6ddbb94bcd69fa853a8e2ac4a2abbb5d74006dda6192f379d7ebc9ff5702e711 WHIRLPOOL f013deb02459331128f777fc052901b655c3ce293e1cd321f230862191be4ef8765143100bb4c341eff1a09c857563d824c63c262513a6537518ca3a90584ea6
+EBUILD anjuta-3.4.3.ebuild 3889 SHA256 0ddee63839ea7dcfaf0359a994255fff20795b18e0538271bf33f058255e91cd SHA512 5cb09d75ae93238afc992b0de902304c0c573691a4f872ac63a525aefdd18cf549795ad7a4e9b28e891e9812d190d966d4062d85848496509720091d4ab9eaf6 WHIRLPOOL e042610fd7b15fab3114244f74794d8f13f0700224f188498c6c434e78c2e883e13ff6145ec43eed182f06bc1ae81efd5b17ab36a2e44a11470f25f08327edd2
+EBUILD anjuta-3.4.4.ebuild 3586 SHA256 820655b816b29390d286515d21b783903dcd06a5ee5de76504db1463f6aff503 SHA512 46f3ed1fb5865cd7e16ec66f3516c75731dbc6d3d13a6c4f993f948bf63db999e4dad80737b47abd251e857631cbfcc51e5f5edc3fe7d2e9e8c225e87330dd31 WHIRLPOOL e8618c736c5c3ced07e3f76b77b247f40d6f9191155e209105e19359ce5f421272c45f028cf5f79b21abab59897a7d3607e9350db99b488e568818ae6d9d3709
+EBUILD anjuta-3.6.2-r1.ebuild 3667 SHA256 b4fbf21c18b00c745d6a8f6e7e8e6f31c668465d38389da5e24f3f790c0692fa SHA512 05b14e336c79d4cebdc3ea852072cc6a5d7e8e609b304a168b6ba22ffa9bd2835c30a6cadd26f9a5d63b67b21ded804cf06a69118f8f76cbda6c115be412074c WHIRLPOOL 994eda9607929280b40711c14195b8b010a5b0ac74a753b32b5f8510cbcb0071c6c3dd071b2b3ecdaeb6ed2a506f5284288f87403c8fa37aee1f2d3f274ef9d9
+MISC ChangeLog 22985 SHA256 9278cd00f18f14022e4be3c360022dde7ebbe3568b6a21013bcb22614ab356bf SHA512 61294c6f687d646860a9d9c5354756b6f1a9594cda51d2da0e552d0e16a131eca28cc27333d002503df55479dad0989ac46dc677a8b1515ce7f742d364f7fb64 WHIRLPOOL 87e22f23c16077799df75b29b00cea6f0e39cb632a5640701c8330d19bf5bd12bd4ba5af1ea9bd72ec154f50ebdf7fbff01ab61e05df54df32c1287d00dfb295
+MISC metadata.xml 454 SHA256 688c117048125211cb9a3d822e28fd098b60b4c0b46c697dd706f64477d5eacb SHA512 83c07843b3ead74c260f6b67792102267e9a4b77b3bac70068e2b864c2554f32620e2487502fbaa8d96dc0c2382ad259c44b4893236dd8a8bedb28ee695b6b55 WHIRLPOOL eff9706978bf3217a677d5aec8e1089bf3f9de69f0f019e7881a6221949639e2f206d92a66c6b214998f04fd767ea00db4593a1d712f1030129afbfb61f4fec6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCng7QACgkQCaWpQKGI+9SudQCfaHmNYtSyHZISzn/fETDRUB7u
-kfEAnRFNR6G0ymrn5ZKbC2v4v0khTX/2
-=9+Pc
+iQEcBAEBCAAGBQJQzvGvAAoJEJ0WA1zPCt1hbBcIAJdHPjFjK38vee4PDPkuRDyQ
++tFesfoPvbaKM8sDbfz1pPZp3YRD4UGXde1Df/Boxl6/ixt5d4X7YG0vAg2qt6Ah
+Rs1AlMWgyal2tH5vOiogeOOqPo5ZU8O7MQ3MoLz/amyA+6QH9RixNgCPAi0MZwA4
+FJbhTZNM6d8oIkUTRUCIqbLQfBLyJHXoB82xbFXxyodkdd108qbQrUSzeEch95Cg
+f3DvOfsa4l9H9P3kq+CMfnL1iBVhla8j47Zg83432x41YGbP8BMN4JGwIlqUB4Nb
+Ao/hhIyLmI24uNpXgwAd7JhzcXurL1vWhMFSs/ZVRUn2VyFBRs4GDXqG8woPmW4=
+=jt/+
 -----END PGP SIGNATURE-----
diff --git a/dev-util/anjuta/anjuta-3.4.3.ebuild b/dev-util/anjuta/anjuta-3.4.3.ebuild
index ee8571e53d22..7ed2a50ca3df 100644
--- a/dev-util/anjuta/anjuta-3.4.3.ebuild
+++ b/dev-util/anjuta/anjuta-3.4.3.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.4.3.ebuild,v 1.5 2012/10/28 15:47:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.4.3.ebuild,v 1.6 2012/12/17 10:19:26 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -12,7 +12,7 @@ inherit gnome2 flag-o-matic multilib python
 DESCRIPTION="A versatile IDE for GNOME"
 HOMEPAGE="http://www.anjuta.org"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 IUSE="debug devhelp doc glade graphviz +introspection packagekit subversion test vala"
diff --git a/dev-util/anjuta/anjuta-3.4.4.ebuild b/dev-util/anjuta/anjuta-3.4.4.ebuild
index a29a6c197159..105ccda70733 100644
--- a/dev-util/anjuta/anjuta-3.4.4.ebuild
+++ b/dev-util/anjuta/anjuta-3.4.4.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.4.4.ebuild,v 1.2 2012/11/17 12:31:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.4.4.ebuild,v 1.3 2012/12/17 10:19:26 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ inherit gnome2 flag-o-matic multilib python vala
 DESCRIPTION="A versatile IDE for GNOME"
 HOMEPAGE="http://www.anjuta.org"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="debug devhelp glade graphviz +introspection packagekit subversion test vala"
diff --git a/dev-util/anjuta/anjuta-3.6.2-r1.ebuild b/dev-util/anjuta/anjuta-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..25a76887d56c
--- /dev/null
+++ b/dev-util/anjuta/anjuta-3.6.2-r1.ebuild
@@ -0,0 +1,134 @@
+# 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.6.2-r1.ebuild,v 1.1 2012/12/17 10:19:26 tetromino 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.18"
+VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
+
+inherit autotools eutils gnome2 flag-o-matic multilib python-single-r1 vala
+
+DESCRIPTION="A versatile IDE for GNOME"
+HOMEPAGE="http://www.anjuta.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="debug devhelp glade +introspection packagekit subversion test vala"
+
+# 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.4.2:= )
+	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 )
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf requires: gtk-doc-am, gnome-common, gobject-introspection-common
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# COPYING is used in Anjuta's help/about entry
+	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
+
+	G2CONF="${G2CONF}
+		--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)"
+
+	# 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"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=684758
+	epatch "${FILESDIR}/${PN}-3.5.91-cxx-check.patch"
+	eautoreconf
+
+	use vala && vala_src_prepare
+	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"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	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."
+
+	if use vala; then
+		elog ""
+		elog "To create a generic vala project you will need to specify"
+		elog "desired valac versioned binary to be used, to do that you"
+		elog "will need to:"
+		elog "1. Go to 'Build' -> 'Configure project'"
+		elog "2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to"
+		elog "'Configure options'."
+	fi
+}
diff --git a/dev-util/anjuta/files/anjuta-3.5.91-cxx-check.patch b/dev-util/anjuta/files/anjuta-3.5.91-cxx-check.patch
new file mode 100644
index 000000000000..db844e07fb68
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-3.5.91-cxx-check.patch
@@ -0,0 +1,28 @@
+From 4d59f47b7f42951638f4390ef1a4a3373486d083 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 25 Sep 2012 02:32:31 -0400
+Subject: [PATCH] configure: fix C++ compiler check
+
+AC_PROG_CXX sets CXX, not ac_ct_CXX
+
+https://bugzilla.gnome.org/show_bug.cgi?id=684758
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 106c1b4..21e9386 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,7 +80,7 @@ fi
+ AC_LANG([C])
+ AC_LANG([C++])
+ AC_PROG_CXX
+-if test "x$ac_ct_CXX" = "x"
++if test "x$CXX" = "x"
+ then
+   AC_MSG_ERROR([C++ Compiler required to compile Anjuta])
+ fi
+-- 
+1.7.12
+
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index 38db6ea0d782..9f12d4b2e897 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -5,8 +5,6 @@
   <use>
     <flag name="devhelp">Enable devhelp integration</flag>
     <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='vala'>Enable support for the Vala programming
     	language</flag>