dev-db/mariadb: [QA] Fix UnnecessarySlashStrip

Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
index bd01fadd2b5669e737093697e27a6ce6e5873fd9..0f2cea96e8328a75006c71d868ab5aa0f8bf6834 100644 (file)
--- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
@@ -288,8 +288,8 @@ src_configure(){
        mycmakeargs=(
                -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
                -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-               -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+               -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
                -DINSTALL_BINDIR=bin
                -DINSTALL_DOCDIR=share/doc/${PF}
                -DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -301,15 +301,15 @@ src_configure(){
                -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
                -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
                -DINSTALL_SCRIPTDIR=share/mariadb/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
                -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
                -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
                -DWITH_UNIT_TESTS=$(usex test ON OFF)
                -DWITH_ZLIB=system
                -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-               -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+               -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
                -DWITH_DEFAULT_COMPILER_OPTIONS=0
                -DWITH_DEFAULT_FEATURE_SET=0
                -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"

diff --git a/dev-db/mariadb/mariadb-10.1.43.ebuild b/dev-db/mariadb/mariadb-10.1.43.ebuild
index efd07a57653770f4080b78c6026f66eb7afd6a1c..7d2cf4bfe68ed61ef9eadacf8127c8e77fe1af4e 100644 (file)
--- a/dev-db/mariadb/mariadb-10.1.43.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.43.ebuild
@@ -293,8 +293,8 @@ src_configure(){
        mycmakeargs=(
                -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
                -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-               -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+               -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
                -DINSTALL_BINDIR=bin
                -DINSTALL_DOCDIR=share/doc/${PF}
                -DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -306,15 +306,15 @@ src_configure(){
                -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
                -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
                -DINSTALL_SCRIPTDIR=share/mariadb/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
                -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
                -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
                -DWITH_UNIT_TESTS=$(usex test ON OFF)
                -DWITH_ZLIB=system
                -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-               -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+               -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
                -DWITH_DEFAULT_COMPILER_OPTIONS=0
                -DWITH_DEFAULT_FEATURE_SET=0
                -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"

diff --git a/dev-db/mariadb/mariadb-10.1.44.ebuild b/dev-db/mariadb/mariadb-10.1.44.ebuild
index 4e0e9491bb2a891ea8b23faed1e3aeb3638a6301..7638b9d33e2f6dc32d35a8adf1c9b418f89d4555 100644 (file)
--- a/dev-db/mariadb/mariadb-10.1.44.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.44.ebuild
@@ -297,8 +297,8 @@ src_configure(){
        mycmakeargs=(
                -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
                -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-               -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+               -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
                -DINSTALL_BINDIR=bin
                -DINSTALL_DOCDIR=share/doc/${PF}
                -DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -310,15 +310,15 @@ src_configure(){
                -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
                -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
                -DINSTALL_SCRIPTDIR=share/mariadb/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
                -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
                -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
                -DWITH_UNIT_TESTS=$(usex test ON OFF)
                -DWITH_ZLIB=system
                -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-               -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+               -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
                -DWITH_DEFAULT_COMPILER_OPTIONS=0
                -DWITH_DEFAULT_FEATURE_SET=0
                -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"

diff --git a/dev-db/mariadb/mariadb-5.5.66.ebuild b/dev-db/mariadb/mariadb-5.5.66.ebuild
index 2cd8c6360ff0f8569c03446660e956f068ee0732..76e6db0543b726cc2c198c9f986650d8c54172f5 100644 (file)
--- a/dev-db/mariadb/mariadb-5.5.66.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.66.ebuild
@@ -254,8 +254,8 @@ src_configure(){
        mycmakeargs=(
                -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
                -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-               -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+               -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
                -DINSTALL_BINDIR=bin
                -DINSTALL_DOCDIR=share/doc/${PF}
                -DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -266,15 +266,15 @@ src_configure(){
                -DINSTALL_MYSQLSHAREDIR=share/mariadb
                -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
                -DINSTALL_SCRIPTDIR=share/mariadb/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
                -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
                -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
                -DWITH_UNIT_TESTS=$(usex test ON OFF)
                -DWITH_ZLIB=system
                -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-               -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+               -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
                # The build forces this to be defined when cross-compiling.  We pass it
                # all the time for simplicity and to make sure it is actually correct.
                -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)

diff --git a/dev-db/mariadb/mariadb-5.5.67.ebuild b/dev-db/mariadb/mariadb-5.5.67.ebuild
index 414400eba52418373d2faa2cb6dfebbc130db74f..a0bc68ae09af9bed3e432af3e18d011182c0db91 100644 (file)
--- a/dev-db/mariadb/mariadb-5.5.67.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.67.ebuild
@@ -254,8 +254,8 @@ src_configure(){
        mycmakeargs=(
                -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
                -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-               -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+               -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
                -DINSTALL_BINDIR=bin
                -DINSTALL_DOCDIR=share/doc/${PF}
                -DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -266,15 +266,15 @@ src_configure(){
                -DINSTALL_MYSQLSHAREDIR=share/mariadb
                -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
                -DINSTALL_SCRIPTDIR=share/mariadb/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
                -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
                -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
                -DWITH_UNIT_TESTS=$(usex test ON OFF)
                -DWITH_ZLIB=system
                -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-               -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+               -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
                # The build forces this to be defined when cross-compiling.  We pass it
                # all the time for simplicity and to make sure it is actually correct.
                -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)