From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 758571382C5 for ; Sat, 20 Mar 2021 19:21:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0529E0895; Sat, 20 Mar 2021 19:21:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB528E0895 for ; Sat, 20 Mar 2021 19:21:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 867BD3408A2 for ; Sat, 20 Mar 2021 19:21:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE97D5B9 for ; Sat, 20 Mar 2021 19:21:31 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1616268088.fd89a51f0151103d6bac5f165e06c78eaa4d81b4.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/bioperl-db/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/bioperl-db/bioperl-db-1.6.9-r1.ebuild X-VCS-Directories: sci-biology/bioperl-db/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: fd89a51f0151103d6bac5f165e06c78eaa4d81b4 X-VCS-Branch: master Date: Sat, 20 Mar 2021 19:21:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bc1a7e80-84ee-4fee-b8b2-928c53e2282a X-Archives-Hash: cfbe723bb5fccf6de04838a6ffb1ed10 commit: fd89a51f0151103d6bac5f165e06c78eaa4d81b4 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Mar 20 19:16:20 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Mar 20 19:21:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd89a51f sci-biology/bioperl-db: adjust mysql_install_db location Since commit 755be857e3051, mysql_install_db location has changed. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> sci-biology/bioperl-db/bioperl-db-1.6.9-r1.ebuild | 43 +++++++++++++++-------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/sci-biology/bioperl-db/bioperl-db-1.6.9-r1.ebuild b/sci-biology/bioperl-db/bioperl-db-1.6.9-r1.ebuild index facab7d5ffb..020fb292174 100644 --- a/sci-biology/bioperl-db/bioperl-db-1.6.9-r1.ebuild +++ b/sci-biology/bioperl-db/bioperl-db-1.6.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -49,6 +49,10 @@ src_test() { ebegin "Setting up test database" + local mysql_install_db="${EPREFIX}/usr/share/mariadb/scripts/mysql_install_db" + [[ ! -x "${mysql_install_db}" ]] && mysql_install_db="${EPREFIX}/usr/bin/mysql_install_db" + [[ ! -x "${mysql_install_db}" ]] && die "mysql_install_db command not found!" + local mysqld="${EPREFIX}/usr/sbin/mysqld" local socket="${T}/mysql.sock" local pidfile="${T}/mysql.pid" @@ -58,24 +62,35 @@ src_test() { mkdir -p "${datadir}" || die "Can't make mysql database dir"; chmod 755 "${datadir}" || die "Can't fix mysql database dir perms"; - if $mysqld --help | grep -q MariaDB ; then - "${EPREFIX}"/usr/share/mysql/scripts/mysql_install_db \ - --basedir="${EPREFIX}/usr" \ - --datadir="${datadir}" \ - --user=$(whoami) || die "Can't initalize database" - fi - - ${mysqld} --no-defaults --user=$(whoami) --skip-networking \ - --socket="${socket}" \ - --pid-file="${pidfile}" \ - --datadir="${datadir}" & - maxtry=20 + "${mysql_install_db}" \ + --basedir="${EPREFIX}/usr" \ + --datadir="${datadir}" \ + --user=$(whoami) \ + || die "Failed to initalize test database" + + "${mysqld}" \ + --no-defaults \ + --user=$(whoami) \ + --skip-networking \ + --skip-grant \ + --socket="${socket}" \ + --pid-file="${pidfile}" \ + --datadir="${datadir}" & + + local maxtry=20 while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do maxtry=$((${maxtry}-1)) echo -n "." sleep 1 done - eend $? + + local rc=1 + [[ -S "${socket}" ]] && rc=0 + + eend ${rc} + + [[ ${rc} -ne 0 ]] && die "Failed to start mysqld test instance" + export MYSQL_UNIX_PORT="${socket}" perl-module_src_test ebegin "Shutting down mysql test database"