Fix clang detection (#483412 by Stefan de Konink) and REQUIRED_USE (#471440 by Jonathan Callen)

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

4 files changed, 124 insertions, 9 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index 6e46a56f0cb9..7c52ec9ea098 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.94 2013/07/30 03:33:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.95 2013/09/05 20:01:42 pacho Exp $
+
+*gobject-introspection-1.36.0-r1 (05 Sep 2013)
+
+  05 Sep 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gobject-introspection-1.36.0-detect-clang.patch,
+  +gobject-introspection-1.36.0-r1.ebuild:
+  Fix clang detection (#483412 by Stefan de Konink) and REQUIRED_USE (#471440 by
+  Jonathan Callen)
 
   30 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   gobject-introspection-1.32.1.ebuild, gobject-introspection-1.34.2-r1.ebuild:
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 7fbc40976fc7..266523e5655f 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -2,22 +2,20 @@
 Hash: SHA256
 
 AUX gobject-introspection-1.34.2-better-traceback.patch 1431 SHA256 921870ef1182bb6d358eaecd479f73bf22404ccd9b4d2ee27005f8aa0960a865 SHA512 48acab361c2e6a938eb88c4c2ea3cdd83dd1eb165d489b3fa54967d748a36842a4f89833a71c73ed79e4ee85e0e9aeb05fb1eac82470cc1664ba9dc0eedb8037 WHIRLPOOL af33c96fa943b6e36269963b603652bb0e6ca9702a57a384dbbef59f7b7516084bc6a2334f41d415460a7d8796c0908f9e24285cfbdde705b4430db0bb747831
+AUX gobject-introspection-1.36.0-detect-clang.patch 1084 SHA256 880db25f54711ff942c18f70ed58d466a59c7b434b1d1a876df3610286e31eb4 SHA512 61d4bb54be5567e69ddc9e9fffd8cfebb71bf7991eb9df21dcb49c10d392e385b84dd2538627c45b12b81f6bb3f6eac60c6ccbfe84132d97cf0c43eabadfe3ef WHIRLPOOL cf95d470d8a7b7d698b56db26fc451e462ad37970c0d275a48b23c9f83c5c3f899cc5bfc24a3da90f1f2bcfcca2f421a7ecf541a066ae824319011d1f16a38d2
 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
 DIST gobject-introspection-1.36.0.tar.xz 1201108 SHA256 e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383 SHA512 5c6d17851ac7d1372abdc6a9ced44d1c2313b098e6fdfbe7cba78bff66032923fccddb58913753f46e1d7fea09536bb057ea2ff7203d5f4f7540badd830eaa83 WHIRLPOOL 1f31a314a9056f2f452e59808ba143f5e387f1c7c82ddb0e3f20295592850995f602a2a82b36602b7089cddb192896d918db02190e411710d8806dbdebc77f4c
 EBUILD gobject-introspection-1.32.1.ebuild 3098 SHA256 d78ff5d29e8f980ae289d059c31a10e25e920c31ec4d4b3716eac4d03269b95b SHA512 0d5aeec20f0988f88aeca439ac6557bb7afa6fa482edf09dae4509e42048b6c1027d380a48f05620d8ea54a382ae41e38f7384874e61de26e151767e0886f022 WHIRLPOOL 517e67a21896915481e814e2afd6138619b92e3ab02408de68aaea833b2543b940e43de1e5dd2d647d4fd2c3f10a63533e8a8f07020bef78d8f5833472323349
 EBUILD gobject-introspection-1.34.2-r1.ebuild 2704 SHA256 aa2ddbdc619a7d2588e70619d499abeac677478f2e4677a1977836366aa68ada SHA512 2ef2bb74ccf7be3ed68a4ea1ccb3b6f0eb016befe64251aea68b1b2797f94d78656688dc4960c820f4aae19156d0ebc4893bb30da08487eb193c1aedd4ced4f4 WHIRLPOOL 25d8e999b6716f3f3a8c7c5b00cc8a18a8b386b763878af174120846d4850668bfb42119ec90288b51137a170a65f5ef247f2d979e794a0d13a637c7f41e2ce4
+EBUILD gobject-introspection-1.36.0-r1.ebuild 2397 SHA256 687cb6a36762901622e488a758814f34ce61b172685ea66809736bb34f154b70 SHA512 339256fe882e76fb6f8bb0a1db5cd1076b2f2c371ac5e8ce85addcec1490098d223a0da6554cb6b0c818fb185292b9f1e24762cf677bb16ac3185ddb5240f29e WHIRLPOOL a2e99d8619f473dea54661a541c4147ab48cb0e801d4bb39867e8a73449c20a796fc20901e3f3900db9790ce361a61bdfd14c71441b38e5c567e5b7d6326bcc8
 EBUILD gobject-introspection-1.36.0.ebuild 2240 SHA256 4ddd061a7679dafee6da1fbe725ddb86b54d3beb065f5cd6354012f664625506 SHA512 9be10ce058ff3b08a4c17835425b305d479d4bddeba43a8ff31920e7483c9eaed034be8800047c8c81f96b9d1ea59be0fc77e4a65b3df25342951ded9431f89b WHIRLPOOL cf669f5290f5b9a84d25ab703e59d3da13b75388204cb807af145f35fc82cf0ab1f3fb40864783a9ed786dc62abb38ae2256ad96dcc146edd94c8f75463c5dad
-MISC ChangeLog 17309 SHA256 b8546bf9efeaf89025c9ef2f66bee48ea92cee459958d3a3fa5cb1ae493767eb SHA512 28a163e25abebfdf4e4d21bdc77df18ce2ccf69492cb1d3960bcb83ae69d5a875f287068cb564ed82f8a174cc55c8d389ed04decc223f96681ffd757cab6a0a0 WHIRLPOOL 2dbd256ecce5b6313b9ea54b570a8cdaa38182df8e69b1a84259fa6c6e8b0a5367905637e24b516f95f3c77060b52a0eaf0c1aa9dd5291a6d5bb6cdf05bffe5c
+MISC ChangeLog 17601 SHA256 07aff01945de86b60eedfcb32be1e160034e258af231889e6b76ce9cce268ff4 SHA512 3a98d26a8cdbfed32ba0d0fb6cc6dfa473f34292581775666fbb7e32e07c64ac331815d4f678f58645e382ea381d02e4e5ff2e0bc90198c02fa8e546899f9ac2 WHIRLPOOL 3bfe33786ff17ac30b9e8f33623a80e4fb49225995f51d0d89636f4a03a5f2b90c7a49170cde9d0f719769b10e8cfa4478dbd8c9536972816b20c915de77bad2
 MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR9zP4AAoJEJ0WA1zPCt1hQCkH/1VGmfOpg01h4rhQIrRoNfvD
-rDlnJ5k+onLrOhULBwtxBjbA6wb7gOEFXzSVHZCNydP5Osjz+qMe3zv0Rb1eug2L
-vhHDAftOa3BRXYF5ns+IxVTsU/e5WoCTMRA8G+WxCN1N35aro1JCEkch4lg/5E4P
-r26IgcXu0sPWbfKQ4VXzg4kZLpdNQHepclDJulLP5LPCJmvst10g1vs/PIEnqy1H
-T2ilDziw9Fwg2ZSwDEW5WVKjRBPx2BJjzMAicfS+B981qtnnEqFQefK+st8pKoh8
-RKP689TNy2cOvpOiQQdPsYi+ojsMAUV66TvQS9fJI4xZvrtiqDGcQQ4jSyIt5E0=
-=gCfz
+iEYEAREIAAYFAlIo4ysACgkQCaWpQKGI+9R1cACeNVEDLXK625cVKVnfA81RXoD1
+sRoAnR96QkdYqVPF/EMgVUaHpn9KK/vP
+=Lrag
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch
new file mode 100644
index 000000000000..8289ec07bdc7
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch
@@ -0,0 +1,27 @@
+From 863ceb7f5a5b5f6accfea23dcd47b5c74a53f68b Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu, 02 May 2013 01:49:01 +0000
+Subject: Do not misdetect clang as the Microsoft C compiler
+
+Just because they both start with 'cl'.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=698090
+---
+diff --git a/giscanner/dumper.py b/giscanner/dumper.py
+index f5346a4..1ef1f4b 100644
+--- a/giscanner/dumper.py
++++ b/giscanner/dumper.py
+@@ -89,8 +89,9 @@ class DumpCompiler(object):
+         # Enable the --msvc-syntax pkg-config flag when
+         # the Microsoft compiler is used
+         # (This is the other way to check whether Visual C++ is used subsequently)
+-        if 'cl' in self._compiler_cmd:
+-            self._pkgconfig_msvc_flags = '--msvc-syntax'
++        if 'clang' not in self._compiler_cmd:
++            if 'cl' in self._compiler_cmd:
++                self._pkgconfig_msvc_flags = '--msvc-syntax'
+         self._uninst_srcdir = os.environ.get(
+             'UNINSTALLED_INTROSPECTION_SRCDIR')
+         self._packages = ['gio-2.0 gmodule-2.0']
+--
+cgit v0.9.2
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild
new file mode 100644
index 000000000000..2a733a056725
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 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.36.0-r1.ebuild,v 1.1 2013/09/05 20:01:42 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="cairo doctool test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.36:2
+	doctool? ( dev-python/mako )
+	virtual/libffi:=
+	!<dev-lang/vala-0.20.0
+"
+# 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="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Do not misdetect clang as the Microsoft C compiler (from 'master)
+	epatch "${FILESDIR}/${PN}-1.36.0-detect-clang.patch"
+
+	# To prevent crosscompiling problems, bug #414105
+	CC=$(tc-getCC)
+
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	gnome2_src_prepare
+
+	# avoid GNU-isms
+	sed -i -e 's/\(if test .* \)==/\1=/' configure || die
+
+	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
+}
+
+src_configure(){
+	gnome2_src_configure \
+		--disable-static \
+		YACC=$(type -p yacc) \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+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
+}