From 2001212dfe03599d6ef7bcde1ff5ae90bf8df23b Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sun, 20 Jun 2021 17:57:32 +0200
Subject: sys-apps/fwupd-efi: drop old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
 sys-apps/fwupd-efi/Manifest                        |  1 -
 .../fwupd-efi-1.0-add-genpeimg-parameter.patch     | 42 ----------------
 .../files/fwupd-efi-1.0-pass-genpeimg.patch        | 21 --------
 sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild            | 56 ----------------------
 4 files changed, 120 deletions(-)
 delete mode 100644 sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch
 delete mode 100644 sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch
 delete mode 100644 sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild

(limited to 'sys-apps/fwupd-efi')

diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 69e486bfbc62..41334f096f0a 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,2 +1 @@
-DIST fwupd-efi-1.0.tar.gz 37465 BLAKE2B 89824d2f32d618802f56ebdb67838eed2759a86556a54a9da4f303220d99fbd2465673181d3d2806f4665061746cf7faebf633d4de8249e2c3f269fe0c22b679 SHA512 fd2fde665e90f40fb8c2235f09fc17618d8cb3f87a23ef37f7940a36c4f4b0f9ccef90745bdca1dd8827f60060e5fd95c139883ce08aedb00a249f6e809703a4
 DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b
diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch
deleted file mode 100644
index a9791b4e1144..000000000000
--- a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 207e8bf4bdb8dbdf8800d4b5cbac5af746047f37 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Fri, 14 May 2021 14:06:31 +0100
-Subject: [PATCH] generate_binary: add genpeimg option
-
-Add a --genpeimg option as the meson.build uses find_program(), so the
-binary could be anywhere.
----
- efi/generate_binary.py | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/efi/generate_binary.py b/efi/generate_binary.py
-index 0193e50..907af9f 100755
---- a/efi/generate_binary.py
-+++ b/efi/generate_binary.py
-@@ -48,13 +48,15 @@ def _run_objcopy(args):
- 
- 
- def _run_genpeimg(args):
-+    if not args.genpeimg:
-+        return
- 
--    # this is okay if it does not exist
--    argv = ["genpeimg", "-d", "+d", "+n", "-d", "+s", args.outfile]
-+    argv = [args.genpeimg, "-d", "+d", "+n", "-d", "+s", args.outfile]
-     try:
-         subprocess.run(argv, check=True)
-     except FileNotFoundError as _:
--        pass
-+        print(str(e))
-+        sys.exit(1)
- 
- 
- if __name__ == "__main__":
-@@ -63,6 +65,7 @@ def _run_genpeimg(args):
-     parser.add_argument(
-         "--objcopy", default="objcopy", help="Binary file to use for objcopy"
-     )
-+    parser.add_argument("--genpeimg", help="Binary file to use for genpeimg")
-     parser.add_argument("--arch", default="x86_64", help="EFI architecture")
-     parser.add_argument("infile", help="Input file")
-     parser.add_argument("outfile", help="Output file")
diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch
deleted file mode 100644
index 7e4dd1af3294..000000000000
--- a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 321f0750ee69cc62ab609f760769d880676f712b Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Fri, 14 May 2021 14:07:11 +0100
-Subject: [PATCH] meson: pass the found genpeimg to generate_binary
-
----
- efi/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/efi/meson.build b/efi/meson.build
-index a496210..7cc1da1 100644
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -215,6 +215,7 @@ app = custom_target(efi_name,
-                       '@INPUT@', '@OUTPUT@',
-                       '--arch', gnu_efi_arch,
-                       '--objcopy', efi_objcopy,
-+                      '--genpeimg', genpeimg.found() ? genpeimg : ''
-                     ],
-                     install : true,
-                     install_dir : efi_app_location)
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild
deleted file mode 100644
index 1f99eec953ed..000000000000
--- a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson python-any-r1 toolchain-funcs
-
-DESCRIPTION="EFI executable for fwupd"
-HOMEPAGE="https://fwupd.org"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
-else
-	SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-DEPEND="sys-boot/gnu-efi"
-
-RDEPEND="!<sys-apps/fwupd-1.6.0"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-add-genpeimg-parameter.patch
-	"${FILESDIR}"/${P}-pass-genpeimg.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang "${S}/efi"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Defi-cc="$(tc-getCC)"
-		-Defi-ld="$(tc-getLD)"
-		-Defi-objcopy="$(tc-getOBJCOPY)"
-		-Defi_sbat_distro_id="gentoo"
-		-Defi_sbat_distro_summary="Gentoo GNU/Linux"
-		-Defi_sbat_distro_pkgname="${PN}"
-		-Defi_sbat_distro_version="${PVR}"
-		-Defi_sbat_distro_url="https://packages.gentoo.org/packages/${CATEGORY}/${PN}"
-	)
-
-	meson_src_configure
-}
-- 
cgit v1.2.3-65-gdbad