diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/Manifest
new file mode 100644
index 0000000000..78f1b0aef4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/Manifest
@@ -0,0 +1 @@
+DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/metadata.xml
new file mode 100644
index 0000000000..2dc293268b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription>
+    Oniguruma is a regular expression library.  The characteristics of
+    this library is that different character encoding for every regular
+    expression object can be specified.  (Supported character encodings:
+    ASCII, UTF-8, EUC-JP, Shift_JIS)
+  </longdescription>
+  <slots>
+    <subslots>Reflect ABI of libonig.so.</subslots>
+  </slots>
+  <use>
+    <flag name="crnl-as-line-terminator">
+      enable CR+NL as line terminator
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">kkos/oniguruma</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
new file mode 100644
index 0000000000..e3be7fef9a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	# https://github.com/kkos/oniguruma/issues/167
+	# https://github.com/kkos/oniguruma/commit/603f4db48efb49307b7515500496e9e7a92fb779
+	sed -e "/^#define MATCH_AT_ERROR_RETURN(err_code)/s/best_len = err_code; goto match_at_end/do {&;} while(0)/" -i src/regexec.c || die
+
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-9999.ebuild
new file mode 100644
index 0000000000..8efae93944
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS=""
+IUSE="crnl-as-line-terminator static-libs"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/oniguruma-6.9.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/oniguruma-6.9.4
new file mode 100644
index 0000000000..f9ddc7a044
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/oniguruma-6.9.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Regular expression library for different character encodings
+EAPI=7
+HOMEPAGE=https://github.com/kkos/oniguruma
+IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=BSD-2
+SLOT=0/5
+SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c932e87188517720b139146c2a99ad3c
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/oniguruma-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/oniguruma-9999
new file mode 100644
index 0000000000..0a7471e3ac
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/oniguruma-9999
@@ -0,0 +1,10 @@
+BDEPEND=>=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 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Regular expression library for different character encodings
+EAPI=7
+HOMEPAGE=https://github.com/kkos/oniguruma
+IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+LICENSE=BSD-2
+SLOT=0/5
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=029f67671a2cce4b80671fd1c8f6453a