Version bump, drop old

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

4 files changed, 75 insertions, 43 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index 84143532e7a3..635d1d5dda0c 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,13 @@
 # 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.159 2013/04/14 16:19:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.160 2013/04/16 19:15:10 pacho Exp $
+
+*anjuta-3.8.1 (16 Apr 2013)
+
+  16 Apr 2013; Pacho Ramos <pacho@gentoo.org> +anjuta-3.8.1.ebuild,
+  +files/anjuta-3.8.1-vala-0.20.patch, -anjuta-3.8.0.ebuild,
+  anjuta-3.6.2-r1.ebuild:
+  Version bump, drop old
 
   14 Apr 2013; Agostino Sarubbo <ago@gentoo.org> anjuta-3.6.2-r1.ebuild:
   Stable for ppc, wrt bug #463660
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index aa77a706bc0b..b4adadbd5635 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX anjuta-3.5.91-cxx-check.patch 677 SHA256 ff5181d0c056c74b9716b99d32b977a1d9058f67b4e6d9b01379aaf684658571 SHA512 aa442709abdc079390d466f7339931732d381e3212158c4f2ff493db0d788004c6a319c388cd10cd9a4e4052f3d55d8b713eb3d0d6ad428c3c5e46d948e476a2 WHIRLPOOL 7586ca17396a3ca64908e8ffc3382d303e01efb7671137527646e0272bec9129b080585b34327e2ac0304e1178686f7e09efca5d54cf2c0811bd391e0552e3fa
+AUX anjuta-3.8.1-vala-0.20.patch 797 SHA256 2fae527822fbabdc1554c54f82a3275c3b509cbaaa46fe1712024c1b1fc159f3 SHA512 28c863a2763767c575be29bba91f828f5d10ad41250c985f52f7e26c1e807e63000f20973a6554b66d1f5a72525f9a78b2ccd12779e79180287ccda2e1078db6 WHIRLPOOL 3eac0684bbf9ab3844fb73ce45e4d2ae8ebd2cb284ff085e873ecd3acd9897de73f7b7013eeaac5170016e65e5980f667a75f229982b115e5964b57dd8959ffd
 DIST anjuta-3.4.3.tar.xz 6177392 SHA256 17881fb3e965a9d347cc1d3596c6d3ba0fe6c6c2a22025a49b1ab092bf6246d0 SHA512 03337fb1cde1a0e1333bc7ba9d413d2b6e77e5163e36f35385101a79ff34b843082cdf4174089c2d10b4471c45f7afa1ca243b8aa47ed76fac963d8910eac1fa WHIRLPOOL f9c5db64ef1ae52ccb6c02d2dd9fc0587ea0ae871f09a265005a61082c0a830db99af61844c4ad6232acd4e3e1a7f28c95f63e92ba8b88d06596d5d8f5967fba
 DIST anjuta-3.6.2.tar.xz 5178068 SHA256 2cf44120dcf22c4f4f25bbc65d3641c206e627776ab0f3a37ff0059844d581a2 SHA512 1c7012b97f51cce056d38c79602da16aab04fa06f24a774f66a78eedfca812ce6ddbb94bcd69fa853a8e2ac4a2abbb5d74006dda6192f379d7ebc9ff5702e711 WHIRLPOOL f013deb02459331128f777fc052901b655c3ce293e1cd321f230862191be4ef8765143100bb4c341eff1a09c857563d824c63c262513a6537518ca3a90584ea6
-DIST anjuta-3.8.0.tar.xz 5168140 SHA256 c95caac9ad56a26457b76c49ec27b38e67de05df5f6656e0fbdac0508d59f117 SHA512 32d1b8398b9cf9f2fd8de1c7385dcab1d13440c2307a6887b6f1f756bfef123d0aa8bb4a600131116cc7950433aab51c5eb83896f18c3221b5866b14ee67e276 WHIRLPOOL d75fe70f852468f71646fccb02784566eedb127969f741ed0f90c193adad40e140449422a5f68fe90b7f97a977e02f127100a7acbdfaa4c6c63b8799293f45f7
+DIST anjuta-3.8.1.tar.xz 5180820 SHA256 ef5d8a5032d4c2025e1870bef044fa025f01096a86f8f226eb178688a960c5b9 SHA512 7e922c509af47cb32bb372d9a95edc6a5b52ae85571a487aecc144ae2d9cba0492360ce3ff368dbc64a82a1ec060157e670af60079838623b4da005952c29861 WHIRLPOOL b2058a1dd743d4fe8f2a54f3200e295a955427fb1dadb79efef8ad54fb0f974dff0b8740e4ceb8c14a0a7411439fe2c0613cc4059c83ac7252e5e17e9c0541fd
 EBUILD anjuta-3.4.3.ebuild 3889 SHA256 0ddee63839ea7dcfaf0359a994255fff20795b18e0538271bf33f058255e91cd SHA512 5cb09d75ae93238afc992b0de902304c0c573691a4f872ac63a525aefdd18cf549795ad7a4e9b28e891e9812d190d966d4062d85848496509720091d4ab9eaf6 WHIRLPOOL e042610fd7b15fab3114244f74794d8f13f0700224f188498c6c434e78c2e883e13ff6145ec43eed182f06bc1ae81efd5b17ab36a2e44a11470f25f08327edd2
 EBUILD anjuta-3.6.2-r1.ebuild 3690 SHA256 a1b1d890ac1278f6ed15c5263483d783dfdef08e10d46463000286ab75db1e55 SHA512 3e5bd7a21445ffe9cb7fecce8132298a3fbf9263a8154f659bcf880edc9ca4b9d15781cf6d0642100d5b0d7b16c386a5917ce2fda3e1285efcd3109f226eddd9 WHIRLPOOL 01b216f6032e5276fef895140ce1dd70d452e4fe2fecdb95fad7307a035317581929206f152dc87646aea449e2149c8690ed34d4f1824caf09b54716fb39260c
-EBUILD anjuta-3.8.0.ebuild 3382 SHA256 b863fed4838323ee7e4d9cf0aa619f25e1ebf5e83b08c6d7fce6873b7b66e89b SHA512 a0265766c3a4b8864a89913a6a2880f13b574def339d43f7feb9a3dc59f22ebcb2d5228e4f6fa41e4642e8fd8f0a8758fdb585f7e9353a8a47db1d6497418a23 WHIRLPOOL 0d5f79bae38a57c8c69ed3c0c2bc4930f77abe781d051cb2ecfcc7865e26d6857e9dbce36c655761d1a8c9d04a2914c4e3c3a02e13e5f629f65e8e1844834901
-MISC ChangeLog 23944 SHA256 36f1d196ff8cef91589cac6e24e6e510fd2cf74b2eb3353d376c3e9e1fd3fa59 SHA512 9badbee584751fde42f7bdfb0ea8a86cdeaa4e68b220ed608c9a4d66a168b22bde7e29c43a70b6c163525de65619dbf5af67cb82037ea7240acd73e95b32c25b WHIRLPOOL 91b730ff87ed0143f446fa9e6e67ffa94d7430a16fafb31506395b575ecf44d0fe3a152eae066e93b90566d4cb7c66b435be02e6306ee87fc880c8ec3e656409
+EBUILD anjuta-3.8.1.ebuild 3615 SHA256 ba554a4432d2b77cd44ba6f760ea50b07a997c08e091971a06f3e568e80d7257 SHA512 0e3c71f213ba463978ae267e7eb52b114994782631861f44df405c2b2dd7c2b1f44614eadfd2cfaed001205d527772659063b72a9bd993e00b1d2e7206a1fa23 WHIRLPOOL fca8e3c2a0906c59dc8fd54fc6b3c6244664b36b5469e3ba970330d24acfd5f5d34c79b89b09ffacf071ccdf7d29ecff7988f19bd277a80405c0fdf6acfe0ca3
+MISC ChangeLog 24156 SHA256 1e46210897213667df6e86f61428ce29d05fc25b0744557314fe95832f24bed8 SHA512 cf4d7e335ac7caabae3f24e7eb59534dc86e5652580458beb8d9816db088d121d379f3ff9b9aad1b98706fbbb34be7668a5051ef36e5c76a1a5cbc0a9faaa835 WHIRLPOOL b4fcf6599bd80b6346e5804a71b4dd7d87b7e5af6393670fbfbe989402fe7fbb4796ed1774d2dcca236b7ec19b62d72adfdb079fdb0937bca50d63d076289c00
 MISC metadata.xml 454 SHA256 688c117048125211cb9a3d822e28fd098b60b4c0b46c697dd706f64477d5eacb SHA512 83c07843b3ead74c260f6b67792102267e9a4b77b3bac70068e2b864c2554f32620e2487502fbaa8d96dc0c2382ad259c44b4893236dd8a8bedb28ee695b6b55 WHIRLPOOL eff9706978bf3217a677d5aec8e1089bf3f9de69f0f019e7881a6221949639e2f206d92a66c6b214998f04fd767ea00db4593a1d712f1030129afbfb61f4fec6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRataOAAoJELp701BxlEWffawP/jpGg4AK6jQfqo8tjyNFxVJl
-vmtkdh0Q+6f/jBBtDxXGeINe5Qymx9ebajxIbYEyXTIDXtHtcks+EWhNtMV6hgBd
-lEyEKsiY1wr3Lx4UVGzW2ZPoTEeXSVmHnNv6UQr7SRTJgwQWCXuX4yhD4NkwfQ/j
-FW5g1xS+LwYzfU+3PRg0YPQjNiXH3XXBc2nS3C2h0RofWm4eASJfuKm6ftrxtLDx
-HPNk22aTlW/yXI7JVlekmFzYdzkAeofu0wPhqmrOO7mMRto4G/W/FtbXeUxMHGny
-lgrSeKCTe5uWzrYf25B7Trao3gZlkwuJNmrZrorr3zRGuKP+bg41Mg3oqLeQhq6o
-MnVSaHj5NVvsJIUdqTwMyK1+AVM91GungiGYhKK/20efT6rOwrHwNVNJ/h/N3Yyl
-wXhz+V/AylG7x1eN7i3QOTciT7PbHq9Nz1YwcHfQaq7CIYybCRcUhIl8Tc3H0Ly8
-hHMrsv1TT0WQHge4KXteTwGlsw8bFnA+8dyAIXQbEXdbgIVQpTapoumP8PTYh2pc
-mi1n9pAYOZ6x6V5X1fUhCpy47h2FRF8QN1JQxi6EQVJIcnbgN0E7MfFXkAELOfvm
-7w33QqcGAkZj3buGDJ0tU3nauJbsqpSEIXUa5AoygNQuCIPcrSRNV+9ygRh+GEyZ
-BCm5ZzMvsP7r8ngGSwX1
-=CCs9
+iEYEAREIAAYFAlFto0AACgkQCaWpQKGI+9S07ACfdHaiY0e3GVyOa2mHsQ4e1N0T
+SDIAn3H7lajWQLrItX7T5OgQq7yonT0N
+=OXUJ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/anjuta/anjuta-3.8.0.ebuild b/dev-util/anjuta/anjuta-3.8.1.ebuild
index c02ffa993bef..d5345daa0d6d 100644
--- a/dev-util/anjuta/anjuta-3.8.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.8.1.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.0.ebuild,v 1.1 2013/03/28 17:00:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.8.1.ebuild,v 1.1 2013/04/16 19:15:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -8,10 +8,10 @@ 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_MIN_API_VERSION="0.20"
 VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
 
-inherit eutils gnome2 flag-o-matic multilib python-single-r1 vala
+inherit autotools eutils gnome2 flag-o-matic multilib readme.gentoo python-single-r1 vala
 
 DESCRIPTION="A versatile IDE for GNOME"
 HOMEPAGE="http://www.anjuta.org"
@@ -22,7 +22,8 @@ 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
+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
@@ -70,27 +71,26 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/gobject-introspection-common
 	gnome-base/gnome-common
 "
-# eautoreconf requires: gtk-doc-am, gnome-common, gobject-introspection-common, yelp-tools
+# 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"
 
-	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
 
@@ -98,10 +98,27 @@ src_prepare() {
 	sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
 		-i plugins/am-project/tests/anjuta.lst || die "sed failed"
 
+	# Let it build with vala-0.20, upstream bug #698158
+	epatch "${FILESDIR}/${PN}-3.8.1-vala-0.20.patch"
+
+	eautoreconf
 	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"
@@ -109,17 +126,11 @@ src_install() {
 	# 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
-	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
+	use vala && readme.gentoo_print_elog
 }
diff --git a/dev-util/anjuta/files/anjuta-3.8.1-vala-0.20.patch b/dev-util/anjuta/files/anjuta-3.8.1-vala-0.20.patch
new file mode 100644
index 000000000000..8e66c810886c
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-3.8.1-vala-0.20.patch
@@ -0,0 +1,23 @@
+diff -uNr anjuta-3.8.0.old/configure.ac anjuta-3.8.0/configure.ac
+--- anjuta-3.8.0.old/configure.ac	2013-03-25 05:32:20.000000000 +0100
++++ anjuta-3.8.0/configure.ac	2013-03-30 21:56:06.603174301 +0100
+@@ -285,11 +285,14 @@
+ else
+         AC_MSG_RESULT(no)
+ 	AC_MSG_CHECKING(if libvala is available)
+-	PKG_CHECK_EXISTS([ libvala-0.18 ],
+-			 [ valaver="-0.18" ],
+-			 [ PKG_CHECK_EXISTS([ libvala-0.16 ],
+-					    [ valaver="-0.16" ],
+-					    [ valaver="" ])
++	PKG_CHECK_EXISTS([ libvala-0.20 ],
++			 [ valaver="-0.20" ],
++			 [ PKG_CHECK_EXISTS([ libvala-0.18 ],
++		       			    [ valaver="-0.18" ],
++					    [ PKG_CHECK_EXISTS([ libvala-0.16 ],
++							       [ valaver="-0.16" ],
++							       [ valaver="" ])
++					    ])
+ 			 ])
+ 	if test "x$valaver" != "x"; then
+ 		AC_MSG_RESULT(yes)