Version bump for Gnome 3.12.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 85 insertions, 5 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index b23a6eadaca0..6aa34fb7c614 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gobject-introspection
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.116 2014/04/25 19:32:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.117 2014/04/27 16:20:12 eva Exp $
+
+*gobject-introspection-1.40.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gobject-introspection-1.40.0.ebuild:
+  Version bump for Gnome 3.12.
 
   25 Apr 2014; Pacho Ramos <pacho@gentoo.org>
   -files/gobject-introspection-1.34.2-better-traceback.patch,
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 1533a8b0ddb8..12e99ac87a39 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
+DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
 EBUILD gobject-introspection-1.38.0.ebuild 2209 SHA256 317a5ad704d6066f14ab608ad61e23eeb787d7e48a189071c3c7fdbd6a114aba SHA512 47bbe82fade9d53cf7d9637af06d0a6169ae6985949f058b37c2137504edaa16ebba5dab3638b38d1197e41abe1b44afbdab5d988d2965fcbf394a2d773352c7 WHIRLPOOL 627cefb749eecfd0011e36b0da7af33dffcd774b14bec2f6b10b07a53297dda0588b447d99ada1324d3eb381896557d128574a9f16f80e859a5677ea8926bee3
-MISC ChangeLog 20521 SHA256 f468fd1dfaa4581dc73f659e9fe5c422fa8d61cfa134b4b11c5c29b5f8c2d0dd SHA512 84905c4fb891a2c8765ca46d685b8d303edf3ec69cd463cbc5e49c6ba581b15b7a45087cef7c8c618572622061e335457aa1cad59c03b43bcd01a441f8641595 WHIRLPOOL 5204445c1611958cd1caa2954da770a0d06d524857a56bfcb29d80d10599de9adaa513ced2f152166b6d1ea7fa912e38ba03ace3251ce309347e9276910a48d4
+EBUILD gobject-introspection-1.40.0.ebuild 2217 SHA256 42bb9114769c1a2cd350b7f1ca07da29cbea6a1f8a0a9d2e065b8ca59637d9da SHA512 1a3c3de8a844b91bd9f5f38f037287c6d9fffa86fe208a4378957f6fe9bd33c7843c2cce34847f7852d656652a683cce0c97b9819c3cb2c76a17b57126b90d01 WHIRLPOOL 22abdad85a45dd71be29ed743bb66d987004c092dc18f3ff444095d4763ae682c55c56c1c4b4699929cc853fa4ee639910ef145a9c1419d644f8d1a0e4080512
+MISC ChangeLog 20690 SHA256 76c540459cf1dbc9ff23ddb45a97ddb6128cda6d0c28522157c205a4db732f56 SHA512 c4050d5f767ec3b6d15144d96c8bb5bbbc9125814857c366056289b6562a56fed57496cfd1e9d1e6c6d2107eb5d82bc97bbc2b6ff5c567b4a869c7c715c83ca6 WHIRLPOOL d70109c86b5c4c4a7bf12b773a197671d1c32f39a6448740ba6ad2dda5c90ccb4dafcf8f017b52f497f85271ffd43b657d5dc8b7fa0a8d248e614271759b6d7e
 MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNauFwACgkQCaWpQKGI+9Qi/wCeOEo2ViYhIZ3eZje1RrJy6idv
-o54AnRPJJkbBLzEXuoP/p6e71ZEiJK7M
-=Qqs/
+iEYEAREIAAYFAlNdLj0ACgkQ1fmVwcYIWAa3CwCeIybn1kaB4dDUtLreCyRzamZJ
+9qAAnjE6yjuNdMF/1YMYm6YuUE4aI/X7
+=rVu4
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
new file mode 100644
index 000000000000..853154dc7a49
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 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.40.0.ebuild,v 1.1 2014/04/27 16:20:12 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit 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"
+IUSE="cairo doctool test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.36:2
+	doctool? ( dev-python/mako )
+	virtual/libffi:=
+	virtual/pkgconfig
+	!<dev-lang/vala-0.20.0
+	${PYTHON_DEPS}
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.19
+	sys-devel/bison
+	sys-devel/flex
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	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"
+	fi
+
+	# To prevent crosscompiling problems, bug #414105
+	gnome2_src_configure \
+		--disable-static \
+		CC=$(tc-getCC) \
+		YACC=$(type -p yacc) \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+src_install() {
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	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
+}