| 1 |
commit: 4dd44867d1710a50b2d79ca095c935d283572555 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 4 18:54:55 2019 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 5 09:39:59 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd44867 |
| 7 |
|
| 8 |
eclass/texlive-common: call non-empty ${ROOT} |
| 9 |
|
| 10 |
EAPI=7 introduces empty ROOT variable if the actual root |
| 11 |
is defined as "/", this leads to the false-negative |
| 12 |
texmf-update and fmtutil calls. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/687306 |
| 15 |
|
| 16 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 17 |
|
| 18 |
eclass/texlive-common.eclass | 4 ++-- |
| 19 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass |
| 22 |
index 4b357897f12..8476b117eef 100644 |
| 23 |
--- a/eclass/texlive-common.eclass |
| 24 |
+++ b/eclass/texlive-common.eclass |
| 25 |
@@ -140,7 +140,7 @@ dobin_texmf_scripts() { |
| 26 |
|
| 27 |
etexmf-update() { |
| 28 |
if has_version 'app-text/texlive-core' ; then |
| 29 |
- if [ "$ROOT" = "/" ] && [ -x "${EPREFIX}"/usr/sbin/texmf-update ] ; then |
| 30 |
+ if [ -n ${ROOT%/} ] && [ -x "${EPREFIX}"/usr/sbin/texmf-update ] ; then |
| 31 |
"${EPREFIX}"/usr/sbin/texmf-update |
| 32 |
else |
| 33 |
ewarn "Cannot run texmf-update for some reason." |
| 34 |
@@ -158,7 +158,7 @@ etexmf-update() { |
| 35 |
|
| 36 |
efmtutil-sys() { |
| 37 |
if has_version 'app-text/texlive-core' ; then |
| 38 |
- if [ "$ROOT" = "/" ] && [ -x "${EPREFIX}"/usr/bin/fmtutil-sys ] ; then |
| 39 |
+ if [ -n ${ROOT%/} ] && [ -x "${EPREFIX}"/usr/bin/fmtutil-sys ] ; then |
| 40 |
einfo "Rebuilding formats" |
| 41 |
"${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null |
| 42 |
else |
Archives