Do not patch m4 files to avoid regenerating autotools #516166 by Rodrigo Severo.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 21 insertions, 59 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 410e985ab748..ec18a0bfeffa 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.208 2014/08/03 14:22:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.209 2014/08/12 12:17:03 vapier Exp $
+
+  12 Aug 2014; Mike Frysinger <vapier@gentoo.org>
+  files/tar-1.27.1-xattr_build_fix.patch:
+  Do not patch m4 files to avoid regenerating autotools #516166 by Rodrigo
+  Severo.
 
   03 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> tar-1.28.ebuild:
   Prefer shipped man page over external one (bug #518932).
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index cf8a51194fed..f10a7ae1fda6 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -5,7 +5,7 @@ AUX rmt 263 SHA256 c0371cb0243a190b6bb43609c86dfb4cd637882d4ff3ff9651ca7ec8d6b59
 AUX tar-1.26-no-gets.patch 779 SHA256 80533a828c8a657ec1d585a6d3b7b2e8fcae6ba1d93d778195a185805f9a2a39 SHA512 98c54f084bb9770c69ba9ec58aff0e4182385984410e83cb93451ceda81152e4a8ddf63d3035b491153b1791888004744ae07f29866daf43e6a0caa4d067bd19 WHIRLPOOL caa81ebf934f60921e40cec889dd164154a43750034d9383e98d3755fdaa9e1f5c6d3a7714b8bcf25d86f41b944dc95c16126af0a6670eedd7939b3b2fe2fc10
 AUX tar-1.26-xattr.patch 29828 SHA256 ce2b67c9fca5e610e117e11485f11bea5d4c6b053392c97825da7f7e65e9d043 SHA512 c8b88b7b9dc642344882d70903dd1657980e05100a618c9919f096e5599954120f6412226e15a827f166db2016c6a7558b07336e14a1a703f27d20339b9d8ace WHIRLPOOL f7e15d70a38b1ea9d6f6a6a3e1357a9c869306420d8ff0a4e325ccfda02fbd6e91fce7c5ca59a35fac43d9c75aae5d508c9eefff781454fe8ed1948537a8dbfd
 AUX tar-1.27.1-recursion_norecursion.patch 765 SHA256 2232bcf904f9cc0a1a485549baf229b741d13fa89b69f8d112846c5f4f8ee0b0 SHA512 6b9a8c9a9f1d8a6c96137353a86c77c170d8f3bdc348c99a1147c950b43780aa896f0d8e1c0c1c70a044a0169f445f2ee6ca89ea680729062bf4f73f93a99ef1 WHIRLPOOL dfef48b1df29c53ff0aacbf7958c9101faf591d98f0e843b22185cd979e5e5d694b5c02b69f692c47f840f214d5bbffdf8cacb043fe1c901a30bd2df218a1643
-AUX tar-1.27.1-xattr_build_fix.patch 7591 SHA256 a961e4faff4fb04088c6cf224e15de9410ce81819c44fd8e4d7926f07893ac1d SHA512 8a89e6ede114cdb67266b63b63d9be2684f463164751f1e03f51d9f2a6909ca20ff597d537db167897c468396c50e73d85bdf2b69a362e2a85dfbdf0012fd061 WHIRLPOOL 900b56f15ed43645a8822f11f0820de0b61718904f4650555c4c24cc02acacbe0706aa0203509f7aa7c95db20c1879e8812de96702f50a71fb3e324e0233f313
+AUX tar-1.27.1-xattr_build_fix.patch 5762 SHA256 a23332692959044ecc281a93de19de2ac7c37c56971d6aa541adf2fd3bc74251 SHA512 d44322734813ec201567d389deffc94f6a08c2f83c93d495f18451666409465a3ad577ca7f4c540d8ca668dd4d3f77d327fdf32669ec8e932d12e8d819f8c5ab WHIRLPOOL 1245479b74b1f11aabbe29f55b90eb7c179f6c8175f77f43f409e58b71b11026dd3f882665c10e777ae3837c1e5fac2ddd0e8f9d241a9a6d694a2ccb20ae38b5
 AUX tar.1 16744 SHA256 47100e0f1dcaeee56b99083d8bb6fb398be701030f0a72439a1b4de31ac701d3 SHA512 1d0cc0449b4e9dbd0693d2ec678629f5dae47b7c25268a754fab07bb422957aded103164c096f12bf21dd12d08622067a26e1ac8d38cda0dfd9320e8ab7cb134 WHIRLPOOL f817e98f978ad0f79a6a8512038174e3438e3c5f5240d0191a0afb8c2e9a4a203c0b2a7e33125d1b3f8632f54851d2ba0d55ae6e141b7703988f4086a39b40af
 AUX tar.1-1.27 13442 SHA256 fd1410214bad29525c08fc0fe499c8807c4cc648c7d56ba83bf429a2c43fdffd SHA512 4810df7e549713287e74a4de7113f2ba41bd96173829313d123be7ac9d74242d3d39ef17604761fbcc607cdd72ada0bcc26c99de5867cab5c1d0e9410131707b WHIRLPOOL ad8847f9d7f3395d42e9500aed6aa43cef2791e034e54c192a6ecef4953b8ba415dbfe1ddda4b113031c9aeb409e0630bc8b432f17ae28e905afa9b1d2b459a6
 DIST tar-1.26.tar.bz2 2339773 SHA256 5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41 SHA512 3bc12441bebfc388017ad0632fb3e777ceaf62be82fb19ce771df8bbb765eb094dad336110189f49f5eaaebd4d6ced586098e1e3c8b9f7f775dc483d5513f209 WHIRLPOOL bfdc579f97a260d6b6776211f470bfc1a99b81d89a8067b2ebfab3101ab1a4f2b4f7c444edffc05bc7585993cae601c499ec074bb606c7ef289deac5429cfb2b
@@ -14,22 +14,22 @@ DIST tar-1.28.tar.bz2 2693989 SHA256 60e4bfe0602fef34cd908d91cf638e17eeb09394d7b
 EBUILD tar-1.26-r1.ebuild 2290 SHA256 03651edf07bc9cc141a524efd006f4361c4cd79b1d5796dd88ebd3e4fd25eb5e SHA512 346ad7e358e2bc5337011cd076daaff887ed7c83d1bd2c411c409b7327d35dfeb01c4be51102623cb0e004da0c4a24393746b0d8260799e86f5de94ff633958d WHIRLPOOL 492c281e5e6929286c01dc9ecbd37b9de72947d3701237e34adeb690f1cdc84a559fcbc2f346505a64ebc4ae1e25d6d4f6882df03495dd767159e0e04ea89100
 EBUILD tar-1.27.1-r2.ebuild 2446 SHA256 1494344aac5ed6ad92511d1351118930e34af406eacee5de46aa805ab61032e7 SHA512 bc8df8eff97313bf4908ec092334b897ced0574ea234d167bb4430dc3842fb4d7e71d2e8876bb52dc85d24c22bd2eda8298b56cd83a409715f32d2d4cb0e5ee6 WHIRLPOOL 2f2377b671699de7954a56fa6ec9c7ceddb2dc9d933d089ccf09d4d6c2df0ea80113841799d7ce3a44d18bc798631b0571812022c0b5b613be06545b1828c055
 EBUILD tar-1.28.ebuild 2288 SHA256 b6c4f42706042001033c09f99767acafb5870569ba87ed42b4a8d2275e2d73a5 SHA512 10bc263ba7e386cc4cf047748d5273be575c5b6e8a6c65f8db033cd500a28925e5a493eca7252fe3d62fbeb959f0534027cd671771656a881ee1af12b49d0d98 WHIRLPOOL 4c4348df02f5cc5a83731ae0dd6cc927f90efc5079e3dcaddb6d610161a80c96b35e1126eca7f6f21ddaebcafaf00df57ebe70fbe344cdde8bbae318bdaec3ef
-MISC ChangeLog 31297 SHA256 a5e06f1114d51b0bc6e4d6f9e135d6d78f84cc613cacd4916305709edad451e5 SHA512 2643910cd5bbfef8e93862cfed26e7194e2180b438ea3cd24aaff7a2f9d882bcf0d4f7e145f6d7bc9213a401995b669ce17bd9df9b3fc2ab31c1e4ff236b47bc WHIRLPOOL e6cc2010cb328afa2fd2133701092ca36e51c67973df40f1ed99fdc18a59587a56a266c3de79c6dc166d5b7fef93735313d085b0d532f029f2b801d72c51bb8f
+MISC ChangeLog 31469 SHA256 ffdfe72a96323177cc5072befed591f6e2fbe8ee4c6f12b2b81ba365599ecc5e SHA512 899ab93a66ec09b2a67c263dc3788421d73fce596feae844a79ece6ed89d2674defbbf6769fdf000e52e3d4678d9d2f5032a6d8182a2ba93e50ed1261fe35f81 WHIRLPOOL c5fc9a6e5399968efc5abc42dd7026dc6c6713340c44e684f1bd266ef8676321cef209f16f53309cb72c3bcd6b899a4f60c95459afea09700042ea10517806dc
 MISC metadata.xml 298 SHA256 776c92889812df8f8dc072ae2ac1d7091f1613afc6332eccd0e20a0d90caaf0b SHA512 9e7e0d3343fc95c9164d7b5cd7bf9a8cc21d5bba06af0ce19f693f8e6039415ab472411fba602fb99a1728529774cd85e828311a77c34d1f157cf4fedea59f65 WHIRLPOOL ddeaf15e3d36ed3c9e0ac13b17e49a187d0855255f38bf60a3726bd10ebaddbfc269a2101bbc64d4c8f69491228165016b2d76b15aabbd9bc3a0bd1732ca8f2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT3kWQAAoJEPiazRVxLXTFCqkQAMVxyBS40V2RYgfHb/Pe5ji7
-QOR1fjYJ2ML8emprxJcgDuUnSe9IxDyvK2M2UOo+i5nn300m7hKsVSoh5hjXv+ZB
-pLVxxLQO2CYdbmizOJfWmE/omLRqfZTb6hHKlnc2A8MNFcEAtbhi0jCnmLWZSlI7
-uWYSBmHiVWMyq7Rjlcrp9iBLlTW+RYWCohjc2CqpmDRXLPNuAc8x9ArA4Bf7BAwn
-0N7qglrE2NMY208z71Y9+8ZqaMUDNtyG6fQwkWcUYqje46cpCM1htPxL0QMINqDm
-izCza4m7wiqywMPk70ZdUT8aO2yDHsOd6T/2LDhVDsUZ5HoPDHyMrRKxHAO+V95z
-gJl2K49TRsBU+I9/BnBOZpKbte+sXQBJtAAi7Ashgr8FxMxhlAXzBBBtRXldU0U1
-fYcMxlXRSSauFbfAodqn4Wp9m+xhiUHXpUoqjXMZWEFiVMNT+orotaOOMKXIsIR5
-/Deu34IYs5XkRM0qeMrzLPajUJxEfAEukiH7K/w1cjjhS1/S/60aYgLCrmHd0i6E
-6blG6QsYqFvhEbLQr0XKJwi0u0aML+upIUQdvq6knEhQ86CrFDpudxG7wHyfxZkQ
-xVIalUr4ZzTerakoizE7YqvxF8EVTBLvv60k7JewBkZINYIc29Rgk1d7CZP0Mn1o
-DDMwnF7IcG+JI3LGsCF9
-=UUvN
+iQIcBAEBCAAGBQJT6gXCAAoJEPGu1DbS6WIA2/sQAJMgn87nFbiQp7h6fT778Uap
+F/5dYB77c9m4fuPU3S8xfuUFrmdpBB/2tWOThv4jJrVQ0l0j0hr42yG8k34j2rJC
+7gnYiHPG1LhyCEFsH9z6hfOjhjKzp9PTFB2FOzLWnvA53AumRuyiKAaD/Udw1Xn7
+UuPPXXfnN/viTlBm8kfabilZfbH3DXObwTBUrhx4iTOa1zmrT1LIEJuzPAh1YVFx
+5Pe6b7G2FUQkhaWUDxkThRJfU1ZjRNVeKyWMZA0P8wLEVVycnAJ/s5AVGcVam3Qy
+FlB7BVpt6GrZYouR7dWxVdpL7OQ6L/AIAdepHaeeoK+Axf+kcSY7zRdrKGIvE64q
+2w14vHLBiJ5TeKiK1xN3R1UJVuew9vDiFv09s0z7ccCJ6hb5adanB9z2qvNd7+aI
+LFx7heQomBa+92O6RbKZnasYTnai1Zer8ywFok+qaBymvXXwrtrwuqhxb2B2SvDT
+yv3Ei53J+8OHA9iweBeWirADs/o6f7ef3K05Y/lCUru/F9RSpuC36Mv3NgAoduvO
+31931N+CxQEPlCrec4rl1xCbpX7LYliTb+wv5E0VD+xVcvcbVzQWcsecODwS33AO
+4CpgJn8RCotT1DF9QlPMPzczyMnxfetn3qVa+cMN0fs4kj2WmvsUSCWtMXFYoLpw
+LLIgBPtdWn+T4F9yzAa4
+=Z2AL
 -----END PGP SIGNATURE-----
diff --git a/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch b/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch
index b3e39f30b17e..14cf90a5f4cc 100644
--- a/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch
+++ b/app-arch/tar/files/tar-1.27.1-xattr_build_fix.patch
@@ -1,49 +1,6 @@
 http://lists.gnu.org/archive/html/bug-tar/2013-12/msg00023.html
 https://bugs.gentoo.org/489170
 
---- tar-1.27.1/acinclude.m4	2013-03-14 21:18:09.000000000 +0100
-+++ tar-1.27.1/acinclude.m4	2013-03-14 21:18:09.000000000 +0100
-@@ -37,18 +37,27 @@
-     [], [with_xattrs=maybe]
-   )
- 
--  AC_CHECK_HEADERS([attr/xattr.h])
--  AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_attr_xattr_h" = yes])
--  if test "$ac_cv_header_attr_xattr_h" = yes; then
--    AC_CHECK_FUNCS(getxattr  fgetxattr  lgetxattr \
--                   setxattr  fsetxattr  lsetxattr \
--                   listxattr flistxattr llistxattr,
--        # only when functions are present
--        AC_DEFINE([HAVE_ATTR_XATTR_H], [1],
--                    [define to 1 if we have <attr/xattr.h> header])
--        if test "$with_xattrs" != no; then
--          AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.])
--        fi
--    )
-+  AC_CHECK_HEADERS([sys/xattr.h attr/xattr.h])
-+  AM_CONDITIONAL([TAR_COND_XATTR_H],
-+    [test "$ac_cv_header_sys_xattr_h" = yes -o "$ac_cv_header_attr_xattr_h" = yes])
-+
-+  if test "$with_xattrs" != no; then
-+    # If <sys/xattr.h> doesn't exist and <attr/xattr.h> does,
-+    # then link against libattr.so and not libc
-+    if test "$ac_cv_header_sys_xattr_h" = no -a "$ac_cv_header_attr_xattr_h" = yes; then
-+      AC_CHECK_LIB([attr],[fgetxattr])
-+    fi
-+    have_functions=yes
-+    for xattr_func in getxattr  fgetxattr  lgetxattr \
-+                      setxattr  fsetxattr  lsetxattr \
-+                      listxattr flistxattr llistxattr; do \
-+      AC_SEARCH_LIBS([$xattr_func], [attr],, [have_functions=no])
-+      test $have_functions = no && break
-+    done
-+    if test $have_functions = yes; then
-+      AC_DEFINE([HAVE_XATTRS],[1],[Define when we have working linux xattrs.])
-+    else
-+      test "$with_xattrs" = yes && AC_MSG_ERROR([xattr support requested but not found.])
-+    fi
-   fi
- ])
 --- tar-1.27.1/configure	2013-11-17 17:18:39.000000000 +0100
 +++ tar-1.27.1/configure	2013-11-17 17:18:39.000000000 +0100
 @@ -33619,19 +33619,20 @@