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 <[email protected]>
johu · Oct 6, 2020 · 22e104c · 22e104c
1 parent df9e91d
commit 22e104c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git 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
@@ -9,23 +9,22 @@ 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=""
 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
 }