gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 7 insertions, 91 deletions

diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index d9d9e02df96f..c15102932102 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,8 +1,6 @@
 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-r1.ebuild 1671 BLAKE2B 3f20384f8aa8d982341c0c596a03968d39512879087cec89b2a3de474889f1c098d680a670f40a12bccf75f62ef22d9e447bddacf01813a38a50bf4eddc05857 SHA512 07bf471cbcdabcb894dfb7f6d4a297dea6a818b368824a1f87eb3a171626e461c2bd8c5789d7daa4b793459e7602e48ef1926f288a1d15abb94a5d8395985421
-EBUILD u-boot-tools-2024.01.ebuild 1841 BLAKE2B e55ea90fb3ec1fe2f67e03b11f3b9431a73c60f0d70c2b69f0fdc964a5b21cf9cda25e4cd2d6f19340d79dddb27c2ea0f805b1e6fc0bec4fd3fbc130139481d2 SHA512 6be9d4630ae18242952bf0315f8e3441a07a01cb7e424428811cd1ef50901f30be997dd8257aa3a1eea6a5811fc66648df1f1d738306c9823c80a61b4ce36c92
+EBUILD u-boot-tools-2024.01-r1.ebuild 1899 BLAKE2B e88bdcebeaea50e8a27638367cef6561bba5f1be2e6b836cead7fa8751d1256d9379513575acac0d8195deae952af7d333a52a168cf90c3dedf741a11368269f SHA512 f7ffe79cbdd9aa816e37e2fa862dbb4a5caee6d3cebdced974319a52a8ddbc10b6001258901ec705db80f887778c2a2e6dc1932da6f353683746b0758751eed0
 MISC metadata.xml 343 BLAKE2B 4115ff47d73727feb01367f4f6a419d46cfed433ac0f8e0b40366f61cefa9beef9c28511a0f8db727b22e04e38b0c741b415bf6edc3b8b4ef0867255beed1935 SHA512 1523312fc43fd850cf4d24b17d17a2607f5dd2786c4827c48014f750b97088ff95c97148cb8e9cbac2fc6b3e759dee32d04a9b5da62c130a7708b34db82e5196
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild
deleted file mode 100644
index 05e693d9e34a..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="https://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-IUSE="envtools"
-
-RDEPEND="dev-libs/openssl:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	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' \
-		scripts/kconfig/{g,m,n,q}conf-cfg.sh \
-		scripts/kconfig/Makefile \
-		tools/Makefile || die
-}
-
-src_configure() {
-	tc-export AR BUILD_CC CC PKG_CONFIG
-	tc-export_build_env
-}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-
-	local myemakeargs=(
-		V=1
-		AR="${AR}"
-		CC="${CC}"
-		HOSTCC="${BUILD_CC}"
-		HOSTCFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}"' $(HOSTCPPFLAGS)'
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" tools-only_defconfig
-
-	emake "${myemakeargs[@]}" \
-		NO_SDL=1 \
-		HOSTSTRIP=: \
-		STRIP=: \
-		CONFIG_ENV_OVERWRITE=y \
-		$(usex envtools envtools tools-all)
-}
-
-src_test() { :; }
-
-src_install() {
-	cd tools || die
-
-	if ! use envtools; then
-		dobin dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	fi
-
-	dobin env/fw_printenv
-
-	dosym fw_printenv /usr/bin/fw_setenv
-
-	insinto /etc
-	doins env/fw_env.config
-
-	doman ../doc/mkimage.1
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2024.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2024.01-r1.ebuild
index f4ac4ba3e697..1e13270fe5ad 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2024.01.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2024.01-r1.ebuild
@@ -20,7 +20,11 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="envtools"
 
-RDEPEND="dev-libs/openssl:="
+RDEPEND="
+	dev-libs/openssl:=
+	net-libs/gnutls:=
+	sys-apps/util-linux:=
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-lang/swig
@@ -76,7 +80,7 @@ src_install() {
 	cd tools || die
 
 	if ! use envtools; then
-		dobin dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
+		dobin dumpimage fdtgrep gen_eth_addr img2srec mkeficapsule mkenvimage mkimage
 	fi
 
 	dobin env/fw_printenv