gentoo resync : 23.06.2018

3 files changed, 56 insertions, 1 deletions

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 611067fe7525..ae4928d5b224 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -3,6 +3,7 @@ AUX nfs-utils-1.1.4-mtab-sym.patch 1020 BLAKE2B 6f1315a02a6070443fbd8cc943e382a0
 AUX nfs-utils-1.2.8-cross-build.patch 1323 BLAKE2B 51ec6b58436725e78fd9000aa1d97a1a73e7884bea01e0d22d5ec0a88cc4d5c8f152baaeb2b602961232c08330b311f3e98cb79c40b7d700a279842430e484d9 SHA512 42a41411d0de384b66a2875fa9ea15e4b854150b5f75ba2db54ad7785fd147ee329eb8867d24a26b2b1d9ef89bd887caeaf0b5a59cdda15f5a11c47888882b9a
 AUX nfs-utils-2.3.1-svcgssd_undefined_reference.patch 1055 BLAKE2B a2f045f7886eb0772ad9b30ddc1c98294039e32f92eb811dcccde8926eda7d33c42b34e07912fcb536ed96a2f0b2114eb293689380751f3c786bdea6a6923ba7 SHA512 21361593415c497fa5a0bbd547b2cb0e0512ad8b3deb2397aba6a453cce840876d607015e46d8c3a367cd478395420d8b24e2f3a7f73d0e75d5a2445e4e46ef2
 AUX nfs-utils-2.3.2-junction_libs.patch 1487 BLAKE2B 5ecd4709fdcbc1c0885c91aea134ef5e5e00e6f58ace39d35d31b5de74d73bf05a4c27befc35f2c8a54d72452f63589c3a2912c3ef37752416389dd9537598e8 SHA512 d724ff25b7bbf03fc2c7d122bb338979ef50c59906a433ced5aa50e84030a375b2c268a05ee930c4f64ce58e938de7d30a9d0b5d3b7e660d8894013786d5bb4f
+AUX nfs-utils-2.3.2-no-werror.patch 1375 BLAKE2B d494d00f81e236fd0531d4629108a4536415e3a6898b655f267b0125c0fd6b87cb567ef5cb7598fc19e68653572c1072566d7ef791fedb9f0c8d9ea663e67565 SHA512 acc3ccd6cf4afa73bbd253f6a1faa0349e6f8d50d57d9316fafa1faeb9f8ed5d5dfa60ec1b0a53339cd71af4d65b32d9595965ec435bc72eadcc86b8d187438b
 AUX nfs-utils.conf 74 BLAKE2B 504c298c1e8e7eb596cd87813f1aeeac5cbc830bb85be9e26ed98f7ed85cdbd14ae2c47b0e111c912398ef28ef629e6de7e585a7b161624e9698ea208750fd9f SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
 AUX nfs.initd 4244 BLAKE2B 0df8f270cf38b16efb331202d300d0bd648ee90c9dc44704e4db6f6aaad53e1c16059e94e14278923db59ce17752e4f034ad948ed53d6f2aefe8ecd6faf808c9 SHA512 f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018
@@ -21,5 +22,5 @@ DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f
 DIST nfs-utils-2.3.2.tar.bz2 884068 BLAKE2B c4133cc12c5c1cd33346408e2d1286cf50880a89ec97cb8ce4453266ba5b145eb1ca7a4362ac1a91ea5c1ebddd4fcd1d6a4cd12f45637cd5d845cc6d8d5f139d SHA512 4b948d92f515e9340163f53ab26dd7189fa8b13909f5c668b7c66ae13f181ed778967edc0a20753763540b5a3f93a41a2de38a7276ffbfadfd866c5ed422520c
 EBUILD nfs-utils-1.3.4-r1.ebuild 5139 BLAKE2B 8c2504911449d130588e6293c0691ddaa881630e01b390e4f7cd891e02ebcf137984565867b21ad59261d38d5ae5bad89ce7d5a3684bc9ae6f3b8a0787d08d06 SHA512 828f39b3f7f117e5930b42c62908b9f6f5ba7cefacaf2a2149108b428b03da8ca1f1ca993a86264876f1103d6118ef6be62ec25babb4d6aff0270b24a4fe4e0a
 EBUILD nfs-utils-2.3.1-r3.ebuild 5294 BLAKE2B 3c04d19a98bd620de460ae07bca7a609bc57c1de39ac621c7cf9404a5297b79d8f3e2d9d5ec2c2fb14754dcd6cb5b0e4e39d1c5f54cb3568e70ae95b266e76ef SHA512 342f97daba6c64b74da49617024c659e3be6f50b698564958a171b222502911369b87f2d18e7770c3fe5f0869d89a5db6d15c1624a62fe1d311de581e1fe137f
-EBUILD nfs-utils-2.3.2.ebuild 5342 BLAKE2B f6c9ef2b8cbcdf74a9d2e34a8ef1af8978bad08a7e9c6bf933cac587dd30a91baf3f9928ae27e6b441c0152d9259933133e44b503e8ea656de80e9f1bdcaaa2d SHA512 30509c92f9e39f4591c0cf541bfb9280e25c52346c9d98a7d037d87e42b9e8f139fefe5f077e7ee744792656f6ba5e211dd0581105f8329af4bd4a5ad2870852
+EBUILD nfs-utils-2.3.2.ebuild 5385 BLAKE2B 4dfc11b9a80be2dcd0501c3da9e541d16cd6d260cf28d18d2fe2cb539274b85b9fa2b29c4f1c251989b8cc2b2778f1aea0f93f10a259458f3e55a15787e03c02 SHA512 1e05759322d7726187956010ff65985970dc3b032838d8b4090361035a922c9d4d425a7c6cd1c415ea5e6f32aacf1f1fbdff1a3d50a58ac09f43e310964799a7
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch
new file mode 100644
index 000000000000..d06fc4ce8b8b
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/656984
+
+Don't build with -Werror flags.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -544,45 +544,11 @@
+ AC_SUBST(LDFLAGS_FOR_BUILD)
+ 
+ my_am_cflags="\
+- -pipe \
+  -Wall \
+  -Wextra \
+- -Werror=strict-prototypes \
+- -Werror=missing-prototypes \
+- -Werror=missing-declarations \
+- -Werror=format=2 \
+- -Werror=undef \
+- -Werror=missing-include-dirs \
+- -Werror=strict-aliasing=2 \
+- -Werror=init-self \
+- -Werror=implicit-function-declaration \
+- -Werror=return-type \
+- -Werror=switch \
+- -Werror=overflow \
+- -Werror=parentheses \
+- -Werror=aggregate-return \
+- -Werror=unused-result \
+  -fno-strict-aliasing \
+ "
+-
+-AC_DEFUN([CHECK_CCSUPPORT], [
+-  my_save_cflags="$CFLAGS"
+-  CFLAGS=$1
+-  AC_MSG_CHECKING([whether CC supports $1])
+-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+-    [AC_MSG_RESULT([yes])]
+-    [$2+=$1],
+-    [AC_MSG_RESULT([no])]
+-  )
+-  CFLAGS="$my_save_cflags"
+-])
+-
+-CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
+-CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
+-CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
+-CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
+-
+-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
++AC_SUBST([AM_CFLAGS], ["$my_am_cflags"])
+ 
+ # Make sure that $ACLOCAL_FLAGS are used during a rebuild
+ AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.2.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.2.ebuild
index 16a7c4fd9cef..553fb8c8b2d8 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.2.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
 	"${FILESDIR}"/${PN}-2.3.2-junction_libs.patch
+	"${FILESDIR}"/${PN}-2.3.2-no-werror.patch
 )
 
 src_prepare() {