Merge branch 'next'

5 files changed, 47 insertions, 43 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 99b1b4e6702b..61a318a245c7 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index f9831406a951..74d9499be0a1 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -9,4 +9,4 @@ EBUILD syslinux-4.07.ebuild 1763 BLAKE2B 3d191d3bc66a6f7f45172f3aa677088f95f04d8
 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 3478 BLAKE2B 1ac8784af49e9c7d4aa1ddad6b839421b91b561e3137e3f999bd61e77187b129b6717397df8ed734245cd9de1c7df2cde38ad0d40cc046a970074af1ca1781d2 SHA512 5247a0696b81fa4d78df0e50753456086d88fdc15b5bcdd7ef33a54dc67a1a941abdd1dea1c9de35d487c39981642665963489ce5741da18a6eee2fb28ac992e
-MISC metadata.xml 330 BLAKE2B bfb2aae9b13d232ca01f0ed74b99385c056ecbf59dba80999ff840c7885450158b44d32bdb9ec51f078e1d3c3f839cf6f9bf6432b0998aa62538d39dfc0a3850 SHA512 89e1dde9592f2cc3ed391f6f3ad29b877751b95b0c1bbb4416cd0c38f136c4a293f4687ebb5758adab540d6f3ff63f20f43847e294644c9e68ee84f3223657ac
+MISC metadata.xml 411 BLAKE2B d3b00622fd68d6ae1b4ba7aa30c33c790b2fbdc688637d3c573cb4496f3952a62f8ae20384badda70b9cbd4ed036e0884becd212d63ec015decc511f1ee7970e SHA512 e8256115d61eeef51be14bea35df6765b356471d145ad8e43e75e6301a4557d526af5fd99b8957fb02ecd9c4a7a0bd0d3db4790abef935887bff8a102709c518
diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
index dbe176cabd0d..72e7472ad1ec 100644
--- a/sys-boot/syslinux/metadata.xml
+++ b/sys-boot/syslinux/metadata.xml
@@ -8,4 +8,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 771fc9dbf2ed..b230514f6ac5 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -2,8 +2,8 @@ AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1e
 AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
 AUX 239-stat-0.patch 3553 BLAKE2B 225dd5e8e001a10a33c7ecb5c1378589b3eeecbea4fc746f27cc72d8eb8787c6966b8787c5922f0d0cefa28ac966c7c4f65ed341335d4105bc109df14110604c SHA512 a982c6384fcad2a1ad709564e932231e837ef799b764bbfa73eff5c42635a4bdc0dcf36e72300482ed188b492da723d3cd7ae04dda9b2c16c70fd1871c556a46
 AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b238d028227e19cb7ba4933a115e2e82652b3179462ed0d2115058bff5d8d0212f439a919857f083c318d SHA512 6aee279728d0e609956c825ced6d2c00d8f4905327492c0348ad6ee8e862287b101ec4e2f1daa19533cf51f2ba1a15f0ea2dd6ccde44a4ff1b0fb151ffc7381e
-DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
-EBUILD systemd-boot-239.ebuild 2424 BLAKE2B ec26000bf32d10242e876af86e401d249c64c58519bd2855d793d2809395b72355f4656e5a1ab5a68c0c10dff9a9fe7bc0034449a357c5322db7ad05d1078d54 SHA512 c5d2be59f5ff81923f86330f4ddba7449663ddcba332fa39373e541a92c032f481a860defaf1ea7e7306b700f7fa16ee105bf7ac517afa4dbd3670c87ddb8730
+DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 EBUILD systemd-boot-241.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
+EBUILD systemd-boot-243.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/systemd-boot-239.ebuild b/sys-boot/systemd-boot/systemd-boot-243.ebuild
index 603415b39a0f..99dbbaa4668a 100644
--- a/sys-boot/systemd-boot/systemd-boot-239.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-243.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit meson toolchain-funcs
 
@@ -15,19 +15,22 @@ KEYWORDS="~amd64"
 IUSE=""
 RESTRICT="test"
 
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	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
+	>=dev-util/patchelf-0.10
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
 	>=sys-boot/gnu-efi-3.0.2
 	sys-libs/libcap
-	virtual/pkgconfig
 "
 RDEPEND="${COMMON_DEPEND}
 	!sys-apps/systemd
@@ -37,43 +40,39 @@ S="${WORKDIR}/systemd-${PV}"
 
 PATCHES=(
 	"${FILESDIR}/237-libshared-static.patch"
-	"${FILESDIR}/239-debug-extra.patch"
-	"${FILESDIR}/239-stat-0.patch"
-	"${FILESDIR}/239-stat-1.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:-/}"
+		-Dblkid=true
+		-Defi=true
+		-Dgnu-efi=true
+		-Defi-cc="$(tc-getCC)"
+		-Defi-ld="$(tc-getLD)"
+		-Dsplit-usr=true
+		-Drootprefix="${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
+		-Dacl=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbzip2=false
+		-Delfutils=false
+		-Dgcrypt=false
+		-Dgnutls=false
+		-Dkmod=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlz4=false
+		-Dmicrohttpd=false
+		-Dpam=false
+		-Dqrencode=false
+		-Dseccomp=false
+		-Dselinux=false
+		-Dxkbcommon=false
+		-Dxz=false
 	)
 	meson_src_configure
 }
@@ -97,7 +96,9 @@ src_compile() {
 		src/boot/efi/linux${efi_arch}.efi.stub
 		src/boot/efi/systemd-boot${efi_arch}.efi
 	)
-	eninja -C "${BUILD_DIR}" "${targets[@]}" || die
+	cd "${BUILD_DIR}" || die
+	eninja "${targets[@]}"
+	patchelf --remove-rpath bootctl || die
 }
 
 src_install() {