[gentoo-commits] repo/gentoo:master commit in: dev-util/cccc/

[Steve Arnold]

commit:     77a4af7c782f230e4f2aa30c1bfa8c24712ab6ce
Author:     Stephen Arnold <nerdboy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 17:17:44 2020 +0000
Commit:     Steve Arnold <nerdboy <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 17:20:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77a4af7c

dev-util/cccc: add latest release, fix current bug

* archaic build setup incompatible with parallel make

Bug: https://bugs.gentoo.org/720714
Closes: https://bugs.gentoo.org/720714
Package-Manager: Portage-2.3.67, Repoman-2.3.17
Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org>

 dev-util/cccc/Manifest                             |  1 +
 dev-util/cccc/cccc-3.1.5-r1.ebuild                 | 25 ++++++++++--------
 .../{cccc-3.1.5-r1.ebuild => cccc-3.1.6.ebuild}    | 30 ++++++++++++----------
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest
index 887fa77c8cf..544fb644520 100644
--- a/dev-util/cccc/Manifest
+++ b/dev-util/cccc/Manifest
@@ -1 +1,2 @@
 DIST cccc-3.1.5.tar.gz 662760 BLAKE2B 57817ef9a44f002c017245d7dd3b1ef97fec59b59bce465d5e5e1cc12409b5602cfd8bf7ee938e526af9bcc11398639900d26848aa4f8c7f623669159de17117 SHA512 61544669a75ff7bd99c6ff5bb1e6ec163f2a09f4538493fe60e8f9f95eab7ba19ad6d39b6717ae010a223b8efe48c497a4feb8ead218e350ee2ab91b9c52c969
+DIST cccc-3.1.6.tar.gz 663731 BLAKE2B 28c2a3c29d549bb10fb0e905a0c3397ab7fcffa5f4a0e8a7b9ab0e91cfbfffd7312891c646c00e4b7687b1fc4a5766b9c9d45fce0175dc403e816d2deab24545 SHA512 4966d590dd479448392611b57758a1b0378e91c505f258db643a256c3c60b9908574e22aecbc57635248694959d429de5f356328f298f1260920ef4b6fb306e4

diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild
index 47a91aadc54..1d3cdf4bc73 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,19 @@ src_install() {
 
 	dodoc README.md
 
-	use mfc && dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
+	if use mfc ; then
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/cccc-MFC-dialect.opt
+	fi
 
 	if use doc ; then
-		docinto html
-		dodoc cccc/*.html
+		insinto /usr/share/doc/${PF}/html
+		doins cccc/*.html || die "html docs failed"
 		if use apidoc ; then
-			docinto html/api
-			dodoc -r doxygen/html/.
-			docinto html/metrics
-			dodoc -r ccccout/.
+			insinto /usr/share/doc/${PF}/html/api
+			doins -r doxygen/html/* || die "dox failed"
+			insinto /usr/share/doc/${PF}/html/metrics
+			doins ccccout/* || die "metrics failed"
 		fi
 	fi
 }

diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.6.ebuild
similarity index 57%
copy from dev-util/cccc/cccc-3.1.5-r1.ebuild
copy to dev-util/cccc/cccc-3.1.6.ebuild
index 47a91aadc54..5100eea55bb 100644
--- a/dev-util/cccc/cccc-3.1.5-r1.ebuild
+++ b/dev-util/cccc/cccc-3.1.6.ebuild
@@ -9,15 +9,14 @@ 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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="apidoc debug doc mfc"
 
 RDEPEND=""
@@ -25,6 +24,8 @@ DEPEND="${RDEPEND}
 	apidoc? ( app-doc/doxygen[dot] )
 	"
 
+PATCHES=( "${FILESDIR}/${PN}-fix-tests-for-name-swap.patch" )
+
 src_prepare() {
 	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
 	use mfc && eapply "${FILESDIR}"/${PN}-c_dialect.patch
@@ -35,16 +36,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 +53,19 @@ src_install() {
 
 	dodoc README.md
 
-	use mfc && dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
+	if use mfc ; then
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/cccc-MFC-dialect.opt
+	fi
 
 	if use doc ; then
-		docinto html
-		dodoc cccc/*.html
+		insinto /usr/share/doc/${PF}/html
+		doins cccc/*.html || die "html docs failed"
 		if use apidoc ; then
-			docinto html/api
-			dodoc -r doxygen/html/.
-			docinto html/metrics
-			dodoc -r ccccout/.
+			insinto /usr/share/doc/${PF}/html/api
+			doins -r doxygen/html/* || die "dox failed"
+			insinto /usr/share/doc/${PF}/html/metrics
+			doins ccccout/* || die "metrics failed"
 		fi
 	fi
 }