Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

3 files changed, 64 insertions, 0 deletions

diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index b5bd6c00855c..a99b8ead8274 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,4 +1,7 @@
+AUX rpcsvc-proto-1.3.1-old-preprocessor.patch 1018 BLAKE2B c65052ebb526976482c591aaba127d01e5369ffc1b89e6a7dec13d22af97718bf768a75870039f5eaabd1153f50d8b01b56489685ff9c55523746029b1b1358e SHA512 14ee7b2ff5e8e981b6a93f63bf01473b326c40977bb181b7a8ae8549ae7967b4cb7ef20beeac741370af77cbbbc8ee2960487b9f962f764e931269141760de58
+DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
 EBUILD rpcsvc-proto-0.ebuild 481 BLAKE2B 4e507a8892c32f17d0852603b2828ca6b69621fc2686db96016b81f1112d1fd38ef6b83798800710fea95cc2bed21b95957c72c83dbbc2397a724c9907891d6d SHA512 9ca5e01d4aeb44b676f958b895a5bdb754ba88b2db19f4c8522408e073e1c901297c135391e1fd94368e9b1c87671e84523715458c98567d60ff3b037eca4cc5
+EBUILD rpcsvc-proto-1.3.1-r1.ebuild 688 BLAKE2B f86e886eb61a421f74c8373e41ee46a03cc8d92a5616d95cd463df808ea959b2af5e5c67894bce1386d129aaf0606bc1cdd4cf146762ebfb7184ed3bf0272170 SHA512 5a8fab744c86854f0924fb0532bd4c4cb023b83d128572ea440048923c213a5ca6f15df74dbb0537e81b157b6f57d60fba148cc7fd4d38c7df4f5bacbb880cd5
 EBUILD rpcsvc-proto-1.4.ebuild 636 BLAKE2B 7ab5930b37236fe1ea6a68e2388e8cb29537be09f27810213b185686ddd0dba9103cb846155d84fa3a26354ea30bfa302dd3aec98d5a8eb0d045f9696af41310 SHA512 9d14f4183f64d416cc68f8051ab76542330efdc076311eb6000f9382181c1ea888c28698914d7823f069b9eaeac21d2ea13441e4fe83ae1d7a51304466959d68
 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..8a8003bcc44e
--- /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
+}