From ed04f17a051240308f2210850a4c3abd8bd7129e Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 30 Jun 2025 07:08:20 +0000
Subject: [PATCH] dev-libs/protobuf: Sync with Gentoo

It's from Gentoo commit 675ee675f9ac182486d6ae145cd88d6d375720dc.
---
 .../portage-stable/dev-libs/protobuf/protobuf-25.6.ebuild  | 2 +-
 .../portage-stable/dev-libs/protobuf/protobuf-27.5.ebuild  | 7 ++++++-
 .../portage-stable/dev-libs/protobuf/protobuf-28.0.ebuild  | 7 ++++++-
 .../portage-stable/dev-libs/protobuf/protobuf-29.4.ebuild  | 7 ++++++-
 .../portage-stable/dev-libs/protobuf/protobuf-30.2.ebuild  | 7 ++++++-
 .../portage-stable/dev-libs/protobuf/protobuf-31.1.ebuild  | 7 ++++++-
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-25.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-25.6.ebuild
index fcac9b8ecb..1024552e92 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-25.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-25.6.ebuild
@@ -19,7 +19,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-27.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-27.5.ebuild
index 3c5e730191..16f078b651 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-27.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-27.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib elisp-common multilib
+inherit cmake-multilib dot-a elisp-common multilib
 
 # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
 ABSEIL_BRANCH="lts_2023_08_02"
@@ -76,6 +76,10 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Currently, the only static library is libupb (and there is no
+	# USE=static-libs), so optimize away the fat-lto build time penalty.
+	use libupb && lto-guarantee-fat
+
 	local mycmakeargs=(
 		-Dprotobuf_ABSL_PROVIDER="package"
 		-Dprotobuf_JSONCPP_PROVIDER="package"
@@ -135,6 +139,7 @@ src_test() {
 }
 
 multilib_src_install_all() {
+	use libupb && strip-lto-bytecode
 	find "${ED}" -name "*.la" -delete || die
 
 	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-28.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-28.0.ebuild
index 2621d4f7ba..432576d639 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-28.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-28.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib elisp-common multilib
+inherit cmake-multilib dot-a elisp-common multilib
 
 # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
 ABSEIL_BRANCH="lts_2023_08_02"
@@ -78,6 +78,10 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Currently, the only static library is libupb (and there is no
+	# USE=static-libs), so optimize away the fat-lto build time penalty.
+	use libupb && lto-guarantee-fat
+
 	local mycmakeargs=(
 		-Dprotobuf_ABSL_PROVIDER="package"
 		-Dprotobuf_JSONCPP_PROVIDER="package"
@@ -138,6 +142,7 @@ src_test() {
 }
 
 multilib_src_install_all() {
+	use libupb && strip-lto-bytecode
 	find "${ED}" -name "*.la" -delete || die
 
 	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-29.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-29.4.ebuild
index 1d23dc9b0c..ea46bda564 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-29.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-29.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib elisp-common multilib
+inherit cmake-multilib dot-a elisp-common multilib
 
 # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
 ABSEIL_BRANCH="lts_2023_08_02"
@@ -80,6 +80,10 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Currently, the only static library is libupb (and there is no
+	# USE=static-libs), so optimize away the fat-lto build time penalty.
+	use libupb && lto-guarantee-fat
+
 	local mycmakeargs=(
 		-Dprotobuf_ABSL_PROVIDER="package"
 		-Dprotobuf_JSONCPP_PROVIDER="package"
@@ -147,6 +151,7 @@ src_test() {
 }
 
 multilib_src_install_all() {
+	use libupb && strip-lto-bytecode
 	find "${ED}" -name "*.la" -delete || die
 
 	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-30.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-30.2.ebuild
index 4b1ed75bf6..7f6d90ae59 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-30.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-30.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib elisp-common multilib
+inherit cmake-multilib dot-a elisp-common multilib
 
 # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/cmake/dependencies.cmake
 ABSEIL_MIN_VER="20250127.0"
@@ -77,6 +77,10 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Currently, the only static library is libupb (and there is no
+	# USE=static-libs), so optimize away the fat-lto build time penalty.
+	use libupb && lto-guarantee-fat
+
 	local mycmakeargs=(
 		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
 		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
@@ -143,6 +147,7 @@ src_test() {
 }
 
 multilib_src_install_all() {
+	use libupb && strip-lto-bytecode
 	find "${ED}" -name "*.la" -delete || die
 
 	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname "${SLOT#*/}")" ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-31.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-31.1.ebuild
index 71bf1e316d..dbfa1f7872 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-31.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-31.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib elisp-common multilib
+inherit cmake-multilib dot-a elisp-common multilib
 
 # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/cmake/dependencies.cmake
 ABSEIL_MIN_VER="20250127.0"
@@ -77,6 +77,10 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Currently, the only static library is libupb (and there is no
+	# USE=static-libs), so optimize away the fat-lto build time penalty.
+	use libupb && lto-guarantee-fat
+
 	local mycmakeargs=(
 		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
 		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
@@ -143,6 +147,7 @@ src_test() {
 }
 
 multilib_src_install_all() {
+	use libupb && strip-lto-bytecode
 	find "${ED}" -name "*.la" -delete || die
 
 	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname "${SLOT#*/}")" ]]; then