gentoo resync : 29.10.2017

6 files changed, 14 insertions, 7 deletions

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index eadd66f1d43a..3ded0a767938 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -11,7 +11,7 @@ DIST grub-2.02.tar.xz 6113260 SHA256 810b3798d316394f94096ec2797909dbf23c858e48f
 DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
 DIST unifont-9.0.06.pcf.gz 1360354 SHA256 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 WHIRLPOOL 3153fe2a254cffa5aac6c5915468262bf60f993ce5a2aa47885ccef2a6714e205724b01fd9d26d499b9efbc5213e3cea0037c91f17fb2ae780ee289cab0de69b
 EBUILD grub-0.97-r16.ebuild 9699 SHA256 03223c6cec66ca01d0ee08db83a96ef3021bca3fa2414fd862727a9ae9cade07 SHA512 0edce20bd616493dc8e83276fd89fc2b762794cc25572c4ad3cc055c1c8c209ca2d6dc6a1a90a54deb17a245f7218468f7054099d20688ebd0debf227624c057 WHIRLPOOL e58455c072c3616fc317359e6d9a6bbf69399be84e30af641530c2892b0e05dec2cd799e2f49e244700982e62666cff33ddcc4a1ec6bb1112d7fff0f3f284b2c
-EBUILD grub-0.97-r17.ebuild 9281 SHA256 66a9f548b0b7e4def066a72a06b96ef3292c15c6adf9d90bade0f1552b960916 SHA512 659b416c659c023cbbbec587f1b6f2e7995016a41194905b647ebff5d0efb670bba83d468ed3b6dd01abd96f1df0c2b013f91c301e437a01e55febde7f223727 WHIRLPOOL a296fd473102bdfadb3ffd4fa8466dace236e183c815a68c9a1d8beb780ea5e20f7e1d39280f689636a6517a6f7b2c5a5997212c29e530f1dba416bbd5eac9d3
+EBUILD grub-0.97-r17.ebuild 9504 SHA256 7f0b3a6205e6ead2c6ce94eaa471e71a31d9a456071d92b2abe06426fe91e809 SHA512 baca5041b77495ba37d0d43e0f8bddc52a61dd176185c1e88d7f2592795a6efb3183661d2433d9fafdf50ee5cf4e5537fbb1a22431f4fe1195f61a3773bfb133 WHIRLPOOL bd0f098de5a91e50c661258d948f55c29b581a6a11abb05ab558b8fcea9eb6bc1e748ecd1b9a994c9e0a3b0a767517dc60cde974b8b29255d34d54a4108e2787
 EBUILD grub-2.02.ebuild 7597 SHA256 ada3921a987f213615b625b6d97491c1d33448f700410413d411a1d95a04660e SHA512 d3aa7a602989d0eee9c48ddd527253099cfb81887171c69add1f83fea36bac295147fc11cd9cdd2c06410670c435cf1c3f20303660675aa936668b04178cb8ba WHIRLPOOL f7032a2a33a7a571f15b99d02ba59bd30582e531a7330932d1d860485f83569fef9ef8bb5f16759691744fdfb28c6fb12bd24f64c82481281739289ae0da170d
 EBUILD grub-9999.ebuild 7599 SHA256 dda50136976d84a46106a3e6b6ffb657c2094a44d44e520b31c1654cc54b32a6 SHA512 cfb7ffc4a2d94d0ceaaf6fa63d6c587b8c35488c3f00cc667073926a00c90044c58e94f69e53d765b13ea792f7e79e49b59529ad2788460367259ad2524bd410 WHIRLPOOL fc8b0d52d2d7659fc1594f2ed07661bcc2edf52db8c9b3fa3d20dcd756e65002812cffac281149728d2e6e58f621fe0fb8cda082ba6946024a3a909d7ff4a002
 MISC ChangeLog 14166 SHA256 fd94eac2c96265c94e4fd203e094dd6f8985ab3146103f313b647aab5ea76814 SHA512 eeea31f9e358370b12e81075308271fe2ae64d6e84b2828261d1c74577fafdd33b412f0d0faa784a0fbd502481ae3619d2320542b49e06a3b6bd0c11c90a1d6d WHIRLPOOL 2732342665c419b0b6f5d8c75b888437cf73600857c30d06f2c39342f64055db79a2de7e4015827bca82ad6d3f0b16532bf6adab6f1e89a3c12e0e2f06556141
diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild
index 038a541f8795..b34191f7346d 100644
--- a/sys-boot/grub/grub-0.97-r17.ebuild
+++ b/sys-boot/grub/grub-0.97-r17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
@@ -67,6 +67,13 @@ src_prepare() {
 		"${S}"/grub/asmstub.c \
 		|| die
 
+	# gcc-6 and above doesnt have a '-nopie' option patched in, use upstream's -no-pie
+	if (( $(gcc-major-version) > 5 )); then
+		sed -i 's/-nopie/-no-pie/' \
+			"${WORKDIR}"/patch/860_all_grub-0.97-pie.patch \
+			|| die
+	fi
+
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 	# bug 564890, 566638
 	epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index d8dca66fb091..8426e2da1429 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -4,7 +4,7 @@ DIST gentoo-logo.png 14501 SHA256 79ebc1d66693371a90e218ad421cfed05066b51a6645bd
 DIST plymouth-0.9.2.tar.bz2 1231336 SHA256 2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f SHA512 89356eb8326504fbf3155de262ce15de0847f0a0e6d157d873cf1dea9af464a6cb9e11d7143ee9a595b217a2487060b5835eba5ac142c3cd6d66689deb272e60 WHIRLPOOL 5f9e662dec633bb606cf4246611b442a0eb9eaa92942b37c53d1c48b6ca8ef96c5f4330d574b82de6a026ca175a770c1a45f52c7809c80d026126d805e707eba
 DIST plymouth-0.9.3.tar.xz 1102724 SHA256 9f8dd08a90ceaf6228dcd8c27759adf18fc9482f15b6c56dcbcced268b4e4a74 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed WHIRLPOOL a7ccc870fb6149da21873ec92b241f564ce76ee0319a626a423ed1f77820deb0d09ed52bab86fdd501a4827dd02bd7403e78af1cbbd4e9f77fc9bda57ce59fa3
 EBUILD plymouth-0.9.2-r1.ebuild 2494 SHA256 8d36fc90c9c33d4bf0f12d325748897025601d19c629db145fb46b02574cf719 SHA512 4413aec2441e4466eaf308f352264abd9147c3eba073affe7b9e7ba84f97169f6be605f64e73c28b83b664699c981349c345576b855274cee9942f490d644435 WHIRLPOOL dab5a053134a27795587cc08a2a3e877b5189d02b7456d94b0c4d5b4ce78c98c26c0a1daf8b477ad63ac1f7aa07b2ce4d235720d0a8dec851b6881a9f2d6fc11
-EBUILD plymouth-0.9.3-r1.ebuild 2547 SHA256 9d24e9afe4658579ba4eb352ad8af5c5dc0e8f9ddc64457a4bfee35b36f91242 SHA512 7b575637ab6f36faba8d8fbc864b15cdda588db146ef76daffd3b9ab6e352c3fce0a3357240d9a7220b1390cca68d0f1db18f6fbace5bb30fbd901afd91021f2 WHIRLPOOL 5b476495e70f76f99872d2917ba662124da504498ae14ff642c8abada9764df58660dab29ba4e67ada8ff79cfac7183bace90fbd59db21f00753c5b1d5487796
+EBUILD plymouth-0.9.3-r1.ebuild 2546 SHA256 d2d7dd9c651e75b9c3638c43e91f674fda24fd689f0329cfdb0d7600b35bf616 SHA512 3caaeaed22f3b3790785f0f08a3b9355ba5ad9e6caa4a67456d409404037f6a630971d087f4ebd0d0a6e54c6e7f28bb2e1f8c4953ff427012c10076f80fa4cd3 WHIRLPOOL abb2e6cafb9a38ff69dd185024f194746d2428883f63b35c5d36c4b9e5cd95b991bac05840a02ca06a7e7e43b2677b205c1b85faff096e969efa137743b874d5
 EBUILD plymouth-0.9.3.ebuild 2432 SHA256 6ebf4f4938458405e48b271c6d19fb4fe0ad40591571dd3bdb9e3bb94890439c SHA512 65c076ee35d7d49427c5bc9f345c06bf7d7b85fbfc2fb5ab575d02a87b9037c3ee8311452aa2d78ebaf5e16af9c35b43b1349f1b949ebd056a3d2d33ddb6b7ad WHIRLPOOL 07bc72daa421e01e610820a4271cf410949c9e9775cc011e6da0cb3a76ead2e0f62a63fbbd2f68f0cd9a005dc345a0b51daeae97e8622bc3f8543d607807486a
 EBUILD plymouth-9999.ebuild 2481 SHA256 f8887533c1ebe597190b773404df95d92f4c09ca7d897aecf8e95b0c00b2abca SHA512 7357f1f65af91ccd2e13698d46292cebcbdbb952291d139128bfb76067968ad4756632fec75fcdadb914a0fd9a3d5cbe8e774503f0eac4cd98c858f5803239f9 WHIRLPOOL 8e6e5bc58d6c4dd1da75faf94822512d85ebf409b7cb53a99c826defb02e26db2b7842b0eb1732cb4c0d1fb0a43596a1401bb22d7648f014e98312c259f914e1
 MISC ChangeLog 5141 SHA256 1bc72234866d8ee0d4e1be6111a65bdb66f3420757e321077e01a105270b128d SHA512 ae63be932052c734edf101b234bee278a47843216c2263291ab7290e1b11b4e8e529b64eedc6e4a41426464e582e6447a93566dfe87972974bc7d57ac1cb7b5f WHIRLPOOL 268716a75b25b8982b0d49bf12f5c7ef02a078da9f93f4cb67d67bc90ab5e249d3de454404c16ec3b3fb5a93ab15da2e15e5b47d67c0a132295a8bd5426c8259
diff --git a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
index eca80c890f83..ebe3831e9a1d 100644
--- a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 LICENSE="GPL-2"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 ~sparc x86"
 IUSE="debug gdm +gtk +libkms +pango static-libs"
 
 CDEPEND="
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 03b28ba67493..a91bf398e1c5 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -10,7 +10,7 @@ EBUILD syslinux-3.86.ebuild 1461 SHA256 c1651a1e027bda3993b72574de7145d227a1aa4f
 EBUILD syslinux-4.07.ebuild 1757 SHA256 cd73015dc2c4b41488b6abc82920e4fe01d2984350e442595e97c297a0cceed4 SHA512 baaff341d9a8e173b7739b0d53b9aea2d53c9e29b319d663d7223a21f7d21422dbb2504b70fc9ec8b92b5f565832ec179276261d01b817be31e2814e66296fc0 WHIRLPOOL 911a669a72427009371cc3800c3c695ade751b34b7eca76f629b17923e62232d5113629e150f75e5e81a3f86a9dc4d9c2cbd51301347b38273e9416c6050c1a9
 EBUILD syslinux-5.10.ebuild 2218 SHA256 f1fc8abe4306f807a92bd3dcae54d61b849d1a10651b26aabfa8f636ad8a8b14 SHA512 2bb2224850aed70306f29d475f5297fc466a4d04e5a70cf749ab1edefe56fe94b0c30eddf0ed226e07338a8e5ecc37ada691b6b4f0edbe62438a8e7e3b359a4b WHIRLPOOL 3a83ea98c845b123142c75013ab33713876692ddedc03efb0c8eeea4e5fe72388c9a5255a506bda0dd36e3829b8f9a4bf50f3038b5b5e93c9eaa1775f8bc3a61
 EBUILD syslinux-6.03.ebuild 3409 SHA256 5c087820814f2a5fb8040659de9e1f5d340d7e06e293f4bad4b69bb27fc586d8 SHA512 55f895a2b6bbdf0e1e7fa321b700138db1dc2dcd073acec722d222adccb55c092057fa90d4421f5b428aec9b66c746f30ae7ec4c62c84bdf04974c7a4a5e1cef WHIRLPOOL 8316e5c2a39e67d2890ac9ad576bfac541b8fdbecee361ed6ab923ceed04c1116eb11f2c6bb8664422e11f7b28f37eca078eea8a3c0848ad4a95d32e9227fe82
-EBUILD syslinux-6.04_pre1.ebuild 3409 SHA256 5c087820814f2a5fb8040659de9e1f5d340d7e06e293f4bad4b69bb27fc586d8 SHA512 55f895a2b6bbdf0e1e7fa321b700138db1dc2dcd073acec722d222adccb55c092057fa90d4421f5b428aec9b66c746f30ae7ec4c62c84bdf04974c7a4a5e1cef WHIRLPOOL 8316e5c2a39e67d2890ac9ad576bfac541b8fdbecee361ed6ab923ceed04c1116eb11f2c6bb8664422e11f7b28f37eca078eea8a3c0848ad4a95d32e9227fe82
+EBUILD syslinux-6.04_pre1.ebuild 3407 SHA256 1a8a4be124d7b7f8de9b3d8341add1671e3db4294656918a0919a107de5d355c SHA512 859e1f935acd80d60de3690206d44f19ca59d0036983ed83c5ed2096117cdc40790699989227e1788b650761665ff9ff1884284287eff8412b36625ef83acde4 WHIRLPOOL 84e6223c9ac0220e0d2900b5fd6f196bd701509777d80ce2b7c46a09503131d18ad4f04c5b0ade797b4f8e304cf13ae2c8c0bb45a432b806956c9afff29187ba
 MISC ChangeLog 4181 SHA256 3211f59f31e63894c8de54ae33b2b959e46e6009b590e86826975a6f41b99be7 SHA512 67dc70ec6005eb4948a09a1fff31e479cb709bc8a4f9334fd9e2dcdea55bfe0f39a77598184725eeed07ad95f112c671d3c823b28a63122514f312856685ad4b WHIRLPOOL 60f5f82fe575a8b57f5b4df6e4dcacd8a04542756b3d3c1174d61b6fa5f8fdfa3758f333947c293170de6778f5993104d44b315163b39137fccfe05a06ef387e
 MISC ChangeLog-2015 20427 SHA256 15fdf0f85aafb3fff824366a1b2f7523c70f7d783e8d868125638499fe73dbd5 SHA512 1b3177021e8ee7e458b89f9baaef66ff6fa5d387cb37a958a64f39102b21ed0d080227c2a7baa881ab8373bd81e27d63b2c0c3543ac066fd7dc99146ae36888f WHIRLPOOL 2a1d22d6b95dfb400687463a3b39f0d8ece73b287d0d49af2ca5b2ce8ba97952b40c5a7ce0aa471adf603c7a6b941a71dcc3ffd237ff1514ddbaa9db2be2a4c1
 MISC metadata.xml 330 SHA256 264a473aea8781b3aa141a0307ff5445e3e0c800262c209b8bdeb5b36b55b627 SHA512 89e1dde9592f2cc3ed391f6f3ad29b877751b95b0c1bbb4416cd0c38f136c4a293f4687ebb5758adab540d6f3ff63f20f43847e294644c9e68ee84f3223657ac WHIRLPOOL fd7bf363f8a45db96a14e83625a63c0333a7527cc664b323fa2aa5cd40043e0094441052fa701e687cd115a3eded20f9a2aa5c18c9226cbbe6a559fbc95a622d
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 3dcc890decaf..2a96ac4acdf0 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-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.x
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools