gentoo resync : 24.02.2018

21 files changed, 118 insertions, 47 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index e4f7d7dd2a12..a3cb900f0545 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index 46a4a034235c..b0a678bcdd4c 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -7,5 +7,5 @@ DIST autoconf-archive-2017.09.28.tar.xz 645388 BLAKE2B b7b62d30ddde199d0f1a61bb7
 EBUILD autoconf-archive-2016.03.20-r1.ebuild 771 BLAKE2B a0df912262006b18fa720f8d9d85522c153ed844b63771d9aad905300008fb6cfa7db21d66d03a8397c84885204eacf2ee66a8dc10c1d002b95fac8ce0009733 SHA512 3389dbf76b58e91adbfa55e13c2f2c86d6451765bed33e8eec11e6bf2c2a2a57d1b0a749530f73a55ac0df7af0aff47ca93ae97450add7641ddeceed6e4de700
 EBUILD autoconf-archive-2016.09.16.ebuild 700 BLAKE2B 57f6359dc76a6c590a520cf2655b9ed1c3dc9ff556633fe8a01fef549a50e30e3bef4173b683cf5ee4e3a6970dd88cf5dff8fca78357fb18a4e15707c2421eb1 SHA512 fb129a0026a8799b56676f65b03042add5509ae5bb9c08c6c43b41f9e6a5f4ac9e7584c4e98d22dba41494b7201c8de61c3094ff3035ab245b3f67371720c21b
 EBUILD autoconf-archive-2017.03.21.ebuild 689 BLAKE2B 186da4be991148dfe8b327d0bc6f5c35360cd64f57a5261a53f6c8f95eab3b2493b4572c0ac08d69cc3a5898c0bdbe7e8bad259887e307f671d04ecdde9d9857 SHA512 8048c045fcd581ff244a50b51815e82cab589877ac1add9634620bb6cdc68a7b5ccd0bd91edf522a35439e5c31c1eb741b6c3bc1fc9ed2b346d67e7a300eb314
-EBUILD autoconf-archive-2017.09.28.ebuild 700 BLAKE2B 57f6359dc76a6c590a520cf2655b9ed1c3dc9ff556633fe8a01fef549a50e30e3bef4173b683cf5ee4e3a6970dd88cf5dff8fca78357fb18a4e15707c2421eb1 SHA512 fb129a0026a8799b56676f65b03042add5509ae5bb9c08c6c43b41f9e6a5f4ac9e7584c4e98d22dba41494b7201c8de61c3094ff3035ab245b3f67371720c21b
+EBUILD autoconf-archive-2017.09.28.ebuild 712 BLAKE2B 441264b77892e6a3cf5ce85dcc622ccc4a25ade94d67f110f90fe4e243fa651d7ac2edffb667a32830586e93ceda99273ecbf6651c0be4f5f6c0e6a8feb266eb SHA512 4ce599500e2379d0fdfb383ebbf23de2f4944871fe803ae6414e28f3f5595231d06fa31add4c139fcbd5cd73c6d204cf7d1ac15383a217f8c67e1dfa28f7ebe9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild
index 253381968955..babf002fe878 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris ~amd64-fbsd"
 IUSE=""
 
 # File collisions. #540246
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 05454f7eac8d..92352242e8f0 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,7 +1,7 @@
 AUX autoconf-2.13-destdir.patch 604 BLAKE2B 4c3607a31a7e99820b49dea142e9b2445a70508cedf7407f7822f86fb4d1595ced6ab202bf6e42e422f41e44c256e62ee2a617f5ea01d1319c66f811333d5c1e SHA512 c69c7681b028f82735e0187dc9ea0d73906b74e32a6d51754e2c973a559895590fb5a1701d153445b772bcf0536a4688292895242910f20e6d4cf1a02f1a877f
 AUX autoconf-2.13-gentoo.patch 799 BLAKE2B e9d403d2e7e6ca2efafcf9b2e7108f8b383b107bc78290242f0ed2662ec8e05c5a178f8014e6317f260695cbaa0e4c6a2cce3221d1990b1fd2a96fa3db5ce611 SHA512 5712ad0d67cb5661c949700d5bc0d8c582b27562229400e7b8b1c0249020d13077af5ef3602adef7135cc8dfe529556d5a23f2ce494e3554322262510c2a9fb7
 AUX autoconf-2.13-test-fixes.patch 547 BLAKE2B aa7509f3098da8e2723f835133e375d63896ea65b3030037d625361fa01a02e7e982920cedcbfdf1679783fd7a6a8f0b8476e583749419fd8d103735c0b98d2d SHA512 085e7525c66e710b42dcb068c8aeda89488d1e926e493bcab74e1a1440f53f67630d6998a2a9eff6dc65cf8f71cad19127d541422b51a2519163b51ba78ae592
-AUX autoconf-2.61-darwin.patch 450 BLAKE2B bf5bf1f9561c0a1880c9e3f97383a8c91450cf727587f267848d7acad8d805e7a0bdb4d64ea8605fa44851d8841d5ce3557afc890bc1a4365844fcaa223e1439 SHA512 b698bb51a1264ce92cced79906926a473d37eaf7dcf5d6d599c6c6012910391933e19a7a436cd0c93f817f56f6749006777bb914648eab8da96ecca0c1e2cfd1
+AUX autoconf-2.61-darwin.patch 454 BLAKE2B c98084d8109ead961c446aecd38d150b244a83a62870e6820c10024085c023ebcbc75d2c388e170c3bdbd562e3a2b795271c52c02b3245ccc30195443d82d89b SHA512 7d11430a596cfa8624380fa21cfee4f4684a0144d4a4f93218656cedc0aeba2e7bf85dd52f7cdad3ef2a9aa4d5213c318b6cde8a33c09690ea4dddc7d8057101
 AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71cab644328c850c77214dd15c99c2b1ae2ee040ef3d75d4dbe3301992bdb9ad2f2b48f4a6363b14e9f6765863e57f0047b83f86 SHA512 38506631fdde1f80a3467673e6fb48d4751323462c1657c85e2b5289e1219ef236ed9af3a66906c8851a62c244c1ffed70537a5f1421539429a9aa04e929d727
 AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
diff --git a/sys-devel/autoconf/files/autoconf-2.61-darwin.patch b/sys-devel/autoconf/files/autoconf-2.61-darwin.patch
index 2ac2be361db1..83f450e6f5af 100644
--- a/sys-devel/autoconf/files/autoconf-2.61-darwin.patch
+++ b/sys-devel/autoconf/files/autoconf-2.61-darwin.patch
@@ -1,5 +1,5 @@
---- bin/autoreconf.in
-+++ bin/autoreconf.in
+--- a/bin/autoreconf.in
++++ b/bin/autoreconf.in
 @@ -110,7 +110,7 @@
  my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
  my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index e00d6b20ac93..582531558165 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -8,5 +8,5 @@ DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c89
 EBUILD bison-1.875d.ebuild 1750 BLAKE2B a5ffd48b64d81d0c64ad403a34228a6d8e2a269f8234f4fc6e9d52d6edb619cfa3f1fb2a382701c52a063f86c3a2961f316b228f74a6b11293a2e3a742343743 SHA512 0a836ccca259f9825325b26d6fe8cae2a83cb4111d0228f4657a2ad048816571abce84bb40c46c734f07a2eb830cb9070d1508976420d2f8352702b6ec7de222
 EBUILD bison-2.4.3.ebuild 1205 BLAKE2B 0bfef6eb3a5b94b8ce4c15deb81f5b9578313c1c87f884b59bf2859df90b53290eb22d8fda516fea8eb9b724ca0a59ba2a74f53c7427dc45b334d7548e1f5c1d SHA512 6c19788ee798a42b2e8e42311e0961c145306bce5abf70d3b9e044752e20a7f14f1666e8746a29cf453ddc0c4cf372d8dc51ad75cb9924df7d94395a25610e99
 EBUILD bison-2.7.1.ebuild 1641 BLAKE2B 41dbe1a40e5ffef3a9d259350cf40c66c17ac4a3f21049e858840a3571b682145d4545a7179fcf4d6c3b3c57db1212669690822ed8d5a510c290dd67bce82a0d SHA512 61b9c0ddf1ffc34bc1d1c849b242a02d9892315eaa14fc465c75349306476bcb93c65efe9223df3f503a7ba48c3e043422d626f955dbeab9f1ea59f95c012b25
-EBUILD bison-3.0.4-r1.ebuild 2342 BLAKE2B ce70f532b64911da1bcd8e73676056c20c42887bff23d24a1c436b381aa75bf7459da61912c6d1ea9325e0ebd7970b86324a43af1731db549a58ed2a7c64af0c SHA512 b0f148604203e0739767c703f6efd461ba8201e95cbffce7293ea1354be2cf7a16683ae79f60686a15e25b9c1ae90f701d331de66eb51e831875e01643f59cbd
+EBUILD bison-3.0.4-r1.ebuild 2469 BLAKE2B 6a0f5900ccd90f71bab9816e0e78a0bcd34f8e4f71517afb8c5d17422e1a19fdc5fe96c06827d4dcbce487b8293b34c36857a133c5ba79cc8c95876ff46057cb SHA512 5cd934e6cb839e468062f726317758e57e9d34dcdb525c9cdb0ce562eb537d25bbc52196b8249a3a6044b2d14a9112d0a1169edc71c13dc29c78c200dcfaf88b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
index 615f9869e38c..f21a9f2a9e61 100644
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.4-r1.ebuild
@@ -33,6 +33,8 @@ src_prepare() {
 	touch doc/bison.1 #548778 #538300#9
 	# Avoid regenerating the info page when the timezone is diff. #574492
 	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
+	# ugly workaround to avoid maintainer mode (see #647410 and #648012)
+	printf '#!/bin/sh\nexit 0\n' > build-aux/missing || die
 }
 
 src_configure() {
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index fd37371e6e5a..98fbf627c90a 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -11,6 +11,6 @@ EBUILD gdb-7.9.1.ebuild 5944 BLAKE2B 2065393cc5a34ff738626f997bec0a5e1e5d383d78b
 EBUILD gdb-8.0.1-r1.ebuild 6986 BLAKE2B 4e9233b0b2a70ab4a4d33c36783c8ed7c2e5e7f0874700b370803a4c266982ac753541e667eb339787dababd2dfe39a2d6d87a93a11ddc86c89e2a1ebca2733f SHA512 9e9e52b5ea2ade456a243108aa20db3cdf2b5ab362376f0271669ea61a3a3fb6b2e8db1e0f37e5daed59f64d84a2fa8a3b9b7ebf36a936e7682a03a6798ca76f
 EBUILD gdb-8.0.1.ebuild 6869 BLAKE2B e35cc00c17a74c32e5aabc6c5b8e9e728fb80e00d06785a5ed131210a38374c468649ec1d553b6fc3ce2c6cbae6f84521625de39b9b5d0d79f984af937bd9f45 SHA512 1b39521e365127436d90b58cd442da0cb5b17f35a4ba1ea298b799fb9f5d058ac0a8425f09702ad8be001e7cba0baa88843e51499513a88313504fd4aba31db0
 EBUILD gdb-8.0.ebuild 6811 BLAKE2B 6d0985b62589a687217ea37b8170cada7c789cd301d6a2c2e2b54695251b2d3709766e070cb4a5315cab34ddd3d6ddd616ce8aa169e6b0bbcf37e54de2b36973 SHA512 3d6f7ce0483625f2772223de9fcbfac47d083cbb7278064f226ffa8476f68d8e236f131b6748b12ebf23a438ceb28e6c29b849607cc2fcb9af424bb772c43ab0
-EBUILD gdb-8.1.ebuild 7000 BLAKE2B 83bd6488369e76ac62713da1ac8b3dc87e471f22b0b9d8c908ffc8953a0a6ae87bb6d11f98048774a1932ca7f421602d97eb9479d836e50602930a78b2bb3890 SHA512 fe4a583c0ac27b9c9cb306ce4cfd958994fc054fa3ed415698fcb6eca596b778d31d1ea3eaac025e7f49fff4ae77675cfad020dadfcf498b1c780faac7629a42
-EBUILD gdb-9999.ebuild 6600 BLAKE2B a6f8cdaee3aa1cb9bd5656cb9cbbbb57d4e73c4ce283a595947f3c50b1ab645962ad66b8f8ec030e06a0515687265a3e453fe56b832f1f04ea1a3f16877ed4c8 SHA512 49415dad8c311943379a875926cb9254aa4c17f704c11a2cf292ae01028f5d6a1e99141c9f0301eedb85f8147af07ff6d4bbc44c31d31be94b03db5ef38ca734
+EBUILD gdb-8.1.ebuild 7114 BLAKE2B 22a8ee631ded20e8f1dff4d2f92130c00bf6e644796e14b23ecd4a0fe408aa7f41f29bf901dddc7bbf153e112e03f61237014cec8d67e537b9df184c6a889957 SHA512 393aac231f0e97421fc3e41bb336c5f8ec8ba8a1a4e38e0a2e3ec52da220d15c11fe1c74b310887bfefe80343849e027c724f0568998eef61e3821a1a3d0dce0
+EBUILD gdb-9999.ebuild 6714 BLAKE2B 7ba651694f6837ff42fe934f6e35805d14f9018cd44920ad32db7967da333957eed3586ee313390e24e7bcf94bd49789e6c98e7cc9114c05a29800ff85375b02 SHA512 70b7adbca6f510c07c09343c1e1a061ab6f99a2606358dcf45c9d1ea56a83660ec0744fc72417d483849b19c33e73b436a05b5f648f1409f06a4640b612b22a2
 MISC metadata.xml 914 BLAKE2B 1260cb2638b32429345bd92c06c58074b3486ba3c516e25dab674b4589bf774f2f7192f7ed3ab9da4ed31e313038a389904bee6f9b77707d794530e3a244dfb4 SHA512 515a5bcd6c70fc87309cd4e3822d83e1b8fdf52e58cbf331df0c38b9096ad2410dfdad14aed100ea0a53457f57ecdf2b61b910b6a52765219815e1872872ee0c
diff --git a/sys-devel/gdb/gdb-8.1.ebuild b/sys-devel/gdb/gdb-8.1.ebuild
index d464d9858286..8ba27771a09d 100644
--- a/sys-devel/gdb/gdb-8.1.ebuild
+++ b/sys-devel/gdb/gdb-8.1.ebuild
@@ -234,6 +234,11 @@ src_install() {
 
 	# Remove shared info pages
 	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+
+	# gcore is part of ubin on freebsd
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		rm "${ED}"/usr/bin/gcore || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 8ae03593af2f..553005830a8d 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -218,6 +218,11 @@ src_install() {
 
 	# Remove shared info pages
 	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+
+	# gcore is part of ubin on freebsd
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		rm "${ED}"/usr/bin/gcore || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index f77469cf3dfd..b3badeaf27ae 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -35,6 +35,8 @@ DIST gcc-6.4.0-patches-1.0.tar.bz2 7577 BLAKE2B 56f7f9722ba446d44753504616b877b5
 DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
 DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 BLAKE2B 29ed4ff1ce6412a0c1a88f613377883ef5d391e7f681989295ac84dbb1950d99a17472d8b95a9351970ee5837cc3bfc4711101042c0e792c0bac3327bfa24d2e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30
 DIST gcc-7.2.0.tar.xz 62312628 BLAKE2B 35e4b732f1a4515fc1a9d4424797177112847588e600dc5531bc9bf72305619d4100e8fd9d945920245e704fc9ac5bc5e3dbd20be6c3af49e689fc5bd1eca10f SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1
+DIST gcc-7.3.0-patches-1.0.tar.bz2 6757 BLAKE2B ffe6a69e61dc4379fc77b0bf21971ff6fe482edd315ae1243e55b147ad5794320816fbfc3f85ccebe34de080e2c5b718b60b59064aaf095e905c1b41d7c08168 SHA512 a86ffc03940afa12c44b919f861b9459a3cd460cd4680dce8316755021789530640977e90c4cff89be768fc62e0e24d9bee0a1ee76c537ad88c8f4ed07f1a73a
+DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 EBUILD kgcc64-4.1.2.ebuild 1168 BLAKE2B b9092641f591201dcb6c59767dac678edc30552927d0850358b308544ea5c85edcdb160db582348679b24dd2a56350476ac6292ab5bed5b0f9fee6df23618896 SHA512 20afe58f1789807d68af569b54cfa0222d82cc8b9f73a50a754f8d0c8ed70a9655ddfb33043caf252fad28563211f716e51204a25fedbfbe5c0d8d47fb8f5fd4
 EBUILD kgcc64-4.2.4.ebuild 1044 BLAKE2B fe27d00088a1dbbafe880dd2ab3fcbb3a5588e918b9a0222225aa8ce0cf46b378bee9f2c77ebb8ad0a1fc7e81d4f6aac5f7fe47428164674adda74d760e49e8e SHA512 604992390f8babdeeacc5afa90934a7b6bf0d2d70d31e4dfda597da8a5f8d62f1ba6c1ccd491ef4ca814e87cc0d9491b3907e452ab51c84f15c5d5486c302c02
 EBUILD kgcc64-4.3.5.ebuild 1101 BLAKE2B 9dc7c4a0948ad9d187749c4a4334cb1755150069d73be88b5e297bc904cc2f54204af9da37347dc787cf6d9ba16401eb422f260480d132d7aedf6f74ef897481 SHA512 04f1dda7aab17364756555b4bbec110437166b6a361067b6e29dd134cdf912581ec76605be99e06a93861b71654867a3af98f91e3e1c35556401422ee9857628
@@ -51,5 +53,6 @@ EBUILD kgcc64-4.9.4.ebuild 1257 BLAKE2B 8207d0c03272ad8f2e08483a5d27954b5b9b90b5
 EBUILD kgcc64-5.4.0.ebuild 1257 BLAKE2B 8207d0c03272ad8f2e08483a5d27954b5b9b90b56b2348a8e2efaeef40cef0beefebf308694b4a0e766c5126627641c3d05c40d655b9f5c3a7f5ae1d4cbe0b92 SHA512 126d2eaf7a5b1005d1cad99cab5c39dc4a2e871cb30ddcfa0b36ed49bc0a94189fcd8c27d1d6251a2ebbb8b26414c89500844da9021ecc51a22015c313ee2e49
 EBUILD kgcc64-6.3.0.ebuild 1258 BLAKE2B e4ad040a25ae62548eb7e34ef8c0fa67fac9c8e5345adf47afe618862af183668d60b5cd8e714b15caef5360510d436e6d1924659db4090adfbea7f3cdc9da57 SHA512 e507f934f00daa1a96025ead307bcfba87ff9c6fb8e95785959b1b0c3522e0b2b7f1e5edde63a2bacd5d162d18bd8d3304ee88be9423b015c17e9496ddaf86ce
 EBUILD kgcc64-6.4.0.ebuild 1258 BLAKE2B e4ad040a25ae62548eb7e34ef8c0fa67fac9c8e5345adf47afe618862af183668d60b5cd8e714b15caef5360510d436e6d1924659db4090adfbea7f3cdc9da57 SHA512 e507f934f00daa1a96025ead307bcfba87ff9c6fb8e95785959b1b0c3522e0b2b7f1e5edde63a2bacd5d162d18bd8d3304ee88be9423b015c17e9496ddaf86ce
-EBUILD kgcc64-7.2.0.ebuild 1318 BLAKE2B 35c5c428209af31ac4184b55f28eb7cd6e2e10cabbce7b58cc3f7dde5c885788c99f8ea74149045bfb129b66f63bb6156bd139c53ae6b7f2e3b2a8af0d25b714 SHA512 b90beb4a28187aac6cdd27053f977f7c59e6527203f6dc5fabad36a8c296cf91d643e2cbcfa969fa7b22421343eaa863d5f9cbf174275276bfc26bf3048842d2
+EBUILD kgcc64-7.2.0.ebuild 1280 BLAKE2B dd8fbd53a8fbf0693266953e4aae83c5076817d0fa6ec6fa8db65cf3f60761eef13d14cc65e03d870a8eabe252900db5544618db0f8c8459ab369a90c7de0209 SHA512 e5eae2ec5aff358824d0719ea9c82d0d629fd944f2ff3fc8924cce1740e522a6e7fd4ae56a760acc8849fbb632a84d2fbb5ec122255e5ce8cfbc2061ebacaae8
+EBUILD kgcc64-7.3.0.ebuild 1257 BLAKE2B 84b5b401193789c6b0dd3e12506d33bb0bc9521aafe753c92382380378224bfebd9001339a30fee6ce228b6c70e96f4bfefed2d0aeaad2f4aaeba193695ab220 SHA512 3e6bad259d5ba110b11c14ff1192c30886597dd0d03812cbb996274be5f0d9f0b8be344fae71915f6352a5998ab6f034c7fa51096a0b775ae0fdfaabbda7a22c
 MISC metadata.xml 371 BLAKE2B fb04a0a3d61482f852618d8a256eaf67c78c6721ef6021d0b6715b39d2c420387faa8597f2539a4870c050a74ab325aa45442d81c4273da0ec0db2904eec6dfc SHA512 29d1c3a9cbb0241c2384fb8aff0b48a35a5dca126b750a4cf25e33a1d29a5e79b8fd0c1d03cb216deeef8f7abeb5230a67b7f421e1765d1f76eee2cb6e8ab4f6
diff --git a/sys-devel/kgcc64/kgcc64-7.2.0.ebuild b/sys-devel/kgcc64/kgcc64-7.2.0.ebuild
index 008c9355f86e..3fe776e02773 100644
--- a/sys-devel/kgcc64/kgcc64-7.2.0.ebuild
+++ b/sys-devel/kgcc64/kgcc64-7.2.0.ebuild
@@ -23,8 +23,7 @@ inherit eutils toolchain
 DESCRIPTION="64bit kernel compiler"
 
 # Works on hppa and mips; all other archs, refer to bug #228115
-# unkeyworded, same as sys-devel/gcc
-#KEYWORDS="~hppa ~mips"
+KEYWORDS="~hppa ~mips"
 
 RDEPEND=">=dev-libs/gmp-4.3.2
 	>=dev-libs/mpfr-2.4.2
diff --git a/sys-devel/kgcc64/kgcc64-7.3.0.ebuild b/sys-devel/kgcc64/kgcc64-7.3.0.ebuild
new file mode 100644
index 000000000000..38de4ce987d3
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-7.3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="1.0"
+inherit eutils toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~mips"
+
+RDEPEND=">=dev-libs/gmp-4.3.2
+	>=dev-libs/mpfr-2.4.2
+	>=dev-libs/mpc-0.8.1
+	>=sys-devel/gcc-config-1.4"
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="${RDEPEND}
+	hppa? ( sys-devel/binutils-hppa64 )
+	!sys-devel/gcc-hppa64
+	!sys-devel/gcc-mips64
+	!sys-devel/gcc-powerpc64
+	!sys-devel/gcc-sparc64
+	>=sys-apps/texinfo-4.8
+	>=sys-devel/bison-1.875"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 5fad2e9ecf50..4e6fb049fb3e 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,15 +1,15 @@
-AUX make-3.82-darwin-library_search-dylib.patch 439 BLAKE2B a1588c20c4e7236a7bf07876de44cc29ac9a7eaee377fee02dfcaade966874480af418fad168cc7e148448e6b11900e55fb34da3fed4057931ea6b7df25604b6 SHA512 aaabf2e7faaa6f116c0124d30e8bc5c049fa471defc39c454e03e3f484265f30fc0388ea13154559925935d803315b5594780b41bbf1d1f7d1599a60f85cd8ac
+AUX make-3.82-darwin-library_search-dylib.patch 386 BLAKE2B 4341e38aa89d08442dde331a7640b95771fb2cad824a32642c8b6bfbcffe609ae1af189d3e49c2eb529cfcbe10e137b9dc34cee3d7aecc8995c9a4459817bc8a SHA512 abd63b6a6d0b3bf77c5f26f0f711d148dd47964564d17562d9714272ff37700afffad50d77d5921c47b1f3eb705112b854ad15933740751071d2579123f9f259
 AUX make-4.0-char-cast.patch 1399 BLAKE2B c4923356f8b6807008dff15612d1c10ac729399f348bf45f9a276a79b8f9dabdc1d107b8c814bd85cbb5e542eab5995edfd590ecf1655cff49e83dffda5a76e8 SHA512 7d1490094b01362bba40cb0d2088d2ee79b9bd6756e4ea51920675ca305acfc653cdf92df5735e4e40360ece6c9de6dafcdd542df6b9821de8b1345b8ad2fb1b
 AUX make-4.1-fix_null_returns_from_ttyname.patch 1888 BLAKE2B 2aee82af5c6d2f8b5fb1d45be2708b6c0f5632236a0be948f16e1e59bd6619145913d4920c8428907479ae29fbc105663f9bbcbd3951ba60b8cead5793b34f65 SHA512 47eb22909be25618fbc120fe5b844207989135101ada960c69557f898b2345c52a25fc329945324cd968f19fc3835330d939cf4ec2faf5ccf5c54e20dc02a1da
 AUX make-4.2-default-cxx.patch 269 BLAKE2B 6bbadfe43e3494c7dbd423edc5caf1eba1b6c3bb8f3b2f04368ccbe5c03f248a2692ba1b2299b966bd630c94e2b66674c079eaafa9b3b3c54bd163e75ac53f9f SHA512 b9c6254c8111111d9986de617023fad1673a8992d5a8b2e1e5ce32a92f5e4d064e1a9677b44f1d647a54ddd1c62782eccfd2d71ddc8d41baee141f65bdc894fe
 AUX make-4.2.1-glob-internals.patch 1752 BLAKE2B 97616f18dcc30dbda296942d7dfa5b1a70c65e6d0c24314c5ae6b30102b81ff5ca0114f9c2a2fa777173204bf5bb0ea9b793317d2d7f7d44ae734e9174c6f361 SHA512 79b5454fa2f1e976611ecf5de99e764d4c9a85917d3d97ce424cd56b0954430f3e31fd2254a30320469f0b30c464734e3633b89d8374b3e4b8d182a342325ab1
-AUX make-4.2.1-glob-v2.patch 845 BLAKE2B 8d5caeece460588fb22cee971e0e3257115fd5ce5b1dfc1b487f9d33fee8545b10bb69e6b2c34cbe54f416819ead8c45db67197332d0e82c1664722b87caa384 SHA512 0a52b1b204e26b397c1d90e27a3b79ea23847d2bdf83a25f620af96f20f81061301414e489422ca5bb313110c33bd142191672f6b188e9276b76f0ce6f0fd8bb
+AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4
 AUX make-4.2.1-perl526.patch 655 BLAKE2B 98bc8bf7ec5bcdb0d726b046ae58cebada8e360087da4c212da19a4cda622c5bbc1c00782802589aee3142a62c3b8a2df18cfa8bc98c523e2eb65aaa29398a6d SHA512 3817f6efed5fbcd2bb9d1747bea4af5a197ef4aa552ab79accee5139d25241956eca669edd19eff32df2a51fee666b6bc398fb6277b1f92f6175eca2d2228d6e
 DIST make-4.0.tar.bz2 1341927 BLAKE2B 84cef70a3611da0172610f083ba18f87317c6bf89a71e53ebd7ed6881a6bc1c81897167cdd9dc09ba4754479b6337c746eb2716b2925aeae7d6488a3c1a81771 SHA512 82de265963cd08701491e02a4917cd2097762657257a9508119e5847050d0cb15580c163159463e822860435c5910190677d8e4aba644ba75df2895f26117376
 DIST make-4.1.tar.bz2 1327342 BLAKE2B 4a93f893d219e2ac16a87f19de018f1d794a1f4c70c2a57dea52ccaa452b288bfbea0e422a880efcb457f666f41a40913a214e0feae4cc7edcebb8ec945bd72c SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
 EBUILD make-4.0-r1.ebuild 1284 BLAKE2B 124d6a7ba1e715ce7f584991c209b53e803fcdb2e9b423481a0e46f8e868a48a19db282554d21a7a75603a72865d25986f746647ceadfe2b833bf4f0b8875598 SHA512 5c2d8ff215eca2f4179c05646a3d5bb67d2aee689e0dae23b964feacada4c166096af46ebaf5b1af20f4cf74c4b3f5275df4a1d7571643079a09de407b64a38f
 EBUILD make-4.1-r1.ebuild 1294 BLAKE2B 79312e1a1af06a8a44aa014226e5c1dbdb16ffdeeb65053181552257f62231f0f5b0e88287a97c4c6eb721d76e02f4a07ea5f7523329ee5497f3f180034e9de5 SHA512 87afba6be03d935e44f94547d12f1bc265774481a065834694b42f083675fb7b01ad00233321c096e1e93e23436cdacb20933b164687b4713d821daecaaff0d1
-EBUILD make-4.2.1-r1.ebuild 1474 BLAKE2B f36146c30046ecbc878b2d245c02252e28b8b73bde5a88e52e8659f7ebec40761a6f24c0b3c5ae8539f953881aa04461535cb9314a04b72ef80cc78fcfe4363b SHA512 91cfeba3d078190d0fa63fe47e54e7775deed15044a378ea700d1271d68cb2a726118efc970966f0677b2a6b3ff7ec8531438915b2862d61d9ad51e26e53766e
+EBUILD make-4.2.1-r2.ebuild 1634 BLAKE2B f8a2a88bd7fb97e3f8723ea977d1b56e4a1030a91fd13f819eb9d2027efe1bee13d6722f2d48b30f6eaddc3d6b2b8d31dda076e95db1330ab30d554d206ee0b7 SHA512 ad948abed2465ee7ab3597a57d5ea1d301249d8dd85be4dda3959885f482df80a0346cb9bd3edc0ccea2cb504b638d4d5ebedff82917d6785dedaef45cd56562
 EBUILD make-4.2.1.ebuild 1333 BLAKE2B 5c9786bcb8119c2e2f98ff07607686ab16638e663c21374504be9687d85752dc58654fcc0aa6e2ff4c9eea25be066fc5409017923e82517d3df32eb32e950568 SHA512 d89725d226ac924816623c6a7237cacd0001c22540c8788808ea59473d526ce8d1bd4d573751569fe605f7c46145d5d7e2a647e86dae6276077fa3aeff915402
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch
index de7e4f615212..d2f60ec91cc0 100644
--- a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch
+++ b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch
@@ -1,8 +1,8 @@
 Fixed default libpatttern on Darwin, imported from prefix overlay.
 Got merged upstream:
 https://savannah.gnu.org/bugs/?37197
---- default.c.orig	2009-05-02 12:25:24 +0200
-+++ default.c	2009-05-02 12:25:58 +0200
+--- a/default.c
++++ b/default.c
 @@ -509,7 +509,11 @@
  #ifdef __MSDOS__
      ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
diff --git a/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sys-devel/make/files/make-4.2.1-glob-v2.patch
index a9aeb787cd72..e55a7790a3f6 100644
--- a/sys-devel/make/files/make-4.2.1-glob-v2.patch
+++ b/sys-devel/make/files/make-4.2.1-glob-v2.patch
@@ -1,17 +1,22 @@
-From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001
-From: Paul Smith <psmith@gnu.org>
-Date: Sun, 19 Nov 2017 15:09:16 -0500
-Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2
+http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
 
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8c72568..4710832 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
+--- make-4.2.1/configure	2016-06-11 01:03:21.000000000 +0200
++++ make-4.2.1/configure	2016-06-11 01:03:21.000000000 +0200
+@@ -11481,10 +11481,9 @@
+ #include <glob.h>
+ #include <fnmatch.h>
+ 
+-#define GLOB_INTERFACE_VERSION 1
+ #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+ # include <gnu-versions.h>
+-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+    gnu glob
+ # endif
+ #endif
+--- make-4.2.1/configure.ac	2016-06-06 14:27:31.000000000 +0200
++++ make-4.2.1/configure.ac	2016-06-06 14:27:31.000000000 +0200
+@@ -399,10 +399,9 @@
  #include <glob.h>
  #include <fnmatch.h>
  
@@ -23,6 +28,3 @@ index 8c72568..4710832 100644
     gnu glob
  # endif
  #endif],
--- 
-2.16.1
-
diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1-r2.ebuild
index d0f079cef26d..c52a434b513b 100644
--- a/sys-devel/make/make-4.2.1-r1.ebuild
+++ b/sys-devel/make/make-4.2.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit flag-o-matic eutils
+inherit flag-o-matic
 
 DESCRIPTION="Standard tool to compile source trees"
 HOMEPAGE="https://www.gnu.org/software/make/make.html"
@@ -25,20 +25,24 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
 	"${FILESDIR}"/${PN}-4.2.1-perl526.patch
 	"${FILESDIR}"/${PN}-4.2.1-glob-internals.patch
-	"${FILESDIR}"/${PN}-4.2.1-glob-v2.patch
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
+	default
+	# This patch requires special handling as it modifies configure.ac
+	# which in turn triggers maintainer-mode when being applied the
+	# usual way.
+	eapply -Z "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch
 }
 
 src_configure() {
 	use static && append-ldflags -static
-	econf \
-		--program-prefix=g \
-		$(use_with guile) \
+	local myeconfargs=(
+		--program-prefix=g
+		$(use_with guile)
 		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index cd52e53fc380..841ef28939a2 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -2,5 +2,5 @@ AUX patch-2.7.6-fix-test-suite.patch 2610 BLAKE2B e750283b85f0cb9d52324f28b8a030
 DIST patch-2.7.5.tar.xz 727704 BLAKE2B a7aefd05da73329ae301f0f6429306661d72fedd59c6d35acef4828c7e5951c0ce3e8cedfc8ed9ac45d45f6eff564c2e41c0ccb95fbe1c668f63844b7069520c SHA512 6620ac8101f60c0b456ce339fa5e371f40be0b391e2e9728f34f3625f9907e516de61dac2f91bc76e6fd28a9bd1224efc3ba827cfaa606d857730c1af4195a0f
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
 EBUILD patch-2.7.5.ebuild 911 BLAKE2B 3eda3342754fb82470d8abbd3a9b9e3ee24b6e8ed62f8d0629fa3b6c3e248a4b522aa1a0074011108d8a74ddf4a94d00aa8d8423efd1b7755b4895438fbe3180 SHA512 f15e1b045b40506b1390a98bcf71834e153bc99d03fac764fea092ada307ac9f36444919052ff4c3a13ba3d5cb9b2afb089f0694f95a19f2636cef43cf149698
-EBUILD patch-2.7.6-r1.ebuild 1006 BLAKE2B 65226ffe1d36be3f10d1ebb973295159f0cd64e6048a2773a95b2e748994466e127fba261a79d2d8a506dd31290ade69639821ae63c8457cfe41401657f05e74 SHA512 b23c82be5193c1f1b353db8534f6dbebdf20db0d83854a08daa0791789f97d96103ebfdfe69e80153dec58d55b79281f95e2c126d718e1cf0ce637df77e47c2e
+EBUILD patch-2.7.6-r1.ebuild 1005 BLAKE2B 736262b329a5cc34856a005ab62fb2155d8beb76f9ec51802301386cc6812c5f9e3ba9abe4054a4549f5521fd56921bf3d13120c7357190e596d3b3b236f0596 SHA512 2424eeed16176ee7b48388caf2dc2d066936d68812c017a2a78e010b7ed40ba36b971839888cfa6003daaf68ba3faaeeefa733fe6cfecca3e95fdfd354ea7689
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild
index 6da5e76b6d65..b4b3fdb87250 100644
--- a/sys-devel/patch/patch-2.7.6-r1.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 
 RDEPEND="xattr? ( sys-apps/attr )"
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 0af735bc7ba3..ed12799ed9a9 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,5 +1,5 @@
 AUX sparse-0.5.1-cmdline-include.patch 1886 BLAKE2B 328a414d8c24f02e682978b7b6fef225519f5c5036ebb6f052dc930536ceb7232dfd45ccd158eaa712d2c4c1c622261969c24703bf4b69d6b625c0be4d397204 SHA512 d4267e94d7603b421a1df09869706114b5f81867ddd1d758b1dd251232f645e4a0c14df1d2bb993c78d14afaa699f84f7754b62fae19d1ccabe28571550d92f7
 DIST sparse-0.5.1.tar.gz 278241 BLAKE2B 6004631c97e2a126d1e239aa1d8fcc540a92b3f63a6a2615f2f63b79a001495e8b27ffa7377c57b43227f3b50288be24cb4657c7801806f7c6d1d11b0f8c8ee9 SHA512 04a26e2b44d99e7402b5e8a8f61ecbd62adbc9c481a0c3c8e0ab2f9599d99f50679ce3f3d0c1ccfd6204c6ec5d9fa272f9fc4c4d21173897ebd592d14c6ee852
 EBUILD sparse-0.5.1.ebuild 1312 BLAKE2B bd5f1b80cfff1c5829436f4100e13c9e38aeb31de616762c10a995988d2edb45fbc0fd5283b2c9dcf1c01bc8176e556be62eff2632498b8b293bfe91b813685a SHA512 566ca832c7b3819268eff5b9ab152ffce778b6a55fcf492a19013f80597639757de06c24dcf6702cc2620ed2013e47a635fd7f7c32ec2047e7b04ab64575cb7d
-EBUILD sparse-9999.ebuild 1312 BLAKE2B bd5f1b80cfff1c5829436f4100e13c9e38aeb31de616762c10a995988d2edb45fbc0fd5283b2c9dcf1c01bc8176e556be62eff2632498b8b293bfe91b813685a SHA512 566ca832c7b3819268eff5b9ab152ffce778b6a55fcf492a19013f80597639757de06c24dcf6702cc2620ed2013e47a635fd7f7c32ec2047e7b04ab64575cb7d
+EBUILD sparse-9999.ebuild 1251 BLAKE2B f31c006640dfef734e03a74c8d8da8c1f36d3922877743e7680af2b5df316ff577fa36a098b43011284a46a68c36d8c4f0af408c8b3bf33c10587bd675cfeed5 SHA512 80eb19066e87eec2de992dda08f83723297074e6ebd00a4dc34c31866fd243fdae437704d15d178e4b79aff1fea0df34c893c1ff3501c776acf6299d580abae2
 MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index aad07d85db73..800ee845a61f 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -28,8 +28,6 @@ DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )
 	xml? ( virtual/pkgconfig )"
 
-PATCHES=( "${FILESDIR}/${PN}-0.5.1-cmdline-include.patch" )
-
 src_prepare() {
 	tc-export AR CC PKG_CONFIG
 	sed -i \