[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/

[Sam James]

commit:     80c42a22d55b56b7df727b1ed3263d60aa36a092
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 22:35:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 22:35:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c42a22

media-video/vlc: fix non-empty ROOT check

We need ROOT here because we're interested
in whether we're going to try execute a cross binary
or not.

Thanks-to: Arfrever
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/vlc/vlc-3.0.12.1-r100.ebuild | 2 +-
 media-video/vlc/vlc-3.0.12.1.ebuild      | 2 +-
 media-video/vlc/vlc-3.0.9999.ebuild      | 2 +-
 media-video/vlc/vlc-9999.ebuild          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-video/vlc/vlc-3.0.12.1-r100.ebuild 
b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
index 86bdf686f59..a5b0926bfaf 100644
--- a/media-video/vlc/vlc-3.0.12.1-r100.ebuild
+++ b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
@@ -488,7 +488,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       if [[ -z "${EROOT}" ]] && [[ -x 
"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+       if [[ -z "${ROOT}" ]] && [[ -x 
"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
                einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on 
${EROOT}/usr/$(get_libdir)/vlc/plugins/"
                "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" 
"${EROOT}/usr/$(get_libdir)/vlc/plugins/"
        else

diff --git a/media-video/vlc/vlc-3.0.12.1.ebuild 
b/media-video/vlc/vlc-3.0.12.1.ebuild
index c696533f688..8c7b08e5d10 100644
--- a/media-video/vlc/vlc-3.0.12.1.ebuild
+++ b/media-video/vlc/vlc-3.0.12.1.ebuild
@@ -478,7 +478,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       if [[ -z "${EROOT}" ]] && [[ -x 
"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+       if [[ -z "${ROOT}" ]] && [[ -x 
"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
                einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on 
${EROOT}/usr/$(get_libdir)/vlc/plugins/"
                "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" 
"${EROOT}/usr/$(get_libdir)/vlc/plugins/"
        else

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild 
b/media-video/vlc/vlc-3.0.9999.ebuild
index d002ba6334e..9d7580017a4 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -485,7 +485,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       if [[ -z "${EROOT}" ]] && [[ -x 
"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+       if [[ -z "${ROOT}" ]] && [[ -x 
"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
                einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on 
${EROOT}/usr/$(get_libdir)/vlc/plugins/"
                "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" 
"${EROOT}/usr/$(get_libdir)/vlc/plugins/"
        else

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index b1f7df19374..d11f88b6a7b 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -485,7 +485,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       if [[ -z "${EROOT}" ]] && [[ -x 
"${EROOT}/usr/libexec/vlc/vlc-cache-gen" ]] ; then
+       if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/libexec/vlc/vlc-cache-gen" 
]] ; then
                einfo "Running ${EROOT}/usr/libexec/vlc/vlc-cache-gen on 
${EROOT}/usr/libexec/vlc/plugins/"
                "${EROOT}/usr/libexec/vlc/vlc-cache-gen" 
"${EROOT}/usr/libexec/vlc/plugins/"
        else