Fix from upstream for working with gcc-4.7.

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

4 files changed, 89 insertions, 3 deletions

diff --git a/dev-util/lcov/ChangeLog b/dev-util/lcov/ChangeLog
index 512cc1e13fc0..bc96c196a316 100644
--- a/dev-util/lcov/ChangeLog
+++ b/dev-util/lcov/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/lcov
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lcov/ChangeLog,v 1.9 2012/05/29 20:05:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lcov/ChangeLog,v 1.10 2012/06/27 22:01:30 vapier Exp $
+
+*lcov-1.9-r1 (27 Jun 2012)
+
+  27 Jun 2012; Mike Frysinger <vapier@gentoo.org> +files/lcov-1.9-gcc-4.7.patch,
+  +lcov-1.9-r1.ebuild:
+  Fix from upstream for working with gcc-4.7.
 
   29 May 2012; Brent Baude <ranger@gentoo.org> lcov-1.9.ebuild:
   Marking lcov-1.9 ppc for bug 406191
@@ -34,4 +40,3 @@
 
   24 Oct 2008; Olivier Crête <tester@gentoo.org> ChangeLog:
   Initial import of lcov, from bug #100803. Ebuild contributed by Ryo Kuya
-
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index e1481ed42187..2f814ec23907 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX lcov-1.9-gcc-4.7.patch 1035 RMD160 5f6477168963c1eeeb96f5fc5e189e33719f89e1 SHA1 9e00e3fed4ba788ff42cec17d79281ee396f82af SHA256 76826522239ce354738de8c6adaf2face028eb42a7516525c4fa2375bbf55fe5
 DIST lcov-1.7.tar.gz 109396 RMD160 2a53f7037a78ee3ddb761c0c2c109a111a318956 SHA1 3cbf50d1e4be3d61acedd243aaed264a4b24a3a6 SHA256 3636cebe44da3c06d0096b4eea96bf7838502cc30611ab25373c03fda382a3b3
 DIST lcov-1.9.tar.gz 140035 RMD160 8065012a49cc7e10c295093c9b0c6dee9efcac22 SHA1 5aff4b998b1288896734326a0b74ab536339ec21 SHA256 c37e125d4f0773339de3600d45ad325fe710ea2f0051d7ee2b8a168f450f1aca
 EBUILD lcov-1.7.ebuild 590 RMD160 6b8b80c63984cb30b0a0c980cc0fff2b60ba7569 SHA1 cc213a8876845fc8c37f7e1643e6abe0a5651752 SHA256 35620819d65798491cd0fb60e2a188420d8f1a7309a08c79d7f3db18cc0b414b
+EBUILD lcov-1.9-r1.ebuild 666 RMD160 5e7d40bd35d235bdbcc3fa509ea4b28b22e2022b SHA1 418a15926e12d452b94dbec8ca790783be32efe2 SHA256 0146e81554cd5b474b462962d093ae482e998194cfc2fa1c4338819911422a86
 EBUILD lcov-1.9.ebuild 587 RMD160 e812e70f2695e118607e1e55fda0ce149f105e17 SHA1 480ec25f0779b9ba1abbc28db203d872109db7fb SHA256 7eae7f2e0f234d8a921cdd06b413d2c263405b39dd4b308f625f8d05ba471e72
-MISC ChangeLog 1254 RMD160 77df7365264fcbad36a56797d3ccb3dff84d5e88 SHA1 0cc777b51afca155e817e2d97eb931cadde98c6c SHA256 a0467adb1117e70c78a66360875374607689d4740a779e824831420efda6717e
+MISC ChangeLog 1433 RMD160 9d6834b444108c80db28b65e0bcc6463b88aecff SHA1 a653a443c1e3d5f8eb549c696843a7d5d61ac8ff SHA256 73f0874d841d91d1b5502c7487ac95f3390eab044f371e2333eb3deab51570ba
 MISC metadata.xml 224 RMD160 35c4d2262596bdad9abcfb4c02e16c6555b79330 SHA1 30504f95e702bff13170d95050f91051bb781df6 SHA256 522b4c8cbdc1df8479a9ec99ee3494d1e60d20558f6dd88bbb1c763cd0324103
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJP64LAAAoJELEHsLL7fEFWc+4QAMFpKfSwQgIq510oNLe/Z32K
+E8B+IWjF+Sclgq56kQM58lLB2w1JRVwB+nGqt/nN8GRnAqJmwhV2aJHhGX9MfCgo
+7FJGk80+D9eIfrnqha6ucDpN1+s8pXrUE6RBWKLIwjrU8MnBv5hnzjEP0JmbRRmp
+rqnN5RO6hXoajCc23MKb4Y6lZeoP6DCSPOKSaJfR+ZsMsnudG3UNUy7Y3s2du5Dn
+M952LIFyKyc7gQhgm0VhzpUnUyi7k3SRrd16+Uy1syr7D0DWqnTAQZLsgEun3ieB
+ZBvL0YJk5UUMX0seUVygQwDuRgrAHuzwF0IZEt2/vgVZenmj4RDxk9inLLLmZrp8
+zZPZa2wA5usRjhhXG+KAiHjr02GikWEPqKctLeRIW8SP3bnLk+4tVq+AnWJpL2rr
+MWTV97ygC1SLNrz/1Waa8BUBu4nLGKEM3NPu5g+gQ2IVknKj+hYXdRstuJ4/q4R3
+SCzzMDN4f72ETwr3ZpJnZzbRyVKE37kLz87jEnQH12jUQPxtdWAwEIVBoRA49Bw7
+OryjOn53o8H0xxbKyvEKXH+zVPbJHMFbS5gNXZxmrEUSBQ1wUAr1ZaVnD7FbfJ9E
+n0A5BFdc2JVrsAqU3Yrx/SLmHcASOfIuAnF0sXglf7a6coM5ib2dNrvF9gFMFF5j
+qgbZquxVH62L+AkoKVdq
+=MAZQ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch b/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
new file mode 100644
index 000000000000..1b9d6ac0ff21
--- /dev/null
+++ b/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
@@ -0,0 +1,29 @@
+fix from upstream to work with gcc-4.7
+
+Index: bin/geninfo
+===================================================================
+RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
+retrieving revision 1.95
+retrieving revision 1.96
+diff -u -p -r1.95 -r1.96
+--- bin/geninfo	20 Jan 2012 11:53:57 -0000	1.95
++++ bin/geninfo	10 Apr 2012 11:48:52 -0000	1.96
+@@ -61,6 +61,7 @@ if( $^O eq "msys" )
+ our $gcov_tool		= "gcov";
+ our $tool_name		= basename($0);
+ 
++our $GCOV_VERSION_4_7_0	= 0x40700;
+ our $GCOV_VERSION_3_4_0	= 0x30400;
+ our $GCOV_VERSION_3_3_0	= 0x30300;
+ our $GCNO_FUNCTION_TAG	= 0x01000000;
+@@ -3023,5 +3024,10 @@ sub read_gcno_function_record(*$$$$)
+ 	graph_expect("function record");
+ 	# Skip ident and checksum
+ 	graph_skip($handle, 8, "function ident and checksum") or return undef;
++	if ($gcov_version >= $GCOV_VERSION_4_7_0) {
++		# Skip extra checksum added by android 4.4.0 / gcc >= 4.7
++		# toolchains.
++		graph_skip($handle, 4, "function extra checksum");
++	}
+ 	# Read function name
+ 	graph_expect("function name");
diff --git a/dev-util/lcov/lcov-1.9-r1.ebuild b/dev-util/lcov/lcov-1.9-r1.ebuild
new file mode 100644
index 000000000000..732df79d61f7
--- /dev/null
+++ b/dev-util/lcov/lcov-1.9-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lcov/lcov-1.9-r1.ebuild,v 1.1 2012/06/27 22:01:30 vapier Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5
+	dev-perl/GD[png]"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${D}" install
+}