gentoo resync : 16.09.2020

3 files changed, 2 insertions, 117 deletions

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 12b23bcfb779..f65b2ff2b019 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,6 +1,4 @@
 AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7
-DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
-EBUILD systemd-boot-243.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
-EBUILD systemd-boot-245.ebuild 2406 BLAKE2B e4bca67a372469170bbb31db40228a504f931f225017144431e53f62de074d6dcaf341760f3f1309e9dea5d4009054293693426c96f654c78c345e2d7a8ed96a SHA512 29aa167db71261b1cc6fe948562206f0c1842aa88bb77dba0c782a00165fd29f4dfcf8b3d63192f5e4a1be7a027c593d2440124725263767e0114f3ce620c542
+EBUILD systemd-boot-245.ebuild 2442 BLAKE2B dac3fbe92676a11ee2d51890a6e202d0a5942f48b2ba5f0d293fb3f0af5c3a7a2fb8439cb5393deba9d09ff52336fc112eecc9ef63865cc57f84bed0688ca789 SHA512 b279b89e5b0f8003e7160e38f4dafb1970306778bbcaca3cc1c5aee3a7f799fe49e8281592ff03a9eec80c3abc1830dfaaca54add53ad978a2d26fa2bab2c542
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/systemd-boot-243.ebuild b/sys-boot/systemd-boot/systemd-boot-243.ebuild
deleted file mode 100644
index 99dbbaa4668a..000000000000
--- a/sys-boot/systemd-boot/systemd-boot-243.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="test"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	>=dev-util/intltool-0.50
-	dev-util/gperf
-	>=dev-util/patchelf-0.10
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-boot/gnu-efi-3.0.2
-	sys-libs/libcap
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd
-"
-
-S="${WORKDIR}/systemd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/237-libshared-static.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dblkid=true
-		-Defi=true
-		-Dgnu-efi=true
-		-Defi-cc="$(tc-getCC)"
-		-Defi-ld="$(tc-getLD)"
-		-Dsplit-usr=true
-		-Drootprefix="${EPREFIX:-/}"
-
-		-Dacl=false
-		-Dapparmor=false
-		-Daudit=false
-		-Dbzip2=false
-		-Delfutils=false
-		-Dgcrypt=false
-		-Dgnutls=false
-		-Dkmod=false
-		-Dlibcryptsetup=false
-		-Dlibcurl=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dlz4=false
-		-Dmicrohttpd=false
-		-Dpam=false
-		-Dqrencode=false
-		-Dseccomp=false
-		-Dselinux=false
-		-Dxkbcommon=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-set_efi_arch() {
-	case "$(tc-arch)" in
-		amd64) efi_arch=x64 ;;
-		arm)   efi_arch=arm ;;
-		arm64) efi_arch=aa64 ;;
-		x86)   efi_arch=x86 ;;
-	esac
-}
-
-src_compile() {
-	local efi_arch
-	set_efi_arch
-	local targets=(
-		bootctl
-		man/bootctl.1
-		man/kernel-install.8
-		src/boot/efi/linux${efi_arch}.efi.stub
-		src/boot/efi/systemd-boot${efi_arch}.efi
-	)
-	cd "${BUILD_DIR}" || die
-	eninja "${targets[@]}"
-	patchelf --remove-rpath bootctl || die
-}
-
-src_install() {
-	local efi_arch
-	set_efi_arch
-	dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
-	doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
-	exeinto usr/lib/kernel/install.d
-	doexe src/kernel-install/{50-depmod,90-loaderentry}.install
-	insinto usr/lib/systemd/boot/efi
-	doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi}
-	einstalldocs
-}
diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild b/sys-boot/systemd-boot/systemd-boot-245.ebuild
index 376d996987d7..94fa4ee8aef1 100644
--- a/sys-boot/systemd-boot/systemd-boot-245.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-245.ebuild
@@ -52,6 +52,7 @@ src_configure() {
 		-Dgnu-efi=true
 		-Defi-cc="$(tc-getCC)"
 		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="/usr/$(get_libdir)"
 		-Dsplit-usr=true
 		-Drootprefix="${EPREFIX:-/}"