gentoo resync : 30.09.2020

3 files changed, 54 insertions, 5 deletions

diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index bbb071a7fd05..1529c62cdbeb 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,9 +1,11 @@
 AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc2914583cf70cfbd7c08153c0c87a76d7f30e41f3660d4ecd9e76b3f06fb562865fc79474019f29c83602728c4 SHA512 f3598e28e98e97d3d1eec8ed4168996623cf920f94870cce4e731de2e1b0925a786dc8cbaf9d70379fc4e73f4f26f3a9405b2077c5246dcd66cc0eab25625b94
 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.15.tar.gz 190487 BLAKE2B 2d6478caae488b84c74a3f7b489013b065b3e8fb106a6e8c5f413ffe87be7f4530aade8d2b5df5b8193949d60f49d5255b4eddb0cd5f1cab6f450ba2f97426ab SHA512 dda0eadbd0ea2093f17cba039309ccda3dbcb7266d083b46bda61e02cd7f049d66de49be1e005157c3e5af910d2703ffbc9cfe7f1242bd67b9787f8508e4d052
 DIST lcov_1.14-2.debian.tar.xz 25740 BLAKE2B ca1a84ed98e0cdd13aae88f0f550cac84f00b3dbf6bd764abe0c7eee7b73c0796abbf20e76cb51707d0d644bb17ee7ad283abbfaa7456dc2a3ade5e12cfbaabc SHA512 10fdb1f82be8cc9aef3b92aa7ca18f2736e5130d8b6ef9703b9444cb88f75f475e8bc48c441ed5cf7e4d11f383c226fc711e8609ea11772b01f454bb6a5bd45a
 EBUILD lcov-1.13-r2.ebuild 859 BLAKE2B d43e1aa8b6117e5296d73da09d943961a86218ccea9f90d890ef0f49835df8fdbf28ebcf78b2a30f57749a54ef22a2cd24a982f66e969f7e80b83803cb8ec66c SHA512 449744a363d44e90cd7fd06cc3beff631a74fd93e6d905c897016b36ec23e85554b163a8274ad951de6cda21adcd4291b754353ae59a6d26e278b61fb4e9b7f5
 EBUILD lcov-1.14.ebuild 809 BLAKE2B b856f279855281d6f25dc6c5ec751e5c4400df33d22a5e098525e0aa1b69edb8decc207d9becf6bbf6b2d53238046cc13dcce9e458a003854cce6349d46aeecf SHA512 4ab08b43adda29c198e59f67e2ebf648884389df131e03eb143bbf777905525d96b59041d8034aeebeaffd621e4f2a22e6d6d4f0c985f20fc09adc95346bd1ed
 EBUILD lcov-1.14_p2.ebuild 1399 BLAKE2B 6ff038ee856a577be12b4f0363abc0f39f181bab519501a77e19398f95885e7a0e8fc83a1b2537df1e0032addfcc29592e1bc2dc3c81a594cc200d54188ec289 SHA512 eba73e1e8f396b4945225e87da9d0eea550611c40b3c5f651ebf83f7a0ba3708acfcc735753023e01be080e60261476ec352a569b6d6a773a2afbd637eff00b4
-EBUILD lcov-9999.ebuild 846 BLAKE2B 9732de1816816254e334946cb3ff24e9806af0542d8948aa7478f956dfa7e044bf491b92f541d35bcd021c67bd794b8b66d927ec2db20c0c37467554709071fb SHA512 a2eaf7ea9fa5328d329991e639f2257f34608fdf67ba330b460a5c186557d0d3429646577a161aadf6f412e2a308154ec4290aecfc9be97dfd515850b9e28cd0
+EBUILD lcov-1.15.ebuild 963 BLAKE2B 12eb656eb9177ee422a10eb25188a9f6c53817e2251264a397e3a08d220970a848ffb69aaae4e40c986d66a186b52f696c9b1dd9319d696d45b1a12f06a70e9f SHA512 e9602ace4785304ae11ea186f3cb670ec1b192102d011ad1d9c8fd3feeeebdcf6c2ba23c9652f442c10a226216484a31ffb866cc63b2abbadc58cacdd95b8cec
+EBUILD lcov-9999.ebuild 920 BLAKE2B c39cab5754c576571ad3ce4b3151b987af87973a896695a3f25edaf95fea78f2ea812243e047aa6564a25dc52d06d8b7566c23025daa0fcd00bb6e2f54bf5f43 SHA512 b1532e9099ed0a39ad83bd96ceb1b6adf4b6bd4a558678b2a9b32246137996657343e7f9af3b721d40726bd14ee4ac1e76e77b8c8a2f9aa57466690709862369
 MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
diff --git a/dev-util/lcov/lcov-1.15.ebuild b/dev-util/lcov/lcov-1.15.ebuild
new file mode 100644
index 000000000000..aaf14998d4b6
--- /dev/null
+++ b/dev-util/lcov/lcov-1.15.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
+fi
+
+inherit optfeature 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"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/JSON
+	dev-perl/PerlIO-gzip
+"
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake -j1 PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+}
+
+pkg_postinst() {
+	elog "Optional features:"
+	optfeature "png output support" dev-perl/GD[png]
+}
diff --git a/dev-util/lcov/lcov-9999.ebuild b/dev-util/lcov/lcov-9999.ebuild
index 295385b60d64..456ec4605d03 100644
--- a/dev-util/lcov/lcov-9999.ebuild
+++ b/dev-util/lcov/lcov-9999.ebuild
@@ -11,20 +11,18 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
 fi
 
-inherit prefix
+inherit optfeature 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] )
 "
 
 src_prepare() {
@@ -37,5 +35,10 @@ src_prepare() {
 src_compile() { :; }
 
 src_install() {
-	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+	emake -j1 PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+}
+
+pkg_postinst() {
+	elog "Optional features:"
+	optfeature "png output support" dev-perl/GD[png]
 }