[gentoo-commits] repo/gentoo:master commit in: sci-biology/ucsc-genome-browser/

[Sam James]

commit:     bbaa144be1ae371f080bd71813b288fa3f1ff51b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 11 00:26:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 00:29:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbaa144b

sci-biology/ucsc-genome-browser: fix VariableScope ((E)ROOT)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild b/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild
index 0423f509cec..f0bb0676ae8 100644
--- a/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild
+++ b/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild
@@ -64,14 +64,16 @@ src_compile() {
 
 	export MYSQLLIBS="none" MYSQLINC="none" DOCUMENTROOT="none" CGI_BIN="none"
 
-	use mysql && export MYSQLLIBS="-L${EROOT}usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \
-		MYSQLINC="${ROOT}usr/include/mysql"
+	# TODO: Change ${EPREFIX} to ${ESYSROOT} in EAPI 7
+	# (and ideally use pkg-config here)
+	use mysql && export MYSQLLIBS="-L${EPREFIX%/}/usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \
+		MYSQLINC="${EPREFIX%/}/usr/include/mysql"
 
 	use server && export DOCUMENTROOT="${WORKDIR}/destdir/${MY_HTDOCSDIR}" \
 		CGI_BIN="${WORKDIR}/destdir/${MY_HTDOCSDIR}/cgi-bin"
 
-	mkdir -p "$BINDIR" "$SCRIPTS" "$ENCODE_PIPELINE_BIN" || die
-	use server && mkdir -p "$CGI_BIN" "$DOCUMENTROOT"
+	mkdir -p "${BINDIR}" "${SCRIPTS}" "${ENCODE_PIPELINE_BIN}" || die
+	use server && mkdir -p "${CGI_BIN}" "${DOCUMENTROOT}"
 
 	emake -C src clean
 	emake -C src/lib