From 755be857e3051bf40448d842bc0c4fecf4ed16a3 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Thu, 11 Mar 2021 21:30:44 +0100 Subject: [PATCH] dev-db/mariadb: install mysql_install_db into /usr/bin Other programs, like kde-apps/akonadi, are expecting mysql_install_db in /usr/bin which is the default for DEB- and RPM-based distribution. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann --- .../{mariadb-10.2.37-r1.ebuild => mariadb-10.2.37-r2.ebuild} | 2 +- .../{mariadb-10.3.28-r1.ebuild => mariadb-10.3.28-r2.ebuild} | 2 +- .../{mariadb-10.4.18-r1.ebuild => mariadb-10.4.18-r2.ebuild} | 2 +- .../{mariadb-10.5.9-r1.ebuild => mariadb-10.5.9-r2.ebuild} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename dev-db/mariadb/{mariadb-10.2.37-r1.ebuild => mariadb-10.2.37-r2.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.3.28-r1.ebuild => mariadb-10.3.28-r2.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.4.18-r1.ebuild => mariadb-10.4.18-r2.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.5.9-r1.ebuild => mariadb-10.5.9-r2.ebuild} (99%) diff --git a/dev-db/mariadb/mariadb-10.2.37-r1.ebuild b/dev-db/mariadb/mariadb-10.2.37-r2.ebuild similarity index 99% rename from dev-db/mariadb/mariadb-10.2.37-r1.ebuild rename to dev-db/mariadb/mariadb-10.2.37-r2.ebuild index 06df5976e16db..54d6e4b34545f 100644 --- a/dev-db/mariadb/mariadb-10.2.37-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.2.37-r2.ebuild @@ -313,7 +313,7 @@ src_configure() { -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLSHAREDIR=share/mariadb -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin - -DINSTALL_SCRIPTDIR=share/mariadb/scripts + -DINSTALL_SCRIPTDIR=bin -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" diff --git a/dev-db/mariadb/mariadb-10.3.28-r1.ebuild b/dev-db/mariadb/mariadb-10.3.28-r2.ebuild similarity index 99% rename from dev-db/mariadb/mariadb-10.3.28-r1.ebuild rename to dev-db/mariadb/mariadb-10.3.28-r2.ebuild index 803610d155ecc..9b89b41f74d83 100644 --- a/dev-db/mariadb/mariadb-10.3.28-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.3.28-r2.ebuild @@ -304,7 +304,7 @@ src_configure() { -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLSHAREDIR=share/mariadb -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin - -DINSTALL_SCRIPTDIR=share/mariadb/scripts + -DINSTALL_SCRIPTDIR=bin -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" diff --git a/dev-db/mariadb/mariadb-10.4.18-r1.ebuild b/dev-db/mariadb/mariadb-10.4.18-r2.ebuild similarity index 99% rename from dev-db/mariadb/mariadb-10.4.18-r1.ebuild rename to dev-db/mariadb/mariadb-10.4.18-r2.ebuild index 3df4ab74bea77..c858a3d8b6667 100644 --- a/dev-db/mariadb/mariadb-10.4.18-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.4.18-r2.ebuild @@ -318,7 +318,7 @@ src_configure() { -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLSHAREDIR=share/mariadb -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin - -DINSTALL_SCRIPTDIR=share/mariadb/scripts + -DINSTALL_SCRIPTDIR=bin -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" diff --git a/dev-db/mariadb/mariadb-10.5.9-r1.ebuild b/dev-db/mariadb/mariadb-10.5.9-r2.ebuild similarity index 99% rename from dev-db/mariadb/mariadb-10.5.9-r1.ebuild rename to dev-db/mariadb/mariadb-10.5.9-r2.ebuild index 42b66a250a057..b685780a5d221 100644 --- a/dev-db/mariadb/mariadb-10.5.9-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.5.9-r2.ebuild @@ -314,7 +314,7 @@ src_configure() { -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLSHAREDIR=share/mariadb -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin - -DINSTALL_SCRIPTDIR=share/mariadb/scripts + -DINSTALL_SCRIPTDIR=bin -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"