commit: 3a44bac7032fd5b21e884bff7c2a0afc37d9ddd9 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Mon Jul 8 13:13:08 2019 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Mon Jul 8 13:21:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a44bac7
dev-db/mariadb: Fix EAPI 7 paths, drop client-libs USE Closes: https://bugs.gentoo.org/689412 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Brian Evans <grknight <AT> gentoo.org> dev-db/mariadb/mariadb-10.4.6.ebuild | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.4.6.ebuild b/dev-db/mariadb/mariadb-10.4.6.ebuild index 9235108192c..d23b680cdd9 100644 --- a/dev-db/mariadb/mariadb-10.4.6.ebuild +++ b/dev-db/mariadb/mariadb-10.4.6.ebuild @@ -26,7 +26,7 @@ HOMEPAGE="https://mariadb.org/"; DESCRIPTION="An enhanced, drop-in replacement for MySQL" LICENSE="GPL-2 LGPL-2.1+" SLOT="0/${SUBSLOT:-0}" -IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 +IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc @@ -117,6 +117,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r11 + !<virtual/libmysqlclient-18-r1 ${COMMON_DEPEND} server? ( galera? ( sys-apps/iproute2 @@ -168,17 +169,6 @@ pkg_setup() { pkg_preinst() { java-pkg-opt-2_pkg_preinst - - # Here we need to see if the implementation switched client libraries - # We check if this is a new instance of the package and a client library already exists - local SHOW_ABI_MESSAGE libpath - if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then - libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so") - elog "Due to ABI changes when switching between different client libraries," - elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient." - elog "Please run: revdep-rebuild --library ${libpath}" - ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries" - fi } pkg_postinst() { @@ -186,7 +176,7 @@ pkg_postinst() { mysql_init_vars # Create log directory securely if it does not exist - [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" + [[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}" if use server ; then if use pam; then @@ -913,8 +903,8 @@ pkg_config() { # https://dev.mysql.com/doc/mysql/en/time-zone-support.html "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null - local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) - [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) + local cmd=( "${EROOT}/usr/share/mariadb/scripts/mysql_install_db" ) + [[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" ) cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" su -s /bin/sh -c "${cmd[*]}" mysql \
