1 |
commit: 22e104ccc5baf2cb3285a367a0d160ac5d50c39d |
2 |
Author: Stephen L Arnold <nerdboy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 6 22:46:54 2020 +0000 |
4 |
Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 6 22:59:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e104cc |
7 |
|
8 |
dev-util/cccc: fix doc install, remove cruft left by melting HD |
9 |
|
10 |
Closes: https://bugs.gentoo.org/746587 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
12 |
Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org> |
13 |
|
14 |
dev-util/cccc/cccc-3.1.5-r1.ebuild | 17 +++++++++-------- |
15 |
dev-util/cccc/cccc-3.1.6.ebuild | 22 +++++++++++----------- |
16 |
2 files changed, 20 insertions(+), 19 deletions(-) |
17 |
|
18 |
diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild |
19 |
index 1d3cdf4bc73..b7c46d713a8 100644 |
20 |
--- a/dev-util/cccc/cccc-3.1.5-r1.ebuild |
21 |
+++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild |
22 |
@@ -53,18 +53,19 @@ src_install() { |
23 |
dodoc README.md |
24 |
|
25 |
if use mfc ; then |
26 |
- insinto /usr/share/doc/${PF} |
27 |
- doins "${FILESDIR}"/cccc-MFC-dialect.opt |
28 |
+ docinto examples |
29 |
+ dodoc "${FILESDIR}"/cccc-MFC-dialect.opt |
30 |
+ docompress -x "/usr/share/doc/${PF}/examples" |
31 |
fi |
32 |
|
33 |
if use doc ; then |
34 |
- insinto /usr/share/doc/${PF}/html |
35 |
- doins cccc/*.html || die "html docs failed" |
36 |
+ docinto html |
37 |
+ dodoc cccc/*.html || die "html docs failed" |
38 |
if use apidoc ; then |
39 |
- insinto /usr/share/doc/${PF}/html/api |
40 |
- doins -r doxygen/html/* || die "dox failed" |
41 |
- insinto /usr/share/doc/${PF}/html/metrics |
42 |
- doins ccccout/* || die "metrics failed" |
43 |
+ docinto html/api |
44 |
+ dodoc -r doxygen/html/. || die "apidocs failed" |
45 |
+ docinto html/metrics |
46 |
+ dodoc ccccout/* || die "metrics failed" |
47 |
fi |
48 |
fi |
49 |
} |
50 |
|
51 |
diff --git a/dev-util/cccc/cccc-3.1.6.ebuild b/dev-util/cccc/cccc-3.1.6.ebuild |
52 |
index 5100eea55bb..b7c46d713a8 100644 |
53 |
--- a/dev-util/cccc/cccc-3.1.6.ebuild |
54 |
+++ b/dev-util/cccc/cccc-3.1.6.ebuild |
55 |
@@ -9,14 +9,15 @@ DESCRIPTION="Source metrics (line counts, complexity, etc) for Java and C++" |
56 |
HOMEPAGE="http://sarnold.github.io/cccc/" |
57 |
if [[ ${PV} = 9999* ]]; then |
58 |
EGIT_REPO_URI="https://github.com/sarnold/cccc.git" |
59 |
+ EGIT_BRANCH="master" |
60 |
inherit git-r3 |
61 |
else |
62 |
SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
63 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
64 |
fi |
65 |
|
66 |
LICENSE="GPL-2" |
67 |
SLOT="0" |
68 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
69 |
IUSE="apidoc debug doc mfc" |
70 |
|
71 |
RDEPEND="" |
72 |
@@ -24,8 +25,6 @@ DEPEND="${RDEPEND} |
73 |
apidoc? ( app-doc/doxygen[dot] ) |
74 |
" |
75 |
|
76 |
-PATCHES=( "${FILESDIR}/${PN}-fix-tests-for-name-swap.patch" ) |
77 |
- |
78 |
src_prepare() { |
79 |
is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin |
80 |
use mfc && eapply "${FILESDIR}"/${PN}-c_dialect.patch |
81 |
@@ -54,18 +53,19 @@ src_install() { |
82 |
dodoc README.md |
83 |
|
84 |
if use mfc ; then |
85 |
- insinto /usr/share/doc/${PF} |
86 |
- doins "${FILESDIR}"/cccc-MFC-dialect.opt |
87 |
+ docinto examples |
88 |
+ dodoc "${FILESDIR}"/cccc-MFC-dialect.opt |
89 |
+ docompress -x "/usr/share/doc/${PF}/examples" |
90 |
fi |
91 |
|
92 |
if use doc ; then |
93 |
- insinto /usr/share/doc/${PF}/html |
94 |
- doins cccc/*.html || die "html docs failed" |
95 |
+ docinto html |
96 |
+ dodoc cccc/*.html || die "html docs failed" |
97 |
if use apidoc ; then |
98 |
- insinto /usr/share/doc/${PF}/html/api |
99 |
- doins -r doxygen/html/* || die "dox failed" |
100 |
- insinto /usr/share/doc/${PF}/html/metrics |
101 |
- doins ccccout/* || die "metrics failed" |
102 |
+ docinto html/api |
103 |
+ dodoc -r doxygen/html/. || die "apidocs failed" |
104 |
+ docinto html/metrics |
105 |
+ dodoc ccccout/* || die "metrics failed" |
106 |
fi |
107 |
fi |
108 |
} |