[gentoo-commits] repo/proj/guru:dev commit in: eclass/

[Alessandro Barbieri]

commit:     dd9177aecb84a314b4f9b8c11f7988f5f90d8869
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jun 17 15:56:01 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Thu Jun 17 16:01:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd9177ae

R-packages.eclass: quoting, more || die, docompress -x html

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 eclass/R-packages.eclass | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass
index 4afcde26f..5e1d6bccc 100644
--- a/eclass/R-packages.eclass
+++ b/eclass/R-packages.eclass
@@ -23,7 +23,7 @@ dodocrm() {
 R-packages_src_unpack() {
 	unpack ${A}
 	if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then
-		mv ${PN//_/.} "${P}"
+		mv "${PN//_/.}" "${P}" || die
 	fi
 }
 
@@ -34,26 +34,31 @@ R-packages_src_prepare() {
 
 
 R-packages_src_compile() {
-	MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" R CMD INSTALL . -l "${WORKDIR}" "--byte-compile"
+	MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" R CMD INSTALL . -l "${WORKDIR}" "--byte-compile" || die
 }
 
 R-packages_src_install() {
-	cd "${WORKDIR}"/${PN//_/.} || die
+	cd "${WORKDIR}/${PN//_/.}" || die
 
 	dodocrm examples || die
-#	dodocrm DESCRIPTION || die #keep this
+	#dodocrm DESCRIPTION || die #keep this
 	dodocrm NEWS.md || die
 	dodocrm README.md || die
 	dodocrm html || die
-	docinto "${DOCSDIR}/html"
+
 	if [ -e doc ]; then
-		ls doc/*.html &>/dev/null && dodoc -r doc/*.html
-		rm -rf doc/*.html || die
+		if [ -e doc/html ]; then
+			docinto "${DOCSDIR}/html"
+			dodoc -r doc/*.html
+			rm -r doc/*.html || die
+			docompress -x "${DOCSDIR}/html"
+		fi
+
 		docinto "${DOCSDIR}"
 		dodoc -r doc/.
-		rm -rf doc
+		rm -r doc || die
 	fi
 
-	insinto /usr/$(get_libdir)/R/site-library
-	doins -r "${WORKDIR}"/${PN//_/.}
+	insinto "/usr/$(get_libdir)/R/site-library"
+	doins -r "${WORKDIR}/${PN//_/.}"
 }