gentoo resync : 15.02.2018

3 files changed, 128 insertions, 0 deletions

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 41887ac11728..b1a0fd520b63 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,7 +1,10 @@
 AUX 233-Force-libsystemd-shared-to-be-static.patch 601 BLAKE2B 2473eb2d2a355e468a7d994637ae10f22f08001b57e5e05ccef7636754ca448f46513fc33a54e8349b7444676bad6c0f03f5f7943f37a65e914efbb27f4ed321 SHA512 05e666114764a97d20bf115e1b114035fc882b101ad01bde8864a31385886e0711e4b37e03d713052aa985503cf7a94eeb5d28c33cc4a504cbb4fc263998d4e1
 AUX 235-libshared-static.patch 968 BLAKE2B 8979c8fa294d1dc3a0356e32ff1a6d15bd3b3a93d5f9bacbbd137bbc38931ae5ec383ecc9ca237e62b80353ac36cd1c0b8df96ff1afd86e1a43c2601574fae01 SHA512 b37a097a14a455f91e1f1f2b00782aa5f1af4e201bbc9c2ebd69b4bb426cabc9d169733f70e09caf8fa36ae62f3eb44d5f7b805bb242310d18c94230f18835ee
+AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
+DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
 EBUILD systemd-boot-233.ebuild 2118 BLAKE2B 02b1df09cf96432b865586699bc0c4da4d3bc064182ac5f55a6e16e3f24691467d8e7fec65d0c658a535dab7b79112cba645c81077772d398a6a963c06be4c0b SHA512 aa7f7259549b397403b7a539015f1435c47e2933d0f67c68e0a633393fc64ac4bb0fac99d7860d400e9da8f68dbc8235340426ceab715e51f4881fbc991ecfa8
 EBUILD systemd-boot-235.ebuild 2274 BLAKE2B 20cae085bbeabfd265d84c16cc80fa9a162cc9d46776984206e04c368697015a6eb4bdb2e16dca2b137417b3ef51ca02f4a368e7c118bb7ce92ccc436e06c290 SHA512 c016caa2373bd5b5893e7db7d0044c71dbed1d7393a8ac42252e2420e8e554624defd644e6d0a8e1ca32e52496b0e674a09c6feb98232293e19b05b2c890e39d
+EBUILD systemd-boot-237.ebuild 2326 BLAKE2B 0525544b11bfe923ea0a9d75f0a3c2dc6af19cda15ee5c5d9855478533a83694e22ab77b8fd8efce7ae54b97b539b3343f9f238fc22633d984acd3939310d5f9 SHA512 f942a34573f78249a0ddc40ab927cf7acf88ded00420a4a3048b8b0ce66b11b75450fb3b1bd9ff914a9d9c9b8e5dbe07e75ff0c263a620b03e31ece738d80df1
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/files/237-libshared-static.patch b/sys-boot/systemd-boot/files/237-libshared-static.patch
new file mode 100644
index 000000000000..9966a5f79162
--- /dev/null
+++ b/sys-boot/systemd-boot/files/237-libshared-static.patch
@@ -0,0 +1,15 @@
+diff --git a/meson.build b/meson.build
+index 36a62d280..87f8da29b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1662,9 +1662,8 @@ if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1
+         exe = executable('bootctl',
+                          'src/boot/bootctl.c',
+                          include_directories : includes,
+-                         link_with : [libshared],
++                         link_with : [libshared_static, libsystemd_static],
+                          dependencies : [libblkid],
+-                         install_rpath : rootlibexecdir,
+                          install : true)
+         public_programs += [exe]
+ endif
diff --git a/sys-boot/systemd-boot/systemd-boot-237.ebuild b/sys-boot/systemd-boot/systemd-boot-237.ebuild
new file mode 100644
index 000000000000..48d61ac38b29
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-237.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+	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
+	>=sys-boot/gnu-efi-3.0.2
+	sys-libs/libcap
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/237-libshared-static.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-D blkid=true
+		-D efi=true
+		-D gnu-efi=true
+		-D efi-cc="$(tc-getCC)"
+		-D efi-ld="$(tc-getLD)"
+		-D split-usr=true
+		-D rootprefix="${EPREFIX:-/}"
+
+		-D acl=false
+		-D apparmor=false
+		-D audit=false
+		-D bzip2=false
+		-D elfutils=false
+		-D gcrypt=false
+		-D gnutls=false
+		-D kmod=false
+		-D libcryptsetup=false
+		-D libcurl=false
+		-D libidn=false
+		-D libidn2=false
+		-D libiptc=false
+		-D lz4=false
+		-D microhttpd=false
+		-D myhostname=false
+		-D pam=false
+		-D qrencode=false
+		-D seccomp=false
+		-D selinux=false
+		-D xkbcommon=false
+		-D xz=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
+	)
+	eninja -C "${BUILD_DIR}" "${targets[@]}" || 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
+}