Gentoo Archives: gentoo-commits

From: Steve Arnold <nerdboy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cccc/
Date: Sun, 05 May 2019 18:32:02
Message-Id: 1557081090.ef188ada4d7af85d45a874a1a3da2547312280f4.nerdboy@gentoo
1 commit: ef188ada4d7af85d45a874a1a3da2547312280f4
2 Author: Stephen Arnold <nerdboy <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 5 18:31:30 2019 +0000
4 Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org>
5 CommitDate: Sun May 5 18:31:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef188ada
7
8 dev-util/cccc: rev-bump for eapi migration and QA cleanup
9
10 * use EAPI 6, filter lto flags, clean up QA issues
11
12 Bug: https://bugs.gentoo.org/651446
13 Package-Manager: Portage-2.3.64, Repoman-2.3.12
14 Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org>
15
16 .../{cccc-3.1.5.ebuild => cccc-3.1.5-r1.ebuild} | 32 +++++++++++-----------
17 1 file changed, 16 insertions(+), 16 deletions(-)
18
19 diff --git a/dev-util/cccc/cccc-3.1.5.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild
20 similarity index 60%
21 rename from dev-util/cccc/cccc-3.1.5.ebuild
22 rename to dev-util/cccc/cccc-3.1.5-r1.ebuild
23 index 07042e9343c..a26523720d4 100644
24 --- a/dev-util/cccc/cccc-3.1.5.ebuild
25 +++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild
26 @@ -1,7 +1,7 @@
27 -# Copyright 1999-2016 Gentoo Foundation
28 +# Copyright 1999-2019 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 -EAPI=5
32 +EAPI=6
33
34 inherit eutils toolchain-funcs flag-o-matic
35
36 @@ -17,7 +17,7 @@ fi
37
38 LICENSE="GPL-2"
39 SLOT="0"
40 -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
41 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
42 IUSE="apidoc debug doc mfc"
43
44 RDEPEND=""
45 @@ -25,15 +25,16 @@ DEPEND="${RDEPEND}
46 apidoc? ( app-doc/doxygen[dot] )
47 "
48
49 -MAKEOPTS="-j1"
50 -
51 src_prepare() {
52 - use mfc && epatch "${FILESDIR}"/${PN}-c_dialect.patch
53 + is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
54 + use mfc && eapply "${FILESDIR}"/${PN}-c_dialect.patch
55 + default
56 +
57 }
58
59 src_compile() {
60 + tc-export CC CXX LD AS AR NM RANLIB STRIP OBJCOPY
61 if use debug ; then
62 - export STRIP_MASK="*/bin/*"
63 DEBUG="true" emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
64 else
65 emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
66 @@ -52,19 +53,18 @@ src_install() {
67 dodoc README.md
68
69 if use mfc ; then
70 - dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
71 - docompress -x "/usr/share/doc/${PF}/cccc-MFC-dialect.opt"
72 + insinto /usr/share/doc/${PF}
73 + doins "${FILESDIR}"/cccc-MFC-dialect.opt
74 fi
75
76 if use doc ; then
77 - dodoc CHANGELOG.md HISTORY.md
78 - dohtml cccc/*.html || die "html docs failed"
79 + insinto /usr/share/doc/${PF}/html
80 + doins cccc/*.html || die "html docs failed"
81 if use apidoc ; then
82 - docinto api
83 - dohtml -A svg -r doxygen/html || die "dox failed"
84 - docompress -x "/usr/share/doc/${PF}/api"
85 - docinto metrics
86 - dohtml ccccout/* || die "metrics failed"
87 + insinto /usr/share/doc/${PF}/html/api
88 + doins -r doxygen/html/* || die "dox failed"
89 + insinto /usr/share/doc/${PF}/html/metrics
90 + doins ccccout/* || die "metrics failed"
91 fi
92 fi
93 }