gentoo resync : 09.06.2018

33 files changed, 44 insertions, 251 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 78ff319452b8..1c747c91ed91 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 75129de0b7c8..269544af485f 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -17,6 +17,6 @@ EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9aaa547bcd671deaff719e9d95e66265a12c7845ea7a98de4337263230ac69f0f634c29a6bead78fa13820dca280f SHA512 4137e36156afbfd4ddc6ba08b6fc94e37556375c42f77e21d72d8338e55af094ef28bcbdfcf2c686232b5932208562f38b64db8638d2199ecfc2465518544267
 EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
-EBUILD binutils-2.30-r2.ebuild 11863 BLAKE2B fcb470f8cfb7200246caa4cab16e18117a34197987a6de9f52c420ea6fa4ba3b617d33aeabe3981461d0ce5d3e1295694a2ee3a8666e186f9fffa289b614e965 SHA512 ed5c7dc6b0f7921cb1aa4c356015677d68235592cfbb8f59ef32b9db49af83747887874942f1e904d370680ef184f5feb8d32992d2710c1c9ba27dd23b8d0e54
+EBUILD binutils-2.30-r2.ebuild 11860 BLAKE2B cd7004b73bffcff8f86fb480060a409f72d8bf211e552779caaf3d897b842d5ec4ea653780b6bc7e5a2f14540458907af6c6b1385bcbb78c7d5d7b45a5eb8c39 SHA512 398a95f3f73b1b5c9f0397a9c3cc7d79b325ab1b62f17f3df78cd6dcebd4fbeaf437f7c07f9966c5944c2c4fd7ab797b23c279d80f5226ad4b58e7dfab7c6e38
 EBUILD binutils-9999.ebuild 11665 BLAKE2B e2db3d6e08d5ad51b485f62b08fbc43a5440299a9e92bbcbee18143c4f31e1f2035d58fd4479bff28985fa5e0c69293631a36bee475e4ee94a6c3c01149dd55d SHA512 08172266dac34ff37dfa143c13734d5a9d4a5eb0fca572b3ab47123403c728c01b75afe9f83fb4edafe6f309b45123cb5a3d44c617b824900388a7f0ab88e6b1
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-2.30-r2.ebuild b/sys-devel/binutils/binutils-2.30-r2.ebuild
index 31336ee7d67d..d88d5caf9dd3 100644
--- a/sys-devel/binutils/binutils-2.30-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.30-r2.ebuild
@@ -35,7 +35,7 @@ case ${PV} in
 		;;
 esac
 SLOT="${BVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 #
 # The Gentoo patchset
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 7c48df7d8e3c..d3bf6440b341 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,14 +1,8 @@
-DIST bison-1.875d-patchset.tar.bz2 698 BLAKE2B a68e6009c24437a36c81e7fb97112f8ad721217b65a03531e5375e7310988f81d8c868485bdfc9b4ea99d4285ead91ad8f4670fb358abe92dc206cf6df4c80a1 SHA512 ac650b6f1b2b26057eda0d9ceae6f36604c88a67419b6190e423a08f863c460ded2a58040a71ce79b5e0b85ab3ede1b7a2ebd204c9bd8eb53f6551f39b160beb
-DIST bison-1.875d.tar.bz2 882745 BLAKE2B c85ce71986ae095e9dcfa24c1a9c7c484b3663994c1e394b7cc78a0ec1cc95df60369ff9878ef82edb4be144298d8648e336e861de98152bf79f6d66369c6dd4 SHA512 f84c6cf41a289ea7e0805cf9b0da6fe2d77f2e03a35c3db7d2e36e5186bba7c0853c3d518bd89f6cfa1030e346e046aa03b33974bb892dbd8f040e5ea2de1126
-DIST bison-2.4.3-patchset.tar.bz2 1102 BLAKE2B 3615841400ba984e563933d31e59a4810e17aed48b8314a3ceb66b47b2ad432e287cf9588b632594311f68d28d2bcce3c6a4f2c4be527c676fcbfd2a4480d04a SHA512 a36cf45b475e55e8baae265e43a151d3324026878d4bb4c119b9fccfc7be3c26ed183632bf210fdb587e2741d298df1e9d4ebb6c3d440f6ae33f40a29949f7a0
-DIST bison-2.4.3.tar.bz2 1652612 BLAKE2B 712444aec9898d2dc5dabd5008363f22f6beeb37e119edbdecb119965652e707d827e621c061b13be2206e29da59d661f1466c976c200ce749cf24062dbb5cf1 SHA512 b789f55d9cb95c1b4fba004691ed9f79b76da55020c9b202e1704a02aab1ba43b9fc1015e29843ed552e6df6165cef9c6ebc8a29d15a21c6e194cad8a42ab055
 DIST bison-2.7.1.tar.xz 1781068 BLAKE2B bd3161bcf4d2a9f046073280a8d751eb770147f942d48326a9ac869cf31fd8f127759167dced662b826fa54a24cd0cf87b0c096814c84e34afed8078368828a1 SHA512 ac0c7ca57142bcb84af498f606acb86091984a00359294fbf721a4ca8112f9fcf26497f7dd2e65f527e04a6e1de94142ecb76602d407e548475970e5a566d370
 DIST bison-3.0.4-patchset.tar.xz 8216 BLAKE2B dd059a7a24faf351fa28bc72b6e183935d4409f91b5dcd8640a14d01b480a3e5b28ddb8f5660f16300a3cf1639d67bd3436d016fa304bb4666c9a43fd7897bd7 SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b
 DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c898df7f0f79c26207599227f40e9ef54f93b2e231e20766ab9a19c0b266545bc5d0bfeabbb958e3e2f6686386c SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
 DIST bison-3.0.5-patches-01.tar.xz 5192 BLAKE2B ee5bbd59569b484e62dbd820a9795fa6d89c79fed96aa0615ec3baa067ae1f0f7ea6eadccf94d20458fc18d5977e8eac4e50a1a5f41f51519d8ff9f58dc78ab4 SHA512 f5df3896a113b6ce4a361d61b0139ee2ed4e0bda4a46e6312ae2ded0c7a1b2d2b67b37545c0bcad806f9289954022ff446c00bc2384dfff4049afb53e4657ed5
 DIST bison-3.0.5.tar.xz 1954868 BLAKE2B b6a8b426304f414c1b7601e75dcae8a63847b71361fba2538ad5cc52f3527fe464b066add670a236d5e1d2aff65bbe7a99c282ee3c72a0bfaa498d40e3a50398 SHA512 00b448db8abe91b07e32ff5273c6617bc1350d806f92073a9472f4c2f0de5d22c152795674171b74f2eb9eff8d36f8173b82dacb215601bb071ae39404d4a8a2
-EBUILD bison-1.875d.ebuild 1758 BLAKE2B 8e97849ea19b9d0ba6ed5e8d0a1012a3e8dab6f4ad553d5fafc7906272ca36b2d9658cf30711efdaadad5c5328c83493f9e503050a9e3d5e41f7cd469bdd068a SHA512 16495d16c9455581c6ef3749c93968e40bb209cc31e154e60bae733853b16868836af7a5c16c5dd3f39da73fb1a169990799f7262506ba7627fc5bdfc35bf074
-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 2469 BLAKE2B 6a0f5900ccd90f71bab9816e0e78a0bcd34f8e4f71517afb8c5d17422e1a19fdc5fe96c06827d4dcbce487b8293b34c36857a133c5ba79cc8c95876ff46057cb SHA512 5cd934e6cb839e468062f726317758e57e9d34dcdb525c9cdb0ce562eb537d25bbc52196b8249a3a6044b2d14a9112d0a1169edc71c13dc29c78c200dcfaf88b
 EBUILD bison-3.0.5.ebuild 2443 BLAKE2B abbd604bfb5b8029c8c301d10585997ed0f226c084343768947cc7c510412c830d52e09bc35496af423307f195249c7a80a8db6d33b5ab69209cdc23c68a7be2 SHA512 3eb5aaa9ba42daffaa92306d565f225dac6202f7b4599efd51f0c49539d0aaa19f4d2e72c90bbd63adedb9a76e628ea7a23b646b5e44011479af04c689ae9bb6
diff --git a/sys-devel/bison/bison-1.875d.ebuild b/sys-devel/bison/bison-1.875d.ebuild
deleted file mode 100644
index c59adc82dd9e..000000000000
--- a/sys-devel/bison/bison-1.875d.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="A yacc-compatible parser generator"
-HOMEPAGE="https://www.gnu.org/software/bison/bison.html"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/bison/${P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls static"
-
-DEPEND="sys-devel/m4
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-1.32-extfix.patch
-}
-
-src_compile() {
-	# Bug 39842 says that bison segfaults when built on amd64 with
-	# optimizations.  This will probably be fixed in a future gcc
-	# version, but for the moment just disable optimizations for that
-	# arch (04 Feb 2004 agriffis)
-	[ "$ARCH" == "amd64" ] && append-flags -O0
-
-	# Bug 29017 says that bison has compile-time issues with
-	# -march=k6* prior to 3.4CVS.  Use -march=i586 instead
-	# (04 Feb 2004 agriffis)
-	#
-	if (( $(gcc-major-version) == 3 && $(gcc-minor-version) < 4 )) ; then
-		replace-cpu-flags k6 k6-1 k6-2 i586
-	fi
-
-	econf $(use_enable nls) || die
-	use static && append-ldflags -static
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" \
-		datadir=/usr/share \
-		mandir=/usr/share/man \
-		infodir=/usr/share/info \
-		install || die
-
-	# This one is installed by dev-util/yacc
-	mv "${D}"/usr/bin/yacc "${D}"/usr/bin/yacc.bison || die
-
-	# We do not need this.
-	rm -f "${D}"/usr/lib/liby.a
-
-	dodoc AUTHORS NEWS ChangeLog README REFERENCES OChangeLog doc/FAQ
-}
-
-pkg_postinst() {
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-devel/bison/bison-2.4.3.ebuild b/sys-devel/bison/bison-2.4.3.ebuild
deleted file mode 100644
index 680885c49ff7..000000000000
--- a/sys-devel/bison/bison-2.4.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="A yacc-compatible parser generator"
-HOMEPAGE="https://www.gnu.org/software/bison/bison.html"
-SRC_URI="mirror://gnu/bison/${P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls static"
-
-RDEPEND="sys-devel/m4"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-patchset/${P}-uclibc-sched_param-def.patch
-	epatch "${WORKDIR}"/${P}-patchset/${P}-no-gets.patch
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# This one is installed by dev-util/yacc
-	mv "${D}"/usr/bin/yacc{,.bison} || die
-	mv "${D}"/usr/share/man/man1/yacc{,.bison}.1 || die
-
-	# We do not need this.
-	rm -r "${D}"/usr/lib* || die
-
-	dodoc AUTHORS NEWS ChangeLog README OChangeLog THANKS TODO
-}
-
-pkg_postinst() {
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 2509027d315f..6bad55d38460 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,5 +1,5 @@
 DIST cfe-6.0.0.src.tar.xz 11959224 BLAKE2B 257edbaedf72bd941b67b4aa2f152a96a37bbea72d21d22d4445152685efe40d75b9a7a39955545643e841ad6693ef12e52b207b9119098774f39e858b64bc09 SHA512 e886dd27448503bbfc7fd4f68eb089c19b2f2be4f0e5b26d3df253833f60b91d70b472a6b530063386e2252075b110ce9f5942800feddf6c34b94a75cf7bd5c6
-EBUILD clang-common-6.0.0.ebuild 773 BLAKE2B eb1d5d5c3a18c7b38535de505bddb911bce68f4c309140d4a0729af9e0db30e7c2ed5778504786a55af986c1be9ebbf5dec8bb3ac6bf0b9ed9a2bf1997997145 SHA512 cb3f0a5d923c3d67245b39a403527de37f58d9f97965309f345c336eb29abd7ef6581d45ad6c717499c03253b69c04d5f6ff9e8bcbe6fa1988411a31b038877d
+EBUILD clang-common-6.0.0.ebuild 780 BLAKE2B c507c9741ffa0703d385a0a31cdb45b4ce107bdffea3ca93e7cae460e3c39625d0da8e9886596f5e5d30b3a318fffd0a9758a1a9a0f1fc13413057895663d36b SHA512 60f4915c48ee0a995d50680f618f5f8e76bfe36a476163e2e131279deb75dd6f66bf105431f554d07b6849b91e4c2bacfc8767ff7c87126ea280e508716e0580
 EBUILD clang-common-6.0.9999.ebuild 666 BLAKE2B dc0dec1a0c708ad38f971a0b33f7751c5c2936170f968b8c43ee1fab836d6f4e485ad898305e50ab6d711733248caac0a5d8769d18dac6838b1ffc315f7e7391 SHA512 4c81e883864a9408eefd53f91ef20bc74bcb87e4f14a1a4d644e7087f15239518b210c9471f800d2ebd326d6c3c5747a87436424c0a75757d85180b26bd2013f
 EBUILD clang-common-9999.ebuild 641 BLAKE2B 81f3432382ffcf77a61d9142a0ae83df84499da1ba31cbd542d2080bde11d92676efd0a9a19f1392f55a300fd9aaf7b0268a8dec7f017cd229eec4dde1b7091a SHA512 0e8661594be1482cda90f240792ae7a9e77c0ba167d874735f89994a24ebf232a5cb10858fc9099c9f639174f2fbf79b7eb16e05ca54d17c636002c72f68d7d5
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-6.0.0.ebuild b/sys-devel/clang-common/clang-common-6.0.0.ebuild
index 05dbb18f31a4..4cc3e42ef4bd 100644
--- a/sys-devel/clang-common/clang-common-6.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-6.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 40c1866b7bc4..552a9fad9e50 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -3,8 +3,8 @@ EBUILD clang-runtime-4.0.1-r1.ebuild 757 BLAKE2B 027d495eb3a9203db1ca76f1f6c99d6
 EBUILD clang-runtime-4.0.1.ebuild 639 BLAKE2B 62665ccfdb77a3635995b6ec9a59589e3d5e5b39c3940b378acc314fc9fcb4af23f7d44fba89f61eceb4055622b9d7c35ae26724b3cc207c06ac60bd2eda5a75 SHA512 b42d5fbf0082e194f4fc4ddf987a2d1dd0f06fc673b590ec278b45cacb8854c207b26cd159fe4cccdd1a123884037fff7c9e5908d0f329b93ff4ef0238e550da
 EBUILD clang-runtime-5.0.1-r1.ebuild 815 BLAKE2B 79a99496306fa8a7c9315d5da28e68d88c0ef92fa7aac53982190a6f008e2013a6a4d60e68683ffd8fffb08b40986ddc393a2f4967a47c05cf876c8558310d88 SHA512 614cb030b1930e8f6f1837d5110b2b87865bc6444a49c34f67abba85419568dacf303720364d2ce2f021b39a1f98760a1ccfe3b65ea890172b8dd1961e199561
 EBUILD clang-runtime-5.0.1.ebuild 685 BLAKE2B 28192550762e053ba121c73c3001d7abd8f3e40cf85c609a51f878a8c5d40e66b10cc3f844a72d7dd552a5cd0d1742cdbf0fbdb8a58b163d34f2f7e6dc11a085 SHA512 5033510813fdeca2497a16556b7e27189f18aa3d04287dd62854883011c4c41257bb897a9130222ff07b8b5ba4b31f206960d35391735c5dad97243471a41027
-EBUILD clang-runtime-5.0.2.ebuild 815 BLAKE2B 79a99496306fa8a7c9315d5da28e68d88c0ef92fa7aac53982190a6f008e2013a6a4d60e68683ffd8fffb08b40986ddc393a2f4967a47c05cf876c8558310d88 SHA512 614cb030b1930e8f6f1837d5110b2b87865bc6444a49c34f67abba85419568dacf303720364d2ce2f021b39a1f98760a1ccfe3b65ea890172b8dd1961e199561
-EBUILD clang-runtime-6.0.0-r1.ebuild 815 BLAKE2B 79a99496306fa8a7c9315d5da28e68d88c0ef92fa7aac53982190a6f008e2013a6a4d60e68683ffd8fffb08b40986ddc393a2f4967a47c05cf876c8558310d88 SHA512 614cb030b1930e8f6f1837d5110b2b87865bc6444a49c34f67abba85419568dacf303720364d2ce2f021b39a1f98760a1ccfe3b65ea890172b8dd1961e199561
+EBUILD clang-runtime-5.0.2.ebuild 820 BLAKE2B 52c56a71db4514803c8ecc070e21a479bad960fdaa40e3fbd6de2229f6f71c0f5fbbfc2dfc5fee8bcb8570c5e71c73be921cd3fcaabe442551d10ccf9a4736e7 SHA512 bcde7bededdae2f422da56eb68ed862fcafb618b8ce6cd1932a5472e325f0c0231429c7914806915b2f4b579655d0f46d82e19f5f83420d204f53a81a9596e47
+EBUILD clang-runtime-6.0.0-r1.ebuild 822 BLAKE2B 1026c7a2622fbeb879699c0a111b76aa4dd50ea375040c90b4dc95d0b8b589a4665e70aa00b8857133eeabd4efcc373e6aae09f043ba12e357c3a07f584710fd SHA512 7b044862d3789d705de7c441043ec3caf820826771916d02ff9120e78185cca51d635051db24be81ac1adbc3f1ed0c632024a0c06216b71ba82335744a3841ef
 EBUILD clang-runtime-6.0.9999.ebuild 780 BLAKE2B c10fc2663938e138f6ffba72fbf4bd87fbd93ed89a40992c0960ba18ade6e162544612c921e49d2f03476b758f0269a16375dba129e19b6a3f7ca88d98d2674c SHA512 90fd1d2a1cb62efc6d877efa8a794a6d16ae6032e5af52c50ff2e8ecb8a1a4552d757ec8dda0f905c78a3e068dd848e9155494c84faec649860be4441f69322e
 EBUILD clang-runtime-9999.ebuild 780 BLAKE2B e62543ab7d24e09ee7c933283e3445103d943196b02fb4891db1af30aef4ee53c709f8f640b4478fc622fdbb243e981fcafbc42fca7cd1e2d2c56576540dab0a SHA512 ab53bd4228bca6cf4eeb52159433dcb0db57fcc920b6c2e2da4f1b43fa65c0de26d8ad6d7a1655eed44031c1deeeff0acd88f80d107f5bdbc7d776cc66f9af06
 MISC metadata.xml 708 BLAKE2B 56cc586deba4a72cc9ebf5d0ac6b9dbb3767b736a96f1c0e4f8d9a715076645be25e42f1c610f55ba69e500bc828d629e7f2253e7c9ed6fd4b01032722bec3c8 SHA512 764eefdff5358c66cad9e8fe18fc7b938c7656268208639cbb92a4b5ae76f7de0dee86a729cc1e6745ddbf7308180885ef99047502e0e040020e738e3d0d1425
diff --git a/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild b/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild
index 5fdd2d6b0a90..2aec5c92acb2 100644
--- a/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="
diff --git a/sys-devel/clang-runtime/clang-runtime-6.0.0-r1.ebuild b/sys-devel/clang-runtime/clang-runtime-6.0.0-r1.ebuild
index 5fdd2d6b0a90..9ab9f95ec042 100644
--- a/sys-devel/clang-runtime/clang-runtime-6.0.0-r1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-6.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index bdab655957c2..ed5c7bcd6dfc 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -31,8 +31,8 @@ EBUILD clang-3.7.1-r100.ebuild 972 BLAKE2B 10a79e07cdf78a7204011d44605c00eb8677a
 EBUILD clang-3.9.1-r100.ebuild 1471 BLAKE2B a3f8f43d3f07cc8598a4bdd8e0c59d1da6528a64bf3c7d3b5f54ac972ff8ec49d83bed04a6646d1f87b525db1dcb597184fd7fc0bc6bc1c5ad85052990ea7f40 SHA512 6868f0fff8faf5a10e9573e76a26000078a94dabe442398d454b3e06a4e1e678670fa57ce10c60ec607601ef72a2f328ef6483a369ecd23b1f6cc59b2755e5b6
 EBUILD clang-4.0.1.ebuild 9614 BLAKE2B ba22e432cd595ecb6a4c13fd4a6de428242b13138f0f079826b4acfd37515c69776800cda3c6533338986bb0db75fa814905a3a4649ebf8812872e97ad1d5a9a SHA512 d533ebcc2d5cfc801d71f95414aa510a4d3143b55fc0917a899a863d19ad8618ba31db6991ad3b73db4959bb2b2e37ea9410e99d2d85cbb81348db1d3af1bf2e
 EBUILD clang-5.0.1.ebuild 10440 BLAKE2B 13bc01d728e98302c8f1708c805e5528fa5f924ac892f17a3f06684fc43448e8d97159f1b9361e633eaccf0717242c4778481f10bff92063256b3307bf7197ab SHA512 57b7dc557e5144d3cc9f7c7560ffaa51ca5af184031b01acb74fd565171d80bfd973f82c7406f8dc624d59f183f12aea8e925465e1059ce1f8a8ce2c2d2fdd94
-EBUILD clang-5.0.2.ebuild 10442 BLAKE2B 5fa2646fa9965c3b843e751a5fce47b76a08fde65d55f70f2d314738dd48e8affaa9ade37d87685c5e9c546aa35c4d1d916ef33acd83484e954c91b3db8a8551 SHA512 d0554f3fc4ceea7cb9d7d33d5aba41c8589fba55e75b551bca861ba517fd77ee8abe89a97d80bedd0852b491d7472e76257eaa643086b925b5253f924545b33a
-EBUILD clang-6.0.0-r1.ebuild 10442 BLAKE2B fa6fce2064b50cedfa4fbf4584f135b605810c39a70d32323f06eef5883c82a77918c0d66fd7b13de5f0bdc55e4c16f484c7fe43c1cfde07704c17fe79629b3e SHA512 9392f1949b9f6a522840acbd54ddb187eb5680cd665790ac55eb279580f36325a747c0e4b9845b605483e7f64abddad1f1232c708c26578562bf1906f4310316
+EBUILD clang-5.0.2.ebuild 10447 BLAKE2B bd8bc12e08364171fdb3c1fb1bf98f4614a0adb6f5e5bfc590488b02b9da9412faaee773fbc331d1deab61e08f54bdd78ea2504eb1f837c07d2832b4f2d4e5ac SHA512 d6fa3371914a9da6bb2728500a5a1bd6846e310b126e5534fb634b4056851d24f88108a0ef40cca7202c4cf65416d48fd17b2caa2342e36397b308537db5b395
+EBUILD clang-6.0.0-r1.ebuild 10449 BLAKE2B c5723a9a32ff5e855f9645736323942836f3762abbb3fb063b1bcc2cb651a0613e29448d1cab6334abaf27b8b4f2432a1bef39195fa775837fd6adb15b4e7053 SHA512 fb0acd4fb403112c1097bb0dde46f30ce242a3fc0bd7c2514bd789a41f89eff73dd0cdb7f2c68bf75547dbc3126f7eceeb274d7ec2f5b6c4d386b4dcd9981325
 EBUILD clang-6.0.9999.ebuild 9415 BLAKE2B c605173c0fbe72841bb6dd63c3f7823c8aeb170c6fdab53a6a0e3470595cd537ed9ad82187d54e2bf2f4d5a19857f509fc0c4cc26824cdc06069340538d7223f SHA512 aba7391f35fb3c47b4d6f447d69bd44c44658bd95171ea74924687a0daff1a1483a94a096e57131da86cbbf6642b513c3ad39d133f2a589e4b8e5b053d3e66a6
 EBUILD clang-9999.ebuild 9487 BLAKE2B d8705c29b9a4e60608af3910a47e91d5a16cf531370b968511e96261207747cdf47981d2ab435a8c1e3ba4fda863248a299609ef2ae79c04aa2f6d68ad586daf SHA512 434bcd703b29bd9491368c0f665581cf3d2569743b311d6430031baf7943ed7d7c1dbd27b8c243c087a709bc0d4e04605648066a7d237888d78b2bd5df179e31
 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932
diff --git a/sys-devel/clang/clang-5.0.2.ebuild b/sys-devel/clang/clang-5.0.2.ebuild
index 6c0b434af8a8..85f7d6b4404e 100644
--- a/sys-devel/clang/clang-5.0.2.ebuild
+++ b/sys-devel/clang/clang-5.0.2.ebuild
@@ -30,7 +30,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 
diff --git a/sys-devel/clang/clang-6.0.0-r1.ebuild b/sys-devel/clang/clang-6.0.0-r1.ebuild
index fcd7f4e18741..bbe27878acb5 100644
--- a/sys-devel/clang/clang-6.0.0-r1.ebuild
+++ b/sys-devel/clang/clang-6.0.0-r1.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 09fca14cb85d..93c0f5502752 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -6,9 +6,9 @@ DIST gdb-8.0.1.tar.xz 19583920 BLAKE2B c22e314a0fe3ccb84cef6eca66c51af60914160ac
 DIST gdb-8.0.tar.xz 19588616 BLAKE2B 148965e33a42787b5fa39650c2b6c48e28895930e36f11b44e8391366be1cc3bd4265ea7df932a7d650291fb20e3f66956c7dff1923025f889e5c035d3bf4207 SHA512 e4044bdd162cbf95044ec1eaa44d2fa62a33e051bdbbacbc97afd4dfb07bae1bea514381fc1966aede89d6796ef2377a15748a93d95e2ad494c8497db489e886
 DIST gdb-8.1-patches-1.tar.xz 8768 BLAKE2B 792ceddcb8eafd028db23d69ad5d9eb00223722520c6ff0a23a24fee1a33dceb02f05e61a1d6c3700835c480b38d66f43f71ef3c4af406d4ae1147eaaf8f311e SHA512 87a5c9d9207817245e1ffd07fdad2cb566de4fc11725aa0e49e58268c3ab1ae3b4b9f4b9faa55acc8cb4c3c7cb5a3875ea7da02abeb8f775953a8aed2e2c6403
 DIST gdb-8.1.tar.xz 20095080 BLAKE2B 9332058b8b723261ba215124f42a2d6ba916219efdfb3c23ae1f48fecf131c801bbd31b345f2c8339b23d74da690be0260ac31f8f2e79549b62f0880199bfdec SHA512 ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357
-EBUILD gdb-7.10.1.ebuild 6606 BLAKE2B f936b1f6fb0107c3b17db4833aba8cdd8f56060a62c644aafc96f05a274569856843d2f59f0415898c3bd547f9d69f6619fccf1e8743454a491ecfa6712878a7 SHA512 ac9409424ffdba44d825d16c0c9768ae0bc51c9deab4975845132f6b630ebf5cbb455344806b8a25425f9bb6a864ec06c3fc33f30abd0eb78e63e0af0f5d5665
-EBUILD gdb-7.12.1.ebuild 6618 BLAKE2B e3e8b6df08f7243df47b410259852ed2fed0607c0c69277c198e6989ce76dc0c20dac0569f75b3ab782877d31bfc61839ae8964db57e470d0cd46fa660261de3 SHA512 b1a21bb16d648fdc45715e85eba3a4dd28f3c3083250355032f1adc671e498ccbf89166350c3ce31ac156832676138053f23cc301fb45620ba7ee4e5127157d0
-EBUILD gdb-7.9.1.ebuild 5944 BLAKE2B 2065393cc5a34ff738626f997bec0a5e1e5d383d78bd774b04c85b683ff499f395fd87349917fc0bab911109ab6fa369176746b16fcfe40d3f996e85709fe6dd SHA512 7fe1fb5eba8ccb86f7b0fad0d433b7a5687421c9f8a57a4f6f393d09c840dd66e8f109873ff9772c2ea7209c5f4b95d2af6d8abe8e3e4c397bc0a96eba08871a
+EBUILD gdb-7.10.1.ebuild 6607 BLAKE2B 363765a64800c4bbb3cb8dadf31acaa1f4ec596095c9b3e032a4173a94b96f641fed500ef0b48b463307e390bf66cc9c0a52f48d01bf329a2e6b16f008cf063f SHA512 37189f8b237e1896ef96371558d3f660798aaab49e873286b9be4ee4d317098addfbfc4bfdf1e5877ee324c69e2ac2ad842c016114e6b1ea1e12a7de3546459f
+EBUILD gdb-7.12.1.ebuild 6619 BLAKE2B 852ee309b4a3938be4111b0e38e301c3cc9bcb328f55b58bcace495d2b3d1de36305fbfd77144c3dc32a06f75c70da0c4942b7ecbfb9d1304e42855c5bc02e59 SHA512 b1b0588da451a6ab00a62365f038e27ca2c1c9fc509b6fc46f96e8cdc12d6c8a5e5d254717e8af12e2b9818b06ed55b470872ad339d4ae1efc185bec9fb36d78
+EBUILD gdb-7.9.1.ebuild 5945 BLAKE2B 2f767de7261f2924808b0eeeed463fb46b6cf490ed54e51d6f49838b61d053f45410ac2dd50f71696afc71d98b89afa34158d25577ad63f07006aea0393e2edc SHA512 7154ae49de7d61bb75752ad1d8e71d0414fa8baef5fb876eead8e5df4b01b2c23555d990ef2915186ca2b098c1ebdacfd121a54aabbcf103a5478affb0b64b8c
 EBUILD gdb-8.0.1-r1.ebuild 7008 BLAKE2B ccb35ca9316b0df5e6940036c33de7bbf2f8dd86ebbe093128595f3f7b8619ea61d59481feb1e49e11a4260f3137d523989b977f01953cfc37204151e2e65704 SHA512 17253bdfb5c2e9976a1f8a6e88fa854d4fc8cbb8b73173f19283a1beec2bf3691b0dad2b4938b2e9d4755a3775945104120ce280fba5fd99b8db63d23adb140a
 EBUILD gdb-8.0.1.ebuild 7001 BLAKE2B 51ee8a28536516b731e510f295fa337d380bc70cbcbddbf6f0f6c03c96feb37f59f873d024823da267152f1a8b5f3e7bc1c9cb977e06b8e02335e66845df1f0b SHA512 ee436fa97e4d7921689115c3aef6d2380d87929b559e5654989727bd5a9c220258df6f9cf0974c02f9518458b3c791e285bbe995cd00d36044be748fc5b3c899
 EBUILD gdb-8.0.ebuild 6817 BLAKE2B 71e593bb7f4f2b9b4d3b3b0eef223c6e0084b2f71ae38ce5035e0e72e3056538087481e8448730a06a35d4f3c307244ff1e68ebd480a3afbd48e030ad352b74a SHA512 1e7cbeb9b79cb2090698fbce6e212f87061db60c25efd9ddeee5db0997607bfb65be8bb22eff5f293adde9601304b9015ab6387fef4b590b618772f317b0edb2
diff --git a/sys-devel/gdb/gdb-7.10.1.ebuild b/sys-devel/gdb/gdb-7.10.1.ebuild
index c662f0cffde3..d0cc28e0e100 100644
--- a/sys-devel/gdb/gdb-7.10.1.ebuild
+++ b/sys-devel/gdb/gdb-7.10.1.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"
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
 	# live git tree
 	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
+	inherit git-r3
 	SRC_URI=""
 	;;
 *.*.50.2???????)
diff --git a/sys-devel/gdb/gdb-7.12.1.ebuild b/sys-devel/gdb/gdb-7.12.1.ebuild
index 6b6a04e9deff..a1863b60ff04 100644
--- a/sys-devel/gdb/gdb-7.12.1.ebuild
+++ b/sys-devel/gdb/gdb-7.12.1.ebuild
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
 	# live git tree
 	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
+	inherit git-r3
 	SRC_URI=""
 	;;
 *.*.50.2???????)
diff --git a/sys-devel/gdb/gdb-7.9.1.ebuild b/sys-devel/gdb/gdb-7.9.1.ebuild
index f2d998373a9f..0e9d8fdb970e 100644
--- a/sys-devel/gdb/gdb-7.9.1.ebuild
+++ b/sys-devel/gdb/gdb-7.9.1.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"
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
 	# live git tree
 	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
+	inherit git-r3
 	SRC_URI=""
 	;;
 *.*.50.2???????)
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index d38048d43b0d..10f508922cc4 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,8 +4,8 @@ DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf
 DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
 EBUILD llvm-common-4.0.1.ebuild 641 BLAKE2B a8543b8d909c48caecbcc423f15742aa56412971320650a87742cf907b0d0d3d143e7caa54b947b592380b40d340bd1957c8df05053f6cc6f932332ce5e71eb7 SHA512 b497a3c7edd56bb634e307a8ad9acecb6f21f2f262ab5f50ee6c9b2bd4c40f0defd8df61ad6f0b0c74222468388cb18d3634e0a0d1662ed4c74d5c2e3db30188
 EBUILD llvm-common-5.0.1.ebuild 832 BLAKE2B b71a86abf77cf505810463c592563717c0941013183dcd42c6f3e0afc3e19b3cdf7a3d583eb1ed48cdfe80c46dba23fdce38c783f845744adb8101b655bfc5cd SHA512 f147fb0f7ead70c26458ec7a776773eb16a148952a5f36703974f3983fe411ed7f7293b88bd3353c55e0316301d10a52a587cab257b104091cc8e9733b175fad
-EBUILD llvm-common-5.0.2.ebuild 835 BLAKE2B 89dbfb278d1dffd42b066901aef2c63c1671206d2cf40246c9bf5bed2610b0c1feddf6c2e6ece9553fd2318a1f86966cdcdb2b2181f1c91bc3111ee234322418 SHA512 2c67d15602719a45d3863b79ff11a61f287ee5aaa45b859aee741a9bcaff011300e61550d37935901e00475b501e519ca39efed9a3554155b9f770a480f6e155
-EBUILD llvm-common-6.0.0.ebuild 835 BLAKE2B 89dbfb278d1dffd42b066901aef2c63c1671206d2cf40246c9bf5bed2610b0c1feddf6c2e6ece9553fd2318a1f86966cdcdb2b2181f1c91bc3111ee234322418 SHA512 2c67d15602719a45d3863b79ff11a61f287ee5aaa45b859aee741a9bcaff011300e61550d37935901e00475b501e519ca39efed9a3554155b9f770a480f6e155
+EBUILD llvm-common-5.0.2.ebuild 840 BLAKE2B 43282c63d613c473c13d22095a4ffdc3c4c1bc871d42dfd097f00215a776bfaf4dae8b7156f0c2f36ce9624bb1b91a621f69e01189dd86882194219980d9154b SHA512 ad9d36d76bbe43002a0298b8840cee7edb98985c084a314bf55c8eff401885fa9ccb1666a2e79dd36209daf398c48fd1d038d49f10265370b03f86adfa1d13d4
+EBUILD llvm-common-6.0.0.ebuild 842 BLAKE2B 5e3b7595a8c27da5fbbbb8bfa369371f29da50618c06bcd4bcbe4ddc027f24e917fad23d0a432d4e9dc1e600683bb9e5d5f20b90d106754b7e6ee40f05c8dddf SHA512 e1cb1065b6c3f66602d431edac11406bc50781ae472e5a0020215540af78fc6d4050a30af25c5aac1396e017e73c3d0066cb35562014c655ff957369ae0b7631
 EBUILD llvm-common-6.0.9999.ebuild 729 BLAKE2B 8455b714f371250a13d032a0bc9cc64fe16a670da92e3f9b46dbc05d79084083cc02db2eea0a1c477877e9c3b2c3b0bb5706539fc83a6089fb79ffd5f6d600d3 SHA512 a697745f5f07f002d3a789583bb3df163713b372147ddc41ca4e6395f9b9de51407aab376cfa8d6ef7276bc9c221f0a9ce2a763f347b3a04656fca5ecc93d258
 EBUILD llvm-common-9999.ebuild 704 BLAKE2B bfcd46a0c3754d0c5542eb1b03c8696ef355ebe34e94c98ab6a23442a88bc6b9a8aa8d2c89b18ed0ceea47bd2adcd7df67c8d201876a04ba7816257f83c53706 SHA512 4a7fd7260e93fa3b44a565c915a8be2e207085a506018b97263740851fd78dacf88e582b73d74a06aa36de2975b751c258ceb7997a5e6ee7db4d404fbed865bf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-5.0.2.ebuild b/sys-devel/llvm-common/llvm-common-5.0.2.ebuild
index b4d44abdf980..3142ca929d3c 100644
--- a/sys-devel/llvm-common/llvm-common-5.0.2.ebuild
+++ b/sys-devel/llvm-common/llvm-common-5.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-common/llvm-common-6.0.0.ebuild b/sys-devel/llvm-common/llvm-common-6.0.0.ebuild
index b4d44abdf980..4ccff3beb373 100644
--- a/sys-devel/llvm-common/llvm-common-6.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-6.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 83c4504fc54e..19ac103d55c8 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -49,8 +49,8 @@ EBUILD llvm-3.7.1-r3.ebuild 16384 BLAKE2B 79560163f422e3b897eefae8ec2ac905a18a4c
 EBUILD llvm-3.9.1-r1.ebuild 16317 BLAKE2B a4edb45656ae073f618d899787a339b0c5e7f8f0bab9a5030c33c85ba9761e9e510021b139aebc422902da55bf5b1ff2caf5c66604f338768eed359ad8bb84d5 SHA512 ee31d4f2612a413aafc906880ea4d7f06c276aa4a0dee9635ac9ec076539ee14c82ce4cc81cd689f6812ae74eaa421ca8648d3d143d5ec238aaf602692f99434
 EBUILD llvm-4.0.1-r1.ebuild 6874 BLAKE2B 1fc78d0d42ed2bf901bdef44262f4ef68a933c89a3cdc43b1d7d2ef39b326499465d32ddd6109128635d68e03293f236cb30b5ddee78999c0e314aadc7c5ae8c SHA512 752e037d12f2906df36c1aebba064dabda343dea1e35af8e7e6cf5e7f739d4f45c9a9ac2e47d92e40d281961421b4b1c630d58f1bf76582876ec168b310d9cd7
 EBUILD llvm-5.0.1.ebuild 7662 BLAKE2B 9b45d4b535e33d0e6ce8ba6b16ee0766301c765474ba555e41136395723098ad34485329b4525c6bbdb4c581daa0507df0f715243c2d6a93ad2f9f0e8b256cae SHA512 ab0904b321fff9b8e7907869ba48e8d91e2bd5dcd4f2032043f1ac9fe18532cbffadac6307b062db307b4e20c2e38d8a360103aa78b10e6e88a72d3584801f2e
-EBUILD llvm-5.0.2.ebuild 7683 BLAKE2B 787456fba39b764033f7621958252e263326423c8d60b1cd26efc86e45458cba90222ad08b543c424598dfc70e4aba81e171be7c74f476015743a6bf1f1ad9f1 SHA512 65de543430013fcfdf14d778055483c9315a21e741749b53af3ea5b5bb4e3ab822664086984db920dd7bcf2a05d9e090427a4121093c45d7021cedf53f466346
-EBUILD llvm-6.0.0-r1.ebuild 7939 BLAKE2B 9d625c5d78a24985db63c68474195b6a7652dcd19f192efa523fd4704a15acfb4492921eb1a753da4bb2593926c073cf5ea805b701557b148ee711329f153ad0 SHA512 d5b1566a9e6a58942b591b1dc9751f1eb6df90955c4cd7d357d6bbe1225c417d2c2dafb4422d61971027da72ce12982ad5bcaf1be3bf81aefc3a10ccbd6a549d
+EBUILD llvm-5.0.2.ebuild 7688 BLAKE2B de25dd876eb21676cc27c69a1abeaf910c290bbde1ae3b4d2d41d19716dd21bdb87bc0062a60ddf8f3e7e2bdddae647bd34a1ff5af2a10204c03f8267064f048 SHA512 fc5568ac7bce60737bd6307361587a4e444b5efbad4a9cf49d186e1a0c75a14d54a1ef29fca8d970fda70c7d0c73d960343aed4162ab7f6ef1849790a126e657
+EBUILD llvm-6.0.0-r1.ebuild 7946 BLAKE2B 3f89f5a486de48c04aef07ad5744c1984a9f79c143299e40fb4e98ecf6ffa96610e30ccf4890fee28cd8cc2e5b705c67ba71df21ba27249f0aec6463f59216c6 SHA512 0d4e650401a80d52aa4de58a93893457e5445a22ffb47d8e85208487fa6f58d55dd109856d290cc12efd0891bf34181f8d791677973562f2930f8678fbf08a93
 EBUILD llvm-6.0.0.ebuild 7820 BLAKE2B a2d8451d0f94dae610fa87673781ec266160efcf93625f50121358f24d2a1df415ffba00a50ebb69ae98c438bb582840615ba0fbc4a5f92cb82f00276b54e717 SHA512 f168b3b8a69b1cd3a6d91fffd99d4413bb2a8e2f28eafdba94abf3e069c7ac024a5cc8fb5a361b16b3faad51759e51753f34a9cbec6cdcebf5e4c090c33d38e1
 EBUILD llvm-6.0.9999.ebuild 7514 BLAKE2B 506aec86e9f4de12d00953a33e2cbd71a29bcfd57ec621d41da18aaceebfcc56b67b830d2d6fb60293651072447947c5851f5a9d1dee64a14ede9249e33b866d SHA512 2b11e3dfdd2eec988f01cde34c1dbaa9cdd0ab4aadddd7592f9e7d782201fb0dae564fd5e69942d8da5b674353e552c4f51d164305676daf871502bb05d88be9
 EBUILD llvm-9999.ebuild 7668 BLAKE2B d5232b4183c9f9a12c3e460afd1144e94961b37c10b6af40cce5c34860a99071098390feb01051d61d749f4908f64da645d8c288c8947745aae8a97bb84d6b6d SHA512 481c508f19dbe6b8db619884d0a27abd8ebe48e6dff94596cf1e056d0944b688432995596e1555be77b513f962127db646a3c43c41482e54418df0e75930a24e
diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild
index cd05103a3845..768c86f3ad63 100644
--- a/sys-devel/llvm/llvm-5.0.2.ebuild
+++ b/sys-devel/llvm/llvm-5.0.2.ebuild
@@ -33,7 +33,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test
 	kernel_Darwin kernel_linux ${ALL_LLVM_TARGETS[*]}"
 
diff --git a/sys-devel/llvm/llvm-6.0.0-r1.ebuild b/sys-devel/llvm/llvm-6.0.0-r1.ebuild
index 9a8bed537ebb..9d7c3168e196 100644
--- a/sys-devel/llvm/llvm-6.0.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-6.0.0-r1.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test xar xml
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest
index 591395619d76..8f39d9ca49ac 100644
--- a/sys-devel/remake/Manifest
+++ b/sys-devel/remake/Manifest
@@ -1,11 +1,5 @@
-DIST remake-3.81+dbg-0.2.tar.bz2 1311308 BLAKE2B 7d6f6d8339a376c3c902013b95027ace4188cdf286b70479b7d7fa1dd5bd5a241b9d50f19239d00e3f9a6716102d81027bdbcb5757dbaaf117caeb419e3cb7b9 SHA512 3f0d828c27e990d4e959fb9f73ca49921eeba76cba1ac869d1165fb4a11d257ffcfcb03ff1886e569db91e06021e4b5055aaaec4069347291d62a5f518440486
-DIST remake-3.81+dbg-0.3.tar.bz2 1078924 BLAKE2B fcabc7fff8eac208a3fe58bc4892e48589122aef3dd94a41191af0bae0c246bd2cd5e9a77184ef1c13b4ff4ea0bd975ab403366315bf2406a1039c491770f491 SHA512 a86ed989ed6c616da0a9850560b88c1a2f8ac277fa4c8abdb2a40543cf63c3180810d5c6a822d7dd6988a53cd36eef18d857e4958787fca2ed616d14186c36b1
-DIST remake-3.82+dbg-0.4.tar.bz2 1360407 BLAKE2B 4543591a3b030123942e165a93174578c8cc7866fe38a169961b22ea150619eb7931011e9711c4d3fc0df41b672920273adadee10f160f7372e838be0e6fe62b SHA512 5f75e7826e4258c33e3844d72d685f1c1d252c352b40c0d6a7a3e5155097496640ff72542786452fa40079060b4c0cb514bda7147521c7170f42003ba8c0aa77
 DIST remake-3.82+dbg0.9.tar.bz2 1152677 BLAKE2B bb4c61b2bad39be1e50c919c2c4b2f069df31a6b6d6e51863257a20ecace2395a16349f8dcafcb4c5bf020d423d91d7d9c9a3098ff2f6d2891a5d3bdbf54b126 SHA512 94682e9d0317088456dac683d67be320fe10bb06a3384969fafefe091558b215105ba3c96a7c1d4e0d970ea2dc5c4f535a704256fe7a4eaa87bec11d78d074cf
 DIST remake-4.1+dbg1.1.tar.bz2 1254246 BLAKE2B be1b18329b36d6c34aaa3270ae2c69b042d467d19bc99ac13562df387a3f0cd0bf19c7e39aebfa983614355c2d0921620609894850e1eb66f24ed08aea36ead3 SHA512 e0dfb0f7a3f05968c3597e73f2fd486929893546a8f993e99ae73c6400050d1faa5baed1b0588d399bfc6e58e8504f857c8734e39a02efd875b522b26dfaa421
-EBUILD remake-3.81.0.2.ebuild 627 BLAKE2B 12752f61d93aaac837b06e11a02690f508d26b00c3a2d3dc77c1526ef40174db2dad0587876950c54a21d894503d77998dd5148e158d19b825cb9b109045ceae SHA512 c722717a790a7af0361eb923d5fc4c4ff5bac5046af09515653180cb66a73afff5d80936e66d2d938c8ce6af1831ad1ec8606a257e9ee2a693b56935ec47e3bc
-EBUILD remake-3.81.0.3.ebuild 630 BLAKE2B 5468fcc264c6975232237682bd362c754e581376d5e99c78598a1feb21d659d3bbc434ddf575e3fb6dc960407cbcbaf9cb3a175dbfa70e41e8bd809052981c7d SHA512 0721dde414af9df567cfedf7c9acfdeccf82d38d277323d3d05e6b9d09f319dd8f15dba3bcfa734eb1a69b44ebaa623de466183f4ac0f61590759c620fc2ee59
-EBUILD remake-3.82.0.4.ebuild 679 BLAKE2B c47832e5620b34a28e25234b34063e97c7fdfd65563638c816f6560e200a07e56df22ef61b4c24ec18a8fe6f658b0f0beed420b9bda94383a177cff150e29719 SHA512 bcae20e6a8ccb77d81f95811a11b2d1129e2be8eba1da1bde12341d813bb9ecc86c4e1d7dde4775cdfc03ddb94c3201b6d5edf05e13d6b2ec895a406b78b7a51
 EBUILD remake-3.82.0.9.ebuild 620 BLAKE2B b81d8e2b9c9e3bab02b116f21ad5484d7b2e49711a9ef5f9d71660aebc1e02c515e0ac82639fe51f752042a0fac4d7e6d995b36ad0ca090418e3b3be58733153 SHA512 78bfb6261ec1bf419ad9740154aa7caba439ad973adaca5a0c7cc7e68a5ba696195f097e3171f186e44f899a7e297d21c7fb8fb2b5828b98a4e7e5327edfb496
 EBUILD remake-4.1.1.1.ebuild 834 BLAKE2B d04bb04d37c434dc64790c4b744bd46b71857c547d44ddf735ba03d211381cb7ac408c2cf84d9c1cec3db7b855c7d4d58526390fd269fd9658f3e5251c3ee1cb SHA512 703662b02b790965479822a6017a0b64407641bb9bb3c8dc50d5aa3853a2a5da80b2c86d4849095383a519c6613b51b4ec0054deeb88c43878a1c17b38cb757f
 MISC metadata.xml 326 BLAKE2B 4ca7da15d02026b12d85b2329d0096bfc817d29b0618a97a61f54b9c6702b3cc89c4674510286c88b59eaa7142b98ff2fdada61ae5d56856b3e6a9e08116a954 SHA512 69c31da5d0fb8b94548ee398fc937405ae11224a415dc7ad6628c9b66362d43c4e3adcfba05016735298d31eba68faa19dab93f3d792629217660e51c382567c
diff --git a/sys-devel/remake/remake-3.81.0.2.ebuild b/sys-devel/remake/remake-3.81.0.2.ebuild
deleted file mode 100644
index bf21b2c77194..000000000000
--- a/sys-devel/remake/remake-3.81.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${PN}-${PV:0:4}+dbg-${PV:5}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS INSTALL NEWS README
-	# fix collide with the real make's info pages
-	rm -f "${D}"/usr/share/info/make.*
-}
diff --git a/sys-devel/remake/remake-3.81.0.3.ebuild b/sys-devel/remake/remake-3.81.0.3.ebuild
deleted file mode 100644
index ef77d4f235f9..000000000000
--- a/sys-devel/remake/remake-3.81.0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${PN}-${PV:0:4}+dbg-${PV:5}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS INSTALL NEWS README
-	# fix collide with the real make's info pages
-	rm -f "${D}"/usr/share/info/make.*
-}
diff --git a/sys-devel/remake/remake-3.82.0.4.ebuild b/sys-devel/remake/remake-3.82.0.4.ebuild
deleted file mode 100644
index 5a10701ab19b..000000000000
--- a/sys-devel/remake/remake-3.82.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${PN}-${PV:0:4}+dbg-${PV:5}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="readline"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS INSTALL NEWS README
-	# fix collide with the real make's info pages
-	rm -f "${D}"/usr/share/info/make.*
-}
diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index 948a2223143e..80ed43d582da 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,8 +1,8 @@
 AUX smatch-1.57-restrict.patch 406 BLAKE2B c22cd24b1666c73daef2b90bd9e8235c418630f153430206f5d32b224782e7d500a6524eadec6ad6c0ff4d379725b84ecc7d8dcd185e7451593e50cfd7929e04 SHA512 fa4816a24a2f0ff4aaf057ac83fc0ba4d9787f0e2daa7e6999700448068460adddce6fcac3efdb7aa69e4d60b9eb34f4ff17056e8037419ac4f5d21b5be5514d
 DIST smatch-1.57.tar.gz 491677 BLAKE2B 150ba84dc797497b2522d28b443a89fbec221a00fcade85014d434f675ec60908a473770c695dbf65a5ed273c3e665aa9dc4ec9a91bc071651388a9ec90f1bfa SHA512 031f417c97d58b617b2e375a28f509f71eb2735212a98aee0e21880a28842078ad3c24b5375a03f73d75fec582a9d187ed6a00a0512c4792e5ffce82dfd79b99
 DIST smatch-1.59.tar.gz 495530 BLAKE2B 668a050e229cd9b4e5881fe059f5a8654164f5a155c471559ce7a82e66bcb2170f89a25680be7ff867f2765b574f363ef95a15a65ca98d47dbd8aed20f588f9a SHA512 5e18f48dbbe11255a06b427205aefd1f8f5a11bb0b238f9134b89e6f5cb838fcae649a4e87a4a04473a33077c94e88aab46b06e33cc87cfe451fa83b5846ccc7
-EBUILD smatch-1.57-r1.ebuild 1258 BLAKE2B 5b6baf229c0fca1923f1695b6746277ec997359db638d278bb1d166c627a7308d5dd3a281ba41a89ab7520d4faa95fff4d6eebbcf64d27bfdd38ae6fe380b215 SHA512 27b2c45fb70953190af70913aa3bf80030b95edd45d1204063db364209df8d453a4c94a57c837fbadf3cf39f1598a5b77b5e5de28654d4ad2762388ac035fb8c
-EBUILD smatch-1.57.ebuild 1209 BLAKE2B fdf5382e44a2c9be25050715d6fb3c6e5e1fcd1195c66b62c359eeb4b2bf2a85191105495bd2016cfac61a20f9b870f48366b3315856e1a39dfba12a9b12e237 SHA512 85aa6e85b35628e53b54e617ab639267f50b12927d5c415d3cee82f19a384462c17d53a65869a9ea4a7b675b4a8b70d757705727af87ac684eb5a1a9167f6a12
-EBUILD smatch-1.59.ebuild 1217 BLAKE2B 3189864e942557f9117dedabf1a9f69e552ffa61b371dfea6ed47151af73594a04f47512a8475ca73829b98167a1c0f4a4c1be76447c086421c5e5e6cba5295d SHA512 c22981a1e5917b32c7ad113df8b7dec529a38bbbaa06ce3abe79c8d23b7b7c86eca90637db0486dcc07d05dbaa48746410f18ce5e5218957f3b831babe810ce4
-EBUILD smatch-9999.ebuild 1217 BLAKE2B 3189864e942557f9117dedabf1a9f69e552ffa61b371dfea6ed47151af73594a04f47512a8475ca73829b98167a1c0f4a4c1be76447c086421c5e5e6cba5295d SHA512 c22981a1e5917b32c7ad113df8b7dec529a38bbbaa06ce3abe79c8d23b7b7c86eca90637db0486dcc07d05dbaa48746410f18ce5e5218957f3b831babe810ce4
+EBUILD smatch-1.57-r1.ebuild 1259 BLAKE2B f7087313102dcddbf48144d7e4466d5b84d736ba6332dcc3c613dca105933cac4b88ee128d62b61e002a2fa9558d190535d83909de3b7da79a63cbf5abb32386 SHA512 d79a795083b48938abd2dcf68cd119b0db642c563e57ba8e38a3ec1031e3bb3ee29c40abc3db6f98b1c0300836871586ace56447376b203dc0ef5395342bd268
+EBUILD smatch-1.57.ebuild 1210 BLAKE2B d9a0ad71528dd7676e0dc3891413cc6bbe17ce875905b7c184a47148331d5222dfcd4e4614c3f9b510f8b49fe2e1f0372e6ae3a740a66bda4e1fe2a5b86eabb1 SHA512 310410b07f94e7ce5fb353696139e28b88af5b0bf112fd078a2c79dcbb6816d6db9dac9c5c2049a3a7215a4b311915b5b33dbecc0d34aecbd2e5cd3bd05b8c5c
+EBUILD smatch-1.59.ebuild 1218 BLAKE2B 3afa9b44109f0be9329a8a756cd30e574d26d39356f3c578f008f333c1a1ead766ba14e7e6f899d24433942e651e8061d70dec9a6336198f17994ff582978dab SHA512 9b88a6e66559e5c68109ef663000cf6b7ce496783b2643a6bb9f7d6fd5e13bd10e7b3bec53867bf93c77d3d2dddd9dec3b92836b2245eb6dc412b3eca6073855
+EBUILD smatch-9999.ebuild 1218 BLAKE2B 3afa9b44109f0be9329a8a756cd30e574d26d39356f3c578f008f333c1a1ead766ba14e7e6f899d24433942e651e8061d70dec9a6336198f17994ff582978dab SHA512 9b88a6e66559e5c68109ef663000cf6b7ce496783b2643a6bb9f7d6fd5e13bd10e7b3bec53867bf93c77d3d2dddd9dec3b92836b2245eb6dc412b3eca6073855
 MISC metadata.xml 337 BLAKE2B 3215b338ec89ebd2d1d39e33c5903a6ad571ee6ad4236968a2c250f2d7882c90c2791746df43455a7fd63ebff544177f49c9e0074a31ccd81f7ef68f1eabfa82 SHA512 8d4007163912848eb4e4b525c808e7c69fe5aa93913398db793b6ed73936cc936a25e1fe7dce4a915b4caf6b2796d6dd4d1a52ed6dfbd2e0fb0faf6c0ba1c7e0
diff --git a/sys-devel/smatch/smatch-1.57-r1.ebuild b/sys-devel/smatch/smatch-1.57-r1.ebuild
index fd7fc3e72b97..6a2ec7381faa 100644
--- a/sys-devel/smatch/smatch-1.57-r1.ebuild
+++ b/sys-devel/smatch/smatch-1.57-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,7 +7,7 @@ inherit multilib toolchain-funcs eutils
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -22,6 +22,7 @@ else
 	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 LICENSE="OSL-1.1"
@@ -31,8 +32,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-restrict.patch
 	sed -i \
diff --git a/sys-devel/smatch/smatch-1.57.ebuild b/sys-devel/smatch/smatch-1.57.ebuild
index e807d2044380..f232ca67e03a 100644
--- a/sys-devel/smatch/smatch-1.57.ebuild
+++ b/sys-devel/smatch/smatch-1.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,7 +7,7 @@ inherit multilib toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -22,6 +22,7 @@ else
 	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 LICENSE="OSL-1.1"
@@ -31,8 +32,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	sed -i \
 		-e '/^PREFIX=/s:=.*:=/usr:' \
diff --git a/sys-devel/smatch/smatch-1.59.ebuild b/sys-devel/smatch/smatch-1.59.ebuild
index b2a8198a82ca..b8be38b5cade 100644
--- a/sys-devel/smatch/smatch-1.59.ebuild
+++ b/sys-devel/smatch/smatch-1.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,11 +7,12 @@ inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -24,8 +25,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	sed -i \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index b2a8198a82ca..b8be38b5cade 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,11 +7,12 @@ inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -24,8 +25,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	sed -i \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \