From: Pacho Ramos <pacho@gentoo.org>
Date: Wed, 18 Feb 2015 12:24:42 +0000 (+0000)
Subject: Scanner: don't pass certain debug level flags to cpp (from 'master'), drop old
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a5792a676cadfa165253196bfa76831c5ed513b;p=gentoo.git

Scanner: don't pass certain debug level flags to cpp (from 'master'), drop old

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

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index 193073017164..afdbc571e809 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.140 2015/01/02 12:08:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.141 2015/02/18 12:24:41 pacho Exp $
+
+*gobject-introspection-1.42.0-r1 (18 Feb 2015)
+
+  18 Feb 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gobject-introspection-1.42.0-cpp-flags.patch,
+  +gobject-introspection-1.42.0-r1.ebuild, -gobject-introspection-1.38.0.ebuild,
+  -gobject-introspection-1.40.0-r1.ebuild, -gobject-introspection-1.42.0.ebuild:
+  Scanner: don't pass certain debug level flags to cpp (from 'master'), drop old
 
   02 Jan 2015; Agostino Sarubbo <ago@gentoo.org>
   gobject-introspection-1.40.0-r2.ebuild:
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 2e895ae50bdd..d70ea84293cf 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -2,29 +2,17 @@
 Hash: SHA256
 
 AUX gobject-introspection-1.40.0-gjs-crash.patch 16493 SHA256 94adc63fa1e0eb81151b93709c7ecb7675000897d2ad86dde6663f6834e2c5b6 SHA512 f1407af05365cc0586a60c1218d2e4b0dbe36e4ae70dbe9aeb893ef53a14a8aceda6bc9eb0d0ca21fd6c7257991156b49b28425a2459d6facfdc0360d3e62e5b WHIRLPOOL 7a35b07ef8161705757d2e5eafc06674dc52d0a22a2b43ada2740a9ab5773f6299e4951bab09bd2f26052345416bdf716e085ae9f8d9152edc3147f84b60a997
-DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
+AUX gobject-introspection-1.42.0-cpp-flags.patch 1204 SHA256 5dc1604729220e3b65ad7231f5bf6ba4b390cdde717c13f52d8156b60e173eb8 SHA512 4404691f809bdf38bcbfc09a88827de0e07c7ff2cd2c5c5377e70288dcad89ce45c0f2d84e71c840930bb62a11b9e9dc6ef48dd0b967010d4a8058afcc2e7108 WHIRLPOOL 1e2e7fa5a6fdddd19cd5cc86625b4a35dfa3b239f240b24706067198dbbc459d2fc8acf6dea866e0c858662431bc0fc783c1f43a5623dda267b15f7cb2b3ab5e
 DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
 DIST gobject-introspection-1.42.0.tar.xz 1308056 SHA256 3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7 SHA512 2f84aae6ebb73f1cda70be6070fdbd0791777baed0f12921518a3c9cc890c406d6649bf0441bef5b93b6da4320d0c2639d9090c43d1011deebd1652f1e958021 WHIRLPOOL fe2703c82c83617093fa9ee74b28a2f6bec87d43f4b6eadf7f124a8454a817b6a30b635ea7c0388e429ae081f23c943ca31c34f2aa68811b1d4d10758b8a6a16
-EBUILD gobject-introspection-1.38.0.ebuild 2216 SHA256 60ae171734654b20bb2c00101483f659241da5f9366ca8b78a8dbe1e5a2e8242 SHA512 777e3ad39c4a43c701f44b29f47b33e8bd83852e28ae69bf74de0dc1cfa49870a873efebf7dd780d8672a8e59feb0a845c6f98c3af41084bd47eb7dce66d172f WHIRLPOOL fc4ddc0e9a8721b4acbd4f66b66736b2c223e5a041aba2d9d505e71e7f2f4ed8653cd9568156672104e3a40c70fc8497e04fde48f808f81c5d2ce50b7063499e
-EBUILD gobject-introspection-1.40.0-r1.ebuild 2343 SHA256 8a730fa322b8a968f5fac86f237c23d35138b97e2c0fd7cf2a1e6ebcb612a50f SHA512 ef9f33ae1a905e1c8b64a2b802bff6733aa4b3c7a8b67691f49791950bd01b757250d0b444d0f1eb5988ae792cda3ea6c20645eee1bb4aaf282150dd2eaf9a85 WHIRLPOOL 9aeebdd82bf686b30721e099d023efcc9684df3770d67e00e1bfeeaca91bc92ee36f9261b3174ad5311e83a55aecb43b7c46b3c89fc17a11dfa7ed2f90f79fda
 EBUILD gobject-introspection-1.40.0-r2.ebuild 2490 SHA256 c88b73efd0e5d8ae2154c07476a1c40312d7a2e7f73403f1dc0ca59ec5a92856 SHA512 707d1e0a713d761396689905d67e2943dcc1dabf1a291aa140558649b621443d38b53ccd46e28715b2cb54fd1c3b08d1660547721c160e4a08e954e569666f7b WHIRLPOOL da388d4a74f82c61a402b5825e85684a37fd4160ebde6c70ef0a5abfa8db6ed63e949141aa97115d145346094d928c933987e002856c7a0e00fa36617065753d
-EBUILD gobject-introspection-1.42.0.ebuild 2353 SHA256 85879f1186bde7c312cc0718ec9db8d8569ee679df27c7c26ce4f676aa058e76 SHA512 65164479a8fdd0d8633aeed5edb0aecbd2b5203fd791032f117d9fcd7772b86519ac63bfbcd6f4f8a50273b8c286a6c682ee4e1700a5a1f1eb8924b02d977a99 WHIRLPOOL bf8c1eaa320397e428e50f9c27e5c9276765e6c724e2c3098b9b6084670f8f0558e38c9f25c3735a37585487a3240317c277232dd0bc8e8af1afb7df437ad614
-MISC ChangeLog 23855 SHA256 dd440ea60074ff34906a22614a72a860b874a1fbf148e31d63f4a2eb71e403e8 SHA512 1daa42f4d49ba0e94e2826558c246601c7722cb57f7a90ff7118af1448a037b28c57b0519581e13aa4317bf8e054d9525e87e5483f1e0309fcade99d79bdc945 WHIRLPOOL 95e8505138b82802855c57160db6b05162ebc0a5605c02b9875d1c20398da12f4e4052e41bf223efb7c8ba75bc0fecb47334407ee80173bcdadef1c4d491a7e9
+EBUILD gobject-introspection-1.42.0-r1.ebuild 2520 SHA256 f6fa6c0044dfd605e375e2c42adb361ffe0c27422e9f8c1d574ae7246ef909a4 SHA512 759428977908d4cf36fe7751667ca59297b78ffb0dfa817799b53ff085c5028eb53297ecd5cf3cae78eaa80671a9c92248ec34649cac840224b6d5bc5d253d53 WHIRLPOOL 91a8b017b57680521d9dd6ec4a0ee39e0820ebf573949c265165208fb4d1f737c5041a27e4e5d33725559c73583a802be60162a46dbc57abf990695271bd8a67
+MISC ChangeLog 24250 SHA256 ed1521ab15e18e95a0ace2c8c66edcd58b1bc098938d8d8a76afb1b3890d2d7c SHA512 cc9499f1f6a570229980a7f1a894837891fa4ed0aa89b14d5a24afbd5d596c708cdf3b2ea82f33a04b043c0912acaab49eda5b29a8b58b1d84daf6fd8ae645c7 WHIRLPOOL c5bc28e4f78ad68fc6ab5ad3aa52adcbc7eaaced3c52a382475fd7fdbd4219184dcf3a228ab2b02bbee1650ff1f7064a55acffcf84323c1e8762a3b4e2e95e76
 MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUpopYAAoJELp701BxlEWf2mkQAJHzPDt+9TDZtauK50vFkdZN
-ehtSN41jgSbK5F4f6iQGXqXz4vIXw/MVLo+iMV+Y1tcpWk/jvzc0aR5b1xq1ZdgX
-YH0+rFo037Y7W7Ow9KM+AT18P9z6RyAp2kbkqj5z5vWBXQBoyHcKFbLuylc5WpGx
-ecsiXoJDj0j4w6aQuGIaxJjzw5LeDCXWAUdFi8x1MJgHZlE5YmtlyLBNKlesH5DS
-Qd9w3hKx+MfsJMURwlzOTPQUr3gFeH7M9yPq2zJv1wdMS5LUGA1DDOdgkFh1Av6K
-pcw4xjJa6KOvutt8hc3B+zf1/pJKRQCN/IRkksI4CLwW+b1qwjUvZriVtnMqV0CF
-F8EEtxpUMEM+JJgRhGKeI802VihvooMSJADKlcXcRUGp4j43EgUc/7Jy5pKwP97J
-tMKx9xyz+A0pkmMaaDHlfHWHRtITwQMHcLvs0+cfVNkIBmRrQd7inhGSpUFutAm9
-fFPiMoINY+FvxO/YC1XW7voMGAzzE2v/SBKrcSNIUV5bdEMXvQaL7Me/aWECnlTx
-xYMyV3vvLKYXsLHIT9kfVjNVJnirePXW+ipHYdImp0RxH32w23yi5oFuWAz/aok3
-7O1oswpO4LREdfvwvjAFBMYmX9E7Nd42W/+IS9gRWzgE6p2Y2HYGf/4sX7g0q677
-N1RnokdWAxb9HOl1JJG3
-=iNUs
+iEYEAREIAAYFAlTkhIoACgkQCaWpQKGI+9TsPQCdEzJYJXCfvqwpRLjvQD4ZRRKs
+He0AmwdEHqJ0UfkYjFGSCZPFDLjoZrF3
+=Nzbv
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.42.0-cpp-flags.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.42.0-cpp-flags.patch
new file mode 100644
index 000000000000..8195cdf362da
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.42.0-cpp-flags.patch
@@ -0,0 +1,32 @@
+From d2dce55c971fc44cc327818b0341eb89f1243db6 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Wed, 28 Jan 2015 21:55:20 -0600
+Subject: scanner: don't pass certain debug level flags to cpp
+
+These may cause cpp to output code that still has #defines in them,
+which the scanner does not expect.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=720504
+
+diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
+index dab1602..9a81421 100644
+--- a/giscanner/sourcescanner.py
++++ b/giscanner/sourcescanner.py
+@@ -294,6 +294,14 @@ class SourceScanner(object):
+         cpp_args += ['-E', '-C', '-I.', '-']
+         cpp_args += self._cpp_options
+ 
++        # We expect the preprocessor to remove macros. If debugging is turned
++        # up high enough that won't happen, so strip these out. Bug #720504
++        for flag in ['-g3', '-ggdb3', '-gstabs3', '-gcoff3', '-gxcoff3', '-gvms3']:
++            try:
++                cpp_args.remove(flag)
++            except ValueError:
++                pass
++
+         proc = subprocess.Popen(cpp_args,
+                                 stdin=subprocess.PIPE,
+                                 stdout=subprocess.PIPE)
+-- 
+cgit v0.10.2
+
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild
deleted file mode 100644
index f6d807297b9a..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.38.0.ebuild,v 1.13 2014/06/06 16:08:52 vapier 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 arm64 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.15
-	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
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.40.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.40.0-r1.ebuild
deleted file mode 100644
index 68d4d1240c36..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.40.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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-r1.ebuild,v 1.7 2014/10/11 11:38:41 maekke Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
-HOMEPAGE="https://wiki.gnome.org/Projects/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
-# We force glib and goi to be in sync by this way as explained in bug #518424
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.$(get_version_component_range 2):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
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.42.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.42.0-r1.ebuild
similarity index 88%
rename from dev-libs/gobject-introspection/gobject-introspection-1.42.0.ebuild
rename to dev-libs/gobject-introspection/gobject-introspection-1.42.0-r1.ebuild
index 810720a330aa..86b0013674d2 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.42.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.42.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.42.0.ebuild,v 1.1 2014/12/21 12:41:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.42.0-r1.ebuild,v 1.1 2015/02/18 12:24:41 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -45,6 +45,12 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	# scanner: don't pass certain debug level flags to cpp (from 'master')
+	epatch "${FILESDIR}"/${PN}-1.42.0-cpp-flags.patch
+	gnome2_src_prepare
+}
+
 src_configure() {
 	if ! has_version "x11-libs/cairo[glib]"; then
 		# Bug #391213: enable cairo-gobject support even if it's not installed