gentoo resync : 19.03.2019

5 files changed, 4 insertions, 21 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index acacfce74527..c2ca0500b1c4 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 73653ca6ad45..0d3a76273eaa 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -1,4 +1,3 @@
-AUX 0.9.2-systemdsystemunitdir.patch 798 BLAKE2B eea3db4b75669ebf2a743dc5d39d2a8c7b65130165f47400a907adae6631ebf88424612ed1093728545f2c7da89b8bc1a4e9ae0d9d56c27a22ad6322aa863bb4 SHA512 5855dfdbd2031b2b0c91991261eda01f310f55ef5526d6a29ae77ae7a6fa1d9431201f05db4cc0ae9f2f4b31575c19316e36a8d4fd9596505fbe0d8d8b847ac7
 AUX 0.9.3-glibc-sysmacros.patch 1170 BLAKE2B cf3b927b3a53c419bcee9fc652346fc8e5858911134a654c7ce0c6f7d1928c91edb9c829b35b10a3107f3427712f697184dd1b66d8395bdb98712a854adb4276 SHA512 82f40cd6ee78904e3ca2ed594c923a11c1a6015e56bfafebf035c25287e2c1708b87901c5b68c04aecf4d1891124d58ab6b3c84ba0e12c5bd5d69dea24bc49d5
 DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c
 DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed
diff --git a/sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch b/sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch
deleted file mode 100644
index b5289244232a..000000000000
--- a/sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index aad673e..592be5f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -122,7 +122,12 @@ AM_CONDITIONAL(ENABLE_SYSTEMD_INTEGRATION, [test "$enable_systemd_integration" =
- 
- if test x$enable_systemd_integration = xyes; then
-   AC_DEFINE(PLY_ENABLE_SYSTEMD_INTEGRATION, 1, [Coordinate boot up with systemd])
--  SYSTEMD_UNIT_DIR=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
-+  AC_ARG_WITH([systemdsystemunitdir], AC_HELP_STRING([--with-systemdsystemunitdir=DIR],
-+    [path to systemd service directory]), [path_systemdunit=${withval}],
-+      [path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
-+  if (test -n "${path_systemdunit}"); then
-+    SYSTEMD_UNIT_DIR="${path_systemdunit}"
-+  fi
-   AC_SUBST(SYSTEMD_UNIT_DIR)
- fi
- 
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 967fc46509c2..7022b8f98e88 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -10,5 +10,5 @@ EBUILD syslinux-3.86.ebuild 1470 BLAKE2B caa769b29ff3b1eec3cbe6dfaa592a7e13d497b
 EBUILD syslinux-4.07.ebuild 1766 BLAKE2B 7deb22867d34e77ddfe38fd91a483bd219a9ca642ecd1b505f451928f8a9eb0f5fbe07b0e4548e814fccf8b871ecba519c7c2df79b8635dd6541f17269692b05 SHA512 34cd4118736926d0254a7bf0d7e18b12c3b151549057cb2559ff9517fec5aee7e02889c934a8bcb2f0801fd9ab5121eec3a86b8d116e0421d09263e6c70d3363
 EBUILD syslinux-5.10.ebuild 2219 BLAKE2B f0ac630efca67b5600c267e3aa7f17c4c227437bc0e9afac60cefaf46aaa30d78c57582e716060bd9b3a6e57e2bf2a84f002804d94be484be11d019fc98a163c SHA512 2c04378b5d5d89e2d92ed1bb8d9cd8752ef8aa5abf77098110f6df39c79e420c66dc6ab1fbababd36c60d84fba3ad442d3bf04d053bd8333d18f16b464839939
 EBUILD syslinux-6.03.ebuild 3410 BLAKE2B fdfef0f6d7e65af38cce92bb82cc75a582e97a753b7fbe1dd3b42c2ff31408b8c43c8c4502145d2684cdd33526a7b33ae9c2475c8e011a5a25fd4e041af68109 SHA512 f6a265acbf4e53c4bb142db3a36cef199edfface74fcf2d9755ffa5289c7716c5604055ae822e19f5d6ac4d9d5d94edb6398a0beb2640c61375b8e41a4944cbe
-EBUILD syslinux-6.04_pre1.ebuild 3408 BLAKE2B 263c1ef5120c41fbfcafff27946f3ed426a08e5c53485b522c79b393906ecaa38fc57eb3d44aa87bae55cf6166b48dc9492de5c979796614714b61c972eb1302 SHA512 b135489d30fadaec58f9c9c4cdab0405dca715cf7b7fcc3207cb6d34918a86993d5519bc4b0dc368e0d1e1344604ca2e8c3f134ec85300c79397dd2895f5db5b
+EBUILD syslinux-6.04_pre1.ebuild 3419 BLAKE2B 7b0608a5920926be6d83cc6083164f386781f081bc68ac917c534be6d0849e90df7c0ae42b9ad8df63cb6e04734d2cd53cdcc4f19639db93fa045266cf8a0ea0 SHA512 48688c01d97c1deeb29765758236802631bd0c6422cb804b223b7eba5dfcf9a3b6e341f866eb3a232e2445aaf2713d04b8bcdbdeedfa216f08cfbd39f24abae8
 MISC metadata.xml 330 BLAKE2B bfb2aae9b13d232ca01f0ed74b99385c056ecbf59dba80999ff840c7885450158b44d32bdb9ec51f078e1d3c3f839cf6f9bf6432b0998aa62538d39dfc0a3850 SHA512 89e1dde9592f2cc3ed391f6f3ad29b877751b95b0c1bbb4416cd0c38f136c4a293f4687ebb5758adab540d6f3ff63f20f43847e294644c9e68ee84f3223657ac
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 649460108cd5..026381ff5364 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -82,6 +82,8 @@ src_prepare() {
 			ewarn "Continuing anyway as requested."
 		fi
 	fi
+
+	epatch_user
 }
 
 src_compile() {