gentoo resync : 16.04.2018

3 files changed, 63 insertions, 0 deletions

diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 75f91881f262..c2b8387832ef 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,8 +1,10 @@
+AUX rpcsvc-proto-1.3.1-old-preprocessor.patch 1018 BLAKE2B c65052ebb526976482c591aaba127d01e5369ffc1b89e6a7dec13d22af97718bf768a75870039f5eaabd1153f50d8b01b56489685ff9c55523746029b1b1358e SHA512 14ee7b2ff5e8e981b6a93f63bf01473b326c40977bb181b7a8ae8549ae7967b4cb7ef20beeac741370af77cbbbc8ee2960487b9f962f764e931269141760de58
 DIST rpcsvc-proto-1.2.tar.gz 59883 BLAKE2B 178f9f9fced73dc2e4b587f1bd7924c2811f0b96b5efc048e9a6d3cb4abd32a2c34ff0f5b01576f3dc51f07ca6a06266cd7a055f278f7b205cbb9e30563015e4 SHA512 59e6ac2c3e551daef584878e8ae8fc2da7cb80a04c20f96de561abc972fcfac1fbb57a5ee0dbe7bf5288a1527c9b87fc3f73a259b30393982a9a642cf4b4deb4
 DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea
 DIST rpcsvc-proto-1.3.tar.gz 59202 BLAKE2B 88c74806419e097b20fc41bb63ff66401a6c21a2b7100474e55f1b6452a32d669e879248f00349604237e996167b21b9173158e69876f0db3a1394fb922df7af SHA512 5880ea39a750ee1f69dcedfe32afd617e695ee5328d6386977bbd11babb7bd18d8cb50c2d5f8daf35650aa8a94a4f6dda1171c1159917bb596108b1057c5a158
 EBUILD rpcsvc-proto-0.ebuild 495 BLAKE2B c5df8759ec767be4305c031aed71246536b2ea8b9256c7667358e27921d1f421e5b462ace83fa383b7e0e54c634b79e3706f05fb77ecc74336fc78eb2e7f5b25 SHA512 3103a561491eb5afe0b35ea513765297edf42b24c24e24130eccef2af36fb85d066ba648a9938fbf744e0c0be3958040892cc66476a80959ab69dbfdac88850b
 EBUILD rpcsvc-proto-1.2-r1.ebuild 649 BLAKE2B d95ca842ad48c1fb83a4003cea99ae44312d7e6cb59f777a67dbca0585809a218230f86f2b1237c704bc9805ab36677374b3bbb6f202f4db5178c628faaee668 SHA512 9901e68bd3672ce6689f055d4d79cc73cbf4352c7bb4e1d901450a6ba47f63c0dfe16681a003069a631d31f56b91ed7cc156d3f54a0b1e39b6bb592d180da96d
+EBUILD rpcsvc-proto-1.3.1-r1.ebuild 701 BLAKE2B 4dbb97af693e72b988e9a53f10a14c77c6cb2e8e3e08fb97b2adcfcd01a93516730a09df08f4720737b54b89adf9f8f718fa7a0e3b9efa8a28eee507fe9696f4 SHA512 551299190b219f56c8c35152990218c25ed5f65787d8c31d52a470f9a4db2e63cb5acb08477104cb3cf0b95f1f62a2e89c75bb0a31346a840e3de14c176f905b
 EBUILD rpcsvc-proto-1.3.1.ebuild 643 BLAKE2B 7172abfbf67547620ae634f806b19e6dc01a154747096a562bda7ff6a0f50122dcc9c7c1c0978a287421c6d662025342202e227b0552e49d55f15513c49b98fd SHA512 5008ae592acc11837cbaa3100b4f837e4673bf8e152863d41bc4ffb3777425b972851e3195236fcf190e90d4e5b2905ce3d10af4b7a2db909d388733f3269d93
 EBUILD rpcsvc-proto-1.3.ebuild 641 BLAKE2B 384f51cfdca049ba988fbed43765e64232a54d7c3341419a24a0e5df8723cdcb24f5adb4a2c744ef5666c1bba493b6b061bd1986fecd88390e2c83d5120c11ec SHA512 ca768b98578bf6c7b7c6127ac6ac9c33ba8c6c7a28672a9231a085ab78a02fc4745e3c54c54e5584c8903f1a922fcc7ab28b0a9ff8ba304d2fffbacd9ff9024a
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch b/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch
new file mode 100644
index 000000000000..5d77786a7129
--- /dev/null
+++ b/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch
@@ -0,0 +1,31 @@
+From ce0ed4f45918f9230db435ee3b733090fa4f9620 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 27 Mar 2018 12:08:30 +0200
+Subject: [PATCH] Remove historic _RPC_THREAD_SAFE_ preprocessor conditional
+
+When the code was imported from glibc, the -D_RPC_THREAD_SAFE_
+build flag was missed.
+---
+ rpcgen/rpc_main.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c
+index 94bd818..1b26e52 100644
+--- a/rpcgen/rpc_main.c
++++ b/rpcgen/rpc_main.c
+@@ -1346,15 +1346,6 @@ parseargs (int argc, const char *argv[], struct commandline *cmd)
+   cmd->Scflag = flag['C'];
+   cmd->makefileflag = flag['M'];
+ 
+-#ifndef _RPC_THREAD_SAFE_
+-  if (mtflag || newstyle)
+-    {
+-      /* glibc doesn't support these flags.  */
+-      f_print (stderr,
+-	       _("This implementation doesn't support newstyle or MT-safe code!\n"));
+-      return (0);
+-    }
+-#endif
+   if (tirpcflag)
+     {
+       pmflag = inetdflag ? 0 : 1;    /* pmflag or inetdflag is always TRUE */
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..414a3aa7a6a0
--- /dev/null
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="rpcsvc protocol definitions from glibc"
+HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
+SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1+ BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<sys-libs/glibc-2.26"
+
+src_prepare(){
+	default
+	eapply "${FILESDIR}"/${P}-old-preprocessor.patch #650852
+	eautoreconf
+}
+
+src_install(){
+	default
+
+	# provided by sys-fs/quota[rpc]
+	rm "${ED%/}"/usr/include/rpcsvc/rquota.{x,h} || die
+}