dev-db/mariadb: QA: Fix prefix support for double EPREFIX

Closes: https://bugs.gentoo.org/644108
Package-Manager: Portage-2.3.31, Repoman-2.3.9

diff --git a/dev-db/mariadb/mariadb-10.2.12.ebuild b/dev-db/mariadb/mariadb-10.2.12.ebuild
index 29a68b7734cc0784df96639657dace96eb054abb..73d4cd9e20ec4fe3c0d4679823a4ad701d16b7ba 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.12.ebuild
@@ -504,8 +504,8 @@ multilib_src_install() {
        mysql_init_vars
 
        # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-       if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-               rm "${D}/usr/include/mysql/server/private/config.h" || die
+       if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+               rm "${ED}/usr/include/mysql/server/private/config.h" || die
        fi
 
        if ! multilib_is_native_abi && use server ; then
@@ -514,9 +514,9 @@ multilib_src_install() {
        fi
 
        # Install compatible symlinks to libmysqlclient
-#      use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#      dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-       dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+#      use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a"
+#      dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
+       dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
 
        # Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
        find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die

diff --git a/dev-db/mariadb/mariadb-10.2.13.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild
index c9a11e7250ca90ad0e3506e54433575f60c79af6..2eff8c74630e80b8286020427afa4ff9a7335538 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.13.ebuild
@@ -534,8 +534,8 @@ multilib_src_install() {
        cmake-utils_src_install
 
        # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-       if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-               rm "${D}/usr/include/mysql/server/private/config.h" || die
+       if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+               rm "${ED}/usr/include/mysql/server/private/config.h" || die
        fi
 
        if ! multilib_is_native_abi && use server ; then
@@ -545,9 +545,9 @@ multilib_src_install() {
 
        if use client-libs ; then
        # Install compatible symlinks to libmysqlclient
-#      use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#      dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-       dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+#      use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a"
+#      dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
+       dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
        fi
 
        # Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.

diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild
index 86c88b6342e47a580eecbef195d2d71881e3896e..3c62b609a1e81fe6855ae00d89e2758db0d5e70a 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild
@@ -532,8 +532,8 @@ multilib_src_install() {
        cmake-utils_src_install
 
        # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-       if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-               rm "${D}/usr/include/mysql/server/private/config.h" || die
+       if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+               rm "${ED}/usr/include/mysql/server/private/config.h" || die
        fi
 
        if ! multilib_is_native_abi && use server ; then
@@ -543,9 +543,9 @@ multilib_src_install() {
 
        if use client-libs ; then
        # Install compatible symlinks to libmysqlclient
-#      use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#      dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-       dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+#      use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a"
+#      dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
+       dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
        fi
 
        # Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.

diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
index 33cd1b5332c0ac5e5bf5a330d2b7b904d52136de..69e55e88ddc545525491ba158e6f68bdea6f928b 100644 (file)
--- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
@@ -536,8 +536,8 @@ multilib_src_install() {
        mysql_init_vars
 
        # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-       if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-               rm "${D}/usr/include/mysql/server/private/config.h" || die
+       if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+               rm "${ED}/usr/include/mysql/server/private/config.h" || die
        fi
 
        if ! multilib_is_native_abi && use server ; then
@@ -547,9 +547,9 @@ multilib_src_install() {
 
        if use client-libs ; then
        # Install compatible symlinks to libmysqlclient
-#      use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#      dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-       dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+#      use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a"
+#      dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
+       dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
        fi
 
        # Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.