gentoo resync : 05.04.2019

2 files changed, 0 insertions, 49 deletions

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 b837890f6162..000000000000
--- 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@gentoo.org>
-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 2a0bf678539b..000000000000
--- 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)