[gentoo-commits] repo/gentoo:master commit in: app-text/calibre/

[Zac Medico]

commit:     07d3becfcbb27d4f00ac8f34f165aab0ba99c34d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 19:47:12 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 19:48:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d3becf

app-text/calibre: fix gentoo-ci lint

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-text/calibre/calibre-3.26.1-r1.ebuild | 2 --
 app-text/calibre/calibre-3.44.0.ebuild    | 4 +---
 app-text/calibre/calibre-3.46.0-r1.ebuild | 4 +---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app-text/calibre/calibre-3.26.1-r1.ebuild 
b/app-text/calibre/calibre-3.26.1-r1.ebuild
index 5fb25df4b35..c92715c1e5f 100644
--- a/app-text/calibre/calibre-3.26.1-r1.ebuild
+++ b/app-text/calibre/calibre-3.26.1-r1.ebuild
@@ -206,8 +206,6 @@ src_install() {
                [[ -e ${x} ]] && addpredict ${x}
        done
 
-       #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for 
init_calibre.py
-       #dodir $(python_get_sitedir)
        PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
        "${PYTHON}" setup.py install \
                --root="${D}" \

diff --git a/app-text/calibre/calibre-3.44.0.ebuild 
b/app-text/calibre/calibre-3.44.0.ebuild
index 2459339e259..9b8c29fcc23 100644
--- a/app-text/calibre/calibre-3.44.0.ebuild
+++ b/app-text/calibre/calibre-3.44.0.ebuild
@@ -196,8 +196,6 @@ src_install() {
 
        addpredict /dev/dri #665310
 
-       #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for 
init_calibre.py
-       #dodir $(python_get_sitedir)
        PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
        "${PYTHON}" setup.py install \
                --root="${D}" \
@@ -252,7 +250,7 @@ pkg_preinst() {
 pkg_postinst() {
        [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
        local x
-       for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+       for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
                if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
                        elog "Purging '${x}'"
                        rm -rf "${x}"

diff --git a/app-text/calibre/calibre-3.46.0-r1.ebuild 
b/app-text/calibre/calibre-3.46.0-r1.ebuild
index 2459339e259..9b8c29fcc23 100644
--- a/app-text/calibre/calibre-3.46.0-r1.ebuild
+++ b/app-text/calibre/calibre-3.46.0-r1.ebuild
@@ -196,8 +196,6 @@ src_install() {
 
        addpredict /dev/dri #665310
 
-       #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for 
init_calibre.py
-       #dodir $(python_get_sitedir)
        PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
        "${PYTHON}" setup.py install \
                --root="${D}" \
@@ -252,7 +250,7 @@ pkg_preinst() {
 pkg_postinst() {
        [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
        local x
-       for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+       for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
                if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
                        elog "Purging '${x}'"
                        rm -rf "${x}"