gentoo resync : 07.10.2018

7 files changed, 158 insertions, 2 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 63fb802b879d..d52935938a5b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 4128ede5c71a..7c5e799b7f44 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,5 +1,6 @@
 AUX elilo-3.16-elilo-loop.patch 299 BLAKE2B 5fe27b5b89d18adace762e2691854140437c5d33281d8b4e6573303b9d80913fa59283ae231213dda985dc9751c019db0a070e77284c56ed3871d799897b3c69 SHA512 6480d3e9403bc54b4a923e77df049eeb42929020f222450e32c12d4dcb09b098aa52924be0ebdda95e01ee8d0ced624ec96c3977cc1213b66dc5a8639797bc20
 AUX elilo-3.16-gnu-efi-3.0.6-ia64.patch 3796 BLAKE2B 9008b004b24b390f46d6b05cf9e9ae0627d4ed930b9965d0295e700ea0c7617f2ac3e1da0b583ab931e8a7bffc0bf8452eb19318d7d1d256a5d4781cde4e710e SHA512 c2ec3ba0d2f5ee3447363a44d9d7863eb323095c40f72243241f608437fd9e2b17ee603666a1103f14a0c66cae025e8f9be09c27d8fb57554f480209a02f39e5
+AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da20844929d0f1749e121b2e05cf8eda2af082ad8c02476cabf864258133964b0fb02ab3ed9969202fe62392718e7e047 SHA512 4cb593ac6b56bbe63b1ff632d00ef1192dc28c9a5af355e740b9ee41697fb48766ccb678636c66ecdb05d7cdf8d16b0a14d99e0347022bbe1cb6ec9be09bfcf8
 AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
 AUX elilo.sh-chkspace.patch 833 BLAKE2B 72d99e45c6deff5262ea02bc8417e77e9e1158e5ef921d142f6ea941fc2c2da1b9f3624bd1e9ca6f9debe63f174d0ee55536bd295706c59dc197227739c03316 SHA512 063131fd53866e717d87a4ca23e5f4143cb166480d89312bbf9f5be9540e29930794657f1eb2709559435abceb415b7775e049a1f8d410ae5007dc967fbf9224
 AUX elilo.sh-vmm.patch 2099 BLAKE2B 8bfca9c76e9dc5232e3602013103dc3e26bc29f880287f1204d429878b0e13cc95ff005934bbf06c9f848cd8c7d7a0162e52c827e1ceaa8809d28864e16712ca SHA512 2bbeca88b38790b3821e4ba54c46d194fbb776cf56788634e91da91e028fedb81a38928d0dbbb503cdf1a047c281800aea1d56a2eae47953dbc2203d795862cc
@@ -15,6 +16,7 @@ EBUILD elilo-3.10.ebuild 1889 BLAKE2B a244e16b853675851ebca1ec3610cf42ee7a5b1661
 EBUILD elilo-3.12.ebuild 1883 BLAKE2B 929411191803ac913ce5eb3fe343c830ad9532713c484d1d589f2b1a6c549d9de817087dce01b89333ee364861719312b8d0d4dc8e7f0e3ddd96207b947d917a SHA512 5a2f73187dc2c70d5742b2a9e0d18d4d17af029c2621f0171945a5466b47f13b1c07b1dc61f357fecce46e5fce8341c2aeb597e15a2e24cbacaf534f39a68c9b
 EBUILD elilo-3.16-r1.ebuild 2022 BLAKE2B 2b7e34a158bbb348c1468d1e79bfccf885f8479f0d209a36e1f9fff334d52fb5eadbb98082ad75b44e5cae50bc2909fb710aab42fee9f54a7c9e73be7e7faa9f SHA512 428ff3638702d11ff93a19c6b3aeca9c9dab556773a6b6a6b3632ed240ae64a3c6269e48f1466dbaf58ebc23c2eb340cbd98c50b0f7a5b45c3224a17b7ed4110
 EBUILD elilo-3.16-r2.ebuild 2072 BLAKE2B 8f3719a94e45a0e7c49304b1ff2c8bfc1727c8256eaf4b11aa4b5e0dacb4caefe9ddb685da60597e4aa1bd2eaf88e18f2c05380e79b72136ee14cacf3a854fdf SHA512 a6be44876a80bd87401bbab2e69edc53b7dd4c1da05c207c8f9a18240cf5c33cb674ee9017658dc17c4b83f4bec26a30088293d084826b813ed187a5a2a61a01
+EBUILD elilo-3.16-r3.ebuild 2116 BLAKE2B 1bd70b5de2b47767160c9296d7b7dc728441860d392a5056f2b6aa183b644b196093f9b43baf0eca5145f5d0552fec672e65f6b113c6614fc01da2c886dc61d8 SHA512 3df96916f9651460544450d280a66c0d78f402f197af5b2b2c39d1364abd295a5f8566d8cd9c00eea2a9b3222415aec512039f2df1c1fcc1f16fbd6f752a6c5b
 EBUILD elilo-3.16.ebuild 2032 BLAKE2B 12c7a08970bcb568944607fb6f9066d6b4bd19dda8a956f0f98480ddae577dab1cba0566b39c4214fd50b618c6df6d797957cafa7f40ccc1d70540dd7d642f3b SHA512 3eefb2956ce6cd1f5322c7ef537fb04fb9518ffb294361c0a449154adf11729ec7999167754cd034cfcbadb16616324c6866f8356e72e73e4aaf52a4e4f77398
 EBUILD elilo-3.6_p20060314.ebuild 2298 BLAKE2B 6ecc279508387df95baf7f32f155a1c33f7307ed58be58616450c4c936a50c42d1510c1801a5e2573c2a0d7570bbe3b4ee608beee4a3242f4e4c31fd2f70d6cd SHA512 0c7d728b8bdf326f9a1597e73d024f1f3069c301bfe09bedddc02cd4ef395d01ccedcf999ae3327065869c84e482b7f0f028284f48a0af70ea76622c73e2225e
 MISC metadata.xml 337 BLAKE2B 7c9b3e56e9680252631db0691b3acfc2a2cbfee80c42af709979085124a35bb9d184e58de3ef4f88b2f3e6cc873b4ef2bd285ce3fc2645aaa9ae869c3b729d87 SHA512 13691bef927bf7f8a4a6d0640d38dabb53fdae1d8bd986c5fe73c1643e2bdbaaac50bfe864e2185a584fa6265a3197afc5273b60b70675481cef61706dde8d87
diff --git a/sys-boot/elilo/elilo-3.16-r3.ebuild b/sys-boot/elilo/elilo-3.16-r3.ebuild
new file mode 100644
index 000000000000..de13af20f9a2
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/"
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+	mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+	dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+	sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+	"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
+	"${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
+)
+
+src_unpack() {
+	unpack ${A} ./${P}-source.tar.gz
+	mv debian "${S}"/ || die
+}
+
+src_prepare() {
+	default
+
+	case $(tc-arch) in
+	ia64)  iarch=ia64 ;;
+	x86)   iarch=ia32 ;;
+	amd64) iarch=x86_64 ;;
+	*)     die "unknown architecture: $(tc-arch)" ;;
+	esac
+
+	# Now Gentooize it.
+	sed -i \
+		-e '1s:/bin/sh:/bin/bash:' \
+		-e "s:##VERSION##:${PV}:" \
+		-e 's:Debian GNU/:Gentoo :g' \
+		-e 's:Debian:Gentoo:g' \
+		-e 's:debian:gentoo:g' \
+		-e "s:dpkg --print-architecture:echo ${iarch}:" \
+		debian/elilo.sh || die
+}
+
+src_compile() {
+	# "prefix" on the next line specifies where to find gcc, as, ld,
+	# etc.  It's not the usual meaning of "prefix".  By blanking it we
+	# allow PATH to be searched.
+	local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+	emake -j1 \
+		prefix= \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		HOSTARCH=${iarch} \
+		ARCH=${iarch} \
+		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+		GNUEFILIB="${libdir}" \
+		EFILIB="${libdir}" \
+		EFICRT0="${libdir}"
+}
+
+src_install() {
+	exeinto /usr/lib/elilo
+	doexe elilo.efi
+
+	newsbin debian/elilo.sh elilo
+	dosbin tools/eliloalt
+
+	insinto /etc
+	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+	doman debian/*.[0-9]
+}
diff --git a/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch b/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch
new file mode 100644
index 000000000000..fb2f6878be03
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch
@@ -0,0 +1,23 @@
+gnu-efi-3.0.8 added StrnCpy. This caused conflict with elilo's definition:
+  ./../fs/../strops.h:30:16: error: conflicting types for 'StrnCpy'
+  extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count);
+                  ^~~~~~~
+
+Work it around by always using private copy.
+
+Reported-by: Bill Glessner
+--- a/strops.h
++++ b/strops.h
+@@ -29,3 +29,4 @@
+ extern CHAR16 *StrChr(IN const CHAR16 *s, const CHAR16 c);
++#define StrnCpy elilo_StrnCpy
+ extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count);
+ extern CHAR8 *StrnXCpy(OUT CHAR8 *dst, IN const CHAR16 *src, UINTN count);
+--- a/strops.c
++++ b/strops.c
+@@ -27,4 +27,6 @@
+ #include <efilib.h>
+ 
++#include "strops.h"
++
+ //#define CHAR_NULL    (CHAR16)'\0'
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 527f0572a4d9..da13294058de 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,6 +1,7 @@
 AUX 233-Force-libsystemd-shared-to-be-static.patch 601 BLAKE2B 2473eb2d2a355e468a7d994637ae10f22f08001b57e5e05ccef7636754ca448f46513fc33a54e8349b7444676bad6c0f03f5f7943f37a65e914efbb27f4ed321 SHA512 05e666114764a97d20bf115e1b114035fc882b101ad01bde8864a31385886e0711e4b37e03d713052aa985503cf7a94eeb5d28c33cc4a504cbb4fc263998d4e1
 AUX 235-libshared-static.patch 968 BLAKE2B 8979c8fa294d1dc3a0356e32ff1a6d15bd3b3a93d5f9bacbbd137bbc38931ae5ec383ecc9ca237e62b80353ac36cd1c0b8df96ff1afd86e1a43c2601574fae01 SHA512 b37a097a14a455f91e1f1f2b00782aa5f1af4e201bbc9c2ebd69b4bb426cabc9d169733f70e09caf8fa36ae62f3eb44d5f7b805bb242310d18c94230f18835ee
 AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7
+AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
 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
@@ -8,5 +9,5 @@ DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c01
 EBUILD systemd-boot-233.ebuild 2118 BLAKE2B 02b1df09cf96432b865586699bc0c4da4d3bc064182ac5f55a6e16e3f24691467d8e7fec65d0c658a535dab7b79112cba645c81077772d398a6a963c06be4c0b SHA512 aa7f7259549b397403b7a539015f1435c47e2933d0f67c68e0a633393fc64ac4bb0fac99d7860d400e9da8f68dbc8235340426ceab715e51f4881fbc991ecfa8
 EBUILD systemd-boot-235.ebuild 2274 BLAKE2B 20cae085bbeabfd265d84c16cc80fa9a162cc9d46776984206e04c368697015a6eb4bdb2e16dca2b137417b3ef51ca02f4a368e7c118bb7ce92ccc436e06c290 SHA512 c016caa2373bd5b5893e7db7d0044c71dbed1d7393a8ac42252e2420e8e554624defd644e6d0a8e1ca32e52496b0e674a09c6feb98232293e19b05b2c890e39d
 EBUILD systemd-boot-237.ebuild 2326 BLAKE2B 0525544b11bfe923ea0a9d75f0a3c2dc6af19cda15ee5c5d9855478533a83694e22ab77b8fd8efce7ae54b97b539b3343f9f238fc22633d984acd3939310d5f9 SHA512 f942a34573f78249a0ddc40ab927cf7acf88ded00420a4a3048b8b0ce66b11b75450fb3b1bd9ff914a9d9c9b8e5dbe07e75ff0c263a620b03e31ece738d80df1
-EBUILD systemd-boot-239.ebuild 2326 BLAKE2B 0525544b11bfe923ea0a9d75f0a3c2dc6af19cda15ee5c5d9855478533a83694e22ab77b8fd8efce7ae54b97b539b3343f9f238fc22633d984acd3939310d5f9 SHA512 f942a34573f78249a0ddc40ab927cf7acf88ded00420a4a3048b8b0ce66b11b75450fb3b1bd9ff914a9d9c9b8e5dbe07e75ff0c263a620b03e31ece738d80df1
+EBUILD systemd-boot-239.ebuild 2360 BLAKE2B 255bb3335539490af4f09e1d372900794255f70d6cbae2a6adba257b5221a6f41291146b3f75cbcdf63737a0ddfa8466c357fb4d75707adbaec2a69acaa2a996 SHA512 3e58b2e39ff984ba133c2e2d51d87904d43670ab8375a50518dfd0cb4014309b26205fdcadbbb6fa06a175a95237f987cb1fcb3d1dd2dbd836969eb20f5a9d4e
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/files/239-debug-extra.patch b/sys-boot/systemd-boot/files/239-debug-extra.patch
new file mode 100644
index 000000000000..19db590257cf
--- /dev/null
+++ b/sys-boot/systemd-boot/files/239-debug-extra.patch
@@ -0,0 +1,40 @@
+From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sun, 19 Aug 2018 19:11:30 +0200
+Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
+
+Meson added -Doptimization and -Ddebug options, which obviously causes
+a conflict with our -Ddebug options. Let's rename it.
+
+Fixes #9883.
+---
+ meson.build       | 2 +-
+ meson_options.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f79ac4b12e7..2209c935ad6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
+ 
+ enable_debug_hashmap = false
+ enable_debug_mmap_cache = false
+-foreach name : get_option('debug')
++foreach name : get_option('debug-extra')
+         if name == 'hashmap'
+                 enable_debug_hashmap = true
+         elif name == 'mmap-cache'
+diff --git a/meson_options.txt b/meson_options.txt
+index e3140c8c110..7b1f61bf464 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
+        description : 'path to debug shell binary')
+ option('debug-tty', type : 'string', value : '/dev/tty9',
+        description : 'specify the tty device for debug shell')
+-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
+        description : 'enable extra debugging')
+ option('memory-accounting-default', type : 'boolean',
+        description : 'enable MemoryAccounting= by default')
diff --git a/sys-boot/systemd-boot/systemd-boot-239.ebuild b/sys-boot/systemd-boot/systemd-boot-239.ebuild
index 48d61ac38b29..4eb8570b73cc 100644
--- a/sys-boot/systemd-boot/systemd-boot-239.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-239.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,7 @@ S="${WORKDIR}/systemd-${PV}"
 
 PATCHES=(
 	"${FILESDIR}/237-libshared-static.patch"
+	"${FILESDIR}/239-debug-extra.patch"
 )
 
 src_configure() {