dev-libs/libgpg-error: fix yat2m dep bug with Cygwin

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x29FB0E9EC719EE20

3 files changed, 120 insertions, 0 deletions

diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 5547341e5d..988f2c4db9 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,3 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 1.29-yat2m-dep-exeext.patch 2802 BLAKE2B 30dddaeb5779381b336c95074e70e864c57ec9d12a8d22f4bdc2340af58a3d529a77ccfaf97c3f632e5e54f3a6d7bde8c49e5e4919928db1b33c79bd86a46a64 SHA512 58390b214f0c01d8119bc6b0cc51a4a04c6d45828743d2d22c0fab5efd4204794e65ef8434a81d1b81abf94cffd10ce1fa02a410b02043051109f0a1d3a92483
 DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
 DIST libgpg-error-1.29-solaris.patch 1445 BLAKE2B 5c7cc0babe2e4bc883991691d95eddb2c96d71972ae05e875fa9c2c8fa964489c6a0f542e1ea4bd5f8efd9df18da4787d4be337657225c0060c8e380370bc84b SHA512 6071e3dc6f280f94a96453d953baa21caac1ff0c7a258d0a2d4e3ca272b664be6fe260ed619a66a6e5d87a7cf22e877e9c30189c641b37a401d84255a2e1add1
 DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
+EBUILD libgpg-error-1.27-r1.ebuild 1495 BLAKE2B 72f4fcf8748d80668827499a003b60101cba1ba94c83d3450a3ecdb3116ea53f20d8484d8297f4cfdd8c45be067faa4a7b4ffa15b379047f084f408d3ce3e176 SHA512 2331146f2baba155a89a02124b2c6b3ffb65c4acb10656324fd6d124b37df496ec96e815a045d6d8b2cb0a89cd383436a5c753aa0d24bcaeda90981e2bf01d4d
+EBUILD libgpg-error-1.29.ebuild 1834 BLAKE2B bdb42d2e2af4f1ba3a7ceb0723f6c1617896e9c1c5b0825b1417a24f9b015579ee4b09d2c907ab433970c46a20cacfc4ca0127122b0548c0bf22658c34ddac44 SHA512 1519f9f7a951d8e63c1b8df3951e8e59c8b45f12ef9a31691aebbd712bb895b7a2e61e9389bc37ad75dada588ef89017bbaf4e619ad98eec0d3a5fcca9afe405
+MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEqGPdSmYcJzzTeG67KfsOnscZ7iAFAls6UjwACgkQKfsOnscZ
+7iBtHBAAlVmz7RvOgyO7et1jkOprn5dGbeOSu/tYkQwrnc9c3L8tFfj/8GvFSzdZ
+tlH/+vcdBhHBljrC4X65F/m/7L2vT1I7ot63xwwHMfwZEw6Ivy8coUGhts7eEjdU
+WG7e23FpbxKMEMiHp7FGbXKiTokWLHYrsnQchHojm1Umu56HifBdkgGmz9Wf5zd+
+EJigJXoMx9k2YaaG6JbeMmiJxE6jMLVw/Wa6z5PxAq2cmeNOXCMZWr+dheSrGK8x
+Pq/390laHb3N7u2BkBnM8U8G9UrXLMEJzSTjKjoCpjwlpHDBluRbDxZ4UwmLSqTB
+/pjTDPTZAF5rwzQLLTmglqqXQHljC11nciPDi7dw6N8Chbv1wCvXhxYbfwCDFQwd
+AajCMN5P+Sql19qal+HoBR+I7fhjvk2FGz3tNZMVt8B0vAUk68Elh/7Ix7OPUaLd
+eOd9KvcIzTX0JZ99Eoc9BvSRP9WxJRiYBSJMIYZJMrWov0K0bg3QL4exzm4xJtqP
+p/+JqiIYcp0AK2jOxkmuNjeBH2rvnbsmX9x8Z/6ZKkfDDd4oCVBYwNdaDs6+4dUf
+QypqPD/v1TtxYrj0CsTt5o+urfcz5Ki/gZy+sVk986k31dy/+rcDFBAYBg01iwLA
+MHwf4s6lkIRVBV3U6QgjZbCPPwQ50xo6Msx/x0MCDJAyI7cC1TM=
+=BxMZ
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch b/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch
new file mode 100644
index 0000000000..e1cfa43d51
--- /dev/null
+++ b/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch
@@ -0,0 +1,96 @@
+From b174418aaf00b82c12b291a86a06855d35a10e10 Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
+Date: Mon, 2 Jul 2018 15:20:41 +0200
+Subject: [PATCH] doc: if ever, depend on yat2m$(EXEEXT)
+
+Cygwin is not a "real" w32 system, and transparently hides the still
+required '.exe' extension whenever possible.  Unfortunately, this does
+not apply to Makefile targets, so we still have to use '.exe' here.
+Fortunately, there is the portable EXEEXT Makefile variable we can use.
+
+Furthermore, we want to use a detected yat2m utility only if we are
+cross compiling, but we do not need a Makefile dependency then.
+Otherwise, the just created yat2m utility should work fine.
+
+* doc/Makefile.am (CROSS_COMPILING, HAVE_YAT2M): Set empty YAT2M_DEP.
+(not CROSS_COMPILING): Ignore detected yat2m, use local one.  Use EXEEXT
+in YAT2M_DEP rather than explicit '.exe' based on HAVE_W32_SYSTEM.
+--
+
+Analysis for the problem on Cygwin when YAT2M_DEP does lack EXEEXT:
+* make has a default rule to create 'yat2m' from 'yat2m.c' (uses CC)
+* gcc transparently adds '.exe' when creating executables for Cygwin
+* 'yat2m.exe' created from default rule does perfectly work
+* automake generates the 'yat2m$(EXEEXT)' Makefile target (uses libtool)
+* with EXEEXT=.exe, Makefile has both targets 'yat2m' and 'yat2m.exe'
+* parallel make does execute commands for both targets in parallel
+* both targets really create 'yat2m.exe', overwriting each other...
+---
+ doc/Makefile.am | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 6f3e5a1..3fff0a6 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+#@@ -37,26 +37,21 @@ myman_pages   = gpg-error-config.1
+ 
+ man_MANS = $(myman_pages)
+ 
++if CROSS_COMPILING
+ if HAVE_YAT2M
+ YAT2M_CMD = $(YAT2M)
+-YAT2M_DEP = $(YAT2M)
++YAT2M_DEP =
+ else
+-if CROSS_COMPILING
+ YAT2M_CMD = ./yat2m-for-build
+ YAT2M_DEP = yat2m-for-build
+ CLEANFILES += yat2m-for-build
+ 
+ yat2m-for-build: yat2m.c
+ 	$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+-else
+-if HAVE_W32_SYSTEM
+-YAT2M_CMD = ./yat2m.exe
+-YAT2M_DEP = yat2m.exe
+-else
+-YAT2M_CMD = ./yat2m
+-YAT2M_DEP = yat2m
+-endif
+ endif
++else
++YAT2M_CMD = ./yat2m$(EXEEXT)
++YAT2M_DEP = yat2m$(EXEEXT)
+ endif
+ 
+ yat2m-stamp: $(myman_sources) $(srcdir)/version.texi
+-- 
+2.16.1
+
+@@ -37,21 +37,21 @@
+ 
+ man_MANS = $(myman_pages)
+ 
++if CROSS_COMPILING
+ if HAVE_YAT2M
+ YAT2M_CMD = $(YAT2M)
+ YAT2M_DEP = $(YAT2M)
+ else
+-if CROSS_COMPILING
+ YAT2M_CMD = ./yat2m-for-build
+ YAT2M_DEP = yat2m-for-build
+ CLEANFILES += yat2m-for-build
+ 
+ yat2m-for-build$(EXEEXT): yat2m.c
+ 	$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+-else
+-YAT2M_CMD = ./yat2m
+-YAT2M_DEP = yat2m
+ endif
++else
++YAT2M_CMD = ./yat2m$(EXEEXT)
++YAT2M_DEP = yat2m$(EXEEXT)
+ endif
+ 
+ yat2m-stamp: $(myman_sources)
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
index da73f4e943..02ef002585 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
@@ -30,6 +30,7 @@ MULTILIB_WRAPPED_HEADERS=(
 src_prepare() {
 	default
 	eapply "${DISTDIR}"/${P}-solaris.patch
+	eapply "${FILESDIR}"/1.29-yat2m-dep-exeext.patch
 	# autogen is needed for getting a version number, it needs a
 	# POSIX compliant shell
 	hprefixify "${S}"/autogen.sh