gentoo resync : 25.11.2020

3 files changed, 86 insertions, 9 deletions

diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest
index b7824ce1db3d..9c4e36cb2675 100644
--- a/dev-util/cccc/Manifest
+++ b/dev-util/cccc/Manifest
@@ -1,5 +1,7 @@
 AUX cccc-MFC-dialect.opt 560 BLAKE2B 65000ebbc99b306318aa2da34031879b7393649573b8509bc12ed6174d59208ea2a06e1af8d98eefb3d142d51e9b98bc9e2a058e8f8f3a68b17f76bb4dfcf6b2 SHA512 e37ded34821690e0b07e4e3da502bccdb5760a38a9f1fbacb6cec4de143cc9c0160684d9a41ce0c3ff8e2a7716889824594d6f8d374a631dbb0de91ccec53903
 AUX cccc-c_dialect.patch 2048 BLAKE2B d97bd8430fe1357779ebf221607ea724485cf5bf572c86f4adcb85ea6d29c41bfeeb562534bccd1787241c024951941921fe6936541c5ea1f72ea923e9612d12 SHA512 5fadc49a0da8ca51b74dd92e673b413b506c8b06dfeabb7da0e2ddf24e7766d58ebbcc00d018677f4b0ff77d10df8b974ff1afd4100c33152e8cad0538b61789
 DIST cccc-3.1.5.tar.gz 662760 BLAKE2B 57817ef9a44f002c017245d7dd3b1ef97fec59b59bce465d5e5e1cc12409b5602cfd8bf7ee938e526af9bcc11398639900d26848aa4f8c7f623669159de17117 SHA512 61544669a75ff7bd99c6ff5bb1e6ec163f2a09f4538493fe60e8f9f95eab7ba19ad6d39b6717ae010a223b8efe48c497a4feb8ead218e350ee2ab91b9c52c969
-EBUILD cccc-3.1.5-r1.ebuild 1415 BLAKE2B 2bd96fcfee18319519fea0992eae94f67c062386a66bfe20fa65ef157c54dc54193960b327723f12db617d379dc8ccc0b819face730cf49fb8267319b3869668 SHA512 b7c4e05f6d0bab14f6a16059850e016657b06539250647ea6f4c2ffa4bc339c27b15c1bce9905239393852f7d673b65cead2e37157b5ed3e67172144ec7ee5aa
+DIST cccc-3.1.6.tar.gz 663731 BLAKE2B 28c2a3c29d549bb10fb0e905a0c3397ab7fcffa5f4a0e8a7b9ab0e91cfbfffd7312891c646c00e4b7687b1fc4a5766b9c9d45fce0175dc403e816d2deab24545 SHA512 4966d590dd479448392611b57758a1b0378e91c505f258db643a256c3c60b9908574e22aecbc57635248694959d429de5f356328f298f1260920ef4b6fb306e4
+EBUILD cccc-3.1.5-r1.ebuild 1582 BLAKE2B 3161e81f0a1ee6c2358b668df1cb764d35375411fb37b3d5a6c3abb07f24ec8263a96cd1a2e795d928c7f0da6d7237cfb4ab973f2a0b9e7cacd3607be704366a SHA512 9302e88885e9abfb94991e1d7881ba8195af9dc172218e3f74ad30d0211ada2e4c2def1127c7873252f5130e8d79677b693711155d86106a3100dce48d1b4adf
+EBUILD cccc-3.1.6.ebuild 1582 BLAKE2B 3161e81f0a1ee6c2358b668df1cb764d35375411fb37b3d5a6c3abb07f24ec8263a96cd1a2e795d928c7f0da6d7237cfb4ab973f2a0b9e7cacd3607be704366a SHA512 9302e88885e9abfb94991e1d7881ba8195af9dc172218e3f74ad30d0211ada2e4c2def1127c7873252f5130e8d79677b693711155d86106a3100dce48d1b4adf
 MISC metadata.xml 694 BLAKE2B d8992216f3b05e4382fa843df2a71673946c1e81ef7325fef7ad39fa073c092cc86b1cd993582b40b230adb6902a406c30a7b9a00d557e7f2aafcf4e940e51cb SHA512 442e37fb776949e1f59ca7074ba1219e77e7e1be0003c5cace090342823227fca6a9a10ef607d133245985c717811005293bf2044fdb0bacfe2e114eea3ec2ad
diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild
index 47a91aadc54e..b7c46d713a80 100644
--- a/dev-util/cccc/cccc-3.1.5-r1.ebuild
+++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild
@@ -35,16 +35,16 @@ src_prepare() {
 src_compile() {
 	tc-export CC CXX LD AS AR NM RANLIB STRIP OBJCOPY
 	if use debug ; then
-		DEBUG="true" emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+		DEBUG="true" emake -j1 CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
 	else
-		emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+		emake -j1 CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
 	fi
 
-	use apidoc && emake CCC=$(tc-getCXX) metrics docs
+	use apidoc && emake -j1 CCC=$(tc-getCXX) metrics docs
 }
 
 src_test() {
-	emake CCC=$(tc-getCXX) test
+	emake -j1 CCC=$(tc-getCXX) test
 }
 
 src_install() {
@@ -52,16 +52,20 @@ src_install() {
 
 	dodoc README.md
 
-	use mfc && dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
+	if use mfc ; then
+		docinto examples
+		dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
 
 	if use doc ; then
 		docinto html
-		dodoc cccc/*.html
+		dodoc cccc/*.html || die "html docs failed"
 		if use apidoc ; then
 			docinto html/api
-			dodoc -r doxygen/html/.
+			dodoc -r doxygen/html/. || die "apidocs failed"
 			docinto html/metrics
-			dodoc -r ccccout/.
+			dodoc ccccout/* || die "metrics failed"
 		fi
 	fi
 }
diff --git a/dev-util/cccc/cccc-3.1.6.ebuild b/dev-util/cccc/cccc-3.1.6.ebuild
new file mode 100644
index 000000000000..b7c46d713a80
--- /dev/null
+++ b/dev-util/cccc/cccc-3.1.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Source metrics (line counts, complexity, etc) for Java and C++"
+HOMEPAGE="http://sarnold.github.io/cccc/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/sarnold/cccc.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="apidoc debug doc mfc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	apidoc? ( app-doc/doxygen[dot] )
+	"
+
+src_prepare() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+	use mfc && eapply "${FILESDIR}"/${PN}-c_dialect.patch
+	default
+
+}
+
+src_compile() {
+	tc-export CC CXX LD AS AR NM RANLIB STRIP OBJCOPY
+	if use debug ; then
+		DEBUG="true" emake -j1 CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+	else
+		emake -j1 CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+	fi
+
+	use apidoc && emake -j1 CCC=$(tc-getCXX) metrics docs
+}
+
+src_test() {
+	emake -j1 CCC=$(tc-getCXX) test
+}
+
+src_install() {
+	dobin cccc/cccc
+
+	dodoc README.md
+
+	if use mfc ; then
+		docinto examples
+		dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc cccc/*.html || die "html docs failed"
+		if use apidoc ; then
+			docinto html/api
+			dodoc -r doxygen/html/. || die "apidocs failed"
+			docinto html/metrics
+			dodoc ccccout/* || die "metrics failed"
+		fi
+	fi
+}