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

[Mike Gilbert]

commit:     cd7fdd79aaea10bf089059344681d49f86599973
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 16:23:48 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 16:41:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7fdd79

sys-boot/systemd-boot: remove old

Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/systemd-boot/Manifest                     |   3 -
 .../233-Force-libsystemd-shared-to-be-static.patch |  25 -----
 .../systemd-boot/files/235-libshared-static.patch  |  24 -----
 sys-boot/systemd-boot/systemd-boot-233.ebuild      | 111 ---------------------
 sys-boot/systemd-boot/systemd-boot-235.ebuild      | 108 --------------------
 sys-boot/systemd-boot/systemd-boot-237.ebuild      | 110 --------------------
 6 files changed, 381 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 7270e8b5f4a..7948d4c26aa 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,4 +1 @@
-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
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f

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
deleted file mode 100644
index b837890f616..00000000000
--- a/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/files/235-libshared-static.patch b/sys-boot/systemd-boot/files/235-libshared-static.patch
deleted file mode 100644
index 2a0bf678539..00000000000
--- a/sys-boot/systemd-boot/files/235-libshared-static.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -1505,9 +1505,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],
-                          dependencies : [libblkid],
--                         install_rpath : rootlibexecdir,
-                          install : true)
-         public_programs += [exe]
- endif
-diff --git a/src/shared/meson.build b/src/shared/meson.build
-index 883821352..b560e65c9 100644
---- a/src/shared/meson.build
-+++ b/src/shared/meson.build
-@@ -157,5 +157,6 @@ libshared_static = static_library(
-         libshared_name,
-         shared_sources,
-         basic_sources,
-+        libsystemd_internal_sources,
-         include_directories : includes,
-         dependencies : libshared_deps)

diff --git a/sys-boot/systemd-boot/systemd-boot-233.ebuild b/sys-boot/systemd-boot/systemd-boot-233.ebuild
deleted file mode 100644
index 313b919e089..00000000000
--- a/sys-boot/systemd-boot/systemd-boot-233.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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=""
-RESTRICT="test"
-
-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
-}

diff --git a/sys-boot/systemd-boot/systemd-boot-235.ebuild b/sys-boot/systemd-boot/systemd-boot-235.ebuild
deleted file mode 100644
index ff86b01e755..00000000000
--- a/sys-boot/systemd-boot/systemd-boot-235.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 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}/235-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 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
-}

diff --git a/sys-boot/systemd-boot/systemd-boot-237.ebuild b/sys-boot/systemd-boot/systemd-boot-237.ebuild
deleted file mode 100644
index 48d61ac38b2..00000000000
--- a/sys-boot/systemd-boot/systemd-boot-237.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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
-}