diff --git a/dev-db/mariadb/mariadb-10.11.13.ebuild b/dev-db/mariadb/mariadb-10.11.13.ebuild
index 3b81ac9bc492e..a207873fad81b 100644
--- a/dev-db/mariadb/mariadb-10.11.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.13.ebuild
@@ -304,7 +304,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# Workaround for bug #959423 (https://jira.mariadb.org/browse/MDEV-37148)
-	tc-is-gcc && [[ $(gcc-major-version) -eq 16 ]] && append-flags -fno-tree-vectorize
+	append-flags -fno-tree-vectorize
 
 	# debug hack wrt #497532
 	local mycmakeargs=(
diff --git a/dev-db/mariadb/mariadb-10.11.14.ebuild b/dev-db/mariadb/mariadb-10.11.14-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.11.14.ebuild
rename to dev-db/mariadb/mariadb-10.11.14-r1.ebuild
index a28797be1a8e6..ae2b036b7263f 100644
--- a/dev-db/mariadb/mariadb-10.11.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.14-r1.ebuild
@@ -310,7 +310,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# Workaround for bug #959423 (https://jira.mariadb.org/browse/MDEV-37148)
-	tc-is-gcc && [[ $(gcc-major-version) -eq 16 ]] && append-flags -fno-tree-vectorize
+	append-flags -fno-tree-vectorize
 
 	# debug hack wrt #497532
 	local mycmakeargs=(
diff --git a/dev-db/mariadb/mariadb-10.6.22.ebuild b/dev-db/mariadb/mariadb-10.6.22.ebuild
index 762f9c2b46793..9efb5abd9ad43 100644
--- a/dev-db/mariadb/mariadb-10.6.22.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.22.ebuild
@@ -316,7 +316,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# Workaround for bug #959423 (https://jira.mariadb.org/browse/MDEV-37148)
-	tc-is-gcc && [[ $(gcc-major-version) -eq 16 ]] && append-flags -fno-tree-vectorize
+	append-flags -fno-tree-vectorize
 
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
diff --git a/dev-db/mariadb/mariadb-10.6.23.ebuild b/dev-db/mariadb/mariadb-10.6.23-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.6.23.ebuild
rename to dev-db/mariadb/mariadb-10.6.23-r1.ebuild
index 186f090edca41..1899f0452049a 100644
--- a/dev-db/mariadb/mariadb-10.6.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.23-r1.ebuild
@@ -322,7 +322,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# Workaround for bug #959423 (https://jira.mariadb.org/browse/MDEV-37148)
-	tc-is-gcc && [[ $(gcc-major-version) -eq 16 ]] && append-flags -fno-tree-vectorize
+	append-flags -fno-tree-vectorize
 
 	# debug hack wrt #497532
 	local mycmakeargs=(
diff --git a/dev-db/mariadb/mariadb-11.4.7-r1.ebuild b/dev-db/mariadb/mariadb-11.4.7-r1.ebuild
index a6fafe54d0508..59b82198547a5 100644
--- a/dev-db/mariadb/mariadb-11.4.7-r1.ebuild
+++ b/dev-db/mariadb/mariadb-11.4.7-r1.ebuild
@@ -310,7 +310,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# Workaround for bug #959423 (https://jira.mariadb.org/browse/MDEV-37148)
-	tc-is-gcc && [[ $(gcc-major-version) -eq 16 ]] && append-flags -fno-tree-vectorize
+	append-flags -fno-tree-vectorize
 
 	# debug hack wrt #497532
 	local mycmakeargs=(
diff --git a/dev-db/mariadb/mariadb-11.4.8.ebuild b/dev-db/mariadb/mariadb-11.4.8-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-11.4.8.ebuild
rename to dev-db/mariadb/mariadb-11.4.8-r1.ebuild
index 1304fe9cdbc19..c585b5f0acb3f 100644
--- a/dev-db/mariadb/mariadb-11.4.8.ebuild
+++ b/dev-db/mariadb/mariadb-11.4.8-r1.ebuild
@@ -308,7 +308,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# Workaround for bug #959423 (https://jira.mariadb.org/browse/MDEV-37148)
-	tc-is-gcc && [[ $(gcc-major-version) -eq 16 ]] && append-flags -fno-tree-vectorize
+	append-flags -fno-tree-vectorize
 
 	# debug hack wrt #497532
 	local mycmakeargs=(
diff --git a/dev-db/mariadb/mariadb-11.8.2.ebuild b/dev-db/mariadb/mariadb-11.8.2.ebuild
index ff6f20f48567d..a6aacc9ebffb9 100644
--- a/dev-db/mariadb/mariadb-11.8.2.ebuild
+++ b/dev-db/mariadb/mariadb-11.8.2.ebuild
@@ -300,7 +300,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# Workaround for bug #959423 (https://jira.mariadb.org/browse/MDEV-37148)
-	tc-is-gcc && [[ $(gcc-major-version) -eq 16 ]] && append-flags -fno-tree-vectorize
+	append-flags -fno-tree-vectorize
 
 	# debug hack wrt #497532
 	local mycmakeargs=(
diff --git a/dev-db/mariadb/mariadb-12.0.2.ebuild b/dev-db/mariadb/mariadb-11.8.3-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-12.0.2.ebuild
rename to dev-db/mariadb/mariadb-11.8.3-r1.ebuild
index c851459278664..937dd9d018a53 100644
--- a/dev-db/mariadb/mariadb-12.0.2.ebuild
+++ b/dev-db/mariadb/mariadb-11.8.3-r1.ebuild
@@ -298,7 +298,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# Workaround for bug #959423 (https://jira.mariadb.org/browse/MDEV-37148)
-	tc-is-gcc && [[ $(gcc-major-version) -eq 16 ]] && append-flags -fno-tree-vectorize
+	append-flags -fno-tree-vectorize
 
 	# debug hack wrt #497532
 	local mycmakeargs=(
diff --git a/dev-db/mariadb/mariadb-11.8.3.ebuild b/dev-db/mariadb/mariadb-12.0.2-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-11.8.3.ebuild
rename to dev-db/mariadb/mariadb-12.0.2-r1.ebuild
index c851459278664..937dd9d018a53 100644
--- a/dev-db/mariadb/mariadb-11.8.3.ebuild
+++ b/dev-db/mariadb/mariadb-12.0.2-r1.ebuild
@@ -298,7 +298,7 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# Workaround for bug #959423 (https://jira.mariadb.org/browse/MDEV-37148)
-	tc-is-gcc && [[ $(gcc-major-version) -eq 16 ]] && append-flags -fno-tree-vectorize
+	append-flags -fno-tree-vectorize
 
 	# debug hack wrt #497532
 	local mycmakeargs=(