| 1 |
commit: 07d3becfcbb27d4f00ac8f34f165aab0ba99c34d |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 15 19:47:12 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 15 19:48:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d3becf |
| 7 |
|
| 8 |
app-text/calibre: fix gentoo-ci lint |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 12 |
|
| 13 |
app-text/calibre/calibre-3.26.1-r1.ebuild | 2 -- |
| 14 |
app-text/calibre/calibre-3.44.0.ebuild | 4 +--- |
| 15 |
app-text/calibre/calibre-3.46.0-r1.ebuild | 4 +--- |
| 16 |
3 files changed, 2 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-text/calibre/calibre-3.26.1-r1.ebuild b/app-text/calibre/calibre-3.26.1-r1.ebuild |
| 19 |
index 5fb25df4b35..c92715c1e5f 100644 |
| 20 |
--- a/app-text/calibre/calibre-3.26.1-r1.ebuild |
| 21 |
+++ b/app-text/calibre/calibre-3.26.1-r1.ebuild |
| 22 |
@@ -206,8 +206,6 @@ src_install() { |
| 23 |
[[ -e ${x} ]] && addpredict ${x} |
| 24 |
done |
| 25 |
|
| 26 |
- #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py |
| 27 |
- #dodir $(python_get_sitedir) |
| 28 |
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ |
| 29 |
"${PYTHON}" setup.py install \ |
| 30 |
--root="${D}" \ |
| 31 |
|
| 32 |
diff --git a/app-text/calibre/calibre-3.44.0.ebuild b/app-text/calibre/calibre-3.44.0.ebuild |
| 33 |
index 2459339e259..9b8c29fcc23 100644 |
| 34 |
--- a/app-text/calibre/calibre-3.44.0.ebuild |
| 35 |
+++ b/app-text/calibre/calibre-3.44.0.ebuild |
| 36 |
@@ -196,8 +196,6 @@ src_install() { |
| 37 |
|
| 38 |
addpredict /dev/dri #665310 |
| 39 |
|
| 40 |
- #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py |
| 41 |
- #dodir $(python_get_sitedir) |
| 42 |
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ |
| 43 |
"${PYTHON}" setup.py install \ |
| 44 |
--root="${D}" \ |
| 45 |
@@ -252,7 +250,7 @@ pkg_preinst() { |
| 46 |
pkg_postinst() { |
| 47 |
[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" |
| 48 |
local x |
| 49 |
- for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do |
| 50 |
+ for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do |
| 51 |
if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then |
| 52 |
elog "Purging '${x}'" |
| 53 |
rm -rf "${x}" |
| 54 |
|
| 55 |
diff --git a/app-text/calibre/calibre-3.46.0-r1.ebuild b/app-text/calibre/calibre-3.46.0-r1.ebuild |
| 56 |
index 2459339e259..9b8c29fcc23 100644 |
| 57 |
--- a/app-text/calibre/calibre-3.46.0-r1.ebuild |
| 58 |
+++ b/app-text/calibre/calibre-3.46.0-r1.ebuild |
| 59 |
@@ -196,8 +196,6 @@ src_install() { |
| 60 |
|
| 61 |
addpredict /dev/dri #665310 |
| 62 |
|
| 63 |
- #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py |
| 64 |
- #dodir $(python_get_sitedir) |
| 65 |
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ |
| 66 |
"${PYTHON}" setup.py install \ |
| 67 |
--root="${D}" \ |
| 68 |
@@ -252,7 +250,7 @@ pkg_preinst() { |
| 69 |
pkg_postinst() { |
| 70 |
[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" |
| 71 |
local x |
| 72 |
- for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do |
| 73 |
+ for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do |
| 74 |
if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then |
| 75 |
elog "Purging '${x}'" |
| 76 |
rm -rf "${x}" |
Archives