[gentoo-commits] repo/gentoo:master commit in: dev-python/pymysql/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     bc4ab2412698e8ab8f3d316380448df3eb28c5f7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 18:32:33 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 19:21:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4ab241

dev-python/pymysql: adjust mysql_install_db location

Since commit 755be857e3051, mysql_install_db location has changed.

While here, make sure mysqld from $EPREFIX is used, too.

Reported-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-python/pymysql/pymysql-1.0.2.ebuild | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
index dbbedb94264..c2dda33e27a 100644
--- a/dev-python/pymysql/pymysql-1.0.2.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -41,6 +41,13 @@ src_test() {
 		einfo "USER set to '${USER}'"
 	fi
 
+	local mysql_install_db_cmd="${EPREFIX}/usr/share/mariadb/scripts/mysql_install_db"
+	[[ ! -x "${mysql_install_db_cmd}" ]] && mysql_install_db_cmd="${EPREFIX}/usr/bin/mysql_install_db"
+	[[ ! -x "${mysql_install_db_cmd}" ]] && die "mysql_install_db command not found!"
+
+	local mysqld_cmd="${EPREFIX}/usr/sbin/mysqld"
+	[[ ! -x "${mysqld_cmd}" ]] && die "mysqld command not found!"
+
 	local PIDFILE="${T}/mysqld.pid"
 	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
 		einfo "Killing already running mysqld process ..."
@@ -54,16 +61,16 @@ src_test() {
 
 	einfo "Creating mysql test instance ..."
 	mkdir -p "${T}"/mysql || die
-	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
+	"${mysql_install_db_cmd}" \
 		--no-defaults \
 		--auth-root-authentication-method=normal \
-		--basedir="${BROOT}/usr" \
+		--basedir="${EPREFIX}/usr" \
 		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
 		|| die
 
 	einfo "Starting mysql test instance ..."
 	# TODO: random port
-	mysqld \
+	"${mysqld_cmd}" \
 		--no-defaults \
 		--character-set-server=utf8 \
 		--bind-address=127.0.0.1 \