Fix parsing problem of certain utf-8 encoded Makefiles using upstream patch. One of those reasons you'd get "*** missing separator. Stop." message.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 111 insertions, 15 deletions

diff --git a/sys-devel/make/ChangeLog b/sys-devel/make/ChangeLog
index 58a27c932c2d..6f73a79f167d 100644
--- a/sys-devel/make/ChangeLog
+++ b/sys-devel/make/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/make
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.116 2013/10/13 16:51:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.117 2013/12/13 06:15:37 ssuominen Exp $
+
+*make-4.0-r1 (13 Dec 2013)
+
+  13 Dec 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +files/make-4.0-char-cast.patch, +make-4.0-r1.ebuild:
+  Fix parsing problem of certain utf-8 encoded Makefiles using upstream patch.
+  One of those reasons you'd get "*** missing separator. Stop." message.
 
 *make-4.0 (13 Oct 2013)
 
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index eb82bd02e984..013fa9e3e0df 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -19,6 +19,7 @@ AUX make-3.82-long-command-line.patch 1598 SHA256 da196f8050c717d42110e9328b3413
 AUX make-3.82-memory-corruption.patch 899 SHA256 8bb84e638f40514045f0c57b0ee9da24024679f624614e4d954ce7e8f6414d3b SHA512 a65428bf6a1ff3bbe811cbf633577f15399bdaeab11fab0e66a104987df4dffc7779753aaaaad0534e591ca6df2fbebfca6522b35487e6bf9166b0681c271ae8 WHIRLPOOL 0200c90954a948108b21e5cec6c95f02479bc0d189cc9cf76de6b0f4c3647225fde83e775b07f23cc4d0e040c02c3ca5972c2f75ac1da8f2ec4896ff21a6ea2f
 AUX make-3.82-oneshell.patch 931 SHA256 017bd61d9ed44a9cda3f7dc2c49d65be33b9b3a225580ad36e9caf5c8481f184 SHA512 85784dfcfeee2b7d7d3d659edc39a268165ab3f9dbd3d716ffcc7ba52cb44c3011cf5aa3e57cdab12f2f8aeec4ff00ffe82959aef242951f4dc1a7c6d4b55d89 WHIRLPOOL 287b8cefc2abfbe4a7825499f6c15db192be1b7941c25a1d5d260fc795a38bbb97923a8da5fe0035697c3dae36bd26b2633d316f6c9c9882be23aee51ece2d62
 AUX make-3.82-parallel-remake.patch 1422 SHA256 e2b63a63a44fb692798d237f888ad35a0899144fc5c6700270dee8ee455ac231 SHA512 640489810aa387524d5b7b0c38b22d13c423e1ca04c2a8915d1736904aa6e158f999eda5d6b0f17c21a85f97b490e73c85fd2d205d494c98099e379842a1fccc WHIRLPOOL cfc8ba57e22524ba675aa916eafcdc5b4bd2121f7d1dfd6cb73a2fadc365975af8360e61b70260632fa13292537ed7ea169861745deb3cd7956a6ff4ff364738
+AUX make-4.0-char-cast.patch 1398 SHA256 bca7308b8e773ff8ae0db76d45060492775987114318152e6f1224c417e63001 SHA512 28d8061550b257a1712a9dcfbc6322cca95b8f5a42ca11646a68e3b8015bc4a687c608485c47cc8f1715b9aa5ea056be1a24bdea5839bca2a03e75ef193261e0 WHIRLPOOL 1ea1fe58ed70ccc202b25988befe9bead39a1100dbd4daf82a749011dcdcfa6e89816d30c418b6b6844e6389b8f66f48647749c8877afbc02ad708b572c31b32
 DIST make-3.80.tar.bz2 920645 SHA256 a99b39e7b04c333724f48c38fede709481cfb69fafe7e32ae4285b7fadf92f1b
 DIST make-3.81.tar.bz2 1151445 SHA256 f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8 SHA512 f38b8219a966b4756149a13435f5b9dc760814aa62c6add8e1760e602f65a83cd0a45ed457a5dbdd2fab91043af4de2c60e62154f95c6b625af3703c824eb653 WHIRLPOOL 39d33b8b9136a3a8cf732fe8f437729ab5d487dc3e6dca0cad6dcdea256eec799d19c6c8d2591c3b526e7bd4fdd901ca7eb1d9e77e525454a3e52e17fd181ce7
 DIST make-3.82.tar.bz2 1242186 SHA256 e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966 SHA512 3260be0d1a9a7c5eb0dbb87179a9a9521fdfc7809ca51f13ee5a37ba5e63d21ad50a4249ec7d3929a9d0ce8c8f6cf302558743964f0f7ff742efe283b91df9de WHIRLPOOL 0b6b5f95f33e0e5584cddad234afb2350bbf62f2a9c280703345100eba7867d80412cbe1b22f429eb32db43dd37e665e0f136d0262ee3f030cf384f77e99d1cb
@@ -31,23 +32,18 @@ EBUILD make-3.82-r1.ebuild 1241 SHA256 449e8f16fab46f04f9d21b52e4712af3922ceaa3b
 EBUILD make-3.82-r3.ebuild 1307 SHA256 86260b468454eb17687dcaac59d288dd1ab192a354b87ba4e9db617342b676f2 SHA512 3000360b794c7f6db2e249a189e386b74410f6e124f2cefa6947db839fb9135ea13944f8c6e34a3644bd776ac45f1df1b4c9883355dca0ebc922dedf9d601fcf WHIRLPOOL 2b9f5e865b984a3a164b95d028e6127cc2e439ba7e8e16019aa954bb6bab8390170b8188ebec336175c96fd671d80a2d5f65490ed5d11b3af88be5a6d6c40b93
 EBUILD make-3.82-r4.ebuild 1875 SHA256 7cee00db1523fa86d61bba1244ec75ee3582c58fc21ddc4bfddb75bd4a73edc3 SHA512 f5817dd770605919bbf04de11efb29f7dfb03647134dd1c958fe93913dda00a3e411115642222cc98a141c99b7901140ccdcfa81b0c953090834b45aa385ea40 WHIRLPOOL 549ad92c4f7f7aa1010b3e0dc3ff2755ab3080e2fd7e15185054905ac3dc8ba33a82974cfa98f4cb840ecc38844988f499aad4dffc81680e9511cfc6c271001e
 EBUILD make-3.82.ebuild 1183 SHA256 1f2ca73bb4d269ad882400528a2eeb2e22fbcee64fb8a589b074009b5df6ea52 SHA512 cc6cc43313c4381fe770ef6d6838d2e66da5ffab950f607f19ffc2f62958f5f15b411292be621ce3ce90f323866807bf03996209f2c694db54921177247d968c WHIRLPOOL 431e29680e0fcbad27939d2a5f37b793b0d605b34289776877ffe4673ab99712101cb5637b702e99b76f63e67625b5914962cd5ab3fe4a1f165dc01412949c96
+EBUILD make-4.0-r1.ebuild 1494 SHA256 4542ac45b558c4ed4975154485d5fe14ca17bf30444de8fb2698c68b95ce595d SHA512 f589fd8cbd11df70fcac7f58247b0934138190a16ecbbb92f3314a10e0216143010817ddee43f92da7cc4052a62b2cac51e8cb0d0e18694d9126590beff8e6d5 WHIRLPOOL 1080ee7de10c4b7357214b53c25073a29484ea57bf52a427b31bdec78e5cc8ac676308628a21c298c99ab4d0e5bab001ce990e7d0cc2e9e770d397b74f22a439
 EBUILD make-4.0.ebuild 1451 SHA256 683191a1d2c0790e241d2301c96311d1500728edc6879b4540c4be780132ae10 SHA512 f67e31508c8d0a8519f84012d65a74be240d98a2354fd14aecdd306ff6bb0db586a5b2c88bb6c2fcc6d5137b02d8bb91704457752ae399f450210e75326cf825 WHIRLPOOL e9a72a7df525fe73f3e289d449a516e770e8fd90b64c212809a2e5e98263f5eefe011881a8acccd7c76ab793bf8a78b82fef5b8e27dcf1ddb972146b15a46b2c
-MISC ChangeLog 15035 SHA256 e828632451841b74b92a52fe3f8010f9ea43bbe516df6c433ffbdd2f4bb88fce SHA512 b36406f7f4066c63132f4e22a52a4e14c0c28f9be9cdfe4076254eec474e43d8e3fc6d0be7aa6063eebd5b6aff79b396f5f2099e96ff3d58516ebdcd5da1933e WHIRLPOOL 8d58f3c08df52e4e8850c196958546c864a1cf65796240e97480833c3cefa6ebe58d8df71f562e303e3bb7a182ad22dc085b16064134750b8bff57403e7bbab1
+MISC ChangeLog 15323 SHA256 beea11fbd3cdd2c7d6614d29b7549d0251716a336b94b9620a63f0eb49d17ca1 SHA512 46b70486e2954d2117ef87c0ec58f37c529aeceb2726767d4b1978f454be9f8b7bbd06be2ab3f0c94fd9d4b652f44e7ba30f85737ed9d508c61e0734ed6e745c WHIRLPOOL bbe00f05e55c5f3a1f2a9e91397581b8a4c5cb086bea4d07450915bdebdd1be26b2fae0c8ed634073f25d53bc6f92404ca2b27aa49d0a725e2ca95e1ccdd921b
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSWs+wAAoJEPiazRVxLXTF61MQAJJpEMtViQWBhdvR2gkHzfN/
-H0chrcmmGmuoivoaaGvsNl0XvXhB9MmkYH/CDJsJw3DDyXwJrpDb/0aG3v//AJhs
-dyOSl3zSQ07PeRg8sYpnG0UFEIy9BX9mik3ZSWSvCWnDqKH6aXUq2q1FztyVwOlm
-Lkxrl7Los0YVQiTNyuxWLMGaSCcthFqvVvBpgQ19MCBQe2nzGg0/WGo/G6HvXf0f
-cP/VrhmMWy8ZtZLvOEk7cuDVmDJSLnD9/EUlkvUU6rz4riD8/R9Gt1Q4ixlPq7V4
-fhFoAu+cu02IuFfxhfdhpDesOSAOt2yVKq4dzZhWchhqqxUciBOKh+Du4ADkoYWl
-wdojIV/Um4q7FAfpwsneqTxDahQJHVtlx/zSAgHYDvjEcD4jCdwBaGndzNJvvSGF
-bGyKmjt8aKXHw0k1/ip43U27JsrzYCcoJZGjhkXmXFsbdOqSb9Z8TnMUrO4dhGaG
-yvF4Vb1j9H7Me+E8w1mdw+za/iMTKdH4nJvQenBnEbzyqUmwvWL/HpnhZ8Hu5bi9
-xRtpKhaLDxgHm6y9vjigZYYC4uN6f9Wf6CfUQVVo4eONknh1TTRJMFiGfISTHcso
-S+PQlThpHf596rvdlAVh4DWDhxMhBQJucN4r9fC/tQKsjfyI4jrP5dERcIO1d5OZ
-q1OKVNu0UZeNIobJRr6f
-=Uihn
+iQEcBAEBCAAGBQJSqqXFAAoJEEdUh39IaPFNYjcH/RxNYBqo60dp3kD2IrJ7juVr
+A0PgHy+JiIHQwDJVwUj8WDp2hQ1FKUAAe46FtVPNqZepm7H5LF3PxKe7FoVTHGbG
+4A4CPZSIzADWB4Fgcs6/W1X7YgA07WRdnTyIvNezY4ztOu0Nx9Doh9sH+lJ2z6Go
++BxE9byqmFjDb+nxD+T5ad6VnW1umavZ4LvEVZKM5DWMmeaLfqmPWdalGGQYIcfb
+vEFsdyCJ9stkryeb2DKYXK+EIPm+o8TX9lBCQSQxc2Dn65BtdFvzPA7uoqyi6XKA
+Qz67iGgAD65f1XD7tWzKI0SuLNUBpr+Z95fBggHh0g3MQaoDKyuJrshXzwz35l4=
+=DjDn
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/make/files/make-4.0-char-cast.patch b/sys-devel/make/files/make-4.0-char-cast.patch
new file mode 100644
index 000000000000..86505be5da47
--- /dev/null
+++ b/sys-devel/make/files/make-4.0-char-cast.patch
@@ -0,0 +1,46 @@
+http://savannah.gnu.org/bugs/?40371
+http://git.savannah.gnu.org/cgit/make.git/commit/?id=9d58570c
+
+From 9d58570c77240fed53d1f88217877f8e778f4bb2 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Sat, 26 Oct 2013 04:10:17 +0000
+Subject: * makeint.h (STOP_SET): [SV 40371] Cast to unsigned char.
+
+* tests/scripts/misc/utf8: Test variable names with characters >127.
+Fix suggested by Robert Bogomip <bob.bogo@milohedge.com>
+---
+diff --git a/makeint.h b/makeint.h
+index 77f51e0..c591427 100644
+--- a/makeint.h
++++ b/makeint.h
+@@ -415,7 +415,7 @@ extern int unixy_shell;
+ # define MAP_VMSCOMMA   0x0000
+ #endif
+ 
+-#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(int)(_v)],(_m))
++#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(unsigned char)(_v)],(_m))
+ 
+ #if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT)
+ # define SET_STACK_SIZE
+diff --git a/tests/scripts/misc/utf8 b/tests/scripts/misc/utf8
+new file mode 100644
+index 0000000..2adcd07
+--- a/dev/null
++++ b/tests/scripts/misc/utf8
+@@ -0,0 +1,14 @@
++#                                                                    -*-perl-*-
++$description = "Test utf8 handling.";
++
++$details = "";
++
++# Variable names containing UTF8 characters
++run_make_test("
++\xe2\x96\xaa := hello
++\$(info \$(\xe2\x96\xaa))
++all:
++",
++              '', "hello\n#MAKE#: Nothing to be done for 'all'.");
++
++1;
+--
+cgit v0.9.0.2
diff --git a/sys-devel/make/make-4.0-r1.ebuild b/sys-devel/make/make-4.0-r1.ebuild
new file mode 100644
index 000000000000..67e31ba4842d
--- /dev/null
+++ b/sys-devel/make/make-4.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-4.0-r1.ebuild,v 1.1 2013/12/13 06:15:37 ssuominen Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Standard tool to compile source trees"
+HOMEPAGE="http://www.gnu.org/software/make/make.html"
+SRC_URI="mirror://gnu//make/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="guile nls static"
+
+CDEPEND="guile? ( >=dev-scheme/guile-1.8 )"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libintl )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch \
+		"${FILESDIR}"/${P}-char-cast.patch
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	econf \
+		--program-prefix=g \
+		$(use_with guile) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README*
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		# we install everywhere as 'gmake' but on GNU systems,
+		# symlink 'make' to 'gmake'
+		dosym gmake /usr/bin/make
+		dosym gmake.1 /usr/share/man/man1/make.1
+	fi
+}