diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/quota/Manifest
index ebd4c38e43..de8eeb05f7 100644
--- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/quota/Manifest
@@ -1 +1 @@
-DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
+DIST quota-4.09.tar.gz 523191 BLAKE2B 30b3828a45dcd7d99ff053f362917c138b1f0bcbde5f6fd3dfc1b48cb12615e5673d852f9276f2b370f9c799a2103e220d91ddf6a770aaaf8944cfb5c1131a74 SHA512 003d45f33543d4c87446e6547079cdae293b8dade01c58cf3626623721a1400ee07681395ad656c23a9ea2a62ab27c6ad24ad55600890e6e25334aba27ab1ad5
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.06-musl-cdefs.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.06-musl-cdefs.patch
deleted file mode 100644
index 286fc481b6..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.06-musl-cdefs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://sourceforge.net/p/linuxquota/code/ci/1959f3768a284315250acd4d17a9f5ef0b8ea189/tree/quota.h?diff=43b6e31f39edbe7de4f4feeef4d0cf6be093e021
-https://bugs.gentoo.org/713390
---- a/quota.h
-+++ b/quota.h
-@@ -1,7 +1,6 @@
- #ifndef GUARD_QUOTA_H
- #define GUARD_QUOTA_H
- 
--#include <sys/cdefs.h>
- #include <sys/types.h>
- #include <stdint.h>
- 
-@@ -182,6 +181,6 @@
- 	#endif
- #endif
- 
--long quotactl __P((int, const char *, qid_t, caddr_t));
-+long quotactl(int, const char *, qid_t, caddr_t);
- 
- #endif /* _QUOTA_ */
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.09-configure-bashism.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.09-configure-bashism.patch
new file mode 100644
index 0000000000..5866d3873d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.09-configure-bashism.patch
@@ -0,0 +1,16 @@
+https://sourceforge.net/p/linuxquota/patches/56/
+
+configure: WARNING: tcpd.h not found
+./configure: 8453: test: X: unexpected operator
+checking that generated files are newer than configure... done
+--- a/configure.ac
++++ b/configure.ac
+@@ -283,7 +283,7 @@ AC_ARG_WITH([pid-dir],
+     [AS_HELP_STRING([--with-pid-dir=DIRECTORY], [Create PID files in this directory instead of /var/run])],
+     [with_pid_dir="$withval"]
+ )
+-AS_IF([test "X$with_pid_dir" == "X" -o "$with_pid_dir" == "yes" -o "$with_pid_dir" == "no"],[
++AS_IF([test "X$with_pid_dir" = "X" -o "$with_pid_dir" = "yes" -o "$with_pid_dir" = "no"],[
+     with_pid_dir="/var/run"
+ ])
+ AC_DEFINE_UNQUOTED([PID_DIR], ["$with_pid_dir"], [Directory for PID files])
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.09-gettext-version.patch b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.09-gettext-version.patch
new file mode 100644
index 0000000000..1dc194f8b4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/quota/files/quota-4.09-gettext-version.patch
@@ -0,0 +1,14 @@
+https://sourceforge.net/p/linuxquota/bugs/142/
+
+Avoids e.g. egrep warnings.
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,7 @@ AC_CHECK_FUNC([nl_langinfo], [
+ # Gettext support
+ # ===============
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.12.1])
++AM_GNU_GETTEXT_VERSION([0.21])
+ 
+ AS_IF([test "$enable_nls" != "no"], [
+     enable_nls="yes"
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.06.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.09.ebuild
similarity index 77%
rename from sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.06.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.09.ebuild
index 1c4cd2de92..8bf802bd6d 100644
--- a/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.06.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/quota/quota-4.09.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -11,12 +11,12 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ldap netlink nls rpc tcpd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+IUSE="ldap netlink nls rpc selinux tcpd"
 
 RDEPEND="
 	sys-fs/e2fsprogs
-	ldap? ( >=net-nds/openldap-2.3.35 )
+	ldap? ( >=net-nds/openldap-2.3.35:= )
 	netlink? (
 		sys-apps/dbus
 		dev-libs/libnl:3
@@ -31,14 +31,17 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 PDEPEND="rpc? ( net-nds/rpcbind )"
+RDEPEND+=" selinux? ( sec-policy/selinux-quota )"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-musl-cdefs.patch
+	"${FILESDIR}"/${PN}-4.09-configure-bashism.patch
+	"${FILESDIR}"/${PN}-4.09-gettext-version.patch
 )
 
 src_prepare() {
 	default
 
+	# Only needed for bashism patch and stale macros patch
 	eautoreconf
 }