wine-vanilla-4.0.4: Fix build with Autoconf 2.71.

Fix an M4 quotation error that causes problems.

diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 15e57f20584da8d21514b89de58acf7ef403bdac..6e9a2e7809171b363ed52f87ebe638e00be04de1 100644 (file)
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,3 +1,4 @@
+AUX 4.0.4-configure-fixes.patch 523 BLAKE2B 8cb555cdf763b734dcf27c6f6892867f597de5481ce69f975df17844518842b9f8f6f0190f8b3690eb4b7f5978f6daa508525eebb07d8349e84f314969c16d90 SHA512 5d67d43d7bcfe6497826ac1f8e2d8f1ac63bc724c31a44caa6cb91d9f5a1004be5a56d0d6f03891c9acb2530fb7f14503f7cc950ff650ebdad31868ee6b1c7b6
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-4.0.4.tar.xz 21686868 BLAKE2B 3ba9afef38a33e53eb1979aa4e7bbb120370692a8480e7bc15fc6959fb326c0c1f2151bb96355220e534858c0be56e1c35813e5e31b8a85db89c701466edac21 SHA512 21780b3c846bfa7a54572fe78939d7a2579a2b96654fc578e8e70d20b50262b4bfb43a0431f4089264cf8f83202c2fc67dd6a4c89257e951b64e7c91ee3bdf4e
-EBUILD wine-vanilla-4.0.4.ebuild 17348 BLAKE2B 65bd1b4f38176557f9d3dcd698f6a637aa6a03573430d7c4f10803e1fd8ff97f916fe324f2d27518438a4a30e4186263277b362266a5a33d36f5fe7e9913fe99 SHA512 8c60ffdddcaa1b37b43b0d3ecee2783749c6b900198726ae5ca289d1d73605a2c709b503ea8bc1b488f46e33e315c23f13135306dd25bd83d21c15865a4059da
+EBUILD wine-vanilla-4.0.4.ebuild 17387 BLAKE2B a957cc455c1d6b2222576dd105ba8039b5081dbeb1098aec5ea6031de6b1f84ddbe4cd139152f039fa846460677e0efdaa7375c89c13382364f45c9bccb52b9c SHA512 7c97bace10135c69a79c3a63c77d006e8387f7ae1e5eb7546f0e1fa1092267271e0e90951e00ae7615578daa1f6d24c02d9601068a16ed2b90f2079fb6c2ad4e

diff --git a/app-emulation/wine-vanilla/files/4.0.4-configure-fixes.patch b/app-emulation/wine-vanilla/files/4.0.4-configure-fixes.patch
new file mode 100644 (file)
index 0000000..8c8a931
--- /dev/null
+++ b/app-emulation/wine-vanilla/files/4.0.4-configure-fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/aclocal.m4 b/aclocal.m4
+index 25ac678..1d41d6a 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -28,7 +28,7 @@ dnl Like AC_CHECK_TOOL but without the broken fallback to non-prefixed name
+ dnl
+ AC_DEFUN([WINE_CHECK_HOST_TOOL],
+ [AS_VAR_SET_IF([ac_tool_prefix],
+-  AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4]))
++  [AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])])
+ AS_VAR_IF([ac_cv_prog_$1],[],
+   [AS_VAR_IF([cross_compiling],[yes],[],
+     [AS_UNSET([ac_cv_prog_$1])

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.4.ebuild
index a516ce034e223478c4cb55397bc8915b712a90f5..f8146a12ec08b8b775716a6aa2f61915879ff492 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.4.ebuild
@@ -139,6 +139,7 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
 PATCHES=(
+       "$FILESDIR/$PV-configure-fixes.patch"
        "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
        "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
        "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508