From ef188ada4d7af85d45a874a1a3da2547312280f4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 5 May 2019 11:31:30 -0700 Subject: [PATCH] dev-util/cccc: rev-bump for eapi migration and QA cleanup * use EAPI 6, filter lto flags, clean up QA issues Bug: https://bugs.gentoo.org/651446 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Steve Arnold --- ...cccc-3.1.5.ebuild => cccc-3.1.5-r1.ebuild} | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) rename dev-util/cccc/{cccc-3.1.5.ebuild => cccc-3.1.5-r1.ebuild} (60%) diff --git a/dev-util/cccc/cccc-3.1.5.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild similarity index 60% rename from dev-util/cccc/cccc-3.1.5.ebuild rename to dev-util/cccc/cccc-3.1.5-r1.ebuild index 07042e9343cb..a26523720d4b 100644 --- a/dev-util/cccc/cccc-3.1.5.ebuild +++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit eutils toolchain-funcs flag-o-matic @@ -17,7 +17,7 @@ fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="apidoc debug doc mfc" RDEPEND="" @@ -25,15 +25,16 @@ DEPEND="${RDEPEND} apidoc? ( app-doc/doxygen[dot] ) " -MAKEOPTS="-j1" - src_prepare() { - use mfc && epatch "${FILESDIR}"/${PN}-c_dialect.patch + 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 - export STRIP_MASK="*/bin/*" DEBUG="true" emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc else emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc @@ -52,19 +53,18 @@ src_install() { dodoc README.md if use mfc ; then - dodoc "${FILESDIR}"/cccc-MFC-dialect.opt - docompress -x "/usr/share/doc/${PF}/cccc-MFC-dialect.opt" + insinto /usr/share/doc/${PF} + doins "${FILESDIR}"/cccc-MFC-dialect.opt fi if use doc ; then - dodoc CHANGELOG.md HISTORY.md - dohtml cccc/*.html || die "html docs failed" + insinto /usr/share/doc/${PF}/html + doins cccc/*.html || die "html docs failed" if use apidoc ; then - docinto api - dohtml -A svg -r doxygen/html || die "dox failed" - docompress -x "/usr/share/doc/${PF}/api" - docinto metrics - dohtml ccccout/* || die "metrics failed" + 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 } -- 2.26.2