[gentoo-commits] proj/musl:master commit in: sys-boot/efibootmgr/, sys-boot/efibootmgr/files/

[gentoo-commits] proj/musl:master commit in: sys-boot/efibootmgr/, sys-boot/efibootmgr/files/

[Aric Belsito]

commit:     b8c0309dd4bd7ce55cda954f50fde196a6c3f0e6
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Mar 19 00:47:10 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Mar 19 00:47:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=b8c0309d

sys-boot/efibootmgr: fix patch

Whoops

 sys-boot/efibootmgr/Manifest         | 2 +-
 sys-boot/efibootmgr/files/musl.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
index 47f35ab..75254e3 100644
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@@ -1,4 +1,4 @@
-AUX musl.patch 472 SHA256 4710704529f140c66b3ebcbfd9613c6471ea27f4eefaaff05427102ef1cabf58 SHA512 08e06251f62f4723b22a447019e7fe0012282876d80511fbebe459fa6adea3ebdfeb322c2e0243d4cdf7a98506ef094a4c0f0142da634a654496e820d697a889 WHIRLPOOL c977cf2c0a517e497ccd3f6eb572dc364d1cfb92d5c899d7fb808ca55fa6b3c30ce458ae5f0422d900ae9ac1c8b4406934b827dce79f5f93aa691e85a1d77b46
+AUX musl.patch 479 SHA256 8c4f2f40cdbfc47895e2920b12ffe52774fc2e868e76da1ddf771015d02912af SHA512 c8160d6fd56cd591efa1177016a41cccbf86642efce4a5065b6eed7c6f122896aa8e23fafa8a66e5c7944aa5016b439879bfb964e281ab21177a9f53d6082139 WHIRLPOOL c5d8b27ab7a00c65bd960d8e3ac5a1e77fa6ee8c86dd9cb869fce5b688c90c20b8388dfb107b475236509841ac32ad590ba7505c2a8e55224a98658809edc08a
 DIST efibootmgr-14.tar.bz2 34972 SHA256 377ec16484414b80afd1b8a586153d7ef55ccf048638080101d49b7c77f37ad8 SHA512 97935f8752440ce236162e174ea3404e907ebddc5877d597a97813da76ad580689fc2e97044885fc860a12a473af7183242b6120e78e53243d35e569fb002baf WHIRLPOOL e5a6860130d9b12274cfe74a962a277989e9961cc8fb70372e8ac0831f79561e30fad0222154c957ed525cf930b912a1d731caff7ef5b2b0987c7cf8f28c4383
 EBUILD efibootmgr-14.ebuild 636 SHA256 4fca795213c9495870aec03d59d07ee48f2b2ba41d14509c1fe0bb197cf6c98b SHA512 08d98eba5fc63cc5cd9217fe786375c2c1ecf299ad425fecdd9cd899d86cd02550518d92e306631c7e5aa39a515a9a1983e915637697d8bc9def9390d9faed84 WHIRLPOOL fcd232396cba4613402edca33d7406c7d62ce3185a8bf082f8a79734d871af43df7bd81077e63c0a9ae771a4fafebf033b325f5b44da7765877ed015d55e6f85
 MISC metadata.xml 626 SHA256 44a2b529eab0c2cec715823ecc54948cb93fafb692ac97dd7c8b8bcb4f3170bd SHA512 d52646244bf9c0d10d8c5b986e110944905fc8f898c0330f65cd6c734e6d8cfabf72854cef362f411d3d63fed3f5e22207a7b94d1ea8076e566d8eff228bb33b WHIRLPOOL 56109722d4478b9980f2077a05b9f74f451646a7df62f5c32c9d6ed9de3ccf34c19f670b1c87e1f57573d2231caebdaae86fa3bc91901622d6aa098a8edeb957

diff --git a/sys-boot/efibootmgr/files/musl.patch b/sys-boot/efibootmgr/files/musl.patch
index b952763..e51f809 100644
--- a/sys-boot/efibootmgr/files/musl.patch
+++ b/sys-boot/efibootmgr/files/musl.patch
@@ -5,7 +5,7 @@ index c7b734a..7f2f657 100644
 @@ -26,7 +26,7 @@ clang_cflags =
  gcc_cflags =
  cflags	= $(CFLAGS) $(SUBDIR_CFLAGS) \
- 	 -Wall -Wextra -Wsign-compare -Wstrict-aliasing \
+ 	-Werror -Wall -Wextra -Wsign-compare -Wstrict-aliasing \
 -	-std=gnu11 -fshort-wchar -fPIC \
 +	-std=gnu11 -fPIC \
  	-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" \

[gentoo-commits] proj/musl:master commit in: sys-boot/efibootmgr/, sys-boot/efibootmgr/files/

[Jory Pratt]

commit:     8e9531b15553c36fd3886e0ce2013cc96d144ca1
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  6 01:30:16 2021 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Jul  6 12:38:40 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=8e9531b1

sys-boot/efibootmgr: treeclean

The only patch carried in Gentoo has been upstreamed for a long time [1]
and the versions in ::musl are superceded by ::gentoo's for a long time
anyway.

[1] https://github.com/rhboot/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f

Closes: https://github.com/gentoo/musl/pull/442

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 sys-boot/efibootmgr/Manifest             |  1 -
 sys-boot/efibootmgr/efibootmgr-14.ebuild | 30 ------------------------------
 sys-boot/efibootmgr/files/musl.patch     | 13 -------------
 sys-boot/efibootmgr/metadata.xml         | 17 -----------------
 4 files changed, 61 deletions(-)

diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
deleted file mode 100644
index 0de41c2..0000000
--- a/sys-boot/efibootmgr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST efibootmgr-14.tar.bz2 34972 SHA256 377ec16484414b80afd1b8a586153d7ef55ccf048638080101d49b7c77f37ad8 SHA512 97935f8752440ce236162e174ea3404e907ebddc5877d597a97813da76ad580689fc2e97044885fc860a12a473af7183242b6120e78e53243d35e569fb002baf WHIRLPOOL e5a6860130d9b12274cfe74a962a277989e9961cc8fb70372e8ac0831f79561e30fad0222154c957ed525cf930b912a1d731caff7ef5b2b0987c7cf8f28c4383

diff --git a/sys-boot/efibootmgr/efibootmgr-14.ebuild b/sys-boot/efibootmgr/efibootmgr-14.ebuild
deleted file mode 100644
index b6059c1..0000000
--- a/sys-boot/efibootmgr/efibootmgr-14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="User-space application to modify the EFI boot manager"
-HOMEPAGE="https://github.com/rhinstaller/efibootmgr"
-SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils
-	>=sys-libs/efivar-25:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/musl.patch )
-
-src_prepare() {
-	default
-	sed -i -e s/-Werror// Make.defaults || die
-}
-
-src_configure() {
-	tc-export CC
-}

diff --git a/sys-boot/efibootmgr/files/musl.patch b/sys-boot/efibootmgr/files/musl.patch
deleted file mode 100644
index e51f809..0000000
--- a/sys-boot/efibootmgr/files/musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Make.defaults b/Make.defaults
-index c7b734a..7f2f657 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -26,7 +26,7 @@ clang_cflags =
- gcc_cflags =
- cflags	= $(CFLAGS) $(SUBDIR_CFLAGS) \
- 	-Werror -Wall -Wextra -Wsign-compare -Wstrict-aliasing \
--	-std=gnu11 -fshort-wchar -fPIC \
-+	-std=gnu11 -fPIC \
- 	-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" \
- 	-DEFIBOOTMGR_VERSION="\"$(VERSION)\"" \
- 	$(if $(findstring clang,$(CC)),$(clang_cflags),) \

diff --git a/sys-boot/efibootmgr/metadata.xml b/sys-boot/efibootmgr/metadata.xml
deleted file mode 100644
index 2202a4d..0000000
--- a/sys-boot/efibootmgr/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<longdescription>
-		This is efibootmgr, a Linux user-space application to modify the Intel
-		Extensible Firmware Interface (EFI) Boot Manager.  This application
-		can create and destroy boot entries, change the boot order, change
-		the next running boot option, and more.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rhinstaller/efibootmgr</remote-id>
-	</upstream>
-</pkgmetadata>