gentoo auto-resync : 20:10:2022 - 01:59:18

4 files changed, 70 insertions, 0 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 38eb3d86216d..1e4f20e0cb71 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index a9a33ace9c7b..302c5534422c 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -2,6 +2,9 @@ AUX imake-1.0.8-cpp-args.patch 388 BLAKE2B fe6640775ff72b135f882d6e4c00a65716703
 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
+AUX imake-1.0.9-no-get-gcc.patch 1048 BLAKE2B 0ff949e2e12afcb59cefc81b60e9801d14bf9b98f19ebe62b6a5ad857ea3b1e1bd3244309953eb450b7f3e29ae9663c695ff790fbaa6a8d202dc062734c21381 SHA512 67f5e4789b739c4d53d331592e83b9455a1e01ff29f9b95db04a25225f70549ced920010dd09b6f9f6e1b70017e1864f7b344fdc4fcd8962f2a9a2853e0b0644
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
+DIST imake-1.0.9.tar.xz 153332 BLAKE2B d9de997016112833e50d1151448366c538b9796622630724552cc0476deed165621edc1a01318a83b577a85fcfc78b753e6fa9fbdf4c71413319abe542f1beca SHA512 e7587cf80369c8f4fcc1207c13bcb74a53d838b504ac8a7f3b98fb8f5f595cc7b8e5e9fad50cadcf40cf27bd02ef4eae7fe458854bbed7bea27d474d66520644
 EBUILD imake-1.0.8-r1.ebuild 676 BLAKE2B 9b48c875622fcb42052cc9b24e2b83f9ca52ba51013388b49666bf96cdce506417bff63b7254750e2815ce40c3e71f184ccf05b904db508b5eeba76c617abeeb SHA512 97a9f6a495354e3a32ecad68b7b3a6004e847d9152255a495bdcaaff42d18c98e4ea1ab27a3f68a359c177464f2f60184518d27b6413d94a04823c866ac9be7d
+EBUILD imake-1.0.9.ebuild 734 BLAKE2B 302e5578b0f9060af97a0d9c0b73c43d989792a02147509d37aa5a106d281ebc5ac3e2ec36fe0dbfccf0e2af0f765930aed20096936ce2b4e7958630a3f66656 SHA512 f709660250c8f57ff0fb80383db8fcb05a4e9f938b8c0f3f28aa5eef68f6255d0b2cd78065b999a6bde5432e5086af6dbefa9336593711cb547dcc772e3f8348
 MISC metadata.xml 337 BLAKE2B 33b94ed7ed8c8068a9fa1e2e3a49b51760e5e19003102a8ff5b76a0f449cc77fbf2aacaa8351a39caf2ab538645eca7862a383e7e4413a59efa69dabf8950c32 SHA512 9e59ae6ff8bef63e98e08ce8eff2d35a1ed3b815b60140523f07f85ea62a3bad952deea65a822393628db1605f2a8ac5ba35c3bb277e85a3cb64dba74936f470
diff --git a/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch b/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch
new file mode 100644
index 000000000000..131b7978165b
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch
@@ -0,0 +1,44 @@
+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
+@@ -1331,6 +1331,7 @@ get_gcc_version(FILE *inFile, char *name)
+ }
+ #endif
+ 
++#if defined CROSSCOMPILE
+ static boolean
+ get_gcc(char *cmd)
+ {
+@@ -1384,7 +1385,6 @@ get_gcc(char *cmd)
+     return FALSE;
+ }
+ 
+-#ifdef CROSSCOMPILE
+ static void
+ get_gcc_incdir(FILE *inFile, char* name)
+ {
+@@ -1630,14 +1630,16 @@ define_os_defaults(FILE *inFile)
+       if (gnu_c)
+ #  endif
+ 	{
++#  if defined CROSSCOMPILE
+ 	  char gcc_name[PATH_MAX];
+ 	  if (get_gcc(gcc_name)) {
+ 	      get_gcc_version (inFile, gcc_name);
+-#  if defined CROSSCOMPILE
+ 	      if (sys != emx)
+ 		  get_gcc_incdir(inFile, gcc_name);
+-#  endif
+ 	  }
++#  else
++	  get_gcc_version(inFile,NULL);
++#  endif
+ 	}
+ # endif
+ # if defined __FreeBSD__
+-- 
diff --git a/x11-misc/imake/imake-1.0.9.ebuild b/x11-misc/imake/imake-1.0.9.ebuild
new file mode 100644
index 000000000000..90e00308d59d
--- /dev/null
+++ b/x11-misc/imake/imake-1.0.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+inherit toolchain-funcs xorg-3
+
+DESCRIPTION="C preprocessor interface to the make utility"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="x11-misc/xorg-cf-files"
+DEPEND="x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.8-cpp-args.patch
+	"${FILESDIR}"/${PN}-1.0.9-no-get-gcc.patch
+	"${FILESDIR}"/${PN}-1.0.8-respect-LD.patch
+	"${FILESDIR}"/${PN}-1.0.8-xmkmf-pass-cc-ld.patch
+)
+
+src_configure() {
+	econf CPP="$(tc-getPROG CPP cpp)" #722046
+}