diff options
| author |   Stephen L Arnold <nerdboy@gentoo.org> | 2020-10-06 15:46:54 -0700 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2020-10-06 15:59:29 -0700 |
| commit | 22e104ccc5baf2cb3285a367a0d160ac5d50c39d (patch) | |
| tree | bf289479d09940692a52b4862604db07ddbd86b5 /dev-util | |
| parent | dev-lang/erlang: bump up to 23.1.1 (diff) | |
| download | gentoo-22e104ccc5baf2cb3285a367a0d160ac5d50c39d.tar.gz gentoo-22e104ccc5baf2cb3285a367a0d160ac5d50c39d.tar.bz2 gentoo-22e104ccc5baf2cb3285a367a0d160ac5d50c39d.zip | |
dev-util/cccc: fix doc install, remove cruft left by melting HD
Closes: https://bugs.gentoo.org/746587
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cccc/cccc-3.1.5-r1.ebuild | 17 | ||||
| -rw-r--r-- | dev-util/cccc/cccc-3.1.6.ebuild | 22 |
2 files changed, 20 insertions, 19 deletions
diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild index 1d3cdf4bc733..b7c46d713a80 100644 --- a/dev-util/cccc/cccc-3.1.5-r1.ebuild +++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild @@ -53,18 +53,19 @@ src_install() { dodoc README.md if use mfc ; then - insinto /usr/share/doc/${PF} - doins "${FILESDIR}"/cccc-MFC-dialect.opt + docinto examples + dodoc "${FILESDIR}"/cccc-MFC-dialect.opt + docompress -x "/usr/share/doc/${PF}/examples" fi if use doc ; then - insinto /usr/share/doc/${PF}/html - doins cccc/*.html || die "html docs failed" + docinto html + dodoc cccc/*.html || die "html docs failed" if use apidoc ; then - 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" + docinto html/api + dodoc -r doxygen/html/. || die "apidocs failed" + docinto html/metrics + 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 index 5100eea55bbe..b7c46d713a80 100644 --- a/dev-util/cccc/cccc-3.1.6.ebuild +++ b/dev-util/cccc/cccc-3.1.6.ebuild @@ -9,14 +9,15 @@ 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="" @@ -24,8 +25,6 @@ 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 @@ -54,18 +53,19 @@ src_install() { dodoc README.md if use mfc ; then - insinto /usr/share/doc/${PF} - doins "${FILESDIR}"/cccc-MFC-dialect.opt + docinto examples + dodoc "${FILESDIR}"/cccc-MFC-dialect.opt + docompress -x "/usr/share/doc/${PF}/examples" fi if use doc ; then - insinto /usr/share/doc/${PF}/html - doins cccc/*.html || die "html docs failed" + docinto html + dodoc cccc/*.html || die "html docs failed" if use apidoc ; then - 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" + docinto html/api + dodoc -r doxygen/html/. || die "apidocs failed" + docinto html/metrics + dodoc ccccout/* || die "metrics failed" fi fi } |