From 9403c20e10161812ed5231e7fd14464ca484aa09 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 28 Jul 2022 21:05:25 +0100
Subject: gentoo auto-resync : 28:07:2022 - 21:05:25

---
 sys-apps/fwupd-efi/Manifest             |  4 +--
 sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild | 50 ---------------------------------
 sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild |  1 +
 3 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild

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

diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index abf98fceec03..6767e348a55b 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,7 +1,5 @@
 DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b
-DIST fwupd-efi-1.2.tar.gz 38867 BLAKE2B aa1a877db06dcf8347dff9411f9c9475b40e9a5f533949b254170c627869c61c5c3b17d9cbc9075af9d4f5c534befe1ab89f27d4684d1f7b701d50ab4cda2ff0 SHA512 c08a471ecdefdf40c94750954595ad1279da204e939517b62f223e0003a258840e7d4725ec74d77ccdf46906561d8ac987dcc67a9d3f6e9ba99219e16dd350de
 DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb
 EBUILD fwupd-efi-1.1.ebuild 1067 BLAKE2B 2dd3c612da1d7fa6603aa6df5589c6d04f3d73a2256952c991114e93842bb0a9f020843416a9fecd44af2361b62a76c91a8dcec8abf97c55717bd58a26a49694 SHA512 014fb50779f0f0dced8f8a6affe6cc4b12171f1e24562f6c27539e458e9ca6396a59e9db18ac1e320cfd05d1a413674be3099b6331087e13ac2b82271ae0bc48
-EBUILD fwupd-efi-1.2.ebuild 1039 BLAKE2B bbf5723c4961a0b883b8d6f48a594c665167d959fd0515bb776d9edf8de3ff48301d1ec037e937dee472f03f36c74e4c57b9ebebd9767190ab033938bd2dbe23 SHA512 7a202e3dc391e038e8083be7ee9c80043786247c9cde956019197359fa5511ed6fe9cd0fa8ca2991dea8d146b2249a4676c0923e7257806ae40299899c114a4c
-EBUILD fwupd-efi-1.3.ebuild 1038 BLAKE2B 198002a15e3a073a641061bb31f7154bf1c86d1f88381d628af3840ac856daacc45e571815029d5fa2e25b0b827ce152202799821564ec812133c6037ddaee80 SHA512 99e3d83cde5d20f9ebf96fd186f67d4ef2eacb1b4f4fdb2d731890fbacdf77b471acabf7f636792e7622c3b928134b74a60810ad04cc12149b7ffe658a1087c9
+EBUILD fwupd-efi-1.3.ebuild 1084 BLAKE2B 602c779689e11e91fcdbba11eb2b1d61e8a0c319f57a8cc06271ec04e7a3577171258861d91fcceaf79c934fac44215540e2c9081b382baf2f38966c299c16bb SHA512 1151570d8986db4b22e4a4b4ea44a79e2f6e5388cc4547e50fd6ac059d12059a47d85502a78997435f8d4b77e266a814b7c42e72330217ad37525b542c6b0a4f
 MISC metadata.xml 502 BLAKE2B 37525a0056ad72eab2b2b7b15436181a8581075053704012670e1f0434c8af74bd0780f16f31fa5cd2c8836bc2e4d8f55dfd5a77140be83ebffda5ca9e1a1382 SHA512 70ccf403ddb8e4d33ee9cc6ba438583d42ab313784c3251919b74a6596c4e3593263a6400513605c1004bc0d3ebb1677febc31449096b825f688ed1cc7052c31
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild
deleted file mode 100644
index e7bb5a79d7d4..000000000000
--- a/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2022 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"
-
-src_prepare() {
-	default
-
-	python_fix_shebang "${S}/efi"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Defi-cc="$(tc-getCC)"
-		-Defi-ld="$(tc-getLD)"
-		-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
-}
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
index 7fff4de7760f..ade0d8be03f8 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
@@ -39,6 +39,7 @@ src_configure() {
 	local emesonargs=(
 		-Defi-cc="$(tc-getCC)"
 		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="${EPREFIX}"/usr/$(get_libdir)
 		-Defi_sbat_distro_id="gentoo"
 		-Defi_sbat_distro_summary="Gentoo GNU/Linux"
 		-Defi_sbat_distro_pkgname="${PN}"
-- 
cgit v1.2.3