gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /sys-devel
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
60 files changed, 221 insertions, 1103 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a4ab35377bff..8e3763015574 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 16746239ba24..2be72226f4ff 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -2,10 +2,10 @@ DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e3297929
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
-EBUILD clang-common-10.0.0.9999.ebuild 670 BLAKE2B 9fa4f350989a3053448c2b79cc6586341eba7a0dc9b384cc29924e8d7350944f3318597c7837187787a0d7c72aa9de91e85c28ee3d9a9181307aca66f5326b40 SHA512 9bd47ee301659bbe0970beb60be6c07ad55622dce93553ace6a182d456a9c528b6fd1ca8860073e058ab2ed3286ddd3d19fc24d38a288474de6054857f81f8bd
+EBUILD clang-common-10.0.0.9999.ebuild 513 BLAKE2B 3ca10da9963052dfcd89bfbc0399f9839325caba42a63e916ccb3ab5f10c0b1f1089cf2b932ce1f166e0dc60ae2d605003e345354eed6310eebc29a40275405d SHA512 18c55050f97348880eaa7676dcf4bde318f2db16c9014713ca32b17c2c02997e68034ed20dc8737a1f1c5d51de88da321dd68bfe83068008dc7f92857d782997
 EBUILD clang-common-6.0.1.ebuild 765 BLAKE2B 3f71fcb29d3b01dceb3f0448d920828a0c24824d373fee861567cc33156cc4aaab25262c5c83ac293486442981aa0029ea38b9bb6e59b4d0c2af4c44725b8435 SHA512 298c3b0f6e8480abc44b7b2c0f2b945f206ce7a936f8bad587b133dc931cd4588069e3a2813299ddf8c6a06b980212295a0729a6d77f21ba74458ebaa10c318c
 EBUILD clang-common-7.1.0.ebuild 766 BLAKE2B a0b5b93670719d86b7edbaaa26586ba2b605a0a9054dd1bef53e566d205f84a9fae06fddc895eb7de4774924f89bdd619e974d9c3877a97b056464ddd534c5cb SHA512 7e7e4aff9bedc62d9bb59cdfa81d404ac0caac9d0b48811195a608db030a4eeda5f98c556a111d115b638c85b52bd27b450ce5a8ec047b220fad3d7213459257
 EBUILD clang-common-8.0.1.ebuild 798 BLAKE2B ee3a460e6e80ac0700fec452f3cf47a1f6054c7b93139e0fd4c5efec8ccf84d1cfe933420cca84e017e115bf45474db42f58813b98dc2f396feb61c00f2901d5 SHA512 feda961724c5bfde42926b0928107fae7df056e63041705a68eb7521ffc1e9f5be8f86591db41d10f97b940ef1ac664dc35ad11e59b29635b46b2fe5ea8c974b
-EBUILD clang-common-9.0.0.ebuild 797 BLAKE2B 0e499ee0e340aa66b80e1ae1cd316b1cbf797319cf41cf4b820d4843076c00c21ac50f82898fc76190a4726f49b1c48176bab1a0636a59138f18c2987e8040ba SHA512 4e495544ce7b601195cc7f38eb251e91ee1d0dd020b4eb388ae5bb151774cd587962dee0a066fa09c214594443b2c75566bbdf04aded77f6ae00a050e898d438
-EBUILD clang-common-9.0.1.9999.ebuild 695 BLAKE2B 96d0c4bc870b20db7b30bce6a8f5b74c414b41328afe3f8c1a21dccc02d06b8f894b93fbd7ca644af188e606429856dca4d6c28479d08bbbb7a251fcf3430850 SHA512 36f8228512ca9c07bc586ee4b8b0537eda0c5bda63f1df6d84d22c4cdff2c7afa57a9e59f67d9c89bdf81a134cc80d65961690fdf023de2897ab78910cf57e4a
+EBUILD clang-common-9.0.0.ebuild 589 BLAKE2B b91f6c2adde1765c0a00a0449f6be5fecfc7902c347d04d86619b834fd6ee3fa8a2f383095681330248f06d712a7fb99dc58624a8c99f811a9a3827903f9124d SHA512 9dd411a4a7eac3d88706452b8021ef17ae14c6260fe80e7dc7ae3fa300e14777b763932f7536a7e00bb421ae2c835c4bacd9444798f88fdcc4c37407f007711c
+EBUILD clang-common-9.0.1.9999.ebuild 513 BLAKE2B 3ca10da9963052dfcd89bfbc0399f9839325caba42a63e916ccb3ab5f10c0b1f1089cf2b932ce1f166e0dc60ae2d605003e345354eed6310eebc29a40275405d SHA512 18c55050f97348880eaa7676dcf4bde318f2db16c9014713ca32b17c2c02997e68034ed20dc8737a1f1c5d51de88da321dd68bfe83068008dc7f92857d782997
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild
index d1ce28354dec..d1bfe71d2f80 100644
--- a/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit bash-completion-r1 git-r3
+inherit bash-completion-r1 llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
-	https://github.com/llvm-mirror/clang.git"
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -18,15 +18,6 @@ IUSE=""
 
 PDEPEND="sys-devel/clang:*"
 
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout '' '' '' utils/bash-autocomplete.sh
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
 src_install() {
-	newbashcomp utils/bash-autocomplete.sh clang
+	newbashcomp bash-autocomplete.sh clang
 }
diff --git a/sys-devel/clang-common/clang-common-9.0.0.ebuild b/sys-devel/clang-common/clang-common-9.0.0.ebuild
index 609bdcde4cc0..3fc7a056a923 100644
--- a/sys-devel/clang-common/clang-common-9.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-9.0.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit bash-completion-r1
+inherit bash-completion-r1 llvm.org
 
-MY_P=cfe-${PV/_/}.src
 DESCRIPTION="Common files shared between multiple slots of clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -18,15 +18,6 @@ IUSE=""
 
 PDEPEND="sys-devel/clang:*"
 
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/bash-autocomplete.sh" || die
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
 src_install() {
-	newbashcomp utils/bash-autocomplete.sh clang
+	newbashcomp bash-autocomplete.sh clang
 }
diff --git a/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild b/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild
index cc703baf0c50..d1bfe71d2f80 100644
--- a/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-inherit bash-completion-r1 git-r3
+inherit bash-completion-r1 llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
-	https://github.com/llvm-mirror/clang.git"
-EGIT_BRANCH="release_90"
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -19,15 +18,6 @@ IUSE=""
 
 PDEPEND="sys-devel/clang:*"
 
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout '' '' '' utils/bash-autocomplete.sh
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
 src_install() {
-	newbashcomp utils/bash-autocomplete.sh clang
+	newbashcomp bash-autocomplete.sh clang
 }
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index ef4e98d21130..886d2797fffb 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -20,10 +20,10 @@ DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD clang-10.0.0.9999.ebuild 11554 BLAKE2B 4a5f81509bd9ae901436e3a834fb2dae840f84655e1f2f792922ba276f0139db665e07f85de23c5bcecb68c80f57442c7766ff7a9e74e2bbe68bfc15f2b45d9f SHA512 517816a43844239a3e0bf7f81ab30b078f99f238c298d6b83a282f10eccc28faf2f82863980dbacdb53942785ca9cd82414d105332acabef065043547d8bc776
+EBUILD clang-10.0.0.9999.ebuild 11008 BLAKE2B 66643542afe563a00694536970f02ce372292cdf571aeb3eba8183602ecb3912f930d8530ce87a8c8077f8bfa4a11da2de9b5da8456479d050af18f51d6930a6 SHA512 44146c6ef198bc0bae642c32d6dd581e7f5722b9da5a4c766eb278431b1623c010cf7165933b759a66e3f5e852cd8dcbece63b277f8841042881a310eafd0491
 EBUILD clang-6.0.1.ebuild 10260 BLAKE2B caa01b8f386069bccd3bc003172b158cb4c82ceb0014cb22c4065f0b8fb257c0a1d418f94b680b86e6386493d68f0192d6a357e98120daa4014283b627394aee SHA512 0efc198053d9f828ef0cc506f3ea731f0e440f2433dcbe3da59673fb7cdb33e746620515585c6d866304087038ce1b70b4b9f35be3cb1cddaf5f413d58e74891
 EBUILD clang-7.1.0.ebuild 10342 BLAKE2B bee118a01e7f6a123406d809e3e87f8f14bdac8060ee9cf0bbd21c0ab99493d215f057d42ce1a50aabab4faab15f5d79313e2123c2815c9346263231ddb18430 SHA512 924d9a98c439918cb1f03da5cda2b87dd412032209752aeaf1e1a69d5bbf8c01f403505681f43c8a08b731aa8a644e35a754bb18624da4d8e4ca5dfebeb17a18
 EBUILD clang-8.0.1.ebuild 10240 BLAKE2B 564acf26ff06469442f634c60cf2ee887f13f8d720f6ee9f104f84057c588e56b5b1e3bd0e3104eff4f25b52d6a69467b95e8f409e67be83887ef41426e8c33d SHA512 fd367c55c9a9f33d765e7d520806802b7e0de6e61eda33b46d1a5a24906e4c6a6295b2467c82d6001db6519be2609097f09ddb11e4b14165a890d85cfbb1ddb0
-EBUILD clang-9.0.0.ebuild 10156 BLAKE2B c2680af0efb87aca3b7b549df42ea1e8d84a3c7df66f71a3b3d63710f8182f14ae744ce8a51bb1f6eb24564a88372d96a517620cf72d87188cb0cdf23b21d740 SHA512 e0d64fc75df9bce9727f825b6cb197670c950cc3aea68a8d1566a86818c912a8ce9bbadef52d1c671a7c6dee307deeb9662e6447f9c55d5b5067ebeb910cf38c
-EBUILD clang-9.0.1.9999.ebuild 9531 BLAKE2B 339c3275077f63069f74ddbc3a9b7aa2e1b48ea0677fd18aeb996b414119d4371f5f226a1e248e10919e798244a7546c557e74fe4170bf93d69e2b502743bf80 SHA512 4bf2f4ab2ca5ab62ba2795089cc9c329e59a1a9c3c3094c770120d94625be74ced3f135b33b4898f69866754f16f6081b76169e0172a80a9ece3f9b07d0c83fc
+EBUILD clang-9.0.0.ebuild 9576 BLAKE2B 17ef1b35de29f82c0ab9132fa1fd1a21ada47f4cabe0d6b7c406d0237eadb7cef05dc73e1cae8fabddb455082d588672a4792699d79be20041ef0e5bf19a0c6b SHA512 5ee6973d2ed6592389a7e83410715e60623426f61b01b76dfb464fa6010e374ca2660b872f8af2516d0c5a3f50219871c62b69c39bf262cd2011970e0e5f5032
+EBUILD clang-9.0.1.9999.ebuild 8960 BLAKE2B b22eb0c4b03309707087ae5790d6f8e8ae2ed402d731057fbeb368a4e837178c21565704ced0ff867edb2decdddc9d1765ab2b292ea573c47745e975033537e4 SHA512 0cd4cb20bd1414744e5a5f259e132e34172d27b66e44506115833946b465eeea710f1dd76ae0f8769aa22b41b06ccb48b3412418f9164231cc4eff78c3928cc4
 MISC metadata.xml 1377 BLAKE2B 8b580be2bcaddb98c2d2b8defd1730c69a7478248f7d241dd00f533d36d750a3f45c1e55161a4fd2731b6211a22c658046cf8ad5a87028c32928dfe0cd4a862f SHA512 b08ea2bd3454abb09abfa92b62e6dae4f4e10db0266c1e4895bef0f6a2d2fadea0b36b9b861831389413e1cca0e3c412b4cf474fc8c4170902b40deeab06686a
diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild
index aa2c3a2ba5d8..6910230d08e5 100644
--- a/sys-devel/clang/clang-10.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.0.9999.ebuild
@@ -3,22 +3,20 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \
+inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
 	pax-utils python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+)
+llvm.org_set_globals
 # We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${P}
-
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
-	https://github.com/llvm-mirror/clang.git"
+S=${WORKDIR}/x/y/clang
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
@@ -84,24 +82,8 @@ src_unpack() {
 	# create extra parent dir for CLANG_RESOURCE_DIR
 	mkdir -p x/y || die
 	cd x/y || die
-
-	git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git
-		https://github.com/llvm-mirror/clang-tools-extra.git"
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	git-r3_checkout https://llvm.org/git/clang-tools-extra.git \
-		"${S}"/tools/extra
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' \
-			lib/Testing/Support utils/{lit,llvm-lit,unittest}
-	fi
-	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
+	llvm.org_src_unpack
+	mv clang-tools-extra clang/tools/extra || die
 }
 
 check_distribution_components() {
@@ -258,7 +240,7 @@ multilib_src_configure() {
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
 	)
 	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
diff --git a/sys-devel/clang/clang-9.0.0.ebuild b/sys-devel/clang/clang-9.0.0.ebuild
index 2eabbee087ce..d6ca87c13d50 100644
--- a/sys-devel/clang/clang-9.0.0.ebuild
+++ b/sys-devel/clang/clang-9.0.0.ebuild
@@ -3,26 +3,22 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils llvm multilib-minimal multiprocessing \
+inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
 	pax-utils python-single-r1 toolchain-funcs
 
-MY_P=cfe-${PV/_/}.src
-EXTRA_P=clang-tools-extra-${PV/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz
-	https://releases.llvm.org/${PV}/${EXTRA_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz )
+SRC_URI="
 	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )"
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+)
+llvm.org_set_globals
 # We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${MY_P}
+S=${WORKDIR}/x/y/clang
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
@@ -98,24 +94,13 @@ src_unpack() {
 	# create extra parent dir for CLANG_RESOURCE_DIR
 	mkdir -p x/y || die
 	cd x/y || die
-
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-	einfo "Unpacking ${EXTRA_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${EXTRA_P}.tar.xz" || die
-
-	mv "${EXTRA_P}" "${S}"/tools/extra || die
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/lib/Testing/Support \
-			"${LLVM_P}"/utils/{lit,llvm-lit,unittest} || die
-		mv "${LLVM_P}" "${WORKDIR}"/llvm || die
-	fi
+	llvm.org_src_unpack
+	mv clang-tools-extra clang/tools/extra || die
 
 	if ! use doc; then
-		einfo "Unpacking llvm-${PV}-manpages.tar.bz2 ..."
+		ebegin "Unpacking llvm-${PV}-manpages.tar.bz2"
 		tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
+		eend
 	fi
 }
 
@@ -150,7 +135,7 @@ multilib_src_configure() {
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
 	)
 	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
diff --git a/sys-devel/clang/clang-9.0.1.9999.ebuild b/sys-devel/clang/clang-9.0.1.9999.ebuild
index 848de712e241..1042dac71eef 100644
--- a/sys-devel/clang/clang-9.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-9.0.1.9999.ebuild
@@ -3,23 +3,20 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \
+inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
 	pax-utils python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+)
+llvm.org_set_globals
 # We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${P}
-
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
-	https://github.com/llvm-mirror/clang.git"
-EGIT_BRANCH="release_90"
+S=${WORKDIR}/x/y/clang
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
@@ -92,24 +89,8 @@ src_unpack() {
 	# create extra parent dir for CLANG_RESOURCE_DIR
 	mkdir -p x/y || die
 	cd x/y || die
-
-	git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git
-		https://github.com/llvm-mirror/clang-tools-extra.git"
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	git-r3_checkout https://llvm.org/git/clang-tools-extra.git \
-		"${S}"/tools/extra
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' \
-			lib/Testing/Support utils/{lit,llvm-lit,unittest}
-	fi
-	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
+	llvm.org_src_unpack
+	mv clang-tools-extra clang/tools/extra || die
 }
 
 multilib_src_configure() {
@@ -143,7 +124,7 @@ multilib_src_configure() {
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
 	)
 	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index a9b3d857d750..25ff52809519 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -4,11 +4,13 @@ DIST crossdev-20190311.tar.xz 27176 BLAKE2B 444828314b4e5363e9603a1fea8034e0b2b6
 DIST crossdev-20190712.tar.xz 27240 BLAKE2B a2d09a21df1eeeb16ad03c7415a58e3d3424221b08d1a672167945df8ebe9b6c1898ee3f684d8653ed088cc1ef0155de0156b14e2a77bb47389c6f3e277039d7 SHA512 987c29b7e36f94e1bd14c4072514a04d6655a41a922cc179e6cd12bc78a71dd60202d202c40a107365297fe11c6e2bdcbd2a3cea21b5b7260c0b8608d9d3ade5
 DIST crossdev-20190901.tar.xz 27180 BLAKE2B 879616453e883c54c9646e9111aba0fca86bda36c3f1fb327a4036a140c58b6b09498fb8e2b6d8e19dcd5efe15245d70585c6b4b463ec9f58ed5c2b84395fa49 SHA512 42d31626f798136df1d9000d0de325d53d51746a8f187001279090b112fe05862930110d2ef877d14dfc9a6d111649f3e335e1bb8e023696a69129592b6a8976
 DIST crossdev-20190908.tar.xz 27216 BLAKE2B f756735108c257b5070031f60f39cd93ce4d146e1f7d0e33df40384033c92d545f11b3aaf7b6313fa3fc402af6d0daa8ec0dd1e0aadb42a9a2f23b05768fbcda SHA512 70fb3a5995c284745fa4aae5844c368e7b8f5190a9ec15384b1db455ff6202bf88e33e16ededb6d127f82bab0aa1d0fd859652c8d4907e9cf7f4e7c95bdfa540
+DIST crossdev-20191014.tar.xz 27240 BLAKE2B 06a76250490c333d03d0227e0505c4cf1125426bc51fddfe1c87700b289a150596318d60e1ba92d9a104a55e23edd9a603edd7887cdcecfe23f9e5c3a759b02a SHA512 82317f0db3f8e3ebe69e5d132d2f248795416f481161a67bf09cccbf82a95b79656a64c476c97c1e31e4dfac1bac6c89b159afae5f0516d08f320cab6cfdbbab
 EBUILD crossdev-20181020.ebuild 843 BLAKE2B 113a2df0272e1325b016953ebb8d6cdf979fb905e4916f5464fa2513494398b284b2f4dddace5da23739a5d9b0f8d3f36b522ce2409bbabc167a85c4919a7f10 SHA512 65ea457893a8f2d320ef5efe0458ae788c625e327a90c2eddacaba32f39942965b721f3d2984847a58cec3e46a863c05432d5462fdd7f017cc4367e4f9a11708
 EBUILD crossdev-20181202.ebuild 843 BLAKE2B 113a2df0272e1325b016953ebb8d6cdf979fb905e4916f5464fa2513494398b284b2f4dddace5da23739a5d9b0f8d3f36b522ce2409bbabc167a85c4919a7f10 SHA512 65ea457893a8f2d320ef5efe0458ae788c625e327a90c2eddacaba32f39942965b721f3d2984847a58cec3e46a863c05432d5462fdd7f017cc4367e4f9a11708
 EBUILD crossdev-20190311.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
 EBUILD crossdev-20190712.ebuild 850 BLAKE2B 15de7dd52f3a59ee044065377bb0cb5645f8ff8d91cfe0e8602b609092e0c35e633b8569449a9ac991d704116cdea7dcd5a636e35ccde9b71b55c8da8c255892 SHA512 7331ed3ce7351a98d7a3b57a30038034156bcd1be4ce099c88e046f0cbd31030fb1f654edd47b674f412f0eef60aeb15e3689fdaccb47eaa54505c013995efc6
 EBUILD crossdev-20190901.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
 EBUILD crossdev-20190908.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
+EBUILD crossdev-20191014.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
 EBUILD crossdev-99999999.ebuild 869 BLAKE2B 54e873c24ced58363ee60e17f9c8fbd9321302842928795a3e80a42665e73191e209b6f05574aa1b33134e02893d91dced4e9d0f7588d0a1f21d438549cf070d SHA512 63a9f99fb197ff45c5c059a6edb39e07a6eacddeab8f0a2264e6a46ae4b685d6821586d50d1962509ffc394db24a956948f53109b49ce0821db0ac3764d38d72
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20191014.ebuild b/sys-devel/crossdev/crossdev-20191014.ebuild
new file mode 100644
index 000000000000..ad51f67caf6b
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20191014.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.1
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+	!sys-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index db56af2d7dc1..faf0ea9b5cc9 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -14,61 +14,49 @@ AUX gcc-8.3.0-ia64-bootstrap.patch 1327 BLAKE2B b8f2e46eb619830fec5f44350bac7f4e
 AUX gcc-8.3.0-norisc32.patch 1390 BLAKE2B fc9d4b5afb57631957d66086af67de5843c3a3421f855bedce747fe41b78f3423c33c0cbb00ac8f4ed27af0691d1f0a7b8342850826667f25ef8a2d63b4e6944 SHA512 8e32e1fe14bdb1b29a6ae3c64f7bfcb7db41ba3fadaa00a5f2b85e4d63991bbb624ef04789a313c277a016ad055795ddba23c69762c19e3a536d4cb101cca2fa
 AUX gcc-9.1.0-norisc32.patch 2559 BLAKE2B 3fd196fd55ea9aeba406b7dbfa60e4c888e1cce7982f6ca35432161f9d523ec05d676925a33c07b4a140d26f9920677a9f70803c1696d085f61dd58950281876 SHA512 3e9c9b172ef4b228a17b8e914816abc8360de8650625d34956a604ee233a0f4a8d05c10a23ac02b9da82ea34d97b852f164cfb5fa2d69de10a6da4c75255cb2e
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
-AUX gcc-configure-texinfo.patch 337 BLAKE2B 6408817927f71c5c55a19510a95e1aaad9b56be216ec1c753920b55a435d70579e27ff5bb8ecbeea1b9ff1c8ae62b940fbf10bf876c3d7ecf6cd662d9b693100 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5
+AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54a00a88b5c389bbf93b8b61bc12c86a07df03d57280759e5485ac0cd89ea69826ace01b5720681ca3102640b SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16
 AUX gcc-spec-env.patch 1544 BLAKE2B ebd019ff63f6a8526f741f1760925538f10b25c7d5fc69bc015e27bdb468ddf1239aa9d0af21520ed1f286babc98b7418828e212b68415d238cd2c78b43db2f1 SHA512 ce9c1f923e2c6d17347ec2d3d8482351a9644194b2753627389294d43bb4f11b9c2ef41eda1b46ad83d09901a0bedebd5b6b8a57a198646030ab61e8d2d8cb48
 DIST bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 829688 BLAKE2B 5a33cf9ecf04df64d23901c4b03f8ab5aad5e8ebeae225fa08c7ceb5fc28c5010685e7c429a1e8b8e21402fc5b906b2f3184a3095e302df647e031339c4e0cef SHA512 d4533d02289dcd2ee11952f83dc687d82624d6e31ddb548e4f54cde4ef9cced5a1aac5b64086441f8930274e31f20d0ee82850fe1257f96c08b05d406d3b2e26
 DIST bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 815566 BLAKE2B b202610cbc3e5a902a2bd9f3d217d224ea5f3ee68247557af907736cff577cd720065ab1567046d89f6d87cc433b3edbd1a24a3c8ef2ced97af9782ce49cab26 SHA512 da11cb354d5ec95c74081c2cbb29bcb49817a1f9d6875587b4a27f1c9fdea8f07eec8147b739bd18a4fa2365e5da50e4bca7d7531612fbf2514c50516d225ac2
 DIST ecj-4.3.jar 1377431 BLAKE2B 1d6a8ae1cef0fc4ee325f935873e4a2e560c34cac929bc4190c7dd47e1ca4480ad608f0b7a5d00f2bde30ff2dc78f74ccb0effa48db1df9358a6e35ebce32100 SHA512 c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
-DIST gcc-3.3.6-patches-1.11.tar.bz2 53924 BLAKE2B 9183d6fcd99c054df0c3bed279b4bc91e8bb68a2be9902a066f87815ee58a83ed2988b5be69af61c1ac4c9059a81b1fa43b8d27f55e46a3f20b7d18abc070895 SHA512 829c282f2e5421e40ac3d86a9536bc06c2ce80765c05a0cce8a012339ce5988024020643422aab758eca4ecf59e829825578e819a7afb3bce3d268b663333eae
-DIST gcc-3.3.6-patches-2.tar.bz2 54171 BLAKE2B 405e9e75a65c4b31f96db51b071151a9a8753ad4ce8d243b3ae9f7d4d697559cf1731966c0ebd9672d17f85cd98ac1fba44f24bb4c9d43ed917af756e134c113 SHA512 97c40adf2d6090eba8eb480aec296533846e77796ea83731c2e1cd1c3b0f1a2596b4decd3d8cea5ab804a003a66c4cc60034585d9a86e4b18cb794334504cf2f
-DIST gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882 BLAKE2B e1e1a1e24368d238b999df061e086c1376b095bba703154fd35edd6337b5fbc265722ffa01ae496e55a524d52792d7802867b38cd426c56397056d96e62036c9 SHA512 d060c1552d4f21b8b1cd6a6e56b9af4f62f61ce8ef4362afb1982b2ad9defe6a9648705cf780103d4f2061737553b6737c276d79b803b6b75ae94035bc881f0e
+DIST gcc-3.3.6-patches-3.tar.bz2 52952 BLAKE2B e4e52b96f67eb8f09ff814b54c60e92b424c38ea4b699a81d37ca9d97551ac665579a624ddffe6498a39a92c2598fe886c9e1203dbf5002252c2edbefe577739 SHA512 a3b35fb0c9faa765c136d4b10023fdffd0d99d256bfffce1a72be778e972bcde1e14804ddb3abbce3b99875968241cc518308a70e9070b6da20f34cc1fdc3605
+DIST gcc-3.3.6-uclibc-patches-1.1.tar.bz2 27261 BLAKE2B 3e6874419f33ff95f166f5bc8aaa0d015340f025562e432794941fc5bcee7190266c414ff1482fbdea36ff90e9886dd7fa6174d0a3482034a661b27b1511c012 SHA512 8e487053ac00153c3670280a977da019eabb6d1c3fde83b964c37ef09c2f7249159f1768e619554fa3e48323ebd7ca2474629f3fbca156f6448cffb6991ec210
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
 DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 BLAKE2B 174eb5e437367a8e64a48f3764b4a3971afc7f5bffac583b7cf4e98a2ea2241ff896751137cc59d45a12b12333319efd52094925ba175073fe70dc143a5ea7fa SHA512 c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa
-DIST gcc-3.4.6-patches-1.8.tar.bz2 61940 BLAKE2B 54026fc7f0a17cac4a219c2182865c597a417448310f2b10f948f971f9639eedf958d03474d999675180e8c8a7ef7f7929551c33fead53b909b4888a5483d78c SHA512 14c12628e0ccdc47492890a46d45f9ef1df3970d1103116c3c3be76ecf1b3560088232819891662f44d621877b59ed38dab48053885bd34e6516d7de514f42d6
-DIST gcc-3.4.6-patches-1.9.tar.bz2 62934 BLAKE2B 5eaeae2c2f4ce79e41e8ed86bc695de67d4e36d238bfdb13486d079495d0013e71a133feababd981f5021dbe409eff684f3a35ec465232e86863a5b299e0ee8f SHA512 3d6d4d5354291758ae00b90e81034950551716cbc5a96325b2bf787e9d400123991b728d0586afd8ada0983b0383668e59e51eceae0c96bbe6281a429293acde
-DIST gcc-3.4.6-patches-2.tar.bz2 63097 BLAKE2B 74c9341e11ee55e0dafa506815462d0b0bee599ab9a23eecf63ee73b043eab7b75bc7f04157526bb73037bba2260af59a6aa88627228e7f73266d4078f6480d0 SHA512 a695b48f48832f7303c8c9cdd7bee8cba5c206295a3ad2d741623ef489c4403cf16b6d84a9181f3e7fbeeafc99b28141f86e57e5d3d152ee285d1a90cf729635
+DIST gcc-3.4.6-patches-3.tar.bz2 62100 BLAKE2B 9d3c2ba5095066ef0eda55e80f2ff62da13c41e7b38193439f29e127004c487de810b5975c585d5944888b5edde7fe24ed8adcfccfc8af24e4fe40799d4e8c8d SHA512 6f68e29ec86d5e3921348be2c5a9eb79e01a5169c20224a9b53fdec5e02a10cb687728677ba9440bf48219f1b9fbd92c0ce72e371f6b16828912e9f72cd8433d
 DIST gcc-3.4.6.tar.bz2 28193401 BLAKE2B b3e2d52269e59acbdb04248d8d95bee957da29722f998ef39731b8f4fe9ce29ab6b29020be440d7d5db2b56f93fa77bc7e56f979912d03ebb755a92ab14927c9 SHA512 d235e1223d5faf8f37f2d73db35edeff44c88974b09dfcf325f4b181b16d7124710d93b1b65b60206ce3525f062236ea0f338b3a5341d7ecbe196d8e90c3ff18
 DIST gcc-4.0.4-patches-1.5.tar.bz2 43777 BLAKE2B 9bd12a707b9721336fa2443d73898df4712a8b81ffc5b7e18b611663f642f6e815d6d6c4583791fee87d36e56dccfd5b364119bfa98bd80cb3e35f20f989c80d SHA512 dc9074fa7861c9efd4bb8a4118551377c88e27f2f2e7ea95fc3c75b3992ab55996afd8606570c795e85e73c9d1e2179f261b6c5d470ce778fec8fec3a74905ea
 DIST gcc-4.0.4-uclibc-patches-1.0.tar.bz2 20164 BLAKE2B d2d9626f03bcf0b06f316f22f2d4ea71ba0721d8369ff914bb27e20c4423a2a5b511bb23e74d2efc247ecc9c0554144a7ebd16d8baf432e289226ef610bef978 SHA512 67bdb8be3b7d173795ae3692f8f76fb6c236bfe3054112db30e3f0a56982685fe0b15e2c37f7d9e15e6198e4a41e47e1434a2befeee4e9e460e7bc9e0fa9d235
 DIST gcc-4.0.4.tar.bz2 32642939 BLAKE2B a152e6183bb288e587f1e6ad21401de5ce21f871aa4f82344bf76af4518d3286d281770754fd5744a9c0a86bd656be8bce88aa72380e42c438271e1f471c4d8e SHA512 194c12b5a1bc50c003f6fc849a4c0032388a960fb4b769bdb6e76cf330f04f880a0723661c991ec03742443c21ccba9af8599ae648a0777e0a5875c5fe7f6abd
-DIST gcc-4.1.2-patches-1.6.tar.bz2 54513 BLAKE2B 5f9d6e3332cbfac0ef757dfbd45226414f41c39f8d828325ab0d1ae1a82855cc6cde09308a7e1565cbd9ddcb1b730681bf7ccf69643a29141b3b029e8fb61135 SHA512 0f225b66851c1e70afe19f59c8527631c8b42f0580922d979d2dbf367b4591a59e7047bcb52b36695bf24fcfd71ea814b0001e001fe0e39482dec7327bb74259
-DIST gcc-4.1.2-patches-1.8.tar.bz2 56242 BLAKE2B ea0605478b8f957c8aff6f3f98a35cecb707f02957a58e966b93aa2d83f9c5dfecf2211df155cc42db0727cfeccdfc55ef628c819b0d3629eafbc829dd300caa SHA512 bd4d9c99d79538d679400fc5c55edb870e71df0b374f5ec397a09bd5cbe72a8557f7fddbb08ccae905631de47eea3a56a756cb8bfce54d74ab46ffe275707f29
+DIST gcc-4.1.2-patches-2.tar.bz2 56296 BLAKE2B 1b7660dc55ce36158f0715c0e277621deb2dbf45bdcb15a723e8c75038c1591cab64864d8a8cde62b443933b6212703996895a98619506437eb185b9f866e4a4 SHA512 c61b0251c8826be34a6688924f61a4318ffc20fe22a7aaee98db69aa84e29f90c2e1eb8c78961f8d6b4d610478c242d3fc1b74642e6e3661b102acea1f1f6e14
 DIST gcc-4.1.2-uclibc-patches-1.0.tar.bz2 20980 BLAKE2B cfc7dd4c7a0b1ed80c491d4ad56b05b05ff308fdbed2faa1b9f15b10c0f7834ee4ffcb0df1619f959f7a1a5f315305b550665c232404a8a3306e3e615539a0c8 SHA512 57789f4236a3085136afa83be3cef677bd813afd258d67bfdbecd2058f497cd459366d5515044c0208ab753946dc951dac6a3889752ca6dae836d837c22ce33b
 DIST gcc-4.1.2.tar.bz2 39707720 BLAKE2B 966b6a64c118456c7fb66eb2ad0dd84b1d53ad88dcbd146f446ef097a6975f5d6a7f1bcbbc4bfcd4e48b00eeb8054728e412db3d9818cff1f195e37859a4e510 SHA512 b97d3b72a3b0355611d5090b2c715b7a774f0e466a89326a0226c2809d12dfafb2d7c5a7af54bd5e00c135bbb6596f535e1a484740f7f1f691e8a57e6f0425cc
-DIST gcc-4.2.4-patches-1.4.tar.bz2 25768 BLAKE2B 502a83eb320ab4e4e4f210958b839f99e4c524ed49676ba909c297a9e0fc93b91411c8aa123e1180909297de0f42c0c320bbe3cf75319728f4a130bb56907f60 SHA512 dacd9d13f29e1e7baf136dee564fd0d128c20f77a8f7ab745263ad9dea8c694c006b89baf93f9aab7a0f93b48c2a54d80c4196f83f0f27c0fe17f7fba9a4fcfd
 DIST gcc-4.2.4-patches-1.6.tar.bz2 27554 BLAKE2B 1b6cf76ec6f0cd17d1078f6586124d6da5b3217f30300970bbcedc024d319fb5768b3a24ba6e366fbd9818f5c973916e7eb77858a6fc3609239f509cfab68196 SHA512 f4b1946429216dc381639e36197e6de8993cd19d3dfa47c52c5383980a3d7eee3613e3cf121609e5ed31dfb466fb97978e4c53240c6135d9babc9e2edb8aaff1
 DIST gcc-4.2.4-uclibc-patches-1.0.tar.bz2 19167 BLAKE2B bf2bcc9ece9096cf7fda9999c56073774072fa03e5dbf389a617888b2269bc79a7cfb68a6e26da66dedce9f954a1766ed21bbdd907b747e9fb5ea3a0fbbb6474 SHA512 5545cfe6bfa7ab9a69a474cc051cc8744380077dcc193afefeb455e959e408a5e4dfd1adde5357886c7f598835400273ef80ad5c14976c0552b44f5cd48704ed
 DIST gcc-4.2.4.tar.bz2 44025458 BLAKE2B 1d9645298dbbb1aba7b2957acf5b9839bd702a85120aa82d4cada0e4ea68a1d633422d8fcedc405504768e2f932e4b9d1a70a86da0b8efa5fc923b786ebc259f SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9
-DIST gcc-4.3.6-patches-1.2.tar.bz2 76826 BLAKE2B c37cb013a6928e8494e9de1eab9601ee4575523b4bfa4e7c1f64cebbf64ef57bf877234a1e637515eef80535d2faa4ea67792e9434b44421a430b6fa6ab07921 SHA512 229692a6026ebadc4d87342fd11695338c0fb2a13c43ed6288710fbdca4d7330c74a2c8a46f60637be9c4c38365076f068d35c5a91faa1c69a55e5e7aeac79f8
 DIST gcc-4.3.6-patches-1.4.tar.bz2 79026 BLAKE2B fd7597483095afa114ab4df18134d3f00882c1476ae30b7aa531dffdca111599e811a451466fa981d0f94eb29a04cd784a36aaab4bd365ad522eac44e5aa5c0c SHA512 4f19a6221c520d62a4ab8731afb76c20d9dcca7b0cf6e52011b30fef013fc21fdf30c619a4bf959a344e9a6849459e9bb25ee204dc1b7d757e87a647ddd1f3c5
 DIST gcc-4.3.6-uclibc-patches-1.0.tar.bz2 3021 BLAKE2B c3b18a85253fc7b63e2f1fa541ce2c9bbe0c664fb5da8d494c89889d19aaebf513c40cabdf3271e3d074aace500bcde4f0ba4478c35ae0ae105b4a31d6e4e917 SHA512 6b85bf4caf5662ae114e472199c2f77d1fef63c485c073643968b6e0575c13bfa4ce9a32191908f34e70d41fd9fb5b9bc2b527542d82dac881a0462bfe89b120
 DIST gcc-4.3.6.tar.bz2 59756702 BLAKE2B 0bca01c8c2e7d8dc2f971c2b2bfb52d61285154c3fd14d6356a1cf083622aadadd9031bf0aead9a285eb1c4200c2d9515773c256acbdc901842aa16e06cc81e7 SHA512 0cb43f523135c6d54b3b5e26de7044fe096c16e7c3af8e400b2b48c5e52b4b5aa56615b1eca5e326b0202cf34870daa6ac44ec9633762acafa4425552b4029ee
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
-DIST gcc-4.4.7-patches-1.3.tar.bz2 25866 BLAKE2B 30c6e50afd9fb3ff159b99a950f07f91ca7684fbcd11339d273695ba7b1cb324b43b23b821923d8f972af6b32e4dd45075b1fbf6740f034b0911831bae494025 SHA512 cb59c8bb72a5414a9930f63e55a175bdc57d51dc518ec7d1245684f4576daa139e10dbe050a75ac960607cb0a5ed52c49ed7139d74398278bb7012ecda7be09d
 DIST gcc-4.4.7-patches-1.5.tar.bz2 27790 BLAKE2B 1598fc1eb320db2ddadff01b3bd8110cab2d838dec75ef1bbaa7465bfdbc69ce5c55cda2bce059f115418bd4506187b62e8eb020237710b1f61468892a43627f SHA512 8420aad5def3c58c75ed955b0d198c2b7d4f0ddeabbad0a83269a1d5078b9240d90a7a272cf0f23f1654cf1058a8e0c9cff29b22c74328b20b9a1e5c19f871a7
 DIST gcc-4.4.7-uclibc-patches-1.0.tar.bz2 3016 BLAKE2B cced59dc8f03a2f8bce7f95c5028164b41189b2272ae6a0d525241dd24df827292dda39b1bd9b4d6c0741be0ff0eb4df62d7c6aadf54d54c2bf64f268c68988f SHA512 46a69cb8e2e3b97116d012b95a515953b2629be04228a2ac90fe628705e6bc3bdf05ee22e3ed7d5fd0fe6e60aad8f1f96f36e8dd3b231bdfd048e61c6cc15beb
 DIST gcc-4.4.7.tar.bz2 63179340 BLAKE2B e01c90907228572c3d25bbb776c8232fa3f8e8f4112a27f69be2bad8eec50b68add39839f8d5726f5f82491f50e71fa1b44d98b60a3e0f145848a0e0e8760700 SHA512 5562a7319cfd8cc7c5261de9170f2cda86cbd3a231a444a5ec0ad3d8fd60af6f8bd86af8f201cebb7bddcd083d761834d1cbd652c68af0f5607d22a63439ed0e
-DIST gcc-4.5.4-patches-1.3.tar.bz2 20108 BLAKE2B 2a78a7e0228ae78996e36b14ad2961d4aba2ebecd8714a393608a41cd53efdd83bc31aebd6fd460372458592167b187997819db1a8a5778474098de224c844af SHA512 ba5781da360b5049ba07aa46dd45b8405540dadd717ceb88c07d8803ba91a90b9ee32147932d3dddf1ae1ece148589cc2b0e709a3fbec7fe56266f6e925fa8a5
 DIST gcc-4.5.4-patches-1.5.tar.bz2 22794 BLAKE2B 8a3a774c68ec37191199d4cc65f18bba55cfae8c5e715485a0950ce43ec6c96f705277460cb28ee8a70f73d9f30d9f06bab53d2e22d2b35bad009d785a0520b6 SHA512 d59857083c41456190adb350d563fe4bb649c4c50cc9a841bbf63ec03be53ee3de5ef3e6720206e7e51184d98453f3163cc267ba71e4fc06b22f44323ca87585
 DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B abf53f85a4af1336437963595b04d2c24284ebf7cc76d845bc3502cf54ef2dcfc21f76fda336f99165cc9939daa8b8c8dc9493c276879670a3cd0ac0efe526da SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a
 DIST gcc-4.5.4.tar.bz2 66426133 BLAKE2B 8725c7868e1fc9e72a28635f39aa014681aa502db4687e5d2d6ec7cf6d30b04902eca2ebbc1ef2b0e20b89908424d0053f0958e24ded5366fa1c38469913caa2 SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115
-DIST gcc-4.6.4-patches-1.3.tar.bz2 16443 BLAKE2B a6d5cb1b51319e3167f687b7efddffd7dc8772b656fc42bb68687c2acc95095c57edcc6c7677b4b23c3666545a7eab6129c39abd3c7877c50c699be1b9b2ac65 SHA512 ed904bb8438a23a2e1ec3aff28c4451128421426305ff07de50edbad51a066bee9d1a9042a9b26c36dbd57e1eb044a474088945d6d780c6e98d7563947fb9b9a
 DIST gcc-4.6.4-patches-1.5.tar.bz2 19017 BLAKE2B e2e9642ef97b126df48b480b7a84d47597686932cd3447f3b210518d5eddfe4d90521a6249f174e4480315a924c48cf98c2a2bf0e383eeddc6d1d75770f2da2e SHA512 f609e71514db89d51fb5047ca12cd0d1dbe352a0047d7ca744115df3ae7c0c61ba8f72b2642080267a549b1c7fad65f728f49a50d00f6796042dafc655de10ea
 DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 BLAKE2B e841db5125638b0ec34323d0500786ab6577042a22af3b423433542164408199ac4ff1036d27999aa01aa96e9e50988df2e86835102142f74c3f8fb33096a47e SHA512 fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133
 DIST gcc-4.6.4.tar.bz2 72006076 BLAKE2B 321c14c097c18cf60c32d228720980717e25e22e26ce5e75c3a411c423f9657eb896974200664132e2fb10c3010c5136d2da7f3c916fffddf7e4afe4e8bfdc20 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc
-DIST gcc-4.7.4-patches-1.4.tar.bz2 18072 BLAKE2B 6bab25aee9f9ef605ce2942928a9d1aa91371b8fdec00643805e5010a4b0ffb043e0dd1a119d1064f79e499983374ed39e475a9718fce632cad07811363ed56b SHA512 9f5d68ba62aee909023542dcece81e4e448ea750254258107d4f70291d8ae99469c4518e42ffddbe6b622b258f463127be6e6ef7eaaeeeb0f59b3b719f3eadca
 DIST gcc-4.7.4-patches-1.6.tar.bz2 20746 BLAKE2B 56687d1788b2a6484fd52dbfffef77f19f3182a38d90ccd24f8df6fbe5daeb3b27176cf01de7ce3723e79b427cd3cc77e06e690e13e8271a0a5067c20117c273 SHA512 4ad9a08f1c9b21b3d9f069346ca752bb9772b9826d3cc50abb9a1cc2b916c208d6a715efdfe3602d5a3f08b6c058e5bfb43f87248b7a09d8b0fc39e2403580bc
 DIST gcc-4.7.4-piepatches-v0.5.5.tar.bz2 15358 BLAKE2B e0df0b19829d9f9b1e8719467a6e15336d58ccf50c182c3d14438bc7e8690940535f6391b83f359c4e0bedf16814b7d4e2b0888f4698740be511bf6a574f9556 SHA512 f5e078bf4c17f7b5be102f1e3358d91c72e80363b5e055a92461f78399a1bf27bf6cb690d41900719bb260b6529f5d1aac999e613fda6ac5e4efa27f622510e6
 DIST gcc-4.7.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B b24522bd5516e0f2bb4e8d20437e0a0aed22ea8cae3c78fc600688f71a57bb7fbd3d431737a30e4406a9ff5426ed7d2289b3efac4d5efaa5841f7db290ef023c SHA512 c2e6c96b74365f8233f6106fa03d94075b60f6f77c683aa2e27aceb007da723243f8e3ddea8b178e6a0f7939b8e35615165534dc74e5050f87680ab261a31c52
 DIST gcc-4.7.4.tar.bz2 82935453 BLAKE2B 98cc902dd1506161b96c8eba10e5a5c7fb11d2dfd95ebac15825806fcdb262a1ff962b72275dcfc8453b753164fc234bdd666b207202cfd5a0a2b4cd09b8c741 SHA512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189
-DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 BLAKE2B 3744dfcac069b5f8321fc9cfb019d44c848d70d17e5908d3d97f0c314b98a7fd884235fec2b21c93027f6152577439f6d424f96836b113dcd589604af969c756 SHA512 8d190f81ca0d25281250dbf0a670fcf12334b0811a5bf664e6450942a2996d02b979c6e8f8760b287edad06df3d1f8e2fe5cb0c3dcf9677c3420457d841d9506
 DIST gcc-4.8.5-patches-1.5.tar.bz2 30345 BLAKE2B 1bd2868e675b43c15d4bafe3c18655042ebf2687ca28675d0e94135251375d6912e086f3132620d8a20a2a6d11a6282b2749c7dbd3b8bb1307909d3502610c32 SHA512 238b5a852521feb90f4f1df691eaeb95c7d125d749253fb800208265e10c9a357842206fcd78a4a2d9c6c16362b623ae1c4878f21e3a9010c6dbffafc5a31f66
 DIST gcc-4.8.5-piepatches-v0.6.2.tar.bz2 14265 BLAKE2B b3bb37957ba8ee446967a3a60fee61c26a49f237241bbaf8bb3c3ec63656dd0492f518b129c8ef43cc06091742bc9c0b1042bb612c1110732b1e9608f28753ad SHA512 cd6af4047d4719dae9dbe86ce5342c7d8ddec38aad032486713b08e1b0cb711f5ca017e08d583137d51b8d4ef673366ba310e71bca7b49b82e9314781d6e9d99
 DIST gcc-4.8.5-uclibc-patches-1.0.tar.bz2 2976 BLAKE2B 1a804fd0b2fd5756e824f3eb511cf62d6af0fa8059ebcffadf6deb85e242ec8728b7883f2e054b465b87e4b61b6a2b55061a68eb8329c3a79a659d4c15808d21 SHA512 5469128eab06525915c75241797ad9ec4b63072ebfd5e110319bf810633cf3fbed39bbda4f6a0c74e537b248e7642780ecbe2086ad10be6e66b7dd289fa6534f
 DIST gcc-4.8.5.tar.bz2 86165587 BLAKE2B 760931013f96083078e74b8376eede6c23954e1f41cb44dbbdd8220fdede48807d89b9ca44fc4ae309f7cef441831b533512f1145cd563c5c797e96cf6cf1bfa SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea
-DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75
 DIST gcc-4.9.4-patches-1.4.tar.bz2 27240 BLAKE2B 26b7d08bad4b617ede2564f77ded67cc87ec6b9f6b4d4ff78b5b75c1d5739fc4049480c716075d74c9b8e23a4a3c1889796cacb3456a3982ab04a0781fe3cd04 SHA512 efa60a7f86e684710848182c7d040565c9cec7666e897adc02e5dea9d4c76117deece7b1f7e1f8772cdec9697bb92b762f93408824e47b3f63b4f35029f50a4b
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
@@ -84,7 +72,6 @@ DIST gcc-5.5.0-uclibc-patches-1.0.tar.bz2 3518 BLAKE2B b528d79d41de1099f3540c168
 DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1
 DIST gcc-6.4.0-patches-1.3.tar.bz2 13617 BLAKE2B 6bfb1d70397e6ca4359e5d190e36003c18c7a03a9be4f923461dcff11307601e6b3502a2e289585b53baeb919008d83c29ad24078f814aed9b331140e4687419 SHA512 91be7c8db0004cdd150fec0f8daa709374753d2f524c58087dcf45b6696dbd609972297e866f971fba1aa679464cf96a384dd111e104183c0939ab69add017b2
 DIST gcc-6.4.0-patches-1.8.tar.bz2 16904 BLAKE2B cc5b47919e6586b8860b7ffd62a90251061d0d07f5fab3085b56fd5fe6419e6f84f98ee5fdaaddeb8ff3e8745178a0e38c8eff55aac7f6d8a97d269afe465618 SHA512 c55ac6b73b4f2ee1fbc2bbfd8d5176e7721ad45899cc4aa8dc858b366504f837d951d614c6af6ce698c320639c49855fd786b7d97e8475091601a4b7c0c2c652
-DIST gcc-6.4.0-uclibc-patches-1.0.tar.bz2 1586 BLAKE2B 21f97a9e1c349b3d52def092a03e5a90533521da9af586be7ee527594f2d65745491ff8758d88c99a7ac215bde7ebf4e47a0a36cfcd7e66f70e0bebf2dadd922 SHA512 266dbe2bb53d892a24cd752d5c6833ea33f8df8b11b0471700ee53865243cd41f412f9bea8a369b474c9cd1435faff2e03902c7cb5638dd3ddcaa665aa2ec522
 DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
 DIST gcc-6.5.0-patches-2.tar.bz2 9870 BLAKE2B c6f6b3c04605da77679474d7784d674b4f6df5d39e7c26fb79b513852acc317776cb9d299ed78bec47544e7c5f932ef8d423483bf55fc830f6c244e71a4740ff SHA512 2e6998204e21fd098cb7823ec2dfa6c448ce0e96d2d4f7a18fcb833d7ac70cb97d7ccf5600dd2b695f7488d65bd4a13633ad78542cde72eca29d23323dfa2301
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
@@ -92,63 +79,41 @@ DIST gcc-7.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 72a5dcb046558c8f5c3a75040fe24ce1
 DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8 SHA512 4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gcc-7.4.0-patches-1.2.tar.bz2 9380 BLAKE2B a9608c7993b875f1c8d81e2aa15c46e10f91e6f37a723d7c09dd29dff7bb169a58597afc483dd46ffb3ce24944f824d746aa49d1a59924036e04aa855ca875aa SHA512 7959126eee11c10d9c3bbc867f6a74273dbd6e8f2d896d65b3fe1de73f0d8e09fbb62c7ff02ba8d1798206251ad1059c4490cdefa8adff09212eb23403923642
-DIST gcc-7.4.0-patches-1.3.tar.bz2 10437 BLAKE2B a344341e431b3430fdbbde2821920277289d88ea8b70ece8ac4369f430f6e1e2516d6b03a180f397339c2a210e64095785251d3efb40b6e4ba19ad2015e8272d SHA512 955fcb57ea3ef9231a30adfb8f999e406cca23fff0c57a097ac5d15c28d62fe630df9db2af06a0fedb330003d84e36a6856368460a5b747cda47f96ab0ce8d32
 DIST gcc-7.4.0.tar.xz 62601888 BLAKE2B df91ec680d5389736d3a37a2d85cf2e12fbe87b642fdf4b332e67a043e00944aca00243cc6709f86abd92115cb5a78502146636395571d1ea4899531e15d5d0e SHA512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
-DIST gcc-8.2.0-patches-1.6.tar.bz2 17138 BLAKE2B edbeba9c41972836de072955c0db51406603aaf0dbb5f84ac1c5d8d2d61a8df6d725356655b69e3678950a0dc6dacc1bc2bf56f3620d685fe5c32045b3893f96 SHA512 32e7bddb5ec288def1e5c79d58023d90e29d77e83b70e3f21a22f4da78061cc49184d92c43807bdfd56a5067cbb9a8cfbfcb514016662aa1a24d791c7bd87b6b
 DIST gcc-8.2.0-patches-1.7.tar.bz2 18166 BLAKE2B 2aff918d253d76c9b7d76b2d82e85c42f2ab8717e73831965b3a0fcc92b1ceacd7aa0b433dd0c180ad16906cfe059c020b256d01271ef95a6e56b08d41f4acfe SHA512 5110b610a4c9116ecd91490f66e570c09217c6b4d18bf46af5e1a51ed043df188ce313bdae6ba670b8800842387c98c1b83b7e1e0c396cbce71e6726d81f589c
 DIST gcc-8.2.0.tar.xz 63460876 BLAKE2B c5372b0bdfcd2729577dca287b294623b78c583491998404eb307768c573618bdaaedb7d9ae0e39ba41a62a14b9525dff0e3083285754b7f5bb9987ecf635185 SHA512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed
-DIST gcc-8.3.0-patches-1.0.tar.bz2 12278 BLAKE2B 793465c5de0af850c7f3017b3011e68f3bd1664e6ce3500a3dc3003d37c03fe81857698957770a135eadd395a7767fa804d354ecdcdeb1d83623280ca569d4ec SHA512 0efadd2481713992807fed2683666f1094b3757674754601c079569f3ef70cd7aed3cefc9f815f4e59a21d37e4e940c122df714e16f3878a5f966450c4273669
 DIST gcc-8.3.0-patches-1.1.tar.bz2 14430 BLAKE2B c702fbdb18c3c952cdb9adead3a193c948d78a4cb4b041beaa51a06b907fd357bb10a2f8d47d55978ebb08590fd7c9a6ec3df8e7a007173e20a55d251d947c72 SHA512 9e2284f597bab6f78ca24ead358b1f50495aefc9e0a416ace24c94723db7b2fb82d48426876138d00c82bcaf9c2f8b4674885988448dcf16dee1b764face9af4
 DIST gcc-8.3.0-patches-2.tar.bz2 16741 BLAKE2B b3db1b94749cb8a04cce8637429e15eda369ec741f236d8322716dcfae6db1dc9479dd4d7715aeb357a0b3106c7f23fd33eba466a041b8e2e0e57b6cb858786f SHA512 13a85ddf76563241973e061ba157942c81391d0b867c66f88da1ad66a79d99ccdd6bc324caca31eb31057c2d27ece89f6546d723a420b3af319c6865337321f1
 DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
-DIST gcc-9.1.0-patches-1.0.tar.bz2 12235 BLAKE2B 3f7a11dfaf05f14a1affcc602bcbea685a214025abc24d6c9df9634a1024142529c3d380d9bcbe50e1d1acdc47f095154cd872fc23487538e697a1fd563b5f23 SHA512 c9a1979e994e08f90a6ec44f088c407946c955f786b7b47adcfc3a56fab5fcaf571442ce60f380444092aad9801cd32f8a4d137bb6076f9a5cf9c961902e52fb
 DIST gcc-9.1.0-patches-1.1.tar.bz2 13931 BLAKE2B 55e863514f41f1af11b1f6f618604edf7f173b4c4ef8df1301ccaf4577355ed03a34b04ab50a6cf4e50317b7f047f279e4212215b183d0642f138ee5163f655d SHA512 ab850bd38902c52586fc84dd1b2da31bab857412db08dce96642f17f213c95bae029bb1be5e0ac4bb12e55f863ecfc2ccda67635e8bc7b54383b2813642d991d
 DIST gcc-9.1.0.tar.xz 70546856 BLAKE2B 0f7e5575aebc24113d12a56eb3dbf4bcdba3c656a76513c44dbbcded9ee71629727f24949bf2e1424682a9e5eda7c51eed93317e6f80013f5a837aaf25b82805 SHA512 b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28
-DIST gcc-9.2.0-patches-1.tar.bz2 12836 BLAKE2B c29516d2877229129cc69ebb781198918f0e59e2a4631f3b2933b5a6db61d50ef0d2e78ee9acaaf1c50c597aad3203d81e49d4e0674f7ac74bdedc401238940b SHA512 0382ed0d483955079bd20fc15066b8f45772651bcba83dbed2c35e51f7259cfd28b825243c6a49a0bf51d9ab1eacec3cf55c47a00d2873d6122d32b9fc05d87c
 DIST gcc-9.2.0-patches-2.tar.bz2 15479 BLAKE2B 14d0b0c903b3fe3d788fb4e41f5dc01949ca30fae03894699b859f02e383ba624dfce38784f3bec4f398395226abe0d4e6e39a265b29708bd86815d87c43da66 SHA512 ec39741a5ceb80d073a749be86985f7a0d5dc45246cf7e43721bc17691aac621cd9f1ad20cd9cbdeeed05d73adfa4fe9b6732b932350ea39e64a53dc2d18bad3
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
-EBUILD gcc-3.3.6-r3.ebuild 1247 BLAKE2B 992f97d49a929c135ca42281a721d8e8dc79a9ce01a61f7a3c2b6fc343361f02da0224ecf90125b9fa8359b92efa401cabf60480fe3fbd1378b1590b77a5180c SHA512 fe11c6ccb51f32c481b6bdeaa40a9723d290b6ba1a3ad27c9da79ebdb1fea2c4cedd0aa97d989758c4e099556968590f716148c27ae18b0955433d624734c11f
-EBUILD gcc-3.3.6-r4.ebuild 1244 BLAKE2B 0d44b62ee7257ee60b47e83354713fdf8ae7aeb742f2923b9454a4bf41a274f2de6a5cb6d5e63569e94a96c0bab3f2020ad8c7f4a48c2bb879d29b14a54da19a SHA512 cb9e5fee43681e6d340b99e27af390cd9df0c06ae655895168c19247fd129a0159f5a4d5529716515838d825da2e8c175259223d2512810e9cbdbc8f0a0db3e7
-EBUILD gcc-3.4.6-r2.ebuild 1364 BLAKE2B 5a8c18766b666047252f0dce63999e3deef64175f3e0054ed6f05de22a325ceb0f89f39ca54165153f318d8746dbcceabff0eda526bdb9dbca8331d2f3046a22 SHA512 4bec661f818ce0040a51ec4a0392353279e32861b44bb61dd034fdf2c819dac65e8ce13f45bacf30b5eacc18f1effb6060336323a9f47c0e41cc1e59af87d52d
-EBUILD gcc-3.4.6-r3.ebuild 1368 BLAKE2B 351d16d2077170861f8ef3a8d94958d27c1529e0ab0c543a134dc818542e84da21f65b78669e6fdfd2a9aa7e43b5f837de722ac70d69f6de8ea2773cec0ab7d4 SHA512 6131b84a91091e3ad0c3335442261f95c84f39b3da6cdb6a6d06e3a771b37e7f3ad322d5c2317935098e509789211f8c649b408a726fb19f0669f7976cc88b83
-EBUILD gcc-3.4.6-r4.ebuild 1366 BLAKE2B 339ea87ce3f6d3a727ba42db090d5721968757900cbe6008cd9739b8bf3c886e4771d00e870f6f2f9c759338d5b9787681bbae2cc43fe23e061f75376dc02c2a SHA512 2326666a9d4e98527c1db24d7e0c1320aa4225464bee5ac672e2ca8a95c0347133201afba333b7ed40f976c91c19c14b121853af3da5927829f05ad4b0b3a297
+EBUILD gcc-3.3.6-r5.ebuild 1242 BLAKE2B 9c316577e76d305f8eac6ba33ca97c26c207cade4da2f0d37c33be02fac6f9faa0eb487ddf9f68fb6db2cd128d6dabc3355eaef62c6775626af56eb96ba2f5b0 SHA512 3d11094be8ea52010d5128941db2dd23fae8e80460f2f03b03ee9111e5a32e3f6dfdf214d257de59de8cc02bdab9cdb563252a5b1a19ccb577d1e7ad8156cb81
+EBUILD gcc-3.4.6-r5.ebuild 1366 BLAKE2B 8049232e639cd5fd334a093b955969b8ee90361ab72cff7a457f332331fb1c336c70e2d5dcc58b6bf65a478b2a383a14297e86e1cbdba814c2f2a9dc509c943d SHA512 db12f820946cc3adf257a091631396c117969469d168bf281cf1eb55f262ef963dbf490dd90bd2160f86715d6ab0e52ea76f43e98f4194671e3519a8fe38dc7e
 EBUILD gcc-4.0.4-r2.ebuild 244 BLAKE2B dfdde3b2f9a0ce404c006be81c660911f6f8bf1ee0705b8675d371905bce310ef712bc898fec7ba02c53a45bbc6868334405a71029104449966ee3cf76e26841 SHA512 b9738da5703eda3e2c2e33bb456549be9ef68e4391cc880b5af8b2f173cdbdad874f609e90fa38547a3ef53657375c0bb8d377bd70bf3edb89a3e30264e7f180
-EBUILD gcc-4.1.2-r2.ebuild 645 BLAKE2B 4e6bb17f0257f81df638f5a0fe5d21f267bcae2b1e103c35c2a1c24ec5a667895293eb43767399bc216734fd8c1505a657a07ded860c559e7474507b5efaf0c6 SHA512 9e7b1dc667d7c9713cb57dc9de6201ae5953b8c7abdcde7eb517bc5469ba9017914391190864ee8da47717712bda6474c437d445508d9ed3811e509ba29907a3
-EBUILD gcc-4.1.2.ebuild 639 BLAKE2B e05e77b33a082e8da1f2f3e4e6940b49a7380e74732ed59c0e21cd4ba64ad5ae14067a1bbfa799df8e9de9d422a570e203b0395ffc5adb0c99311f9c017dffb8 SHA512 84226545fe5f56e6cc27f56a53a2ec5259a5844ea9de13f2a5ec136597034c6c362bd90543bf4fd857244f5126576dd37729fcf4869f1c9ebb755641513328cc
-EBUILD gcc-4.2.4-r1.ebuild 384 BLAKE2B 0c2e15f263640875c8eaffb8ef818a870d8393d34864b606cc6a376a2424c6850c6584e6a033383fa86bfe7a9a8d55219d843517ac2a9336181270836e1dc26e SHA512 8cac17aa46816b7078ccb5baacf5dab88ecb6e5067fdf5baa0ea40847b2de51241d4f4c2a7df3437f71a617166d1378da679322d10740f8fd5b921f745974cda
+EBUILD gcc-4.1.2-r2.ebuild 643 BLAKE2B 982428e246fa55bb4a9aeb7fd4fb59a9f9ac083f2d18720268fb052055682ad47891158cf473483084f89be2310d57669e997ba0c59b438953511bba74c4d5a8 SHA512 1f360765493b17fdfc28e84ae81580fe3f2a4915d52b279c3093e214d2c0eaeb9b23a854dd93b80ff50b358fee9bf961ee21e19de4d0437a6c94ba7da19c5952
 EBUILD gcc-4.2.4-r3.ebuild 382 BLAKE2B 1a4eaa374f6320d9d74d6838adfe15e75df48f772164ed2a29b307a2f5bb47043bf8a6ae615f684da09614be559e7d40182a86b43878867aaa40b8a9edfbc1a4 SHA512 714ce7583805a3ec20427ca3cb8674880ae6a3778eef072fa70195691e7559bfff4e5b58d670bff6ea54a0c9e0e59465c20d9a5c7e6f77894de2c8abb5bff954
-EBUILD gcc-4.3.6-r1.ebuild 620 BLAKE2B 0005548b6c588cc49c64c68357edd47b5f484b7d98bdb66e6c0a8f4e6d4393e37c43a35bb23276ffbea5f660ea0dfe726e0ec31340100681bc66366ac081f5df SHA512 6548f867b27b8cde18d2e22334c4a7cb52587491cc20553dfd31faf09633784cb9332335b45923f349c6f6769e1a8aaa43fae476a8d2db6979404b553054684c
 EBUILD gcc-4.3.6-r3.ebuild 625 BLAKE2B 05d5d5a9479619e2557469b8916bf4d97174d8a422b047b75450bae59a674540329dfc50064c9ec110a181e8dec0c37c4bdb1d7fb99fcf199fcaebcfa861a9d2 SHA512 d9b7b05da1b35aa0b32fb1cf018b5fa5e7b8cabe0227d17fd5c7d300b13e48e06bc6849de48ea79f911e8c61f8dcc474d93df2cbdce2b5ddf4cca0e7888e1248
 EBUILD gcc-4.4.7-r2.ebuild 670 BLAKE2B 26855169a9b2c3e030ab7d7726cfd49c868ddb9fa3a29b010901ad78a212a98da2d4fb6b5975dd8440670c6b8075df7898915eb07053febd8309fc307d75a495 SHA512 924332c285c4711d892ddf5cfb207768d338f49e15c98d82069f21e1359793b273fad658a660f98b06c65413ffd5fa823d42694443f2d507296289ffc964bab5
-EBUILD gcc-4.4.7.ebuild 664 BLAKE2B 9e73a4d9a1d6ee39c7c99b2ee3715271507f8dc7b9a19ef67e69608b685aedd35f8e3b8b058b9975905476ac6cf332f7896bc20dd6208d0782f2a63d83ce1c97 SHA512 59f87d093a20896ca84acf1819e3e01118ab7a87ee8206608750aac19f24d196aea9ea05d6048a64049fae45409b5b48559ea8fad53979758a59d93093b092e0
 EBUILD gcc-4.5.4-r2.ebuild 671 BLAKE2B d4c7b126e8425ea7243e7a0455a9d292d71e4400c5a1c2038924b3a82e6671a7aaae23ce25d278aeec1fc630f061cb33322a7a8252f1cc9a488594480e76b409 SHA512 9255d4766a9a7fdbcf461fd5858ce81815eee4e3360453aeefbb88d5edf1d25bf503719b4535f5dfed5c39d99eea02cd6a22f10f57ddfe05c9b4ea31b27f485e
-EBUILD gcc-4.5.4.ebuild 665 BLAKE2B 5b83269a6883147bc328c2cb773fa873ca866503555af6445549477df6f4c79bdeff45d1a6224970da5e6cb820da2fca375541f9cc75757c18e41de378b4a7f7 SHA512 b80d984dd1569a34f485d5c3cee2fb7da955849c34e6549f706e3594ca84e36d32dd0322d1264f12c7f3f1aeb6d56a21a7184311ed6b247814b6aecbc429854d
 EBUILD gcc-4.6.4-r2.ebuild 752 BLAKE2B 2ad17521fda216cebbd81f09fac5a45ea923099caa5ec565aca8d735045a44ddc11c815a41a002e695425fecc15c7cfc17bbfb5b8bfd6a940f89e5a154fbf08a SHA512 783c5306f1272268f85a259ecda8d4c6f681e5b0e4a1d44b6bc2e928191f69225083236f31ce7fd421a4c8bb68fcd1bfa2c43785f70a71b24e6a974ce6991b8a
-EBUILD gcc-4.6.4.ebuild 746 BLAKE2B cff0a4ba88b67c30dace6567e58729246c767b9e5ae38d0ab71071bdb40a1767e81fb88e95854ba8e9afdc433e6a7a9bcd4d63c0cc5cf41da396f6802a51ebe6 SHA512 1b2f1618e4ebe63cf6304e56008618611fc862b2e96279f3a09f4baecc0e624adbe7c41b9d3467a2d54c5c2a0f8fa1c26ce49e5383f799ad23b32c7484bb5c21
-EBUILD gcc-4.7.4-r1.ebuild 1266 BLAKE2B aba6e2589b35bd8e6d172941dad424aa7763d65c7ead0af50dbff1260a928a8c8fd88e6e80fb9ed946883ce66ae31ff19198532045c096471925450ac3a30266 SHA512 38d149c4a916ac0a4cf032000550285c8af692b2681058ab3af07eca5745bc3290a37b09a6fe1be1ef422dd9f2bf1531f9d32341fae4d534bea37458bced82e5
 EBUILD gcc-4.7.4-r3.ebuild 1278 BLAKE2B 7bebadeeece4abbac0aadc45a86e3cd85ee2f3acbfaa943835dd051ee4d157356a9434800371936a78f33bf7082ba216b7e205737cf9110488c60683b02df690 SHA512 fcacc27b7406fa747e7be7bab432ab9aca59d51fd0ab23a1f922ff074f6c77293791473a5630731332e4bb225d3aab9ac12b860b538e56bc3eb4a7e9567ef61b
-EBUILD gcc-4.8.5-r1.ebuild 1379 BLAKE2B 7e5b9f6c0eefbb8245ae85555db1367636a23659b44389548312eff6e1577672b12731a6ef53b514b605dfbbf056baa9ad55037828d00e7587c60eb4e22fbd55 SHA512 9e8025d98ed2503ecbc7d9eab87a9fa6f1a5f538e82a565c967f9da0cfd9ff5c2fca6fba9de6d7ab0ced4c4e8040ed21b4e2b453461a27f5133b38de575a94ac
 EBUILD gcc-4.8.5-r3.ebuild 1389 BLAKE2B 37df6ef3df83f2e01b5bb925dd9c5a2325b8901ffb7345cf1ce76be696a1b8a6d84d8e70ca0a1aeba27ed850569d88c1cbe60fb697bcb81fdae9f2d8aa49a2f8 SHA512 e24737d4c52e501dd6b18d5f5a0b02077090394fd019d6828bb20a1466203d0bf84be071c20168fbe104c9ec975e27a1e9fb6902a0b1fb8b7507cfd06f8fcb51
 EBUILD gcc-4.9.4-r1.ebuild 1448 BLAKE2B dc46a837d0c7cbf779acb42d2f594c24e31784ee3e2de2f19f105bf06afd8a1c6dea7b1b741b402c9c59f717be9c6f9311664b916a50241a009954ce5fcf621e SHA512 aa8de516f9b193eb83532761d7cc37611e70bc4e9bdc007e88935933db8ee10ef1eb1b464d79169754f98f8ae50586ac6e209dd91b7372b561fd35e39ba2d519
-EBUILD gcc-4.9.4.ebuild 1438 BLAKE2B 9c679ca2f020d789b6ff202c6e6ce4490f71a561ce39c10194f894acfb3b4c8c698e7829f412a0ab8c5261b1127256c9287a446b9f7e6c91fc59c2c5a3a084eb SHA512 8548710087c4f26a956204ea685012fd50c64ca331ddecfacca5dfc21299150d2b96dc75be2de44d13aeb315fb794396d2db57a41b6d6584835ee9f65b0a5bcb
 EBUILD gcc-5.4.0-r4.ebuild 1253 BLAKE2B cf875a9c59182778fcceae3cdcaf1328ad1b5862749357d2547d59ef0b148035437f9316fe9670af6ca1453f9c547f5f16a32e2ef6257dd07ffb3a7a3c1bb20d SHA512 57ed71a09f0450566eac1d4184336f4e1b139eb564aa5cb5252e405ca79140f40a98f0f78502db7e7ebe05873b0ddb9df97f56326b19262acafb9f7d4e1c6482
 EBUILD gcc-5.4.0-r6.ebuild 1264 BLAKE2B e8cb5d56de1caa4bce8ee9abd13b8162dcd07fd59e572d5c9612468c2826316f34e0c4691f5b9083fe56be1ee26814ff4c6c3a3d5e70d33fe6414d16496e31b5 SHA512 ee312bf2ab36a547b7b50f34362350e6da4a31c747974a5f323808fa9aa336c135a449fce0ddd3882771fc3eaf0e6f8a451b46745d35fa5ede810cc939df36c1
 EBUILD gcc-5.5.0.ebuild 1263 BLAKE2B b3b1d3b078f1ea9d1ddd25ff5af34b2de4ddbb9bedb15ee986ec09b5ae8182cf3ce4b4ef98e735d4585716a48e3dcb0341703a082fea3d17affa444f01363eca SHA512 74e4006d54a9a17f5d734b597169d2c5e9b84a1b07fb964507662e9432e2660f829abeb2b43f639d993f42333e88184aab41683f11952fcb000bc0e95d934a97
-EBUILD gcc-6.4.0-r1.ebuild 503 BLAKE2B 4e975145f5178501ab1395ff7b006c1801540658b4f22ffaa9d868a7317f9ec14a75ffb6f67152bc2f1bfa03cc18c660ae658598e93b6af7b4d6b24bbd3147a2 SHA512 7c78d60d0890b13035046021b9bf8e98429128841b3b9f8395a93c749fda540eaf74fcf2fb6eae0015bd201d19807d3c9ff868542359d85cad342eacfac8f93c
-EBUILD gcc-6.4.0-r5.ebuild 510 BLAKE2B 038be8e0a938d097fb227ff0d37f109ed8e5d4b6c27a22b0dabe1d63921e55678225e313a7eab1bcc59bbbc21d51f801a879e299982f238720ef012e16a3459c SHA512 f38908994a93fe52659c6e368ef205617c57d6aa039ab92773682b9fd5bcff3d29215114f79b52f32acb0b53064942316d1ca331a5c0257beb381dcc55717d8b
-EBUILD gcc-6.5.0-r1.ebuild 441 BLAKE2B e0c319a5db64d1c431415b6c3e855898b349f351e6bb069307d81a03d14bed0315371351cdc609409cdf17a36617404ba336dd5ed18531d17678178c474fbcd8 SHA512 b02f43a6d8b557ce5f30fa497d3264361de88ca38fc37fc7326ca295c75be6690f023f28ae1a2a7984f49ba6a55eaaad6e12dd51cdf76e4c64688d956afb3a71
+EBUILD gcc-6.4.0-r1.ebuild 483 BLAKE2B 9ddd24be4f511d175abf27e61cc6339f47ea3e0b2eff72f5f48a102ee87adcfcd2c7e9bce78404ac980cbbc938ec13fe31c386cb3cf73de08e07d847f1168ca7 SHA512 1a9f86590a6eba7c55bbff68241b4fd144cddb7b2b85d16f8ea7a3e4c222273a4d7e4db2beb0f0841feca836637e9edf7491efb6c342805b8f63b07462f5a76e
+EBUILD gcc-6.4.0-r5.ebuild 493 BLAKE2B 0b5297ae31b5bbdd1ce8a89c5245a924091c623804b9eb85459e30b181c0a49b207ee0b94bbe2db3d6f6998dc138b3ef47ba1306ded0dc0433cbbaaed32ac932 SHA512 779ebf69bd79b5a19adc09abf14041efb6d0106acf61208ac043b088739c13d6f9a15b3251e1e6b467c89972ecc5fada392559a35f13b15f4b108c780331a097
+EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B 628463c07685e8552a8c1648e482b5cacb6e06bb0e2270d3dac66f7dbedb05354ba5c7fb3d3300ca72db0f4979da75bf22e897299a6904707695d0563a1b5c4b SHA512 5605e214d01b3d267e70ed84e4fdb0766185fc8f08cce72f499b39d0ae04e1b4c0ecee5f58e03df9d3d46f25ec1bb558394df1db7290ac9b97a09d712ff80cd8
 EBUILD gcc-7.3.0-r3.ebuild 512 BLAKE2B 5dcfac456882dc9fd89dc8f24b12971fc1f2b127923df8ff79a395d387cbb1394ae50b59268d0c850ee80d4867f8b2fd84b1ec8a42bbd647b8d5834150ba93ae SHA512 392d93ff982cf0d3d76b377e39120ec55e6a902b76d2de7e3c33893577040a49c93c1d82f03f058939fe5a757441becc6e1b7e941b81d97f05274f0583c5554e
 EBUILD gcc-7.3.0-r6.ebuild 522 BLAKE2B 755ad4c05d992ac021ee698b06a19d56c582ab920b609a97e97bedb3b7f89a920e579b00ab54cf8eb8cbe45c5a327389c3e069b647237b36e646bcf23e0ab159 SHA512 57d1e0ac05d6567e1676814d3e3a5e9880d74d9f468df2b015d28b296ccfa7740a8062ae152d6d398309f2ceb167f09db7da920c551b1d1a34228a016e1ef33a
-EBUILD gcc-7.4.0-r1.ebuild 462 BLAKE2B 4f6d76f13eb65955a6637a32fab88765c539766a6aa35f128520fb23f7277cf3ced0a5f7fb603ba68fa9a51926f1253f9a6006a136c5142feee110abd2fd3609 SHA512 3c2f61f81b47bfeb638549a86131c537a0085a72d33c1fd7609b7fd7549e9ee0f412493fa7da3a24ef202edd4e4ce7b37856307a70b07976c95e552b1656f8b8
-EBUILD gcc-7.4.0-r2.ebuild 454 BLAKE2B 001819ad19ea25d1d13ef1a5c882f255cfba78bbf33b88e18d99f2d7613b83ae13c6a6aa130f3e4aa3a187c99ea4361085386e5643bc060b6efcd4609f8032e5 SHA512 5eeaac1365df066b9cc664abb95f44f34d4c482607f4adc8a9cf7c52818c8179de548b1ef1d850931998add067b516d0e6da81e55a6ad0957317dc378d6b50ff
-EBUILD gcc-8.2.0-r5.ebuild 469 BLAKE2B b3692d021177644a95419aca62e9f7f11d0675cc0e5b73fee6232a2f4a8437d2735f74765420b8a4408be4c935217e915aa44a2feb174f86ab741d7d301c81ac SHA512 a91d521c557bfa79f1737d5023c3e271cce2bd88b8b9dcdd00d07e7944ff8d9a4da8175bd445fe813add966517c10398dc21fbbffdbbca906a5a938ad319e317
+EBUILD gcc-7.4.0-r2.ebuild 449 BLAKE2B 09efac22d94ab1860165ae73f94d84bc7b046146e192d3976ba140f40681b15fb612645864d9c390b7847635e5538369a08d2df8ed07a6d716c707aa11baa324 SHA512 22b344b8940d6cd0d605c24e7b16b85f6825a1f2e80e5864b2bf5aa3e9ae92f200ac7912ba20cb8be30174ccd46bb890c722d37d2d64ad730509ea68438b07a0
 EBUILD gcc-8.2.0-r6.ebuild 551 BLAKE2B ce07e5a5450b5c503b96e6000cf11cc8be10c80a7fdfb7928430cb9326470fc3ce6f86e85fe65931af282159c1d7eb075553e87d7d356c332bfcec0f6d154334 SHA512 8a773b462295156e8eda8eec0e173f667ca0bc528ed143f6da87c16628fcde56e96858cc8abe6cf72fb7226c088b95f998c8777d25f8a2f517240a3fed4a97f3
-EBUILD gcc-8.3.0-r1.ebuild 589 BLAKE2B edf51a3803f74dc734274c1598996a783c68e116cdddc7ce3ca596b87a9c6fb587c600ea0485a0a82afed3289a86f3d63d706ce3d706ccfd451bb96657ead637 SHA512 0e89f09a97f24420f100f992c6e066cc35c15ca62d9bb477088625e029e1da18a36b036a0b26954848487c5a8739dc7d6706d58d825898345c53c19c55083604
+EBUILD gcc-8.3.0-r1.ebuild 587 BLAKE2B 715429395b96a959d8ebd2a6ca0ca830bc8178b7865996951d081cfa7ff3deb309d40e8930221f726d1114557e8053874a849e23f39896c3bd448271a8b4b633 SHA512 3a7e946786d04176c6bb90ba5232e53a725502fbb1ac1a91465a10c3b52e17c0b72ef8bc35bdbc6162c4724e45758c4768092b5632f69d7ef773b05a30508e34
 EBUILD gcc-8.3.0-r2.ebuild 545 BLAKE2B 714a2df9755a80b710f86dbac1a4952a4c9d5cc8f4f02f8a72bbd51075f7ea4a3fc86f319a870262aabc968c4c8942f7f6ac1a3a42327c25e1fc8fae60839d97 SHA512 691189b20477748877e73e6e7084156fc64baa41057325cc1b2556745bf6509bda065e0867416b60e224e74be838615d1adea40fd0fd3ca067aa2d570eef92cf
-EBUILD gcc-8.3.0.ebuild 451 BLAKE2B 2fcdd71b1cfcf9b81cf2c2a26e859dec96abb6d749ec18bcd9926105db0dcfaca78aa3afe8ee59a52462d2a16f174c90ea33ea5fd9d59f6d88bbd2c60bec6afe SHA512 02704672e19662e9667ede97a5e85a21fbe760be3f48172bd17393701cab801e126bf585dd726fcd614002eda209bec06b60ca47f8e6139243f9c262bec3421e
 EBUILD gcc-9.1.0-r1.ebuild 458 BLAKE2B 0e85fb6cd36c50c7158df2c1116f2a022dea82b6a03a0f8680de6fc6b9350e3b1dbdcc81dd001b1a9d2897cd474d7b81234c8397a4a77f8a04dc335ed4ad94de SHA512 1aba6bc02aacd1eea97515269fac9ead83631882a69a4c01026d111a7c87860292929d914cdfd5e5749319a0be775fea852e6631f320744e0c169a21e74a4495
-EBUILD gcc-9.1.0.ebuild 547 BLAKE2B c4781dea03f7a58b88c3e860028801faf92638e50db24f2b2033a360d8de8e5519c8e3594bf59271cee087f36ab39bc8d84f8a5d42a67d76468f78bd27ba839c SHA512 d5287c6f8b1d406ba5eeec1daf7362651bef74a966241db28790d93388d46c0a807e87e880fbefdc1be76c38463591707733c8512daf35485e95dd2c824b830a
 EBUILD gcc-9.2.0-r1.ebuild 456 BLAKE2B 1168d4b532a519290ef57b889bf26ed1ddb68f2c866a0255054fefb6032f033dbbc367169e5c1930901e6e340289428a8ae275db5aad05ee30c23e54f73189a3 SHA512 1855114a1e1a815d3e4ef2316d4ae00d60900b08d160a74fce7d375371e613e07e80ed644bd8aef2376472b62634b05ba8f3233b5b055b02fbc3ca52026d3f54
-EBUILD gcc-9.2.0.ebuild 456 BLAKE2B e3274020a269fe99d86ec5f3011e76a29aeb04cf6337399b1bb282b2e057c7b2a9621d57548482c8428bd2e88477dd4c6fa8af40a8bb035874b4741867721315 SHA512 2d15d635ad6b6cae0382e2a771a184f73a1c51b472847fbd4ac12c1b019d49c7cce6ce71ff1904252d0c7ddde755f90472f334793e6707eb1b7303faf709d159
 MISC metadata.xml 3010 BLAKE2B 1a52f8672191d79b8797e777952e32728c88f7a54e05ff058129ac4281f46753beba81726e11991d3d06b3ff8f5d1613718b8e26c8897955d8438bca19a3fa60 SHA512 d6feda30c1d16d470fe5598ec28d2025f7b074899bb0a451e0b7e6dffdab2bc9c106b0cecd649e35d86b331fc220e8c4a9178acea510ebd23b08547c66089751
diff --git a/sys-devel/gcc/files/gcc-configure-texinfo.patch b/sys-devel/gcc/files/gcc-configure-texinfo.patch
index ddc098ddbd58..99e90998a469 100644
--- a/sys-devel/gcc/files/gcc-configure-texinfo.patch
+++ b/sys-devel/gcc/files/gcc-configure-texinfo.patch
@@ -4,8 +4,8 @@ that it violates the cheesy version grep.
 
 http://bugs.gentoo.org/198182
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -3573,6 +3573,6 @@
        :
      else
diff --git a/sys-devel/gcc/gcc-3.3.6-r3.ebuild b/sys-devel/gcc/gcc-3.3.6-r3.ebuild
deleted file mode 100644
index 041188adcc4d..000000000000
--- a/sys-devel/gcc/gcc-3.3.6-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.11"
-UCLIBC_VER="1.0"
-HTB_VER="1.00-r2"
-
-inherit eutils toolchain
-
-# ia64 - broken static handling; USE=static emerge busybox
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
-# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
-# well tested in gentoo on any arch other than amd64!!
-RDEPEND=">=sys-devel/binutils-2.14.90.0.6-r1"
-DEPEND="${RDEPEND}
-	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	if [[ -n ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] ; then
-		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/os/uclibc "${S}"/libstdc++-v3/config/os/ || die
-		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/locale/uclibc "${S}"/libstdc++-v3/config/locale/ || die
-	fi
-
-	# Anything useful and objc will require libffi. Seriously. Lets just force
-	# libffi to install with USE="objc", even though it normally only installs
-	# if you attempt to build gcj.
-	if use objc && ! use gcj ; then
-		epatch "${FILESDIR}"/3.3.4/libffi-without-libgcj.patch
-		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
-	fi
-}
diff --git a/sys-devel/gcc/gcc-3.3.6-r4.ebuild b/sys-devel/gcc/gcc-3.3.6-r5.ebuild
index df6053980e8b..ca341bf4a814 100644
--- a/sys-devel/gcc/gcc-3.3.6-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-PATCH_VER="2"
-UCLIBC_VER="1.0"
+PATCH_VER="3"
+UCLIBC_VER="1.1"
 HTB_VER="1.00-r2"
 
 inherit eutils toolchain
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
deleted file mode 100644
index 0389c0bc4377..000000000000
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.8"
-UCLIBC_VER="1.1"
-UCLIBC_GCC_VER="3.4.5"
-HTB_VER="1.00.1"
-HTB_GCC_VER="3.4.4"
-D_VER="0.24"
-
-inherit eutils toolchain
-
-KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
-# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
-# well tested in gentoo on any arch other than amd64!!
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.14.90.0.8-r1
-	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	# Anything useful and objc will require libffi. Seriously. Lets just force
-	# libffi to install with USE="objc", even though it normally only installs
-	# if you attempt to build gcj.
-	if use objc && ! use gcj ; then
-		epatch "${FILESDIR}"/3.4.3/libffi-without-libgcj.patch
-		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
-	fi
-
-	# Fix cross-compiling
-	epatch "${FILESDIR}"/3.4.4/gcc-3.4.4-cross-compile.patch
-
-	# Arch stuff
-	case $(tc-arch) in
-		amd64)
-			if is_multilib ; then
-				sed -i -e '/GLIBCXX_IS_NATIVE=/s:false:true:' libstdc++-v3/configure || die
-			fi
-			;;
-	esac
-}
diff --git a/sys-devel/gcc/gcc-3.4.6-r3.ebuild b/sys-devel/gcc/gcc-3.4.6-r3.ebuild
deleted file mode 100644
index 3a6d9f58e5d9..000000000000
--- a/sys-devel/gcc/gcc-3.4.6-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.9"
-UCLIBC_VER="1.1"
-UCLIBC_GCC_VER="3.4.5"
-HTB_VER="1.00.1"
-HTB_GCC_VER="3.4.4"
-D_VER="0.24"
-
-inherit eutils toolchain
-
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
-# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
-# well tested in gentoo on any arch other than amd64!!
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.14.90.0.8-r1
-	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	# Anything useful and objc will require libffi. Seriously. Lets just force
-	# libffi to install with USE="objc", even though it normally only installs
-	# if you attempt to build gcj.
-	if use objc && ! use gcj ; then
-		epatch "${FILESDIR}"/3.4.3/libffi-without-libgcj.patch
-		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
-	fi
-
-	# Fix cross-compiling
-	epatch "${FILESDIR}"/3.4.4/gcc-3.4.4-cross-compile.patch
-
-	# Arch stuff
-	case $(tc-arch) in
-		amd64)
-			if is_multilib ; then
-				sed -i -e '/GLIBCXX_IS_NATIVE=/s:false:true:' libstdc++-v3/configure || die
-			fi
-			;;
-	esac
-}
diff --git a/sys-devel/gcc/gcc-3.4.6-r4.ebuild b/sys-devel/gcc/gcc-3.4.6-r5.ebuild
index 691eeea7f8e7..d7bf23b41528 100644
--- a/sys-devel/gcc/gcc-3.4.6-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PATCH_VER="2"
+PATCH_VER="3"
 UCLIBC_VER="1.1"
 UCLIBC_GCC_VER="3.4.5"
 HTB_VER="1.00.1"
diff --git a/sys-devel/gcc/gcc-4.1.2-r2.ebuild b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
index 574788a3f09e..439973da5a9f 100644
--- a/sys-devel/gcc/gcc-4.1.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PATCH_VER="1.8"
+PATCH_VER="2"
 UCLIBC_VER="1.0"
 D_VER="0.24"
 
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
deleted file mode 100644
index fb958bc86e3e..000000000000
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.6"
-UCLIBC_VER="1.0"
-D_VER="0.24"
-
-inherit eutils toolchain
-
-KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
-
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch
-}
diff --git a/sys-devel/gcc/gcc-4.2.4-r1.ebuild b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
deleted file mode 100644
index ccad607df6a5..000000000000
--- a/sys-devel/gcc/gcc-4.2.4-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.4"
-UCLIBC_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
diff --git a/sys-devel/gcc/gcc-4.3.6-r1.ebuild b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
deleted file mode 100644
index 13c159fc06a6..000000000000
--- a/sys-devel/gcc/gcc-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.2"
-UCLIBC_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-}
diff --git a/sys-devel/gcc/gcc-4.4.7.ebuild b/sys-devel/gcc/gcc-4.4.7.ebuild
deleted file mode 100644
index 34640172a986..000000000000
--- a/sys-devel/gcc/gcc-4.4.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.3"
-UCLIBC_VER="1.0"
-
-inherit eutils toolchain
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-	use vanilla && return 0
-
-	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-}
diff --git a/sys-devel/gcc/gcc-4.5.4.ebuild b/sys-devel/gcc/gcc-4.5.4.ebuild
deleted file mode 100644
index 0735102e9246..000000000000
--- a/sys-devel/gcc/gcc-4.5.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.3"
-UCLIBC_VER="1.0"
-
-inherit eutils toolchain
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-}
diff --git a/sys-devel/gcc/gcc-4.6.4.ebuild b/sys-devel/gcc/gcc-4.6.4.ebuild
deleted file mode 100644
index 47155da62601..000000000000
--- a/sys-devel/gcc/gcc-4.6.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.3"
-UCLIBC_VER="1.0"
-
-inherit eutils toolchain
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=${CATEGORY}/binutils-2.18"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-4.7.4-r1.ebuild b/sys-devel/gcc/gcc-4.7.4-r1.ebuild
deleted file mode 100644
index e3d14526e937..000000000000
--- a/sys-devel/gcc/gcc-4.7.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.4"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.5.5"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64"
-SSP_STABLE="amd64 x86 ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=${CATEGORY}/binutils-2.18"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-}
diff --git a/sys-devel/gcc/gcc-4.8.5-r1.ebuild b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
deleted file mode 100644
index bd652d8ed76e..000000000000
--- a/sys-devel/gcc/gcc-4.8.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.3"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.2"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-}
diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild
deleted file mode 100644
index 5edaa285cb58..000000000000
--- a/sys-devel/gcc/gcc-4.9.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.3"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.4"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	# Bug 638056
-	epatch "${FILESDIR}/${P}-bootstrap.patch"
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-}
diff --git a/sys-devel/gcc/gcc-6.4.0-r1.ebuild b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
index a662ae793542..09a35310afac 100644
--- a/sys-devel/gcc/gcc-6.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 PATCH_VER="1.3"
-UCLIBC_VER="1.0"
 
 inherit toolchain
 
diff --git a/sys-devel/gcc/gcc-6.4.0-r5.ebuild b/sys-devel/gcc/gcc-6.4.0-r5.ebuild
index 138098ca5674..d675c0e81a63 100644
--- a/sys-devel/gcc/gcc-6.4.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 PATCH_VER="1.8"
-UCLIBC_VER="1.0"
 
 inherit toolchain
 
diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
index 0a8f58febc87..e25c6fdd307a 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.4.0-r1.ebuild b/sys-devel/gcc/gcc-7.4.0-r1.ebuild
deleted file mode 100644
index bd17a751b0d3..000000000000
--- a/sys-devel/gcc/gcc-7.4.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.2"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
index 62cdb74d516d..1099e797728f 100644
--- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
@@ -3,11 +3,11 @@
 
 EAPI="5"
 
-PATCH_VER="1.3"
+PATCH_VER="1.2"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.2.0-r5.ebuild b/sys-devel/gcc/gcc-8.2.0-r5.ebuild
deleted file mode 100644
index 73a14f4d9f67..000000000000
--- a/sys-devel/gcc/gcc-8.2.0-r5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.6"
-#UCLIBC_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
index bd9df9561f86..df51b2dc8a75 100644
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.1"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.3.0.ebuild b/sys-devel/gcc/gcc-8.3.0.ebuild
deleted file mode 100644
index 15779b5b4bc5..000000000000
--- a/sys-devel/gcc/gcc-8.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-9.1.0.ebuild b/sys-devel/gcc/gcc-9.1.0.ebuild
deleted file mode 100644
index 3aeba122c2ae..000000000000
--- a/sys-devel/gcc/gcc-9.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-	eapply "${FILESDIR}"/gcc-9.1.0-norisc32.patch
-}
diff --git a/sys-devel/gcc/gcc-9.2.0.ebuild b/sys-devel/gcc/gcc-9.2.0.ebuild
deleted file mode 100644
index 6e7404c49e5d..000000000000
--- a/sys-devel/gcc/gcc-9.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="1"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 549c8474b544..4f63b4c0a303 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -6,10 +6,10 @@ DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD lld-10.0.0.9999.ebuild 1885 BLAKE2B 708c9d6ed0d818ef10994535c68d2b9d99c44a35aae799ed26375bc8cc3750e1e66856c94e2dda75c825ff752e2721cef9386c98de29ae3795b2b010dd57fa3e SHA512 611358ed36abb80d1f6a52bd54de9b5bd94145c4fa5864a0af504bd260d83ff917607d75d7cb8ea4ebe7b06699ba83fd5dc954fc1c8e59480099695646cc5fd8
+EBUILD lld-10.0.0.9999.ebuild 1459 BLAKE2B f59003d44ddc7fd961aef614642a836dd5903e6a43ab8c28c3d23b3da525b9f6709910c143b8d38973ea29ed6e366305e1dce05fd729376b7beb541dda02f742 SHA512 1fa91d16eb705704d09925f50fa015b791619ad9d6c7f90f8cbf834cc5d20e07f95b93713c7637e71676912c80d846546fdb96283406fca2ba95f93b339eea4d
 EBUILD lld-6.0.1.ebuild 1719 BLAKE2B cb698926f7f3eb053ab46b549293cd5135afa9fe167e27401f08c42d2ef47f3585a2fb7411711d4393f58b65c21e92bc7da57bec55dde5ceed98eb8e16cc0993 SHA512 069c8b6561ac1e05552f4bf2b7af13255586022f45c7f929a5d4c06560eae3692f74da553274d49390ae8e510d0cc167800d1ca946e3ecd39d2632d3a66a85bc
 EBUILD lld-7.1.0.ebuild 1725 BLAKE2B 61454551884ee0d7d50ea65b4816ad516784f81965dca35ee696547e367ac446692c3430660f3d0b82446974d264ca0671517a2d3ed04fe3d263a4b435657923 SHA512 10fc7671b1afc5db3cc2a854e6b1f7c6b297c67967c6a90efb392537f5dc3b7150f4efe60a92554b2332dd2ce27284405053dc6c42d4a51ee739ead9ca65d1f4
 EBUILD lld-8.0.1.ebuild 1794 BLAKE2B 31cf9d99132629908515eb9a8c6b074caa7b84bfbd86446fcd7f65391e247ac23ffd272b715836fc0d787c004a00f613c2c7b0d1bff96a1c8e9054554ae3fe41 SHA512 3d29acfa6f2eedd49917bf811f93f0f9646de38f4b17cf78d748e93c0bb0653f95e7ff1d6aefa0e77ad7af4479f7d3b27d4b10a49ae34aa86efcbeb636064e79
-EBUILD lld-9.0.0.ebuild 1810 BLAKE2B 0c22845cb2b6c1ff1c5e3d355c1eb8151406ea73b68f3eba1c7007407494270a1bc564f4e3ad34d2b167dd1842534b906345d74ea4fb2ef7a149d7e20521026b SHA512 ade9fdea84d8309a5f8b5a0521f06ddd0b4b7b1918ffcbb9069e6071232402753f870195acbdf6d083826de870160648a9a691e5c0ccc781a9cc46ced503386f
-EBUILD lld-9.0.1.9999.ebuild 1757 BLAKE2B feb199a7eda6c979f17c990998241e61e7b0965b3706fcb5a98ff2ac3422accb17623008b2646fddcf26f28daa513762ffcbad8df469e9cf4ce3e8a78f138140 SHA512 673b939d4b005e652abe3b9e8da40c1c41f0fde09550b4619bd04dde4898baea565da6ce72205b62666da2efeed0f87096279013533d88d9fe42999747745cf4
+EBUILD lld-9.0.0.ebuild 1336 BLAKE2B a61d7f26913105465fc178398fdd736b4b67afb86d69d22beae24bc649a52fe0cfd43345adfbc1c9d47a4da18f98943d60403b9254071fbdf822753c062fd1af SHA512 4618436b1710849f8258a0de88f0b4b596fd4ee48f02e940f1169452118441abbe51e1cd0d0f579be88f90b17a121dce5e0cef09e1ae54a9a1d88a24ad5c8269
+EBUILD lld-9.0.1.9999.ebuild 1306 BLAKE2B a6a6163883468f2a694799b353aae0da4c93438101a950bc5f2e6a4881bc3ea1d6db27c017536e75e9c580c53fe89fe88a42672de122ff8de70dd00388e53ec2 SHA512 4afd940fb0b4cc109199464d2dad47d433f004148c5ac03d916c6f892089ddb696bb0232e44e433e28c3f68d2e549bb6f68f3a63f79ecaf0106750fd6785ac0c
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-10.0.0.9999.ebuild b/sys-devel/lld/lld-10.0.0.9999.ebuild
index 9d1c88d828d3..fed376f6958a 100644
--- a/sys-devel/lld/lld-10.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-10.0.0.9999.ebuild
@@ -3,18 +3,14 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils git-r3 llvm multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/lld.git
-	https://github.com/llvm-mirror/lld.git"
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -38,21 +34,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' utils/{lit,unittest}
-	fi
-	git-r3_checkout
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
diff --git a/sys-devel/lld/lld-9.0.0.ebuild b/sys-devel/lld/lld-9.0.0.ebuild
index c938e81bb902..ce499310894b 100644
--- a/sys-devel/lld/lld-9.0.0.ebuild
+++ b/sys-devel/lld/lld-9.0.0.ebuild
@@ -3,21 +3,14 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils llvm multiprocessing python-any-r1
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
+inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz )"
-S=${WORKDIR}/${MY_P}
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -41,18 +34,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/utils/{lit,unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
diff --git a/sys-devel/lld/lld-9.0.1.9999.ebuild b/sys-devel/lld/lld-9.0.1.9999.ebuild
index 6935200f15c6..08b0bcbf80e9 100644
--- a/sys-devel/lld/lld-9.0.1.9999.ebuild
+++ b/sys-devel/lld/lld-9.0.1.9999.ebuild
@@ -3,19 +3,14 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils git-r3 llvm multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/lld.git
-	https://github.com/llvm-mirror/lld.git"
-EGIT_BRANCH="release_90"
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -39,21 +34,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' utils/{lit,unittest}
-	fi
-	git-r3_checkout
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 79ff3f75521d..082e76f179ea 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -2,10 +2,10 @@ DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD llvm-common-10.0.0.9999.ebuild 733 BLAKE2B 1f9de93b6caf96b7a5bea067dd55dec75c61fe7f44904adfa262b33626c8a336896d44bb46cce14b1aaeece0a741eadf731e0be52688c2debb80f83bb12ba0d0 SHA512 a39e5d1047c1bb2c94e01062eab53920c5f07303d68f79b205cd8e2d33c173f717b7b2bed7edd051e7c77f934fa837250e51f1775816ee91d45244ac6f84bbf6
+EBUILD llvm-common-10.0.0.9999.ebuild 528 BLAKE2B 957a2fbd49748e29068dfa987ee45e4fe1330c386ec4c3d7f2105136d1561c4427fe098f4199052b0f8267f4b5e50ff10f0c359435e4df007a6b4d9970275bd4 SHA512 643116074781e724ffb1184eaaa2ae041e20c9fb9b8927f1e6f1784c0a94b62021138267ff4d1fc1714e40eb4cf2e9b378b72d17ed16da32c9a0696580c8fe30
 EBUILD llvm-common-6.0.1.ebuild 826 BLAKE2B c2f09d2ecaa48389fdccb1ba3d225aacdfb55afe18ffdb25ee245ed8942c0d5e01a275fc3ff46b50683ee4424b1d3c04c2ed588c62b05d300b2664b5b1c03b25 SHA512 182dfa879c2bbb3a698359dab6103d16b5ecb9900327e2f41e114830c32dd52224274d80866e3c6516a2eaed6b11fc77853be1cd0bca334571230c177b362bfc
 EBUILD llvm-common-7.1.0.ebuild 823 BLAKE2B 303878e56feb88de440edeb2e36b9f1ab6068b661e3acf2c74eb28d41506f3159f61f9b23875159f86fb87ba61b0dde94a8d31349e00c8712f6fa674cf2c0cbe SHA512 d8617f793fddbca40aab02ccca07dd1ea886666800483c7c8e9ad612bfa3cdc1fad67c151677a875a96c1b07acf639eb5a279371488f90d97da58d0dee971372
 EBUILD llvm-common-8.0.1.ebuild 855 BLAKE2B 81171ca3ce7d05be60c151d814ceb592e18fd2d8986db8a1106662727d0b1f94011cac9057f7fe8b398197b2d8fe588e684dacf7ed6b4d93777f4a8cdbfdc644 SHA512 f6a1f1b256bb1dae884dcecbeb6b22c295407ea3b3126839ac99c7c6e745c074c77167f52d7790b38501a0cab5680109274323ff8f6d27ea9b39bdec82ff8f7f
-EBUILD llvm-common-9.0.0.ebuild 854 BLAKE2B 7ba3438bc9652c079895bf882c7841e7dd17f0cbd42e64c777ee40b7f46467690dd63e87b52fc7df6672a0d73a97a6c160a59702b0d8c302c4921e678afabd46 SHA512 7c6cb6209583266105192897a13c9d8e870d9479d384c96be6c24584961287505186af140aff2e304f758dbdfd2f3be9757e564008c60815c1890658240550b8
-EBUILD llvm-common-9.0.1.9999.ebuild 758 BLAKE2B 2f6317c0d24a961be87d31390448570908901a773aa2e7a93e3e01ad2bf1f473bdba044261405f0f34c369d60521519e1031be215eaba07f98a107b2ad4c2f2c SHA512 5b233105e8750ae316c48a65069912f582315a2dcb5dda5e72c047152a0955a0a008c1c2238d18c7f0a67d610a58906838704af79a9d17359f075e6f14e8f696
+EBUILD llvm-common-9.0.0.ebuild 604 BLAKE2B af30f6a0ba31d0d1accbaf2fe0ccdf670523ffaf3df6d882ce95b13f563e78ad8758fd7325ae6576b0dc9cfd1ee9da25400449c394b06c25552eef7420190dc5 SHA512 5d03af9b060a60cb5610378b6a7539462093b957ca01072bb2f451c1f2131686780da09af966955cb60636bef71474c4c6f2685a1ca2b45c4dac3710eabf725c
+EBUILD llvm-common-9.0.1.9999.ebuild 528 BLAKE2B 957a2fbd49748e29068dfa987ee45e4fe1330c386ec4c3d7f2105136d1561c4427fe098f4199052b0f8267f4b5e50ff10f0c359435e4df007a6b4d9970275bd4 SHA512 643116074781e724ffb1184eaaa2ae041e20c9fb9b8927f1e6f1784c0a94b62021138267ff4d1fc1714e40eb4cf2e9b378b72d17ed16da32c9a0696580c8fe30
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild
index 11a022242bd0..ba2ffc76a706 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-inherit git-r3
+inherit llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
-	https://github.com/llvm-mirror/llvm.git"
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -18,19 +17,10 @@ IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
 
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout '' '' '' utils/vim
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
 src_install() {
 	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
+	doins -r */
 	# some users may find it useful
-	newdoc utils/vim/README README.vim
-	dodoc utils/vim/vimrc
+	newdoc README README.vim
+	dodoc vimrc
 }
diff --git a/sys-devel/llvm-common/llvm-common-9.0.0.ebuild b/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
index 65eb4d232e33..a81f8f505994 100644
--- a/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-MY_P=llvm-${PV/_/}.src
+inherit llvm.org
+
 DESCRIPTION="Common files shared between multiple slots of LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -16,19 +17,10 @@ IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
 
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/vim" || die
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
 src_install() {
 	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
+	doins -r */
 	# some users may find it useful
-	newdoc utils/vim/README README.vim
-	dodoc utils/vim/vimrc
+	newdoc README README.vim
+	dodoc vimrc
 }
diff --git a/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild b/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild
index ae78e1164ce5..ba2ffc76a706 100644
--- a/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild
+++ b/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild
@@ -3,14 +3,12 @@
 
 EAPI=7
 
-inherit git-r3
+inherit llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
-	https://github.com/llvm-mirror/llvm.git"
-EGIT_BRANCH="release_90"
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -19,19 +17,10 @@ IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
 
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout '' '' '' utils/vim
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
 src_install() {
 	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
+	doins -r */
 	# some users may find it useful
-	newdoc utils/vim/README README.vim
-	dodoc utils/vim/vimrc
+	newdoc README README.vim
+	dodoc vimrc
 }
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 8fd8e3584de4..2068164613a2 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -12,11 +12,11 @@ DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD llvm-10.0.0.9999.ebuild 12638 BLAKE2B 4274d77376edb411eb9db36d2646ec33ac494447f8f6e1f601a9f91bbbd3c1788be32ca6fb088cd2690e7840ba941bdf5b4a76bea022be452f05c09278a88c20 SHA512 1edfcd2156e17af680f0f4be48bacaca1f5b8ea01fe5dbdb86702fb1cc574f2413df63bf59af8250348fc35386b90bed46e2e9dfcf2ef55b76afb85170d4fc3c
+EBUILD llvm-10.0.0.9999.ebuild 12474 BLAKE2B e3ae359df77b8e55f639a34cd576ab36f694144ba585cedd995884193e3dfe3d969070913e0505f45689a30a3f4211999affbf5cb6677670ee9734d19b915307 SHA512 e4327f352eac05f4af2819086500578b2acf808a7b6cf930350fcaa9e600ac72c209841cef44342fa5b6d4af26e872da5c593297c99695e77b4c00fba00204f9
 EBUILD llvm-6.0.1-r2.ebuild 8211 BLAKE2B 78c9a44c232d0522d52cb1901cda93ef5dcb5df1c8c4aa052122250f9460ca984219c41dfa311a15585637aac6d03e698e15fe6af5ff4273f9265f805e1faf01 SHA512 405bf67ea2457ad0df9f9476d58836685634f5b434cda584c913c1e37f2ba803c2995bf5538515b73bc991a1ff44dd28fa004a459ea86b7af7c2bc23564d0619
 EBUILD llvm-6.0.1.ebuild 7866 BLAKE2B dd6136d06da729413062835ecbc872a8b734ae680369180b19c179067f0cf93bdac82c56bc4954a6cd34c406adaa41376466e496d9fcc1321635de386fd11bc8 SHA512 c0592f651d2db40307bbe2dc499fdf0578b271df30162c5dedcc35ae2022e95efe75d8604a7e12dc2e24e9be937e12bb97004619832f0a2529ea82d78cb42179
 EBUILD llvm-7.1.0.ebuild 7821 BLAKE2B 39820b1dfafde7810aaa2e5851c6293cbe39ef4961a2219ee189d2e8ecbee73771c3f24d356c9506adfdca1ff66904ee394dc3c5ec06b394628a130c4d309b2a SHA512 df4c8f686f6cf0a54a733eb449e9def48bc4baafdea2a5feea2bbec78573ec070a7bf679ace0e27db3cb64babb8d5c9977ee56da67cb7328584d1128c4fe6329
 EBUILD llvm-8.0.1.ebuild 8630 BLAKE2B c0b2d7ea039431c047607492b6f9be8852bd472623e893d624905286b29344a6c5b774671d19a8a18cca9975a4337c218cfc6821cf338000d7985d88a44a6c5a SHA512 23bbfce6f6ed1547b0ca01eaef78f5f7795cd1c5e202e1d625373c36cfb02ee1479c5dd6113f77513e80154644f506581114c7b4544d533e7ed82eb289338415
-EBUILD llvm-9.0.0.ebuild 8591 BLAKE2B d45d52e88d1c7101c854379bf4cffe3cffe8ac617df961e96e9f9670e64f10eac7de21bd714401b89b52b4e27e6729892ac185ef5f78fb04ff9be21f3e694bc9 SHA512 7f99235ba3b502f2f0c444bc6805c2548025b1e1b807719b38f4bda390206cdfca57b0326ada624bc3079bb918a5b982f0961f48e9a4fccd739724a7709f02ba
-EBUILD llvm-9.0.1.9999.ebuild 8289 BLAKE2B 4e63e11f29bd3b88382963ffa8c125308e101d946cd28d7493a2a2e4e7d6180514154310b007f808922d9ab821e9bec70c1cc4f7a3b78fe5354ddf17e21f6ec6 SHA512 49aacf1f630431bcefdaba3bdf34ceef5cf97f363b81937028608d6ee62ea6367309f7f4a3fe9663b5fba35bbc20945a6d8f822e22ec9bf7d518816eff67b8e6
+EBUILD llvm-9.0.0.ebuild 8633 BLAKE2B 5d3540c704a6e4537a64faeeda171fb691732343551e7e5ade9ff691d65776ea2a09911d2df32a8709ef4ef1f0155b67c40414ae519065a81ce136996a0665f9 SHA512 933c19440fec88a31e299066f558baf0f608f4b4b580547ca42d889166ffd8326afd47cfa0a42c35647f5d20034e620ec648c4e9b1f6cbd83acc513a0157ca08
+EBUILD llvm-9.0.1.9999.ebuild 8100 BLAKE2B 9cd90c255149b10d8610ac922ebcfa56185069e577bc52a63e2c84142431bb60fa3ce3d0777329c9cc9fe2cafa154e3f0d103fd1274a79a4255181435dc47d00 SHA512 736bb5a67f41ffe95cc5c13a01198fa7110deba89d10e7e3b1dc9263f58c6684e3dddd9c5bfaba994701bc88d21720a7147fbb9500dd8bfe3e009ecb4d3f78bc
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
index 77a6c8423834..ac0af7a686a0 100644
--- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
@@ -3,19 +3,14 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils git-r3 multilib-minimal multiprocessing pax-utils \
-	python-any-r1 toolchain-funcs
+inherit cmake-utils llvm.org multilib-minimal multiprocessing \
+	pax-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
-	https://github.com/llvm-mirror/llvm.git"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
 
 # Those are in lib/Targets, without explicit CMakeLists.txt mention
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
diff --git a/sys-devel/llvm/llvm-9.0.0.ebuild b/sys-devel/llvm/llvm-9.0.0.ebuild
index 62d66ff6800b..a01238a0f752 100644
--- a/sys-devel/llvm/llvm-9.0.0.ebuild
+++ b/sys-devel/llvm/llvm-9.0.0.ebuild
@@ -3,20 +3,16 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils llvm.org multilib-minimal multiprocessing \
+	pax-utils python-any-r1 toolchain-funcs
 
-inherit cmake-utils multilib-minimal multiprocessing pax-utils \
-	python-any-r1 toolchain-funcs
-
-MY_P=${P}.src
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz
+SRC_URI="
 	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
-S=${WORKDIR}/${MY_P}
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
 
 # Keep in sync with CMakeLists.txt
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
@@ -88,6 +84,16 @@ python_check_deps() {
 	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
 
+src_unpack() {
+	llvm.org_src_unpack
+
+	if ! use doc; then
+		ebegin "Unpacking llvm-${PV}-manpages.tar.bz2"
+		tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
+		eend
+	fi
+}
+
 src_prepare() {
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
diff --git a/sys-devel/llvm/llvm-9.0.1.9999.ebuild b/sys-devel/llvm/llvm-9.0.1.9999.ebuild
index 5ff9e20d7e12..2f2597f5b16d 100644
--- a/sys-devel/llvm/llvm-9.0.1.9999.ebuild
+++ b/sys-devel/llvm/llvm-9.0.1.9999.ebuild
@@ -3,20 +3,14 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils git-r3 multilib-minimal multiprocessing pax-utils \
-	python-any-r1 toolchain-funcs
+inherit cmake-utils llvm.org multilib-minimal multiprocessing \
+	pax-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
-	https://github.com/llvm-mirror/llvm.git"
-EGIT_BRANCH="release_90"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
 
 # Keep in sync with CMakeLists.txt
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
diff --git a/sys-devel/parity/Manifest b/sys-devel/parity/Manifest
index 92428ad3bbb1..20064141035a 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -1,9 +1,2 @@
-AUX parity-1.2.6-debugging.patch 431 BLAKE2B 4f97a2b3199f5507bba25ec97a86f358d252bede55795ee1ed4cb5c0eaccc82d19dc424dc3934e9daaa2e144316d0e129aecd1d27a4fb770367c306cddf748c9 SHA512 da62fc499c5d9e25c3373d8f3529c8dfb0c26bfb08bba851b144d4f2f0b98e29fcf2d1e11022d10412b67afad84e70bcd5456842f4beccaaeab1bf1091e9ddb9
-DIST parity-1.2.4.tar.gz 456408 BLAKE2B 6d7bd4ad1f890d391779f2412bf8586fee16ef760ee02d07a802ded6783c76cec2bc51314a26fea18dadce62fea5d66c826194c974aa4de21924fd7704347ac2 SHA512 236476c8fbf29e84363062722cb5092d07c86798584d0a17ea0406b2416e044fd2952f81e31b5a49b3f117592a7fbf496379ad065320d44fee8d33ebb86ec590
-DIST parity-1.2.5.tar.gz 559411 BLAKE2B 62392ea202c408ed4d6bd91e865ced73ab014c46768e899a30006df5fe204fb1d08d18ed07589878118548e799b2ad2bf10b5353a4d8b998722677efaafbecf8 SHA512 daadf80582b7fa8914f7899e4055185885164210f9a970ff178c3846da83058e3bd70c1db10406e3bcaef05148e87226846cb39e30cbbd1e0821176a8f65c32b
-DIST parity-1.2.6.tar.gz 559357 BLAKE2B 733721306e02e50d5fc65859b77d562c4fd5a7df6ab3ae3c5bbe3a8c4c12d27b87f1889a44cc4ab402cc81c9910ad89c2e54aef054e235dd3686841bbe8458a6 SHA512 fe043feef71db20cf759fd1b5eb8e855f5f78b278f48e9d4afdd2c06fc6c6ae861439cde3829728d3548e072cb065aea5d4048da7ad8bc49f5bc7fcebf7ad430
-EBUILD parity-1.2.4.ebuild 1840 BLAKE2B b2f7e16a0991c862e70e32a6dbd1c5b0825579983e408cd5230b2b6678272405f8c538cc79e8cd89ce981251a66b17f9f5841dc3ba810fb7306ef6e035fcac83 SHA512 b9a729395449b6265357c134b56046bd3928dfb2c99a526e402be319c74f04ddfeca107ca15db3c405ec1d9a9ed2b512e24aa48f7d57db0ae485c6ce86ff1379
-EBUILD parity-1.2.5.ebuild 1840 BLAKE2B b2f7e16a0991c862e70e32a6dbd1c5b0825579983e408cd5230b2b6678272405f8c538cc79e8cd89ce981251a66b17f9f5841dc3ba810fb7306ef6e035fcac83 SHA512 b9a729395449b6265357c134b56046bd3928dfb2c99a526e402be319c74f04ddfeca107ca15db3c405ec1d9a9ed2b512e24aa48f7d57db0ae485c6ce86ff1379
-EBUILD parity-1.2.6.ebuild 1912 BLAKE2B aa23528b4e873248845648dbeb3b065f1b96e7dc402779f572c12bcb094396bba497ce9aedae51d5c8adc0e89fc5193287fab44c06c8793644e2dc9af32a5ce6 SHA512 3472126d0cca7f23f207187fe648c48a31abfafb7440a815f1a7dae952b53a42732fa3d50dae3b3e3eb5f5b42c00bfcd847f108a9845ecd21ecc440245b47c99
-EBUILD parity-9999.ebuild 1764 BLAKE2B 3a8275c1a5807cb47b8797079c0e0e014b9bd6c91fe4499991cb06dc983cd8b0845e58fce6bcf13787806ae5a516c86f511900cfe752ed1d9d91aade66900336 SHA512 54d31b9ded689c7c4fef7277ae0da942009e87c94f5e66fe14fea42b61a9df8ecdc8598bec16edf3246d4fbf06a654adec91a87a97eb7df85b7aecf4257b797e
-MISC metadata.xml 1167 BLAKE2B 3d67fe08381e493a73ff9add1c70c1894ddb9cf250a022a39093fe9460dc1defaf771b0c6589f0d4026f4f75d142970b189fe59ab1f8c12db3c338e3dec1a7ba SHA512 c4f930164516bf18f2b911684e5a3bc11b337e50314ece31210abc58d327b91ce5845d0e3d7da85e71026f5e3657e362a66c34bcfa3f1569bce5c348dbcefccc
+EBUILD parity-9999.ebuild 1760 BLAKE2B c62864c0e71a39c4377f42d1ca9d48de76f067cce8d5366b7856425e330e507bd8897903ab1a513a4eed73323ca1f08aa2f62ff1d62fe0224c88d700c90569b9 SHA512 6d861a309dd629d75f8ccb46b3b79dc6f32587e5dc49dc7b241b4d0049aaedecc22185f4c30df93cfe519c56411115679cdbb6a648a23572fbdae806b72bf704
+MISC metadata.xml 1163 BLAKE2B 72a30d918efe5f179d9bdad8accb6a59ddee5bc65c025c2e9b8db3c2eed8a94bd99438609db8a28cca06cabbdde1e52615870384276735855612bd58f0e2ceb8 SHA512 1cb4c0a6fa98ceaf9da3ff73e959fcbc17a1b9a870610f4bc50c0729f5c2560ca9f1753934573dc47b1fe1c4ae98ca7c4dacd5ea99cce6e18c4d97141eda851c
diff --git a/sys-devel/parity/files/parity-1.2.6-debugging.patch b/sys-devel/parity/files/parity-1.2.6-debugging.patch
deleted file mode 100644
index 709f46ee9734..000000000000
--- a/sys-devel/parity/files/parity-1.2.6-debugging.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- parity.runtime/diagnose.c.orig	2012-09-28 17:12:54 +0200
-+++ parity.runtime/diagnose.c	2012-09-28 17:11:14 +0200
-@@ -745,9 +745,11 @@
- 		CloseHandle(hCore);
- 	}
- 
--	// abort on fatal exceptions
--	TerminateProcess(GetCurrentProcess(), 1);
--	ExitProcess(1);
-+	if (!IsDebuggerPresent()) {
-+		// abort on fatal exceptions
-+		TerminateProcess(GetCurrentProcess(), 1);
-+		ExitProcess(1);
-+	}
- 	return EXCEPTION_CONTINUE_SEARCH;
- }
- 
diff --git a/sys-devel/parity/metadata.xml b/sys-devel/parity/metadata.xml
index b5ae82a3cc83..40c8b82ed8b6 100644
--- a/sys-devel/parity/metadata.xml
+++ b/sys-devel/parity/metadata.xml
@@ -17,8 +17,8 @@
 		<flag name="vc11_0">Enable support for Visual Studio 2012</flag>
 		<flag name="vc12_0">Enable support for Visual Studio 2013</flag>
 		<flag name="vc14_0">Enable support for Visual Studio 2015</flag>
-		<flag name="vc15_0">Enable support for Visual Studio 2017</flag>
-		<flag name="vc16_2">Enable support for Visual Studio 2019</flag>
+		<flag name="vc15">Enable support for Visual Studio 2017</flag>
+		<flag name="vc16">Enable support for Visual Studio 2019</flag>
 		<flag name="vc_x64">Enable support for 64bit Visual Studio compilers</flag>
 		<flag name="vc_x86">Enable support for 32bit Visual Studio compilers</flag>
 	</use>
diff --git a/sys-devel/parity/parity-1.2.4.ebuild b/sys-devel/parity/parity-1.2.4.ebuild
deleted file mode 100644
index a52cea9e6344..000000000000
--- a/sys-devel/parity/parity-1.2.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="An Interix to native Win32 Cross-Compiler Tool (requires Visual Studio)"
-HOMEPAGE="http://www.sourceforge.net/projects/parity/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit subversion
-	ESVN_REPO_URI="https://svn.code.sf.net/p/parity/code/trunk"
-	ESVN_BOOTSTRAP="confix --bootstrap"
-	ESVN_PROJECT="${PN}"
-	KEYWORDS=""
-
-	DEPEND="dev-util/confix"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86-winnt"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	if [ -z "${MSSDK}" ]; then
-		einfo "NOTE: When using Visual Studio 2008, the Platform SDK is no longer"
-		einfo "installed alongside with the other components, but has it's own"
-		einfo "root directory, most likely something like this:"
-		einfo ""
-		einfo "  C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A"
-		einfo ""
-		einfo "To make parity find it's paths correctly, please set MSSDK to the"
-		einfo "value correspoding to the above example for your system."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# create i586-pc-winnt*-g[++|cc|..] links..
-	local exeext=
-
-	[[ -f ${ED}/usr/bin/parity.gnu.gcc.exe ]] && exeext=.exe
-
-	# create cross compiler syms
-	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-gcc
-	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-c++
-	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-g++
-	dosym /usr/bin/parity.gnu.ld${exeext} /usr/bin/i586-pc-winnt$(uname -r)-ld
-
-	# we don't need the header files installed by parity... private
-	# header files are supported with a patch from 2.1.0-r1 onwards,
-	# so they won't be there anymore, but -f does the job in any case.
-	rm -f "${ED}"/usr/include/*.h
-}
diff --git a/sys-devel/parity/parity-1.2.5.ebuild b/sys-devel/parity/parity-1.2.5.ebuild
deleted file mode 100644
index a52cea9e6344..000000000000
--- a/sys-devel/parity/parity-1.2.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="An Interix to native Win32 Cross-Compiler Tool (requires Visual Studio)"
-HOMEPAGE="http://www.sourceforge.net/projects/parity/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit subversion
-	ESVN_REPO_URI="https://svn.code.sf.net/p/parity/code/trunk"
-	ESVN_BOOTSTRAP="confix --bootstrap"
-	ESVN_PROJECT="${PN}"
-	KEYWORDS=""
-
-	DEPEND="dev-util/confix"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86-winnt"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	if [ -z "${MSSDK}" ]; then
-		einfo "NOTE: When using Visual Studio 2008, the Platform SDK is no longer"
-		einfo "installed alongside with the other components, but has it's own"
-		einfo "root directory, most likely something like this:"
-		einfo ""
-		einfo "  C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A"
-		einfo ""
-		einfo "To make parity find it's paths correctly, please set MSSDK to the"
-		einfo "value correspoding to the above example for your system."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# create i586-pc-winnt*-g[++|cc|..] links..
-	local exeext=
-
-	[[ -f ${ED}/usr/bin/parity.gnu.gcc.exe ]] && exeext=.exe
-
-	# create cross compiler syms
-	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-gcc
-	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-c++
-	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-g++
-	dosym /usr/bin/parity.gnu.ld${exeext} /usr/bin/i586-pc-winnt$(uname -r)-ld
-
-	# we don't need the header files installed by parity... private
-	# header files are supported with a patch from 2.1.0-r1 onwards,
-	# so they won't be there anymore, but -f does the job in any case.
-	rm -f "${ED}"/usr/include/*.h
-}
diff --git a/sys-devel/parity/parity-1.2.6.ebuild b/sys-devel/parity/parity-1.2.6.ebuild
deleted file mode 100644
index f91ef988e4dc..000000000000
--- a/sys-devel/parity/parity-1.2.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-if [[ ${PV} == 9999 ]]; then
-	inherit subversion
-	ESVN_REPO_URI="https://svn.code.sf.net/p/parity/code/trunk"
-	ESVN_BOOTSTRAP="confix --bootstrap"
-	ESVN_PROJECT="${PN}"
-	: ${KEYWORDS=""}
-
-	DEPEND="dev-util/confix"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS=""
-fi
-DESCRIPTION="An Interix to native Win32 Cross-Compiler Tool (requires Visual Studio)"
-HOMEPAGE="http://www.sourceforge.net/projects/parity/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	if [ -z "${MSSDK}" ]; then
-		einfo "NOTE: When using Visual Studio 2008, the Platform SDK is no longer"
-		einfo "installed alongside with the other components, but has it's own"
-		einfo "root directory, most likely something like this:"
-		einfo ""
-		einfo "  C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A"
-		einfo ""
-		einfo "To make parity find it's paths correctly, please set MSSDK to the"
-		einfo "value correspoding to the above example for your system."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debugging.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# create i586-pc-winnt*-g[++|cc|..] links..
-	local exeext=
-
-	[[ -f ${ED}/usr/bin/parity.gnu.gcc.exe ]] && exeext=.exe
-
-	# create cross compiler syms
-	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-gcc
-	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-c++
-	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-g++
-	dosym /usr/bin/parity.gnu.ld${exeext} /usr/bin/i586-pc-winnt$(uname -r)-ld
-
-	# we don't need the header files installed by parity... private
-	# header files are supported with a patch from 2.1.0-r1 onwards,
-	# so they won't be there anymore, but -f does the job in any case.
-	rm -f "${ED}"/usr/include/*.h
-}
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild
index 50ab4b1e491e..f1ec325bab1f 100644
--- a/sys-devel/parity/parity-9999.ebuild
+++ b/sys-devel/parity/parity-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/haubi/parity"
 
 parity-vcarchs() { echo x64 x86 ; }
 parity-vcvers-legacy() { echo 7_0 7_1 8_0 9_0 ; }
-parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15_0 16_2 ; }
+parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15 16 ; }
 parity-vcvers() {
 	parity-vcvers-legacy
 	parity-vcvers-current
diff --git a/sys-devel/ucpp/Manifest b/sys-devel/ucpp/Manifest
index 3a42fc7f5d10..6a9351362e0e 100644
--- a/sys-devel/ucpp/Manifest
+++ b/sys-devel/ucpp/Manifest
@@ -1,3 +1,5 @@
 DIST ucpp-1.3.4.tar.xz 274488 BLAKE2B be43b8c88de2cd32514ecf7dc429c0ca5e88150594c9868fd6d8c3d90a0aabfc6e0f0741d75e4f558de426df7d6c54a3bc7e8e362c5066672f5fe9096cbedc18 SHA512 f9ea88e8f53e728a5b0fcb9084d6d6e140737b00fe350a9c6bc53ef2bb5f7b09d3c9d9a4a2147f635d796247e1b920fd3fea0cdce3ec3f4578694162c2f4c2a6
-EBUILD ucpp-1.3.4.ebuild 591 BLAKE2B 6d80b987090a4cb09458887559090de527c22d0087f0d292e4ee0be0d62fb9afe47294c407ce664753611a7c4b4933acebb37312efbae794832d6704189b9351 SHA512 b033cd3319afb32ad086368aeb4770967079172c2952d756362b2f2eed3ef6bc503d284a93ddedd1e53b8492ce01be07ed0d78818650972b3d9b858fbe7cb5a2
+DIST ucpp-1.3.5.tar.xz 289468 BLAKE2B 6a038cc5d02f080747a321a55af66f2072503a5c0a554492ea8aed34ff9c3b7b85e3778114e18c3e09f06f1472a1479f39c96997404e0345153a1f84e3f9daee SHA512 3ded8f7bc2b238adb6e7f4162aee48e039dfe7cee31b700c38e8f147634d47cd1ceaf39c343549b0d4a58358e6b9743f7e84f87b253dc19c05e543d68ade24ce
+EBUILD ucpp-1.3.4.ebuild 574 BLAKE2B 2002a1b0705e980708737550da4a722e8519ddf1c832a7decc7e7e898d66026e36bb24d0ed991b21e7f3fa12f968461e46756016372f56889ebccc4dfc837bd4 SHA512 2ba8452a39a918af48768c515f11510a8db1eab4881357625efba8349776e1b4a276e814dd78602b0c0e2f982a4d65d0a478220483600383e2a377a1e09b6fb1
+EBUILD ucpp-1.3.5.ebuild 620 BLAKE2B 68c704439b47439c0d511c67dd7ea75d1e1636190cee68c2d13422faf59fefb82b2a5fd9c7d33f73bd1ccbe8abbe364a86d849bf5574c75ebd543c0a41395ba9 SHA512 0a6d5b14542313bcc3661674f62bec34ce8a8e6321b863ccdfe43dc3189705e9acecc06c8e71d330f44b8797b6d2e9e705e74d6ddb6946d0f29368b40a3c5ae5
 MISC metadata.xml 450 BLAKE2B 0fba16b58542fffb8e1e99af14e6d4b1f24cd4d689e1a31e1cd513794f1f4c5c14eb7b4a39eab5e8c2a9d13433d670778171b6ac73be66e577798149a93db818 SHA512 6e19033ae2cbfe1a02e6fee2ed078600593e3cdbcccd4b86ec4ccb5283e3b3ad300d6bc9b9803b0b1f6a7e5cc49c8a0d955170e1fc7ba1f26ce0a26e3c0bdf48
diff --git a/sys-devel/ucpp/ucpp-1.3.4.ebuild b/sys-devel/ucpp/ucpp-1.3.4.ebuild
index c7e8b1fec9e8..febb7024590c 100644
--- a/sys-devel/ucpp/ucpp-1.3.4.ebuild
+++ b/sys-devel/ucpp/ucpp-1.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DESCRIPTION="A quick and light preprocessor, but anyway fully compliant to C99"
+DESCRIPTION="Library for preprocessing C compliant to ISO-C99"
 HOMEPAGE="https://gitlab.com/scarabeusiv/ucpp"
 SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
 LICENSE="BSD"
diff --git a/sys-devel/ucpp/ucpp-1.3.5.ebuild b/sys-devel/ucpp/ucpp-1.3.5.ebuild
new file mode 100644
index 000000000000..dd47d3413428
--- /dev/null
+++ b/sys-devel/ucpp/ucpp-1.3.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library for preprocessing C compliant to ISO-C99"
+HOMEPAGE="https://gitlab.com/scarabeusiv/ucpp"
+SRC_URI="https://gitlab.com/scarabeusiv/${PN}/uploads/79f08e39c676f15ed8a59335f6c9b924/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="static-libs"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -type f -delete || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /sys-devel
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)