7 files changed, 115 insertions, 2 deletions
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index a00158ebd8c7..a89fcf90af0c 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,8 @@
+AUX imake-1.0.8-cpp-args.patch 388 BLAKE2B fe6640775ff72b135f882d6e4c00a6571670372f06af974ad47a88906e5863fdbe2a461eaccf94fbcc60fbb2cad362bf71003a49fb27a1b09d0cd086d38c8fdf SHA512 60664a5e53489de391121bfa8869b4d56d4753a1218d2ea6f4fe84cf730db67a1ae1e511759a51c02240edadc80d4f06d6339c444f29f590c4c8630eb3cc7729
+AUX imake-1.0.8-no-get-gcc.patch 860 BLAKE2B 712c3c150ddcc57fea50d8eda31933c0cb039bcaad5da3e017c329c5123e8541a8380ff393d94839a3f1590836205f130d53da409c09902b81e435ba283d2263 SHA512 72e6617454378eae9a5b35356c15e3be7f9dddf294c937da6f70815cb33be5b775f05f51246e78fed0a17a2dfc95e14ffc578d6fd70a2b259471473e21bca3f5
+AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a67a426a77a0c4733f5b7bed990b7a2e5e59e524ea907c7b215b2232cf9674dddfa29974a90768487ddfa97399ac21 SHA512 1e5034209290387b3e0320f85eab876a5ed571896072c3da940e6fa13eb4a2ecb6b325104125738ae3502f420b5aaf00797ca9b71a832dcfda72a911df5e5029
+AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.8.ebuild 507 BLAKE2B ee0bbda5ad649905cb4a41487a0a2f2176666c20133b2d1a35d80aa9ea08f80885caf222a9ce9f105d7b0a843aa518b7db29621038046e15c7cafbbe5ee41ab0 SHA512 e8b40578cdaf3dd290966733ec0f7713113d245d24a2874da574481261bee44dc07d9774ecc981fc3c7af77bcd8118c384fafcaefd8cffffdad76db4ce615351
+EBUILD imake-1.0.8-r1.ebuild 662 BLAKE2B 0824c55bf9009b28ce38ab5798984bbef4e35a3865b2def51226b3f526a8f3a763e7f96b3a43070dd02677ebb89643a52a0855de53917ef2100d2364654029a8 SHA512 07c1c881c62bbe98e36e8ecfd17d8a67543b748ce8b80e3d486b02f6636bdcafdb676eed20913a8c776f19a5af2775eee32f7e06a07ad95d71912cb13c2772d0
+EBUILD imake-1.0.8.ebuild 508 BLAKE2B 10f2fc16413dc09c3ad1022bee49e7ee54c0186836a821bd279520d70877fe37bd27b5cecc8591c346437b9934e45aea3fa272689e0aee99cb6aab33e6952dca SHA512 f37a1fae560be0236d4919d0ed7cd83a2a93504de77d266d732d89382d28f5f2dce6c526ddc1a5dbfda3b9603b0e4101db136de5e7bc18b8e3ed3fb74a7f9266
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/files/imake-1.0.8-cpp-args.patch b/x11-misc/imake/files/imake-1.0.8-cpp-args.patch
new file mode 100644
index 000000000000..4fb382b0a19c
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.8-cpp-args.patch
@@ -0,0 +1,18 @@
+Copy code from IMAKEINCLUDE to IMAKECPP to handle arguments
+such as -E. Lets IMAKECPP=$(tc-getCPP) be usable.
+--- a/imake.c
++++ b/imake.c
+@@ -532,6 +532,12 @@
+ 			}
+ 	}
+-	if ((p = getenv("IMAKECPP")))
++	if ((p = getenv("IMAKECPP"))) {
+ 		cpp = p;
++		for (; *p; p++)
++			if (*p == ' ') {
++				*p++ = '\0';
++				AddCppArg(p);
++			}
++	}
+ 	if ((p = getenv("IMAKEMAKE")))
+ 		make_argv[0] = p;
diff --git a/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch b/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch
new file mode 100644
index 000000000000..155200461157
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch
@@ -0,0 +1,37 @@
+If /usr/bin/cc exists then get_gcc() is always true on Linux (and many
+others), but will fail in the event it's missing (-native-symlinks).
+
+get_gcc_version does not execute gcc and merely sets defines, so
+call it without using get_gcc(). Validity of using NULL should be
+verified if there's ever a new version.
+--- a/imake.c
++++ b/imake.c
+@@ -1341,4 +1341,5 @@
+ #endif
+ 
++#if defined CROSSCOMPILE
+ static boolean
+ get_gcc(char *cmd)
+@@ -1394,5 +1395,4 @@
+ }
+ 
+-#ifdef CROSSCOMPILE
+ static void
+ get_gcc_incdir(FILE *inFile, char* name)
+@@ -1640,12 +1640,14 @@
+ #  endif
+ 	{
++#  if defined CROSSCOMPILE
+ 	  char name[PATH_MAX];
+ 	  if (get_gcc(name)) {
+ 	      get_gcc_version (inFile,name);
+-#  if defined CROSSCOMPILE
+ 	      if (sys != emx)
+ 		  get_gcc_incdir(inFile,name);
+-#  endif
+ 	  }
++#  else
++	  get_gcc_version(inFile,NULL);
++#  endif
+ 	}
+ # endif
diff --git a/x11-misc/imake/files/imake-1.0.8-respect-LD.patch b/x11-misc/imake/files/imake-1.0.8-respect-LD.patch
new file mode 100644
index 000000000000..a53808625c95
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.8-respect-LD.patch
@@ -0,0 +1,15 @@
+Use LD env if available, other tests already do similar for CC.
+https://bugs.gentoo.org/729630
+--- a/imake.c
++++ b/imake.c
+@@ -1110,5 +1110,9 @@
+   signed char c;
+   int ldmajor, ldminor;
+-  const char *ld = "ld -v";
++  char ld[PATH_MAX];
++  const char *ldenv;
++  if (!(ldenv = getenv("LD")))
++    ldenv = "ld";
++  snprintf(ld, PATH_MAX, "%s -v", ldenv);
+ 
+ # ifdef CROSSCOMPILE
diff --git a/x11-misc/imake/files/imake-1.0.8-xmkmf-pass-cc-ld.patch b/x11-misc/imake/files/imake-1.0.8-xmkmf-pass-cc-ld.patch
new file mode 100644
index 000000000000..a27c1ac04ba0
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.8-xmkmf-pass-cc-ld.patch
@@ -0,0 +1,15 @@
+Makefile calls imake again but with ignored CC/LD.
+Passing only if set rather than use defaults.
+--- a/xmkmf.cpp
++++ b/xmkmf.cpp
+@@ -56,7 +56,7 @@
+     echo "make Makefiles" &&
+-    make Makefiles &&
++    make ${CC:+CC="$CC"} ${LD:+LD="$LD"} Makefiles &&
+     echo "make includes" &&
+-    make includes &&
++    make ${CC:+CC="$CC"} ${LD:+LD="$LD"} includes &&
+     echo "make depend" &&
+-    make depend
++    make ${CC:+CC="$CC"} ${LD:+LD="$LD"} depend
+     ;;
diff --git a/x11-misc/imake/imake-1.0.8-r1.ebuild b/x11-misc/imake/imake-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..288d12c0a9cd
--- /dev/null
+++ b/x11-misc/imake/imake-1.0.8-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xorg-3
+
+DESCRIPTION="C preprocessor interface to the make utility"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="x11-misc/xorg-cf-files"
+BDEPEND="x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cpp-args.patch
+	"${FILESDIR}"/${P}-no-get-gcc.patch
+	"${FILESDIR}"/${P}-respect-LD.patch
+	"${FILESDIR}"/${P}-xmkmf-pass-cc-ld.patch
+)
+
+src_configure() {
+	econf CPP="$(tc-getPROG CPP cpp)" #722046
+}
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 83e3302b4d8a..0a444446e083 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"