3 files changed, 15 insertions, 2 deletions
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index ec5e7b6ac631..b4e68d8941b3 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	dev-lang/go"
 
+PATCHES=("${FILESDIR}"/${PN}-9.0.0-limits-gcc11.patch)
+
 S=${WORKDIR}
 CMAKE_USE_DIR="${S}/boringssl"
 
diff --git a/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch b/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
new file mode 100644
index 000000000000..ced85fc8306e
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/764071
+--- a/core/fastboot/protocol.cpp	2018-06-21 02:58:42.000000000 +0200
++++ b/core/fastboot/protocol.cpp	2021-01-06 10:11:52.806586912 +0100
+@@ -37,6 +37,7 @@
+ 
+ #include <algorithm>
+ #include <vector>
++#include <limits>
+ 
+ #include <android-base/file.h>
+ #include <android-base/stringprintf.h>
diff --git a/dev-util/cproto/cproto-4.7r.ebuild b/dev-util/cproto/cproto-4.7r.ebuild
index bde2acb8200f..0ae328fd7df6 100644
--- a/dev-util/cproto/cproto-4.7r.ebuild
+++ b/dev-util/cproto/cproto-4.7r.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/cproto/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="sys-devel/flex
 	virtual/yacc"