From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1212244-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BDBE41381F3
for <garchives@archives.gentoo.org>; Tue, 6 Oct 2020 23:00:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DDB17E09B1;
Tue, 6 Oct 2020 22:59:59 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B4FD9E09B1
for <gentoo-commits@lists.gentoo.org>; Tue, 6 Oct 2020 22:59:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7C799340DF4
for <gentoo-commits@lists.gentoo.org>; Tue, 6 Oct 2020 22:59:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 07F6F26
for <gentoo-commits@lists.gentoo.org>; Tue, 6 Oct 2020 22:59:57 +0000 (UTC)
From: "Steve Arnold" <nerdboy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Steve Arnold" <nerdboy@gentoo.org>
Message-ID: <1602025169.22e104ccc5baf2cb3285a367a0d160ac5d50c39d.nerdboy@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cccc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/cccc/cccc-3.1.5-r1.ebuild dev-util/cccc/cccc-3.1.6.ebuild
X-VCS-Directories: dev-util/cccc/
X-VCS-Committer: nerdboy
X-VCS-Committer-Name: Steve Arnold
X-VCS-Revision: 22e104ccc5baf2cb3285a367a0d160ac5d50c39d
X-VCS-Branch: master
Date: Tue, 6 Oct 2020 22:59:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bc6cd32e-fd80-4b1b-9aaa-3e625a9d6250
X-Archives-Hash: eee803b91602a4c057bfe43ce8fd3142
commit: 22e104ccc5baf2cb3285a367a0d160ac5d50c39d
Author: Stephen L Arnold <nerdboy <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 6 22:46:54 2020 +0000
Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org>
CommitDate: Tue Oct 6 22:59:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e104cc
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 <AT> gentoo.org>
dev-util/cccc/cccc-3.1.5-r1.ebuild | 17 +++++++++--------
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 1d3cdf4bc73..b7c46d713a8 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 5100eea55bb..b7c46d713a8 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
}