From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- dev-python/pymysql/Manifest | 2 +- dev-python/pymysql/pymysql-1.0.2.ebuild | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'dev-python/pymysql') diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest index 80f2e7539ca1..851bf94191eb 100644 --- a/dev-python/pymysql/Manifest +++ b/dev-python/pymysql/Manifest @@ -1,3 +1,3 @@ DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638 -EBUILD pymysql-1.0.2.ebuild 3797 BLAKE2B 9c57667606aee1eebba23f07b8ba84f0da467e3eca4cc7729cd4792bcfab5193a96d4fea95f48eca1650ba5c31dc0d9660825e308fe02a804184d69705dcc01a SHA512 be2a0dc58e51598b9f7acdcab0ee0b2d1db473a572e90df9bd772bb4c645bb1717009f35819624fd4e70b671c4e054427bdebc5f97a4443f37486d53b0e05a4f +EBUILD pymysql-1.0.2.ebuild 4159 BLAKE2B 751d7afc39728fceac6021f3d5e5e4d4e5d08ef77dc949e4b9159e67d1233aa8a21abe07a9b1a0db772b9d5db0a027028599b658d8bcfc57b07a8ff56ac4ecd5 SHA512 d94e7c93f6a5368f07858f201235f680f1ff65c679ec4f6120b2963d63dd8ba475913a63a1649230b244bbc77e0c0b89c283259a9595591b6300236303f84973 MISC metadata.xml 493 BLAKE2B df91299acd855c04a29b3c0cf33b450de6a9687b3c45a0c59cc55a69c544d561f107da1d90a1b52dffaa13fe218cef978edb4b7036eb62651da7de39568fdc00 SHA512 ae8cbe0ea29c8457dbbfd4cc21169fce54b868f93045f5ebbd9c8909b052c7efa2cedacc1ba5ec13d1ab9476b39cc595a52ee9ceb489b6aec3f824f2027fc4c6 diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild index dbbedb942643..c2dda33e27a7 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 \ -- cgit v1.2.3