Fix test-readlink. Thanks to Michael, bug 376639.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 34 insertions, 4 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 7c842e2e9de8..5a81ea7472c7 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/m4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.152 2011/05/31 15:37:21 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.153 2011/08/30 01:43:33 mattst88 Exp $
+
+  30 Aug 2011; Matt Turner <mattst88@gentoo.org> m4-1.4.16.ebuild,
+  +files/m4-1.4.16-fix-test-readlink.patch:
+  Fix test-readlink. Thanks to Michael, bug 376639.
 
   31 May 2011; Jeremy Olexa <darkside@gentoo.org> m4-1.4.16.ebuild:
   Add Gentoo Prefix modifications since the ebuild was already EAPI3. Keywords,
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 409e1d2fecd2..11dbed614f16 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX m4-1.4.15-git-version-gen.patch 1275 RMD160 8a0660c118ab584f6a91691318d0415f7a46daaa SHA1 7b9371299803afefdbe8d8beca0c7e3e0c1aa4ed SHA256 42cfd406e5508768987b916b46bcbc7e81ef8ed57f65428fc9a462439eba0896
 AUX m4-1.4.15-uclibc-sched_param-def.patch 580 RMD160 2bcea0eb33aaef5ae5f9046a36385af7a9194865 SHA1 e3c94913eaaf8a280e598353f89ef46119dd3f94 SHA256 b111051eaaa15ce6e53ae168d06e0fb9688c70141060abfe0a15c5d1400fbaf9
+AUX m4-1.4.16-fix-test-readlink.patch 326 RMD160 ca8e772f02039b0fcf43e7ee96715a7afd208ab0 SHA1 6ad56ee3bcbf18c0f86d5e9ada0b00f13c654412 SHA256 5d036a2aab097de8c0b83b6562732235e9863542478d302f5b96d58ee1fe9717
 DIST m4-1.4.15.tar.xz 947068 RMD160 a51516c6e22d3518eabb934083a6d450d85190e2 SHA1 d4c7fe695ddf93c0f05c6435d892520b65f4c0d7 SHA256 ec26b4ef8037286b36bc5af9893f0da63bf8615bbf478a587aa6cab927b0349d
 DIST m4-1.4.16.tar.xz 1005264 RMD160 179325c371810db9489d8c2c65d5ab3a38ba84e0 SHA1 d8688d1d84e058366134301e018e57bbbdc33463 SHA256 d5b5d51cf8f5b18f3bac39bc2f6b1e61f34d400136ae1a87d075e26a38028d5d
 EBUILD m4-1.4.15.ebuild 1282 RMD160 59f1072471225fe0f7e5334250e802f5c3177bf5 SHA1 5abe7f09506d99cb9bf8ba6709d86d0f1334cf3f SHA256 e472ea03a5e23e7bd1b38f499d6c3cfc9a99354c653fd14b7c5eed40b7647190
-EBUILD m4-1.4.16.ebuild 1567 RMD160 77f72df102898db1e7aa508e35c16b343e7ec645 SHA1 a49795a9db0408d6f005594107b2d870f0aaac63 SHA256 c759683530706d662ad90d73eca5a26308f5e8df52c3a531cb507dfb0611a2a2
-MISC ChangeLog 17142 RMD160 b59e82f3f92e37a9d5f025c57d9703b4ff05ae9d SHA1 b0c2a8bf7c49eec85ddc8221e6d63e409926951f SHA256 6389f2593a0d85aa0e6c68ed3d7f3844134b7f0c7bbfc2bf3967d67f8f9155ef
+EBUILD m4-1.4.16.ebuild 1645 RMD160 0fddc17d7002accbd6078d57b5f92bbf6c8eea1f SHA1 1324122f9692665350c5f91eaa2e9bc1979685cc SHA256 9ea6c2355c435f9e44ef53266f83cc2d17e8ed70133f65e58817f0a7d0ee6870
+MISC ChangeLog 17306 RMD160 29e29e02bfe7f9bb73638b363b470c68e886e35d SHA1 3b5a3169b6147e32f9a60a12538eb5f902f43872 SHA256 109a798319c6ba54cb8b7ddd69cf3857dd5a0286a76cee420284c3f14f90c06b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5cQE4ACgkQTVUdg23rv51I5ACdEcHZweDhRdlieTnNp2a9j9Bd
+tXYAoIr826acXhWiDaNqK378EhTFaMsL
+=YINa
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch b/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch
new file mode 100644
index 000000000000..bb887c4b2305
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch
@@ -0,0 +1,11 @@
+--- tests/test-readlink.h
++++ tests/test-readlink.h
+@@ -38,7 +38,7 @@
+   ASSERT (errno == ENOENT);
+   errno = 0;
+   ASSERT (func ("", buf, sizeof buf) == -1);
+-  ASSERT (errno == ENOENT);
++  ASSERT (errno == ENOENT || errno == EINVAL);
+   errno = 0;
+   ASSERT (func (".", buf, sizeof buf) == -1);
+   ASSERT (errno == EINVAL);
diff --git a/sys-devel/m4/m4-1.4.16.ebuild b/sys-devel/m4/m4-1.4.16.ebuild
index 826df369df55..2f41e9141369 100644
--- a/sys-devel/m4/m4-1.4.16.ebuild
+++ b/sys-devel/m4/m4-1.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.16.ebuild,v 1.2 2011/05/31 15:37:21 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.16.ebuild,v 1.3 2011/08/30 01:43:33 mattst88 Exp $
 
 EAPI="3"
 
@@ -19,6 +19,10 @@ IUSE="examples"
 DEPEND="app-arch/xz-utils"
 RDEPEND=""
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-test-readlink.patch #376639
+}
+
 src_configure() {
 	# Disable automagic dependency over libsigsegv; see bug #278026
 	export ac_cv_libsigsegv=no