Print the filename and line being parsed if g-ir-scanner crashes while parsing a gtk-doc annotation. Update to EAPI5 and python-single-r1.

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

4 files changed, 149 insertions, 9 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index f7412124e856..c8a12896bc52 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/gobject-introspection
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.84 2012/12/09 18:33:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.85 2012/12/29 10:35:10 tetromino Exp $
+
+*gobject-introspection-1.34.2-r1 (29 Dec 2012)
+
+  29 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gobject-introspection-1.34.2-r1.ebuild,
+  +files/gobject-introspection-1.34.2-better-traceback.patch:
+  Print the filename and line being parsed if g-ir-scanner crashes while
+  parsing a gtk-doc annotation. Update to EAPI5 and python-single-r1.
 
   09 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gobject-introspection-1.30.0-r2.ebuild, gobject-introspection-1.32.1.ebuild,
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 45dae67300e6..e069bd43b9cf 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gobject-introspection-1.34.2-better-traceback.patch 1431 SHA256 921870ef1182bb6d358eaecd479f73bf22404ccd9b4d2ee27005f8aa0960a865 SHA512 48acab361c2e6a938eb88c4c2ea3cdd83dd1eb165d489b3fa54967d748a36842a4f89833a71c73ed79e4ee85e0e9aeb05fb1eac82470cc1664ba9dc0eedb8037 WHIRLPOOL af33c96fa943b6e36269963b603652bb0e6ca9702a57a384dbbef59f7b7516084bc6a2334f41d415460a7d8796c0908f9e24285cfbdde705b4430db0bb747831
 DIST gobject-introspection-1.30.0-patches-1.tar.xz 5776 SHA256 90a01c8b3ce6b112d58e9781460f3664d652bed169ddbdd9451a5e0a9fe2d37c SHA512 a11195aa3c7ebeee89d7262751f1b894890170d99cbfbfa4a5122f616adbe394b2abf8f00d9f658e906c9ccc34608ecc9939a98e2d2a0bf98ad3116e393c0d40 WHIRLPOOL 21d173277ecf0a3186efd2975b8c5746ca9a765a2c8db023706083b2eab47e5c8aac4ea728c2e9a2e30453fd3aef63ca4ce5a8aafe3882a116a7e2e1e0a738f8
 DIST gobject-introspection-1.30.0.tar.xz 1063720 SHA256 8e4274579096e983fad3148cdab50295a4701e45cd9a4e02f7242fc0a04c47b2 SHA512 fa4daa40ad971fd3da8d7b29ada94bd7d29a011972dd007c24692fb1b3e72716bdaa8a3e932c22fa5bf41a4c0d3b1a0a5012a6abac69714ab3fcde0c669da9f4 WHIRLPOOL 0a70ffb3135509accfe484a1e52adc1a674d89a4f2874aea60f45047269f27a410c769f85ac21b7f06396489a69bd5a01422618b8c11b1af678fd8f523d6d6a6
 DIST gobject-introspection-1.32.1.tar.xz 1120996 SHA256 44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858 SHA512 115d317890e1a66a64760baebad5c9a0b50600f4cf8ba805fed8fcf047413be51603a3dbd83f552609e7a30dba303ebe9e6bfaa0bb3d6e2f95ad9f98d2c4a02c WHIRLPOOL 7a04b5db51ddbf555e251788334c1976874ab847f89577a0d1e94bbabc9c8bd9ecba7dbe9b85b1e92a63cb942df626a3934b959331e118750f8f4f5520961a64
 DIST gobject-introspection-1.34.2.tar.xz 1088768 SHA256 bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429 SHA512 e57839f9354aacded057911914de94d6357c323cb57cbd2934e668f2d149e779d1aca818e18b13d67fd359afe75dbe9e3525d8f7544a7ced0bbe8f7397526330 WHIRLPOOL 01b5b0662886bd708dad0d60eb06ba18af8c5f50895268bc618ddfa988789621d086b754afe48d7002ba8c8163d92318ff34d564605f406f92ef4cb9ad4659b5
 EBUILD gobject-introspection-1.30.0-r2.ebuild 2702 SHA256 f59a167478a965c6b61fc67a9f40ca05d39a7b015fd0d5a0413b9eb1f4ef0622 SHA512 57f7377879b2b48e1fba18e385bb46eac0907333e34c6378cd6942a3a53a60669a1222c3f4f2d3d86ef7baebf18252f53406302dd959611d5d5b0abb03d5764f WHIRLPOOL 142b5602cb4517dfc150ba2d3f753b36d8cd35a7e7eb976bee3adea9ff92570dc0994ef58ea1e5505f9b77517edb2d39abce6de144abe24e79386718d2f239f0
 EBUILD gobject-introspection-1.32.1.ebuild 3001 SHA256 a04f5f593d362a802e66f813aec43a278ed06e01905a4a364c36e3b5a9f43c2b SHA512 00feaff99ca8dbb0a7b9b1ad5cb9a855b734f3bc14ae9b0b7471b9e64411f7febdd601337a0006947fd4038283ded4380684e50a83da4a82a6bf0fffad6f6945 WHIRLPOOL 19a18bd0f46ff0a5428414060b6f957e847a18916f20f9877e2307d8f4a43fb3d826bc921b16d26294553be1bbc029bd7dbd7e4d172d739dae72dbaa7b40ff25
+EBUILD gobject-introspection-1.34.2-r1.ebuild 2582 SHA256 135daa39715479667ea1d631f77653ab17eb8479e789720a206bcec2e5021bc8 SHA512 3fc5eab44ebbe237927928fb1523eae4691edc6053d7a0c1999bbceb9bb20d9f4903abfa1cdaf3987b0ad10918fd4a98eb3ece849bdf94112484ba0963f2f5b5 WHIRLPOOL 6cd053f0704ca8092b44d580f311596483540f86aecfa18534ab7489c03f9441dcc9601eb9f1554f840ef46a640a58e3b839df177bf541d775c39d6cfce74636
 EBUILD gobject-introspection-1.34.2.ebuild 2801 SHA256 ea89e3e4b7954e46a790e38718e57187c8f572588df6788e280a88ba61df1723 SHA512 d918de34a89ac7ed928f927c4096471064f88212a55337b2ca7f25f77c188cc22962191a7d448668529dc0fb4084f9555fd0310359deeec6099cb800e7dcade5 WHIRLPOOL 10deb676e0537b3e58845c191f7002c22ccf6671fe41b23584e73ebcbf22f0503b1eadea7e8d0f854146d8baee4a3962e126de5e168cd1018f8920778050037c
-MISC ChangeLog 15474 SHA256 621c28e3005fb0ac737bca3b4846f9ca92f150ac29b8929bc5c3a83716d404f7 SHA512 072c78accf8c8c7adc093cb397e4b55c25553bdda4d4ce653a0250f284225e7b3e6f7fc9f852b8cce0774edecd0fa34f615d6c110a5a9fd682c6c108cdfcdcc5 WHIRLPOOL 049cefc3ef2e94464bebd5303e3091adf7850e6fc4cf6515585aabf82d86ad23f27bedef92402407955375cabf974d13101b0105a88fca96d2c53aedf2dd8e11
+MISC ChangeLog 15830 SHA256 c46fb49b0fb421b729782d49e237df320f5c88b9c51938018830a813c110d6f8 SHA512 73d445dac0701a40a7ede8757624212f4cda36deece4fbbddb4c9ca658a8b4bb273a64ab62f7179dc44355ec22846072bec6d6472681c7bb8c79dd9cb0cc301f WHIRLPOOL c23b36779b9a3c1cbd9492d0e2d83fbf30d07255c02e5adfbeb59ff5be616933bf2653b63e6ecf151d060e36fe9aeb501809de44c05249ad35a50ea86bed11f7
 MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQxNmPAAoJEJ0WA1zPCt1hGUQH/2i2iAPHMUD31MF6/sAUhAiL
-VbNqwhPJINlK30fVJBjcvmerVfsaQywb6a6ncwsH8xPH6jBV2DcCSG2ZU2PnIx4y
-uYVsQ5ZPabblUqavB96urc+siTL9aT9SHkGVOMa19iMJPytUmMq5xGsQfgjTrlnG
-gOKeJVKvDHbAL95DIf5AOl4UCm/riKMMdVo3xSpqbra5tO6/yWsQmXGeSFor7ZBJ
-e1f77vFGrWBsjQdAxSDtLf7xuIxIDSpDnVJpVszScAjilsiOOlgaqjsQ9cL0JxSQ
-0kUVkQ7WZyYBl5ExbXIQePtWL7MpOJDqdFaAAZ9Soq9MdzsRK3GUhibjH1hjW7Q=
-=8BQk
+iQEcBAEBCAAGBQJQ3sdfAAoJEJ0WA1zPCt1hKs4H/1pzT7Fi1Vq17EechiZWdiXh
+u03nDSbUFdQ1s8c4otqwy3mDHPKuxxIx8UhOoAqukNMhnSyyWNiPwEhLCQkNsTP+
+w6GepO+tGkcoYpvf/35YLausbem88hCeHbsvPDSFI/D4IvxbPyjcl+uHmHrwYDUn
+JpB/meA33uEOPPwuHdzeWIvOaY27y15rq+bpj+W47/g+oQii6E3jfUPsMEDePjWh
+Q0eX5tb7vlWXUDroOKATYXklQae6kCHuQiumbvA5a0JUFyDKAW9+kxxwCBy1l1a1
+C86kiNKEDGrAO4YCO8PeoIjIIKKGbeoOACU1diy+eSn4Anv+8FkTXCEOtsmNrWs=
+=ODAz
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.34.2-better-traceback.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.34.2-better-traceback.patch
new file mode 100644
index 000000000000..296ef17b07f7
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.34.2-better-traceback.patch
@@ -0,0 +1,43 @@
+From 3e452d88e285531f78707de9a0326649d537e59f Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 29 Dec 2012 05:22:08 -0500
+Subject: [PATCH] scanner: add filename/line to the backtrace if
+ parse_comment_block() raised an exception
+
+In most cases, such exceptions are caused by gtk-doc syntax errors in
+annotations, and developers want to see which annotation made g-ir-scanner
+crash.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=690850
+---
+ giscanner/annotationparser.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
+index f545590..f33e956 100644
+--- a/giscanner/annotationparser.py
++++ b/giscanner/annotationparser.py
+@@ -24,6 +24,7 @@
+ 
+ 
+ import re
++import traceback
+ 
+ from . import message
+ from .odict import odict
+@@ -766,7 +767,11 @@ class AnnotationParser(object):
+         comment_blocks = {}
+ 
+         for comment in comments:
+-            comment_block = self.parse_comment_block(comment)
++            try:
++                comment_block = self.parse_comment_block(comment)
++            except:
++                message.fatal("error when parsing comment block\n%s" % traceback.format_exc(),
++                              message.Position(comment[1], comment[2]))
+ 
+             if comment_block is not None:
+                 # Note: previous versions of this parser did not check
+-- 
+1.8.0.2
+
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.34.2-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.34.2-r1.ebuild
new file mode 100644
index 000000000000..10a9f26f2588
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.34.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.34.2-r1.ebuild,v 1.1 2012/12/29 10:35:10 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="doctool test"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.34.1:2
+	doctool? ( dev-python/mako )
+	virtual/libffi:=
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="x11-libs/cairo[glib]"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# To prevent crosscompiling problems, bug #414105
+	CC=$(tc-getCC)
+
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		--disable-static
+		YACC=$(type -p yacc)
+		$(use_enable doctool)
+		$(use_enable test tests)"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=690850
+	epatch "${FILESDIR}/${PN}-1.34.2-better-traceback.patch"
+
+	gnome2_src_prepare
+
+	# avoid GNU-isms
+	sed -i -e 's/\(if test .* \)==/\1=/' configure || die
+
+	gi_skip_tests=
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+		if use test; then
+			G2CONF="${G2CONF} --disable-tests"
+			gi_skip_tests=yes
+			ewarn "Tests will be skipped because x11-libs/cairo[glib] is not present"
+			ewarn "on your system. Consider installing it to get tests to run."
+		fi
+	fi
+}
+
+src_test() {
+	[[ -z ${gi_skip_tests} ]] && default
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}