gentoo resync : 08.05.2018

6 files changed, 10 insertions, 6 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 34136e00610a..17817f4ef16b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 1f5b9b790d87..306795ee0e84 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -16,7 +16,7 @@ DIST splash.xpm.gz 33856 BLAKE2B e8d0ee91a87ed45f47fa58b07a6476b19ddb3f98ffee41a
 DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
 EBUILD grub-0.97-r16.ebuild 9596 BLAKE2B ff6e369d331c18300a8a5b73232d5381ffecac3364ce2c789e3db2f510f1d0ebc929994eaafa41cec4193676c39022f4bda868afd95d5ee15dfa61fadba29bf8 SHA512 26aa6178cc463e79cf3416773517e35606aca9d8721da2f6aee0d5b7db223b32e4ca812188a488734784a5725646daceff24b3ae9d8e14452becad1ce25ebff1
 EBUILD grub-0.97-r18.ebuild 10141 BLAKE2B 7af15e1634c7e96930a7ddaa72d9ab7adae72a0b62729d65d52fd86262d7a7c2a27e2a59c412733463bccc83e9b30d62408d5bebb30f90c99135c05fabc140e7 SHA512 d9c481f77fa1d2f750b64de8cfa02f52be9a0d563607ca50117e4792add79b21e3fb34dc448beebbbb7a99153b9dc5cad01d447209fae154a8205864593c89d6
-EBUILD grub-2.02-r1.ebuild 7899 BLAKE2B 440179eb3af11eee89a9a14e97fce63978d9e4df66f9debf2f686f8926b5f454fd227d2c4df93dc567bb8bd1033428be7e4cb9b5282896a8800ede385d5125cf SHA512 89d9141ea8a56061b065d8f13b6162830fd211ecf5a01ca1bcd5384ad21f9e1d8ef24a70172701864bdbaea30cf0da8cbd60e772c75b9aed2cbeff55ee0acd9d
+EBUILD grub-2.02-r1.ebuild 7897 BLAKE2B 5d469ccd66ffcbbaa38bcb2e9d6334ed50c8d01b7e4952d0861475b908971560d28908c3a20f7d5b698b31ad368215f910bc6638edd358253b1338448a20f80f SHA512 12a8d9663ba37568da21f974f684e84e8d278ef33de8fd34e92e8d3b4c4fbec81adf69a96143f4c86ea0ad36aa5a6334235ee4e6d33d5b65dc40b836bcec55ac
 EBUILD grub-2.02.ebuild 7597 BLAKE2B 31631da1a5c9c871ecfff60f9508bc81b557ed25226b70f31b0157611db6ea237e269f44fc0789215c19c32f4633cb9e0ca1293c3af2dc86b6e6b4ffb78538ed SHA512 d3aa7a602989d0eee9c48ddd527253099cfb81887171c69add1f83fea36bac295147fc11cd9cdd2c06410670c435cf1c3f20303660675aa936668b04178cb8ba
 EBUILD grub-9999.ebuild 7755 BLAKE2B b5db9a0dc7b0fddf4320a31bd69450b26acc5e24540ddcc80e9172a0ec70b4141705a20185a2327d5c4edf5a214bbe979c10175d2cb105b45e4c7a94bed57d7e SHA512 19072f01a8e2f7f5f6ed65dd48a6e6120adb2004f49cba33b02e04ee4131cea7f077490f76d484e458f62fd3f719d488ed1d08bad793fc8c4bc4ea5bd31c7792
 MISC metadata.xml 1488 BLAKE2B 3aa41f3c6c45258892bcf2800bfe09b506d11aa69a3071977e58736e496b72b71df579cfcaf1d14a3b81db695aca0bf7dbcc7a18faf1c62dd05f033bdafb00c8 SHA512 71f3e48b73c3d20f213ae928b16499131417562d98b83f2d82a5fb026c8cc06ecddf9db32565d9e1602d4258f7a2cc1796eb523c4cb98fb6b7753328a29e93ba
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index 03b5f77360f3..c8bd4fb84d95 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 09ce8b21f72d..37464405bb30 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -2,6 +2,6 @@ AUX silo-1.4.14_p20120819-gnu90-inline.patch 544 BLAKE2B 6336a6713a706b8181cbb5d
 DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1 SHA512 bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
 DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B c44a0204e3aece4eec8355f88b3a195c1ba7019c0aa648cc4e28ff6cb85fc6d96634bd282e5aaea9123dbc5835820acf2fc15054c91842d6b1040fc13cb0033b SHA512 60719b672a0f1dd2a005e763efd232bbf7aeb00198e0b46827208b78f1b32acc3a730d43944382dec4b95fddfbb373b1eb69dc911ad28ec9d1d1e6c45d84db20
 DIST silo_1.4.14+git20120819.orig.tar.gz 755510 BLAKE2B f1185086671c12c901704c2aa1f582a4e983d2d4a2d5ec18194aebcd43a7bdf9e7ad329efebaf4911d40f8a417ff8c8566b61be4eac5fea13235ac44d0edf852 SHA512 2d1dd8f805fb0a272877b5e8e19e5a645aa9fe02cf2b5ef43b5d2894c0c6a5a82483a0e41556af50f01dc795dc5e43350ae92139485c19d64cda75c2aca01a38
-EBUILD silo-1.4.14_p20120819-r1.ebuild 1565 BLAKE2B 598fdbfd6184670c88d7023fa1f7713178b7be1fe68497c7e3f87bcaafcbdaca102f44ee589d9f73cdbb134178c7e9b2014e456a656e38e8974a35caaede0e9d SHA512 472d1e04e628d409dffcc77bcc17073591116ef6c77859d1f7a238b0bf9e87311c62c2a1e1988df3077c914d792dc61b3a9930b4687f9c14bec53392064a8aea
-EBUILD silo-1.4.14_p20170829.ebuild 1613 BLAKE2B cc6dd35696d8eea18ea27cb702a6baff0e2458ced042e4b3e2ad2f3995c6c64b75c0145bcdf1da91b7b79c002e6dc8bae4601702973575b8c09cc78b0cdfe47f SHA512 6c1a1bca4ee295f3d64b883843307ecee5371e6a4272fbe42a065ee96dca70be586a2e2cd87c17fab8a56877ee671828f8bd92377cb3215303d96ed82bd07f42
+EBUILD silo-1.4.14_p20120819-r1.ebuild 1706 BLAKE2B 6c4886239f6f55a88640e166b7eb84a3da383795c42e19bd70ec0bfef687b6624c2fb71ea11603d964f86b5dd97e2cb4b9d09b79df650f9552ecec8ddcd3b80d SHA512 88d310f1178eb846f99edebae4b3fddbe3aa2f8a0a0f9fdca568cd9342fe74e0613b8c73d5d751a23faef5c9914695d6d245e0938561de25f9d1fde217804134
+EBUILD silo-1.4.14_p20170829.ebuild 1754 BLAKE2B 8a513a439b379c1bb0ba873a9e523c082dd8d6eef946cbbbe73f7cbe1d227b9f2dee81d9ce1ce8a0970e6cfda43e26d925beb497e67482c8aa2b68afbcabb286 SHA512 e834d2ac08340c360a897e2b608456c88140988b4ab6c0b5c5ce6b455e87a89199b02d4845f948248aa8312fb9d576f11a38715aabba70408a459fcf513954f5
 MISC metadata.xml 383 BLAKE2B 30e20990d4d208db4d45f19aaab45fad2afdb238415163399d2665d1327f6932dbf420ecc455ad03ba69492a1ec9c18397362164873016427a624e8fb3e41844 SHA512 4d4c999f52f1dfb269edc79e10df3fe667273d895eceaa4db695e9bcfe5ba781a0f9f7367411fb4be71ecedc679ce792c2359801e28b2c164fd7f44b971ced5a
diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
index 2431901f440d..946707a29471 100644
--- a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
@@ -40,7 +40,9 @@ src_prepare() {
 	sed -i -e "s/1.4.14/1.4.14_git20120819_p1/g" Rules.make || die
 
 	# Fix build failure
-	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make || die
+	# -fno-PIC is needed to shrink silo size back to manageable on
+	# profiles where gcc has -fPIC default (via --enable-default-pie).
+	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
 }
 
 src_compile() {
diff --git a/sys-boot/silo/silo-1.4.14_p20170829.ebuild b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
index dde2b3c9a733..e62265f8848c 100644
--- a/sys-boot/silo/silo-1.4.14_p20170829.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
@@ -29,7 +29,9 @@ src_prepare() {
 	sed -i -e "s/1.4.14/1.4.14_git20170829/g" Rules.make || die
 
 	# Fix build failure
-	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make || die
+	# -fno-PIC is needed to shrink silo size back to manageable on
+	# profiles where gcc has -fPIC default (via --enable-default-pie).
+	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
 
 	# Don't strip ieee32.b during compile
 	sed -i -e '/^	$(STRIP) ieee32.b/d' first/Makefile || die