[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

[Thomas Deutschmann]

commit:     755be857e3051bf40448d842bc0c4fecf4ed16a3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 20:30:44 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 23:37:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=755be857

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 <whissi <AT> gentoo.org>

 dev-db/mariadb/{mariadb-10.2.37-r1.ebuild => mariadb-10.2.37-r2.ebuild} | 2 +-
 dev-db/mariadb/{mariadb-10.3.28-r1.ebuild => mariadb-10.3.28-r2.ebuild} | 2 +-
 dev-db/mariadb/{mariadb-10.4.18-r1.ebuild => mariadb-10.4.18-r2.ebuild} | 2 +-
 dev-db/mariadb/{mariadb-10.5.9-r1.ebuild => mariadb-10.5.9-r2.ebuild}   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 06df5976e16..54d6e4b3454 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 803610d155e..9b89b41f74d 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 3df4ab74bea..c858a3d8b66 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 42b66a250a0..b685780a5d2 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"