gentoo resync : 15.02.2018

20 files changed, 229 insertions, 295 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a107cc43625a..e4f7d7dd2a12 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 20587cd99e31..674ac5c87998 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -6,6 +6,6 @@ DIST autogen-5.18.12.tar.xz 1018412 BLAKE2B f8ac1efbd6c6afdaa248e3063cf43fe0d32d
 DIST autogen-5.18.4.tar.xz 1017936 BLAKE2B bc2b4d7143642baa923c49bfe37d60c0d3a0a3a09a9af504c5dc865f1054e4d510ca3144737c2098a75189a7335bc560ec26318689ebf6d1291969d5a081cfa2 SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6
 EBUILD autogen-5.18.10.ebuild 1155 BLAKE2B 5247ebdb86d1a049087ed0bb2b2ac0efef3d3a07e26943d035971c2bb55fc554d7dccd9c45b98355ae5a234a254c7744e29907e2e3467b7aeec878eed5991efb SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa
 EBUILD autogen-5.18.12.ebuild 1214 BLAKE2B 8ac64ad2743bcd3a3392adbc7dbbd40edb9f30ef0e721699fb5995b2688ef47ae7eca72bec7da59a546ad80f4fe6f1d02b5586a427b8ef804f668ed7c5b0cdc5 SHA512 5a58610c10865a0b73d0b5a347fd58d6f12a6cb2941a33920ef0be73f4b0b76938c8aaa62296ac948a73acaa9d4b82d6b4dd5061bccf18f2164846724739544c
-EBUILD autogen-5.18.4-r1.ebuild 1005 BLAKE2B dfeaef4b16c1f5d595f1de1bd45f708396b989bbe758572d44e3ca31ecda300c593c44402ccaba478f9469af9b186c1dc3e5a3ee09f2a1ee0837142bcd9597cd SHA512 753f60ae9aec07e18d7aff99579760b046e0009d2a98c330aba1333263c70a063b78b2187395cc15988430829616036f4548d44a4c31bb9ab0ab6235acd06ab6
+EBUILD autogen-5.18.4-r1.ebuild 1004 BLAKE2B d34792d63b7006fe750917af01043c57e44c4e2a52e8d37df5a42501c5ba1a3101d0cbc34766fbcdb3bb6ee38319a843d61c47dbf8100aa470cd0bea6751e035 SHA512 9e5e9db6af651b4ac29e579a9bd528d9e7d960c5dffd80544b9bdbd378c1fea642be6d4237301b2dc0e62ea18aa0418817619d56f57fbdc6b4d2e3669c299074
 EBUILD autogen-5.18.4.ebuild 988 BLAKE2B 33c9989c980c49e9831243f11711b8f056b1ad761859d35ca8e7a2591074cee3d52be9706ac7909b3af4d95dc411be153ff91d430bb4d6d6a0173645597457bf SHA512 703592e8e47e247aba37a140e015d25a46bd3c9d1b1cf4ad1ac49782e39b35b7a376cd27437d8f6969056d879630e0fb55d1e35fabddaa4730820ef549cf936b
 MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541
diff --git a/sys-devel/autogen/autogen-5.18.4-r1.ebuild b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
index 1b71af5b0771..ba2709a78820 100644
--- a/sys-devel/autogen/autogen-5.18.4-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4-r1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND="
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index efcca640fd4f..a8fd847ce73d 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -40,5 +40,5 @@ EBUILD binutils-hppa64-2.28.ebuild 650 BLAKE2B 6b0cf836068c33cbcb5a14a1e03e43cc8
 EBUILD binutils-hppa64-2.29.1-r1.ebuild 647 BLAKE2B c17820e537f67c2a26af197ee7ebb75176b82db1aeab7d4f43325cee6a535760953ed365d11e30dec733c6364e035c96f07620e5aa8ab980be043473db759ba8 SHA512 7076225bc7f9dcd90b69459acd42d06b592225bceb967e9f1a9058cc35080ecf3201116520fdac8a4a063aff6c4eb42bd0185ccbdcbc3c6017e1e34af51da993
 EBUILD binutils-hppa64-2.29.1.ebuild 676 BLAKE2B bf9da84ae57d3756e147bd875941758139551f3c0a61bc011109d33a26364a9e9d02ec4307679c849be2441864c8bad09463cee247f99f58a437f98dbf720f38 SHA512 435494d643ec9d50aa584df181a44bb386a993c78e34152d931f435fb60df9868c5c87a16cdcd24d5556056351d114375cc0d8e2d46e1d1fac9b3b81da7a3db8
 EBUILD binutils-hppa64-2.29.ebuild 650 BLAKE2B d5fe2e9a8c5fc3d906838e6c0621329e0082d4705d222a2c4d513bcbaf4e5e6cc64582ea8a8e41ae1deda4d8651bc299892990dcf15670eb8fb5248ea9b8333f SHA512 7786209f9e2c4e1fa40ec08b8a4ff1c89d1471a2f438a7b750cb4067b19520a1a9b9be0c46396b2e0d0b9ad4c0f2d82cbacf4e77397661b04d49da45ebac70fa
-EBUILD binutils-hppa64-2.30.ebuild 10684 BLAKE2B 72d9a1cbddb0c7720137d9f91fb8a6c113422bbd05c908de21baacf290f424cfba33d7df1462c620163f2fcb491c68fd5d760443c2e67a9b0baf79f1848d0586 SHA512 b38f1460886fe203d0551d580ae438ce541346883b30a01cb02d6baf1c7b7883e2282fb92b38f9dd7c087ae25fe3cd7266be16204867688bfd2e8d5180a586a2
+EBUILD binutils-hppa64-2.30.ebuild 10711 BLAKE2B d91a6fc2d813d54c6db206df19bb35b191fc7d1e5de8082b989436f88f1d99cc96a1140ab056f6bc7aac7ba4848d479cbd93d86269bd33e079a535d3b4218bbf SHA512 08b44c429c6d6dca8d75f39419a320fba335142e9fc9ae2a54c1fdd48f1d087e87a3dffc235314e1c2f36f38addb7230babd76a5aac6904a1cbe96767ac13ca0
 MISC metadata.xml 445 BLAKE2B 38db0981b080e996e57421a2c75b2ebb2172ef38c0cfadf4b6105901985e9d46b5ba1c939641747be35cfacb4e1928a9f711465b2e17909a282d0acf244b8be3 SHA512 dd2ce9defb3a005665ad2f495513c40b5420629e31a336f6640ef91c9effc6f062bd338a87fe70de8a6a2993dda9e141396b602a1e2b7445f15e6f33473d29ef
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.30.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.30.ebuild
index 36883ada0ff4..2d7dd1ef3938 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.30.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.30.ebuild
@@ -81,6 +81,7 @@ if is_cross ; then
 fi
 
 MY_BUILDDIR=${WORKDIR}/build
+S=${WORKDIR}/${P/-hppa64/}
 
 src_unpack() {
 	case ${PV} in
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index b045e5cc6399..50f26741bb24 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,9 +1,6 @@
 AUX dev86-0.16.19-fortify.patch 325 BLAKE2B 3747ed3c7cc2df559bfdec185e1db8d45138f2819cefcfeabe4687f4b270e18ddefd334403fcaacbff0a9f0882a5e9b473b7d42da649dc189b3f84fd47a082d5 SHA512 04195831db5802ae25a5a1957979b5439168c708d9d3702a62c1d267090fca59e565ac78bb3a6bfb312282ce002b52760903e9d4ab30f3c906568a70dc349696
-AUX dev86-0.16.19-memmove.patch 401 BLAKE2B 7d0a4fbc2a31ba764e52af652b698770a46657028addcd340e364b4e80d7c6e00965b13cd981dc2437179746a0a22652096eec7a271cc3811a38cec851a1c4c5 SHA512 4fa5ee815636048db2a0f5faeeb48b06e559639fb21be1db3319495bfe5f5e1ee1afcfc920d496845cf4bb3eae7ff4bf9aa77124638788f918ae27599d153a6a
 AUX dev86-0.16.21-non-void-return-clang.patch 425 BLAKE2B e781f5f38fb5cd4c427aaccc6d47f8935797bc92ac4024ca6bef2c40585ace38bd720e9cf4b3be391d81ff0e4e8708bbf5758979d544417e135430cbd1a06af8 SHA512 57781aab833999b86d57a4c62d686b61f11a64225debf82ca57252bfe5043d0bdef04749bbbf3e1af73a6d40242ebd5efa41b147e4677b7c8ed4b071c5100318
 AUX dev86-pic.patch 574 BLAKE2B e6566a39aad0a48b2b1c626630fce8071567c98efd06a37105e5012c6a0c06341a801809efb3d4b3da9ff2313bdbf14c14d885b9eed37ae6ca93011ec3b9edd3 SHA512 44f0649fbb4b2514ecdd54c988db1a5547d68afed2bff7ebe15163ff287fd4be81bc2d700ed92414caea5c967b7455817fdefd1d19a86609221940a495b5ceda
-DIST Dev86src-0.16.19.tar.gz 713688 BLAKE2B c62a552be801ff109ee30c403d43586e2601342bd6fe0902d287849a88778338764216663c5302e7401e2b09962e116f2e3569c144846e5fcec87523d69ff206 SHA512 4077f7ac800330eb4658ffaa53dc8cc982792b1dcd7a59625cba4a5dac494117c6bd4ec5307bf02349ad6ae3d0c0903ab2e41123a8df94373e469092fa005cd3
 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
-EBUILD dev86-0.16.19.ebuild 1854 BLAKE2B 49f3ee0daa8a7b1410aadd978a733862cd6a40556bc49f89b3921da2a64d1bd5217c1455ef97e87bd62a0a17a6b35436923fc2e62b05c35eec39925a65b24548 SHA512 17d24085519121a56639ce740c315faaa2815731e63420c5ad164b148acfa507a14a2caa6651dc13c597de2d008adbf07c6a7995cac7fdf300c13d98881459e5
-EBUILD dev86-0.16.21-r2.ebuild 1871 BLAKE2B 3046eb3fe8f3896bb4ed3ba3fb12a2e3beab636d6ffd2bfc968933b7f4a09b5dfd85456fb00a48b4a07fd9c3d296b8761f81eaff9887ac8c75aa8152630dbdcd SHA512 2df3325a2aed9ea2a9051c8a8e3e28c71c268a726188a25a0bff078d89f8981f27051625b16e887f0e4eee2128921fe8772e1e1f78ae3c8eba65f1ba3cd5dce2
+EBUILD dev86-0.16.21-r2.ebuild 1870 BLAKE2B e6da95b4a65b98d1215e109519c3400ed7b5189cacb1cda4cb0186bdb348134fd22b58b6e25ed2426c784e8a5e3ff0f11dc378ef642a361d200ff3323e9096d5 SHA512 5edc82cfd68a9e08bc5ef95b0fabfeca13bdf63a209ea3dfcb0730203bb7ca804c5c91aa60776668d6195c771f2ee38f55845f16b061b63a4ccc9a2bb561d9c3
 MISC metadata.xml 269 BLAKE2B 52fbe2001fcfbc7e12accb112937522d10be0763440ba36e3377bfab21d75b4a4e9507d7974c3434bf8c01bb24e939f91023d31909bc962aa3ead89c607f6ff1 SHA512 fc49c52f63fc653414208095ec460b4d991d1710b0ea92ca8ab598bca9316b42144e498503b79e7f1db22e3a8c26c009f51cf2d5eb0163a6afc18ed40d4541f2
diff --git a/sys-devel/dev86/dev86-0.16.19.ebuild b/sys-devel/dev86/dev86-0.16.19.ebuild
deleted file mode 100644
index 835423c7e4d1..000000000000
--- a/sys-devel/dev86/dev86-0.16.19.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86"
-SRC_URI="http://www.debath.co.uk/dev86/Dev86src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-devel/bin86"
-DEPEND="${RDEPEND}
-	dev-util/gperf"
-
-STRIP_MASK="/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
-
-src_prepare() {
-	# elksemu doesn't compile under amd64
-	if use amd64; then
-		einfo "Not compiling elksemu on amd64"
-		sed -i \
-			-e 's,alt-libs elksemu,alt-libs,' \
-			-e 's,install-lib install-emu,install-lib,' \
-			makefile.in || die
-	fi
-
-	epatch "${FILESDIR}"/dev86-pic.patch
-	epatch "${FILESDIR}"/${PN}-0.16.19-fortify.patch
-	epatch "${FILESDIR}"/${PN}-0.16.19-memmove.patch #354351
-	sed -i \
-		-e "s:-O2 -g:${CFLAGS}:" \
-		-e '/INEXE=/s:-s::' \
-		makefile.in || die
-	sed -i \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		bcc/bcc.c || die
-	sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die
-	sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die
-}
-
-src_compile() {
-	# Don't mess with CPPFLAGS as they tend to break compilation
-	# (bug #343655).
-	CPPFLAGS=""
-
-	# First `make` is also a config, so set all the path vars here
-	emake -j1 \
-		DIST="${D}" \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/bcc" \
-		INCLDIR="/usr/$(get_libdir)/bcc"
-
-	export PATH=${S}/bin:${PATH}
-	cd bin
-	ln -s ncc bcc
-	cd ..
-	cd bootblocks
-	ln -s ../bcc/version.h .
-	emake DIST="${D}"
-}
-
-src_install() {
-	emake -j1 install-all DIST="${D}"
-	dobin bootblocks/makeboot
-	# remove all the stuff supplied by bin86
-	cd "${D}"
-	rm usr/bin/{as,ld,nm,objdump,size}86 || die
-	rm usr/man/man1/{as,ld}86.1 || die
-	dodir /usr/share/man
-	mv usr/man usr/share/
-}
diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
index 832575fed108..0e731cc95637 100644
--- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="sys-devel/bin86"
diff --git a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch b/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
deleted file mode 100644
index 12df3f672624..000000000000
--- a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/354351
-
-fix sniped from Debian:
-* Fix "FTBFS: ncc: illegal label": apply patch by dai that replaces strcpy
-  by memmove (closes: #591133).
-
---- copt/copt.c
-+++ copt/copt.c
-@@ -174,7 +174,7 @@
-   /* Delete leading white spaces */
-   for (cp = buf; *cp && isspace(*cp); cp++) ;
-   if (cp != buf && *cp)
--	strcpy(buf, cp);
-+	memmove(buf, cp, strlen(cp) + 1);
- 
-   return(buf);
- }
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index a5af64b910f0..cd52e53fc380 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -1,5 +1,6 @@
+AUX patch-2.7.6-fix-test-suite.patch 2610 BLAKE2B e750283b85f0cb9d52324f28b8a03087980e8a61b16c3465914eeca65a3b800d8946a10c4dd0ab08b18c1cbc37810e55fb5c35314082a8c11e383b7d50d1bd3f SHA512 7ced1f9b937bf62131654d8a25c8d2a3f3cfe5fa8961e2e000542cce68061b10895bc0001ded898b9a43608af1f9c07903dc5c2f0a41662470d97188ed682115
 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.ebuild 957 BLAKE2B 0fa435619e2068fbd100ca5947c52291b53b18755d7d19e45a8fa26c828e6b2f9e2d032296864ee8fe4e741a3b90b8eba41f5602475d22db2f453c172d06c696 SHA512 aec57551782124eef9727a693638a7a9965f5fedb417fa99dbb64377f4d4501d1d6ff1e2ca4b243f1a27cca25124edcb0ea784dea8744b1885e1be55365cafe3
+EBUILD patch-2.7.6-r1.ebuild 1006 BLAKE2B 65226ffe1d36be3f10d1ebb973295159f0cd64e6048a2773a95b2e748994466e127fba261a79d2d8a506dd31290ade69639821ae63c8457cfe41401657f05e74 SHA512 b23c82be5193c1f1b353db8534f6dbebdf20db0d83854a08daa0791789f97d96103ebfdfe69e80153dec58d55b79281f95e2c126d718e1cf0ce637df77e47c2e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch
new file mode 100644
index 000000000000..3aff5c0f77ba
--- /dev/null
+++ b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch
@@ -0,0 +1,120 @@
+http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288
+http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5
+
+--- a/tests/crlf-handling
++++ b/tests/crlf-handling
+@@ -14,7 +14,7 @@ use_local_patch
+ use_tmpdir
+ 
+ lf2crlf() {
+-    while read l; do echo -e "$l\r"; done
++    while read l; do printf "%s\r\n" "$l"; done
+ }
+ 
+ echo 1 > a
+--- a/tests/git-cleanup
++++ b/tests/git-cleanup
+@@ -36,8 +36,8 @@ BAD PATCH
+ EOF
+ 
+ echo 1 > f
+-echo -n '' > g
+-echo -n '' > h
++printf '' > g
++printf '' > h
+ 
+ check 'patch -f -i 1.diff || echo status: $?' <<EOF
+ patching file f
+--- a/tests/merge
++++ b/tests/merge
+@@ -30,30 +30,28 @@ x2() {
+     while test $# -gt 0 && test "$1" != -- ; do
+ 	echo "$1"
+ 	shift
+-    done > a.sed
+-    echo "$body" | sed -f a.sed > b
++    done > b.sed
++    echo "$body" | sed -f b.sed > b
+     shift
+     while test $# -gt 0 ; do
+ 	echo "$1"
+ 	shift
+-    done > b.sed
+-    echo "$body" | sed -f b.sed > c
+-    rm -f a.sed b.sed
++    done > c.sed
++    echo "$body" | sed -f c.sed > c
++    rm -f b.sed c.sed
+     output=`diff -u a b | patch $ARGS -f c`
+     status=$?
+     echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d'
+     cat c
+-    test $status == 0 || echo "Status: $status"
++    test $status = 0 || echo "Status: $status"
+ }
+ 
+ x() {
+-    ARGS="$ARGS --merge" x2 "$@"
++    ARGS="--merge" x2 "$@"
+     echo
+-    ARGS="$ARGS --merge=diff3" x2 "$@"
++    ARGS="--merge=diff3" x2 "$@"
+ }
+ 
+-unset ARGS
+-
+ # ==============================================================
+ 
+ check 'x 3' <<EOF
+--- a/tests/test-lib.sh
++++ b/tests/test-lib.sh
+@@ -41,7 +41,7 @@ use_local_patch() {
+ 
+     eval 'patch() {
+ 	if test -n "$GDB" ; then
+-	  echo -e "\n" >&3
++	  printf "\n\n" >&3
+ 	  gdbserver localhost:53153 $PATCH "$@" 2>&3
+ 	else
+           $PATCH "$@"
+@@ -113,22 +113,15 @@ cleanup() {
+     exit $status
+ }
+ 
+-if test -z "`echo -n`"; then
+-    if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
+-	eval '
+-	    _start_test() {
+-		echo -n "[${BASH_LINENO[2]}] $* -- "
+-	    }'
+-    else
+-	eval '
+-	    _start_test() {
+-		echo -n "* $* -- "
+-	    }'
+-    fi
++if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
++    eval '
++	_start_test() {
++	    printf "[${BASH_LINENO[2]}] %s -- " "$*"
++	}'
+ else
+     eval '
+ 	_start_test() {
+-	    echo "* $*"
++	    printf "* %s -- " "$*"
+ 	}'
+ fi
+ 
+--- a/tests/merge
++++ b/tests/merge
+@@ -32,7 +32,7 @@ x2() {
+ 	shift
+     done > b.sed
+     echo "$body" | sed -f b.sed > b
+-    shift
++    test $# -eq 0 || shift
+     while test $# -gt 0 ; do
+ 	echo "$1"
+ 	shift
+-- 
diff --git a/sys-devel/patch/patch-2.7.6.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild
index b16c1511b888..6da5e76b6d65 100644
--- a/sys-devel/patch/patch-2.7.6.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r1.ebuild
@@ -11,13 +11,15 @@ 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 )"
 DEPEND="${RDEPEND}
 	test? ( sys-apps/ed )"
 
+PATCHES=( "${FILESDIR}"/${P}-fix-test-suite.patch )
+
 src_configure() {
 	use static && append-ldflags -static
 
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 970882008ac9..0af735bc7ba3 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,9 +1,5 @@
-AUX sparse-0.4.3-gentoo.patch 1446 BLAKE2B 432086bedcb87765f350abcfa367aec73193d27034915372667845e8d3d4bf16187f20e8b0a6f61d31f7ceab6fae5604d975fbf84fb320fd55258e958b86dc8e SHA512 a270266af0ce1728b114092271e627f63f8e55339b06c67634825a7c89a7cf7e1af17cdd47b5dab7475ef7eca39b95026264c870dee2c3a228c63af0bbdec461
-DIST sparse-0.4.3.tar.bz2 172431 BLAKE2B 06864e372e676a5f0426612774f1df2d224e8e6a12b8f7edf7056225b19725e876196c12e4c92a9a2b64eb410c8a840f777b4df2ffb9945079f4903562fb0633 SHA512 ff3dbd3e28b1a95dc9d6abf9a4ffdfaa0f470047b8232bd50930839432ae66a2249adb861c880e8eef1a906b007fd7d1c1ef8683c48c763eb523aedc9e1df631
-DIST sparse-0.4.4.tar.bz2 174074 BLAKE2B d57c5ec6f837ef1fa8992b5ec21f467583888d9ac3b7699a73e6b8fa80046253cdc554a4c685c2d98474a18fee6fca26fa004d3afa74b18c8f58b05a2900d589 SHA512 5cd5e660ea863170e86f1abaa040434c43a5cc7e92560f1bcbcce9ce906ae7355c066168bfc1dcc551e41e4c0f864122be288ed69eb1c4cda8b7c0825b5b647f
-DIST sparse-0.5.0.tar.xz 187576 BLAKE2B c525ce2a11143cd2dbeaff3e8cb1eb66b1792a678946ce001f76ac9882cd54cce4d4c5ff740c12e0e54ca91a6a2dc57bc7682ff8653333014fcc382e662ba596 SHA512 0cb70a74034c4bc4d5340ab7d19288a438f4b6d0c4c63ac95d1f4cc3c5fdfe1370a27a607605a6f0c85ea6f371141c55abfdb4438d9e87b2d544fff5674f7ce4
-EBUILD sparse-0.4.3.ebuild 1322 BLAKE2B 749e70acabe5932b09851d5b51aabeb05cc0de325cc153f4fc5966df9047e6d14fbba8d81de1798397121a3836be45768beffe9e28a2bd3b98eb3988066deacb SHA512 6fd02eeb079aa4d042dbb541943c3a7b3e2c53dca0f06230fa627bb89558259a9bd78c7b54f4f5f87a4fc9318db0894aa7d3e6fa924d5d841099ab95913d8d83
-EBUILD sparse-0.4.4.ebuild 1167 BLAKE2B 1f82b207002f728ac590fa648edfd56b1175110e8d00a73c212f2a163a06ca9fc87c1423035625da6dc455349cbcbfa44a74d63650c738af0eb7366078562240 SHA512 02606f9f9925a0c10b40512dc292a16d9ef98a8cb40194bb5a00950e1f3efe68074d1b00b438b38e7bb2a61f4b076b05dbad68f2eeaa8d4506fbb45070ab1cdc
-EBUILD sparse-0.5.0.ebuild 1226 BLAKE2B c3f3fa210aa80790711b1258d2b49f3891cd7a7b4653432a90c0f0e35fbe56713f73ff4b31743deda6c34bbb44ff3207241e55e6459bf5d3376f58b4da2f9cf1 SHA512 2bad4ec621b8e2998fc8cd909031060b15df6d93343582aa2f51553aa681ab58a0b3a9b58999d7e9dfe7d332baf57a4c6ed6b448389efe3e3db44399cf1aca2e
-EBUILD sparse-9999.ebuild 1226 BLAKE2B c3f3fa210aa80790711b1258d2b49f3891cd7a7b4653432a90c0f0e35fbe56713f73ff4b31743deda6c34bbb44ff3207241e55e6459bf5d3376f58b4da2f9cf1 SHA512 2bad4ec621b8e2998fc8cd909031060b15df6d93343582aa2f51553aa681ab58a0b3a9b58999d7e9dfe7d332baf57a4c6ed6b448389efe3e3db44399cf1aca2e
-MISC metadata.xml 525 BLAKE2B 956633b76bd4f8edde355ea0cec33cc8b3724eeb74bb14f8d2e21a50c0463d5edcc98d2d254f1c87bd246c7148827cdc977d532c847e4bc0ada7395d0b13baa6 SHA512 13276deb8b8de0457f74caaeef8cb268af9489f66b6714e376cf78927890b011f5523f284cc069ff5f955d78ddcf83d21db035d24ea3b7c4b670350e17f9aaa5
+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
+MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859
diff --git a/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch b/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch
deleted file mode 100644
index 6f46687d78b3..000000000000
--- a/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 74905df..1f2b2b6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,7 +4,7 @@ OS = linux
- 
- 
- CC = gcc
--CFLAGS = -O2 -finline-functions -fno-strict-aliasing -g
-+CFLAGS ?= -O2 -finline-functions -fno-strict-aliasing -g
- CFLAGS += -Wall -Wwrite-strings
- LDFLAGS += -g
- AR = ar
-@@ -21,7 +21,8 @@ HAVE_GCC_DEP:=$(shell touch .gcc-test.c && 				\
- 		echo 'yes'; rm -f .gcc-test.d .gcc-test.o .gcc-test.c)
- HAVE_GTK2:=$(shell pkg-config --exists gtk+-2.0 2>/dev/null && echo 'yes')
- 
--CFLAGS += -DGCC_BASE=\"$(shell $(CC) --print-file-name=)\"
-+GCC_BASE = $(shell $(CC) --print-file-name=)
-+CFLAGS += -DGCC_BASE=\"$(GCC_BASE)\"
- 
- ifeq ($(HAVE_GCC_DEP),yes)
- CFLAGS += -Wp,-MD,$(@D)/.$(@F).d
-@@ -113,7 +114,9 @@ SED_PC_CMD = 's|@version@|$(VERSION)|g;		\
- 
- all: $(PROGRAMS) sparse.pc
- 
--install: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc
-+all-installable: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc
-+
-+install: all-installable
- 	$(Q)install -d $(DESTDIR)$(BINDIR)
- 	$(Q)install -d $(DESTDIR)$(LIBDIR)
- 	$(Q)install -d $(DESTDIR)$(MAN1DIR)
-diff --git a/parse.h b/parse.h
-index 6b21e23..b26bd03 100644
---- a/parse.h
-+++ b/parse.h
-@@ -35,10 +35,6 @@ struct statement {
- 		struct /* declaration */ {
- 			struct symbol_list *declaration;
- 		};
--		struct /* label_arg */ {
--			struct symbol *label;
--			struct statement *label_statement;
--		};
- 		struct {
- 			struct expression *expression;
- 			struct expression *context;
diff --git a/sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch b/sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch
new file mode 100644
index 000000000000..5ea763001a05
--- /dev/null
+++ b/sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch
@@ -0,0 +1,66 @@
+diff --git a/validation/include-eval.c b/validation/include-eval.c
+new file mode 100644
+index 000000000..bf9bf63fe
+--- /dev/null
++++ b/validation/include-eval.c
+@@ -0,0 +1,7 @@
++/* nothing */
++
++/*
++ * check-name: include-eval.c
++ * check-command: sparse -include ./include-eval.inc $file
++ * check-known-to-fail
++ */
+diff --git a/validation/include-eval.inc b/validation/include-eval.inc
+new file mode 100644
+index 000000000..e2561ca41
+--- /dev/null
++++ b/validation/include-eval.inc
+@@ -0,0 +1,12 @@
++typedef unsigned long long_t;
++
++inline
++static unsigned int ok(void)
++{
++	return sizeof(long_t);
++}
++
++static unsigned int ko(void)
++{
++	return sizeof(long_t);
++}
+diff --git a/lib.c b/lib.c
+index 4602cf85d..b255fec14 100644
+--- a/lib.c
++++ b/lib.c
+@@ -1351,6 +1351,20 @@ struct symbol_list *sparse_initialize(int argc, char **argv, struct string_list
+ 		 */
+ 		protect_token_alloc();
+ 	}
++	/*
++	 * Evaluate the complete symbol list
++	 * Note: This is not needed for normal cases.
++	 *	 These symbols should only be predefined defines and
++	 *	 declaratons which will be evaluated later, when needed.
++	 *	 This is also the case when a file is directly included via
++	 *	 '-include <file>' on the command line *AND* the file only
++	 *	 contains defines, declarations and inline definitions.
++	 *	 However, in the rare cases where the given file should
++	 *	 contain some definitions, these will never be evaluated
++	 *	 and thus won't be able to be linearized correctly.
++	 *	 Hence the evaluate_symbol_list() here under.
++	 */
++	evaluate_symbol_list(list);
+ 	return list;
+ }
+ 
+diff --git a/validation/include-eval.c b/validation/include-eval.c
+index bf9bf63fe..1a91dab84 100644
+--- a/validation/include-eval.c
++++ b/validation/include-eval.c
+@@ -3,5 +3,4 @@
+ /*
+  * check-name: include-eval.c
+  * check-command: sparse -include ./include-eval.inc $file
+- * check-known-to-fail
+  */
diff --git a/sys-devel/sparse/metadata.xml b/sys-devel/sparse/metadata.xml
index 58fef00ea442..ee8e0692a0ca 100644
--- a/sys-devel/sparse/metadata.xml
+++ b/sys-devel/sparse/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>toolchain@gentoo.org</email>
 		<name>Gentoo Toolchain Project</name>
diff --git a/sys-devel/sparse/sparse-0.4.3.ebuild b/sys-devel/sparse/sparse-0.4.3.ebuild
deleted file mode 100644
index c351211de29d..000000000000
--- a/sys-devel/sparse/sparse-0.4.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib flag-o-matic toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	inherit git
-fi
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.bz2"
-	KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-fi
-
-LICENSE="OSL-1.1"
-SLOT="0"
-IUSE="gtk xml test"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-src_prepare() {
-	# https://cgit.gentoo.org/proj/sparse.git
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-mymake() {
-	usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
-
-	emake \
-		V=1 \
-		CC="$(tc-getCC)" \
-		GCC_BASE="$(gcc-config -L | cut -d : -f1)" \
-		HAVE_LIBXML=$(usex xml) \
-		HAVE_GTK2=$(usex gtk) \
-		PREFIX=/usr \
-		LIBDIR="/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		"$@" \
-		|| die
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-
-	mymake \
-		$(use test && echo all) all-installable
-}
-
-src_install() {
-	mymake install
-	dodoc FAQ README
-}
diff --git a/sys-devel/sparse/sparse-0.4.4.ebuild b/sys-devel/sparse/sparse-0.4.4.ebuild
deleted file mode 100644
index 51173588d3c2..000000000000
--- a/sys-devel/sparse/sparse-0.4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	inherit git-2
-fi
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="OSL-1.1"
-SLOT="0"
-IUSE="gtk test xml"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-src_prepare() {
-	tc-export AR CC PKG_CONFIG
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^CFLAGS =/{s:=:+= $(CPPFLAGS):;s:-O2 -finline-functions::}' \
-		-e "s:pkg-config:${PKG_CONFIG}:" \
-		Makefile || die
-	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LIBXML=$(usex xml)"
-}
-
-src_compile() {
-	emake $(usex test all all-installable)
-}
diff --git a/sys-devel/sparse/sparse-0.5.0.ebuild b/sys-devel/sparse/sparse-0.5.1.ebuild
index 8771de72828a..aad07d85db73 100644
--- a/sys-devel/sparse/sparse-0.5.0.ebuild
+++ b/sys-devel/sparse/sparse-0.5.1.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
 inherit eutils multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	inherit git-2
-fi
 
 DESCRIPTION="C semantic parser"
 HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
 
 if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
+	KEYWORDS=""
 else
-	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.xz"
+	SRC_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git/snapshot/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-LICENSE="OSL-1.1"
+LICENSE="MIT"
 SLOT="0"
 IUSE="gtk llvm test xml"
 
@@ -31,15 +28,18 @@ 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 \
 		-e '/^PREFIX=/s:=.*:=/usr:' \
 		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^CFLAGS =/{s:=:+= $(CPPFLAGS):;s:-O2 -finline-functions::}' \
+		-e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \
 		-e "s:pkg-config:${PKG_CONFIG}:" \
 		Makefile || die
 	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)"
+	default
 }
 
 src_compile() {
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 8771de72828a..aad07d85db73 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
 inherit eutils multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	inherit git-2
-fi
 
 DESCRIPTION="C semantic parser"
 HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
 
 if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
+	KEYWORDS=""
 else
-	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.xz"
+	SRC_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git/snapshot/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-LICENSE="OSL-1.1"
+LICENSE="MIT"
 SLOT="0"
 IUSE="gtk llvm test xml"
 
@@ -31,15 +28,18 @@ 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 \
 		-e '/^PREFIX=/s:=.*:=/usr:' \
 		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^CFLAGS =/{s:=:+= $(CPPFLAGS):;s:-O2 -finline-functions::}' \
+		-e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \
 		-e "s:pkg-config:${PKG_CONFIG}:" \
 		Makefile || die
 	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)"
+	default
 }
 
 src_compile() {