diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/rpcsvc-proto-0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/rpcsvc-proto-0
new file mode 100644
index 0000000000..45ab8ec066
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/rpcsvc-proto-0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=elibc_glibc? ( sys-libs/glibc[rpc(-)] )
+DESCRIPTION=rpcsvc protocol definitions from glibc
+EAPI=6
+HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+ BSD
+RDEPEND=elibc_glibc? ( sys-libs/glibc[rpc(-)] )
+SLOT=0
+_md5_=8f4909e2db92be403fa2fddfecc17969
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1
new file mode 100644
index 0000000000..cfd8bb44e4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=rpcsvc protocol definitions from glibc
+EAPI=6
+HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+LICENSE=LGPL-2.1+ BSD
+RDEPEND=!<sys-libs/glibc-2.26
+SLOT=0
+SRC_URI=https://github.com/thkukuk/rpcsvc-proto/archive/v1.3.1.tar.gz -> rpcsvc-proto-1.3.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=64ec735e6bdff002d80bcda8558107a0
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/rpcsvc-proto-1.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/rpcsvc-proto-1.4
new file mode 100644
index 0000000000..e6fc9ce932
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-libs/rpcsvc-proto-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=rpcsvc protocol definitions from glibc
+EAPI=6
+HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD
+RDEPEND=!<sys-libs/glibc-2.26
+SLOT=0
+SRC_URI=https://github.com/thkukuk/rpcsvc-proto/archive/v1.4.tar.gz -> rpcsvc-proto-1.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=43cb1be1f0bc1cd189074eeb81814026
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/Manifest
new file mode 100644
index 0000000000..dc231fa6a2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch
new file mode 100644
index 0000000000..5d77786a71
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/metadata.xml
new file mode 100644
index 0000000000..bcf493eae9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
new file mode 100644
index 0000000000..e78fd8941b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="rpcsvc protocol definitions from glibc"
+HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
+
+# Fake version to help portage upgrading.
+
+SLOT="0"
+LICENSE="LGPL-2.1+ BSD"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
+RDEPEND="${DEPEND}"
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
new file mode 100644
index 0000000000..8a8003bcc4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/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
+}
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
new file mode 100644
index 0000000000..af9ee8387e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
@@ -0,0 +1,29 @@
+# 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
+	eautoreconf
+}
+
+src_install(){
+	default
+
+	# provided by sys-fs/quota[rpc]
+	rm "${ED%/}"/usr/include/rpcsvc/rquota.{x,h} || die
+}