From b8851a4bac782b040f67fec54e0e18c4d14f8da8 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Mon, 29 Oct 2018 02:32:54 +0100
Subject: [PATCH] dev-db/mariadb-connector-c: USE=mysqlcompat: Use separate
 symbolic link for each header.

Making /usr/include/mysql a symbolic link would collide with
/usr/include/mysql directory installed by dev-db/mariadb.

Closes: https://bugs.gentoo.org/668560

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
---
 .../mariadb-connector-c-3.0.6-r1.ebuild         | 17 ++++++++++++++++-
 .../mariadb-connector-c-9999.ebuild             | 17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index a72bd4c2353..6a7479e9b43 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -97,6 +97,21 @@ multilib_src_install_all() {
 	fi
 	if use mysqlcompat ; then
 		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
+
+		dodir /usr/include/mysql/mariadb
+		dodir /usr/include/mysql/mysql
+		local f
+		for f in "${ED}/usr/include/mariadb/"*.h; do
+			f=${f##*/}
+			dosym ../mariadb/${f} /usr/include/mysql/${f}
+		done
+		for f in "${ED}/usr/include/mariadb/mariadb/"*.h; do
+			f=${f##*/}
+			dosym ../../mariadb/mariadb/${f} /usr/include/mysql/mariadb/${f}
+		done
+		for f in "${ED}/usr/include/mariadb/mysql/"*.h; do
+			f=${f##*/}
+			dosym ../../mariadb/mysql/${f} /usr/include/mysql/mysql/${f}
+		done
 	fi
 }
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 1b2b77025ff..7c734854335 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -97,6 +97,21 @@ multilib_src_install_all() {
 	fi
 	if use mysqlcompat ; then
 		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
+
+		dodir /usr/include/mysql/mariadb
+		dodir /usr/include/mysql/mysql
+		local f
+		for f in "${ED}/usr/include/mariadb/"*.h; do
+			f=${f##*/}
+			dosym ../mariadb/${f} /usr/include/mysql/${f}
+		done
+		for f in "${ED}/usr/include/mariadb/mariadb/"*.h; do
+			f=${f##*/}
+			dosym ../../mariadb/mariadb/${f} /usr/include/mysql/mariadb/${f}
+		done
+		for f in "${ED}/usr/include/mariadb/mysql/"*.h; do
+			f=${f##*/}
+			dosym ../../mariadb/mysql/${f} /usr/include/mysql/mysql/${f}
+		done
 	fi
 }
-- 
2.19.1