gentoo resync : 15.12.2019

3 files changed, 62 insertions, 30 deletions

diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 5e072597f538..3ae504e1bd21 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,8 +1,9 @@
 AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc2914583cf70cfbd7c08153c0c87a76d7f30e41f3660d4ecd9e76b3f06fb562865fc79474019f29c83602728c4 SHA512 f3598e28e98e97d3d1eec8ed4168996623cf920f94870cce4e731de2e1b0925a786dc8cbaf9d70379fc4e73f4f26f3a9405b2077c5246dcd66cc0eab25625b94
-AUX lcov-1.9-gcc-4.7.patch 1035 BLAKE2B d4ce8c505f1dd22f44feadf9f99bcf73fd5e461a714d3d40d5e8e222b5d427d947e42d4806252437ae4392ec3ee3d9521f85173044d493f7a4f81a35e042c5fd SHA512 c9d1a80ead5ed8de91fdac4ac3b7b8d8cbcf245f38276c91551a4f74942ff348947fbbd4b4a3fa171fd90ea240ffea8f4b162ca9eab2a929a7daa2eb0834f307
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
 DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
+DIST lcov_1.14-2.debian.tar.xz 25740 BLAKE2B ca1a84ed98e0cdd13aae88f0f550cac84f00b3dbf6bd764abe0c7eee7b73c0796abbf20e76cb51707d0d644bb17ee7ad283abbfaa7456dc2a3ade5e12cfbaabc SHA512 10fdb1f82be8cc9aef3b92aa7ca18f2736e5130d8b6ef9703b9444cb88f75f475e8bc48c441ed5cf7e4d11f383c226fc711e8609ea11772b01f454bb6a5bd45a
 EBUILD lcov-1.13-r2.ebuild 863 BLAKE2B 225a3bc7d5ddd4cf45c145788cb42b28a77292080facee66a59677855cb14ef32986545adbd601e9240cc9732fe18514a6ad40b714ec99bbdcc04b163a870ccb SHA512 15c4ddbe6e88b6c41a31398a2684b4c5c74819a6030eade8c8735ad2959d2dd9bb58fac90957b17c3f57dc58898f56ce2901ac9e2239bb2e2ec6af04291c8332
 EBUILD lcov-1.14.ebuild 813 BLAKE2B ee220647f69ce9d789b296922ee6dc2324124aabc5e12f7d705787cbe69c21dc19fcb89804b19dc71645aba34b71d11116ff99fa137f2dc3b9d2674af3aa0e58 SHA512 4c7dc995012ba8b9f15b2b507e819a3da9da01b25a3f6b24544d36f1a46017e4fafef35b58795071043c473179ec0ef59fac769d3874e170b770d1de10c1674a
+EBUILD lcov-1.14_p2.ebuild 1396 BLAKE2B b159f23ae9b33d60365773141cd64833e2b8d70993b13d4361f73ee1d550ca371380f9f2b8df20b97cd95e269ca27bda01f2f4457ac21fab58d5597ceb3d7f6c SHA512 f234978b961b7bde29f36b73a4bc719ce63af4291fb58304ab846f053114ac3152835d401bcfe1cce67bb41e74aaae6e994f53627792c13f887597cfeb87a6e7
 EBUILD lcov-9999.ebuild 850 BLAKE2B fd1abd672df98cf8329ffbb0bd46a13477c0700ec6f63b33fddc1ab3b9d44d2e5a24c8aba47a90ff761bbb283fe28bff7d9a621383265eed349f90a0726c8e56 SHA512 86de86036f1e89fb53bf84da63fc30457cb300158a66caae3f2baf8ab525de3924677c7c3f2c8675e72c6533b5ea63080590c86c553ec27afd68cdcde606c9d8
 MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
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
deleted file mode 100644
index 1b9d6ac0ff21..000000000000
--- a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.14_p2.ebuild b/dev-util/lcov/lcov-1.14_p2.ebuild
new file mode 100644
index 000000000000..41677b6255db
--- /dev/null
+++ b/dev-util/lcov/lcov-1.14_p2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LCOV_V=${PV/_p*/}
+DB_V=${PV/*_p/}
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="
+		mirror://sourceforge/ltp/${PN}-${LCOV_V}.tar.gz
+		mirror://debian/pool/main/l/${PN}/${PN}_${LCOV_V}-${DB_V}.debian.tar.xz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+fi
+
+inherit prefix
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="png"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/JSON
+	dev-perl/PerlIO-gzip
+	png? ( dev-perl/GD[png] )
+"
+
+PATCHES=(
+	"${WORKDIR}/debian/patches/handle-equals-signs.patch"
+	"${WORKDIR}/debian/patches/fix-undef-behaviour.patch"
+	"${WORKDIR}/debian/patches/reproducibility.patch"
+	"${WORKDIR}/debian/patches/gcc8.patch"
+	"${WORKDIR}/debian/patches/gcc-9-support.patch"
+)
+
+S=${WORKDIR}/${PN}-${LCOV_V}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+
+	# Broken by https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da
+	rm -rf test/lcov_diff || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+}