gentoo auto-resync : 19:02:2024 - 11:39:43

5 files changed, 40 insertions, 2 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index c7e38474a4ec..47e22fe6df59 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 3ce528c31985..ea9c67f9bd42 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,6 +1,8 @@
+AUX disable-unused-mkeficapsule.patch 558 BLAKE2B 139a3f6a7637984c3dfd2ac1fac8e3907fe99fc9f3a48e729de503cf6430a3bd2842a7f650e1e6afd20591d50e40e12cdfea4aaa1c79d3bdb619612a8d8b5005 SHA512 f88bbe68a258931dcf72c329fe1dcecda21eedd267900f481ccdc4f12dce86f4158373fe0c4481029dc0fa66709b9d9bac8e0bdbd472fcfd71f521a5d233a00b
+AUX disable-unused-pylibfdt.patch 471 BLAKE2B eeb65f9a5b158d4b13b633419d0e174d65903c5e23114862cfd49a7467d641e28968bd2893bf32492976609b4922becd7565f477d6fee1a545ba75b9068491b3 SHA512 0bbc980b092c33af1d4be750dedce374b3b2fd420268ceffb6f7029e6199a6f753d2708f6fba9a61020b4adec47996d8de858a1e7e64e8d09bd7405b66694d0c
 DIST u-boot-2023.10.tar.bz2 19645392 BLAKE2B 1404ab42e8b0c821fbfdf612cc00ed5d6b1a1d15d4e69647e788cf97536234f89fe000f480107f8a78b56f7dae7a022f5e742c06ca7f381050e2251889fcdb83 SHA512 f238a69b9cc08ee0a69ea8ca2fa26975f2f2ede14e978b4db274b1e4095e43af0052307ac39034658a72ec9706951cd03c0f316d0591f391adecaf2cc9496fc4
 DIST u-boot-2024.01.tar.bz2 19926911 BLAKE2B c62a22f56276426917b0db508ad7dc82efa4fe7be14c5e7d79ecdea172b2b383981b7e65b7e920b196d0162a17fb362ef97a8d758a1b30e509e3c66748d2c106 SHA512 45bd093ba3bda23e43cdde83d8656c1ee1348ac2886ecff1fee475f101ac4965a5be6565408fa5b990c723f3fdc833edfca60a719f735a43040cd14a1b59a88b
 DIST u-boot-tools-2024.01-fix-invalid-escape-sequence.patch 1285 BLAKE2B ad0af975b59794f21a44472a1f1b4542e75e478d51e649a6c339a4af9963cb4b822e6eba6819cbd3d35c09f3c33f1995288ef296e07466a427cf1f0dd0a399e1 SHA512 8675c267ca5a234924bdf8fc03dcaf75501cf86ac7a9b2e7fbc7982b9620e8863af289c124c5e91cccee58cc116b4d2798be745dedc1b28099a143f3464ad4d6
-EBUILD u-boot-tools-2023.10.ebuild 1563 BLAKE2B c890dd5ff76b03a57fff1a2d28a93f2890e5d8755b4109f1b5327b5c6497ba980861ebf7f834e0cc4eef2b977f9d7f28bce400e22c7abea9b65da9e624c6a4fc SHA512 bc37c660974217c7c8713de08ad24a560f7f5a7a007d576436f9470a4be91afaa16e659c7f7ae77ef400206ded79d687ccd92bd6aa759214e4cde49e6a9708ca
+EBUILD u-boot-tools-2023.10-r1.ebuild 1671 BLAKE2B 3f20384f8aa8d982341c0c596a03968d39512879087cec89b2a3de474889f1c098d680a670f40a12bccf75f62ef22d9e447bddacf01813a38a50bf4eddc05857 SHA512 07bf471cbcdabcb894dfb7f6d4a297dea6a818b368824a1f87eb3a171626e461c2bd8c5789d7daa4b793459e7602e48ef1926f288a1d15abb94a5d8395985421
 EBUILD u-boot-tools-2024.01.ebuild 1847 BLAKE2B 8736f7d1441ab25a53b7d49c3772eea7e02bffe0a023dae5d4f401196efe112a73760773acd598c37adcff388ae3936995dcf39fe483880b2265f572d57ccd54 SHA512 c5ade9586464f8376aea463c758ecc2be0f2ebe583ce30b699d3e4e938e37c493386a3f75509d28b8a8ef0f62431d922237a25358b0969ef4c06f91ef2d5ff1d
 MISC metadata.xml 343 BLAKE2B 4115ff47d73727feb01367f4f6a419d46cfed433ac0f8e0b40366f61cefa9beef9c28511a0f8db727b22e04e38b0c741b415bf6edc3b8b4ef0867255beed1935 SHA512 1523312fc43fd850cf4d24b17d17a2607f5dd2786c4827c48014f750b97088ff95c97148cb8e9cbac2fc6b3e759dee32d04a9b5da62c130a7708b34db82e5196
diff --git a/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch b/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch
new file mode 100644
index 000000000000..90c8ce3f0a4d
--- /dev/null
+++ b/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch
@@ -0,0 +1,14 @@
+Disable unused mkeficapsule
+
+`CONFIG_TOOLS_MKEFICAPSULE` requires gnutls to build. Since we don't actually
+expose the tool, we can just disable it.
+
+diff -ur a/configs/tools-only_defconfig b/configs/tools-only_defconfig
+--- a/configs/tools-only_defconfig	2023-01-09 09:07:33.000000000 -0700
++++ b/configs/tools-only_defconfig	2023-08-11 14:01:50.151294889 -0600
+@@ -33,4 +33,4 @@
+ # CONFIG_VIRTIO_SANDBOX is not set
+ # CONFIG_GENERATE_ACPI_TABLE is not set
+ # CONFIG_EFI_LOADER is not set
+-CONFIG_TOOLS_MKEFICAPSULE=y
++# CONFIG_TOOLS_MKEFICAPSULE is not set
diff --git a/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch b/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch
new file mode 100644
index 000000000000..8686341a8776
--- /dev/null
+++ b/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch
@@ -0,0 +1,17 @@
+Disable unused pylibfdt
+
+The `imply BINMAN` causes `pylibfdt` to be built, which requires python. We
+don't currently expose `pylibfdt`, or declare python dependencies, so disable
+it.
+
+diff -ur a/arch/Kconfig b/arch/Kconfig
+--- a/arch/Kconfig	2023-01-09 09:07:33.000000000 -0700
++++ b/arch/Kconfig	2023-08-11 14:01:05.998403114 -0600
+@@ -205,7 +205,6 @@
+ 	imply KEYBOARD
+ 	imply PHYSMEM
+ 	imply GENERATE_ACPI_TABLE
+-	imply BINMAN
+ 
+ config SH
+ 	bool "SuperH architecture"
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2023.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild
index 81a202294643..05e693d9e34a 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2023.10.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild
@@ -19,12 +19,17 @@ IUSE="envtools"
 RDEPEND="dev-libs/openssl:="
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-lang/swig
 	app-alternatives/yacc
 	app-alternatives/lex
+	sys-apps/which
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/disable-unused-mkeficapsule.patch"
+	"${FILESDIR}/disable-unused-pylibfdt.patch"
+)
+
 src_prepare() {
 	default
 	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \