[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/

[Mike Gilbert]

commit:     e297bb1001aaa9a87abb86f28c4ac786d7c97b45
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 18:50:50 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May 30 18:51:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e297bb10

sys-boot/systemd-boot: bump to 233

Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69

 sys-boot/systemd-boot/Manifest                     |   1 +
 .../233-Force-libsystemd-shared-to-be-static.patch |  25 +++++
 sys-boot/systemd-boot/systemd-boot-233.ebuild      | 110 +++++++++++++++++++++
 3 files changed, 136 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index e2bcea5e83a..71c131fed62 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,2 +1,3 @@
 DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
 DIST systemd-232.tar.gz 4529048 SHA256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 SHA512 5dbe52f655ec2901b1bfbb1256f83ba26bc82c13097ac9a82e4fbb97886551530f9888c369592f1b410cfff40d6d127b985533a3e29cfab5b30d18739ee5dcb1 WHIRLPOOL f2a1499584c5b5c4d9e945e45ef5e0eef2e8be77acdbd7b3b29a8c8b62dc7a10c162a856df7107c19e2eb19e63bc43a33433686472ca30909237981683cbe980
+DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e WHIRLPOOL ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176

diff --git a/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch b/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch
new file mode 100644
index 00000000000..b837890f616
--- /dev/null
+++ b/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch
@@ -0,0 +1,25 @@
+From 5aefd5fddd2af5f979ece96cda8ed1ab0492709c Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@g.o>
+Date: Tue, 30 May 2017 14:05:41 -0400
+Subject: [PATCH] Force libsystemd-shared to be static
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2a5610740..4e95cb316 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1145,7 +1145,7 @@ libshared_la_LIBADD = \
+ 	$(BLKID_LIBS) \
+ 	$(LIBCRYPTSETUP_LIBS)
+ 
+-rootlibexec_LTLIBRARIES += \
++noinst_LTLIBRARIES += \
+ 	libsystemd-shared.la
+ 
+ libsystemd_shared_la_SOURCES = \
+-- 
+2.13.0
+

diff --git a/sys-boot/systemd-boot/systemd-boot-233.ebuild b/sys-boot/systemd-boot/systemd-boot-233.ebuild
new file mode 100644
index 00000000000..52aa812768a
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-233.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools 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=""
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.27.1
+"
+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}"/233-Force-libsystemd-shared-to-be-static.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		EFI_CC="$(tc-getPROG "EFI_CC CC" gcc)"
+		cc_cv_CFLAGS__flto=no
+		cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
+		--enable-blkid
+		--enable-efi
+		--enable-gnuefi
+		--disable-acl
+		--disable-apparmor
+		--disable-audit
+		--disable-bzip2
+		--disable-elfutils
+		--disable-gcrypt
+		--disable-gnutls
+		--disable-kmod
+		--disable-libcryptsetup
+		--disable-libcurl
+		--disable-libidn
+		--disable-lz4
+		--disable-microhttpd
+		--disable-myhostname
+		--disable-pam
+		--disable-qrencode
+		--disable-seccomp
+		--disable-selinux
+		--disable-xkbcommon
+		--disable-xz
+		--disable-zlib
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	local targets=(
+		bootctl
+		man/bootctl.1
+		man/kernel-install.8
+		'$(bootlib_DATA)'
+	)
+	emake built-sources
+	echo "gentoo: ${targets[*]}" | emake -f Makefile -f - gentoo
+}
+
+src_install() {
+	local args=(
+		DESTDIR="${D%/}"
+
+		# bootctl
+		bin_PROGRAMS=bootctl
+		install-binPROGRAMS
+
+		# kernel-install
+		install-dist_binSCRIPTS
+		install-dist_kernelinstallSCRIPTS
+
+		man_MANS="man/bootctl.1 man/kernel-install.8"
+		install-man1
+		install-man8
+
+		install-bootlibDATA
+	)
+	emake "${args[@]}"
+	einstalldocs
+}