From 38b2d044a1eac3ddb57cb250264f5e9dfa50ba96 Mon Sep 17 00:00:00 2001
From: Allen Webb <allenwebb@google.com>
Date: Wed, 15 Jul 2020 08:44:19 -0500
Subject: [PATCH] dev-lang/tcl: Fix cross compilation by not setting include
 directory.

Bug: https://bugs.gentoo.org/731120
Signed-off-by: Allen Webb <allenwebb@google.com>
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
---
 dev-lang/tcl/files/tcl-8.6.9-include-spec.patch      | 12 ++++++++++++
 .../tcl/{tcl-8.6.9.ebuild => tcl-8.6.9-r1.ebuild}    |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 dev-lang/tcl/files/tcl-8.6.9-include-spec.patch
 rename dev-lang/tcl/{tcl-8.6.9.ebuild => tcl-8.6.9-r1.ebuild} (98%)

diff --git a/dev-lang/tcl/files/tcl-8.6.9-include-spec.patch b/dev-lang/tcl/files/tcl-8.6.9-include-spec.patch
new file mode 100644
index 0000000000000..4b3a1c66d431f
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.6.9-include-spec.patch
@@ -0,0 +1,12 @@
+This resolves https://bugs.gentoo.org/731120
+--- a/unix/configure.in
++++ b/unix/configure.in
+@@ -895,7 +895,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
+ TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
+ 
+ # Install time header dir can be set via --includedir
+-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
++eval "TCL_INCLUDE_SPEC=\"\""
+ 
+ #------------------------------------------------------------------------
+ # tclConfig.sh refers to this by a different name
diff --git a/dev-lang/tcl/tcl-8.6.9.ebuild b/dev-lang/tcl/tcl-8.6.9-r1.ebuild
similarity index 98%
rename from dev-lang/tcl/tcl-8.6.9.ebuild
rename to dev-lang/tcl/tcl-8.6.9-r1.ebuild
index 27b6a02f2715d..824abc3e73df5 100644
--- a/dev-lang/tcl/tcl-8.6.9.ebuild
+++ b/dev-lang/tcl/tcl-8.6.9-r1.ebuild
@@ -25,6 +25,7 @@ S="${SPARENT}"/unix
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
 	"${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971
+	"${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120
 )
 
 src_prepare() {