sys-devel/clang: Switch to patchsets

Signed-off-by: Michał Górny <mgorny@gentoo.org>

11 files changed, 14 insertions, 336 deletions

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index e71645f01831..57eb19d6fa7c 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,9 +1,13 @@
-DIST 10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch 23184 BLAKE2B 42bfc9401bceea6627703f7611aafe4708e4e745e47e8caa01fb8c7126524ef65e4c135cfd0541bc663bfc52fa8c47342f7f8de462abe283ec353b068d2e3532 SHA512 9561c9ab6dc62257b7626f7898afa667401522817ec57137641f8687549b0b8e531659a5afd5226dd7619126cc67f68235f628cbe639345277415343c4ca3650
 DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc
 DIST llvm-11.0.0-manpages.tar.bz2 179592 BLAKE2B d03dff5e7426f4c648d6112dee0fa7a91edf41584290c94c3f738fc65fa82fc6ef47b49c245fb0e741bdf267fc64534311194c476ece4b447649ba2250e61430 SHA512 1cf598f50c99a85a35b03398e4768cd1eafec9d602f788d401120adb91b3b59965216ed7102da26b7c2af7e1bbca4bca8f1d43bb687fcd8ed418e2f7076bdce4
 DIST llvm-11.0.1-manpages.tar.bz2 180888 BLAKE2B 9d70e83704d77aa5007cc8eb8e667fbb1f4dd3a8df607d0bbf4f3f5049ac04263e6e01bf8da0d212f456a49c90b853485746af68f0a1e2b5f3b704914bd45aaf SHA512 c67df394dd1a94ae632ce55ff1b1aa4cc4aa8b59b17521cd91932c1b44efe90f29e84233a0ebe882d39f54a5b28edf4ef40769e7ecc1a5f1021d64c5f99e33ad
 DIST llvm-11.1.0-manpages.tar.bz2 191571 BLAKE2B d6f8e1390dd3e6e8bbcd66c0079ef89f2ff3479743499c36ab32f8bc8281631a96113df9a87f6284058365950f4df3c75dacfcc11920fc5ea7ef0233ba842b77 SHA512 2543e519f51cc7ecb51a732c658ec5d35c5225e30a677f24ead75e81fb1ab793a030e79f21d0b702a2cf6ab6da1a2cba839b49a98e1b0a36384e98076ed5c4b1
 DIST llvm-12.0.0-manpages.tar.bz2 191228 BLAKE2B 60cc736de2512b9368d55cc8c73e8b537c0fb8f0cb923b0c5c9e5866785013df93efc6cb448c91b7635e856a8d663278a3ba40620a2e4c05c006b6fc5b482b4e SHA512 4a4f55da8da0cb7d4d9281b13168864a3c0b10000b3e750b22b93d9b4f68a2d9a2e1da10c94d27081a0bce9694fa55a9d5e723676f9066393dc8001382d1d6da
+DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
+DIST llvm-gentoo-patchset-11.0.0-1.tar.xz 6100 BLAKE2B 6f8fc9b7daa703f04b1283caaeb3665d4bec56ff80b1c5db35917c578fdd92617222bd2d2b83020144b8abdeaa261142b68aa3dee24350133f6721e41a167b78 SHA512 debdd92e6aa3133f474dfbd79f267e76d9d979e4e5d464c8d4343c6e6816b46376ca8080a9ee916152861907af9d0645ce71cf3582ef3dc31ec4ca3410fde9f6
+DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
+DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
+DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
diff --git a/sys-devel/clang/clang-10.0.1.ebuild b/sys-devel/clang/clang-10.0.1.ebuild
index a3627a962031..216a296796ec 100644
--- a/sys-devel/clang/clang-10.0.1.ebuild
+++ b/sys-devel/clang/clang-10.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,13 +9,13 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch"
 LLVM_COMPONENTS=( clang clang-tools-extra )
 LLVM_MANPAGES=pregenerated
 LLVM_TEST_COMPONENTS=(
 	llvm/lib/Testing/Support
 	llvm/utils/{lit,llvm-lit,unittest}
 )
+LLVM_PATCHSET=10.0.1-1
 llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
@@ -74,12 +74,6 @@ PDEPEND="
 # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
 # multilib clang* libraries (not runtime, not wrappers).
 
-PATCHES=(
-	# fix simultaneous linking to .a and dylib
-	"${DISTDIR}"/10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch
-	"${FILESDIR}"/10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch
-)
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/sys-devel/clang/clang-11.0.0.ebuild b/sys-devel/clang/clang-11.0.0.ebuild
index 6a99b268fe0c..ef1644eb8bc0 100644
--- a/sys-devel/clang/clang-11.0.0.ebuild
+++ b/sys-devel/clang/clang-11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
+LLVM_PATCHSET=11.0.0-1
 llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
@@ -75,10 +76,6 @@ PDEPEND="
 # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
 # multilib clang* libraries (not runtime, not wrappers).
 
-PATCHES=(
-	"${FILESDIR}"/9999/prefix-dirs.patch
-)
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/sys-devel/clang/clang-11.0.1.ebuild b/sys-devel/clang/clang-11.0.1.ebuild
index 08342b7bd68f..abcafbb66518 100644
--- a/sys-devel/clang/clang-11.0.1.ebuild
+++ b/sys-devel/clang/clang-11.0.1.ebuild
@@ -63,6 +63,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
+LLVM_PATCHSET=11.1.0-1
 llvm.org_set_globals
 
 # Multilib notes:
@@ -76,10 +77,6 @@ llvm.org_set_globals
 # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
 # multilib clang* libraries (not runtime, not wrappers).
 
-PATCHES=(
-	"${FILESDIR}"/9999/prefix-dirs.patch
-)
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/sys-devel/clang/clang-11.1.0.ebuild b/sys-devel/clang/clang-11.1.0.ebuild
index 1d53c32e7a4d..ba76e14ffdba 100644
--- a/sys-devel/clang/clang-11.1.0.ebuild
+++ b/sys-devel/clang/clang-11.1.0.ebuild
@@ -63,6 +63,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
+LLVM_PATCHSET=11.1.0-1
 llvm.org_set_globals
 
 # Multilib notes:
@@ -76,10 +77,6 @@ llvm.org_set_globals
 # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
 # multilib clang* libraries (not runtime, not wrappers).
 
-PATCHES=(
-	"${FILESDIR}"/9999/prefix-dirs.patch
-)
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${SLOT%/*} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/sys-devel/clang/clang-12.0.0-r1.ebuild b/sys-devel/clang/clang-12.0.0-r1.ebuild
index 100f9a26b26a..c6dfa3e4fb4c 100644
--- a/sys-devel/clang/clang-12.0.0-r1.ebuild
+++ b/sys-devel/clang/clang-12.0.0-r1.ebuild
@@ -63,6 +63,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
+LLVM_PATCHSET=12.0.0-1
 llvm.org_set_globals
 
 # Multilib notes:
@@ -76,11 +77,6 @@ llvm.org_set_globals
 # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
 # multilib clang* libraries (not runtime, not wrappers).
 
-PATCHES=(
-	"${FILESDIR}"/12.0.0/readd-reporter.patch
-	"${FILESDIR}"/9999/prefix-dirs.patch
-)
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/sys-devel/clang/clang-12.0.0.9999.ebuild b/sys-devel/clang/clang-12.0.0.9999.ebuild
index bd58b0be005c..74d03d6bde4f 100644
--- a/sys-devel/clang/clang-12.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-12.0.0.9999.ebuild
@@ -63,6 +63,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
 # Multilib notes:
@@ -76,10 +77,6 @@ llvm.org_set_globals
 # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
 # multilib clang* libraries (not runtime, not wrappers).
 
-PATCHES=(
-	"${FILESDIR}"/9999/prefix-dirs.patch
-)
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/sys-devel/clang/clang-13.0.0.9999.ebuild b/sys-devel/clang/clang-13.0.0.9999.ebuild
index bd58b0be005c..74d03d6bde4f 100644
--- a/sys-devel/clang/clang-13.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-13.0.0.9999.ebuild
@@ -63,6 +63,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
 # Multilib notes:
@@ -76,10 +77,6 @@ llvm.org_set_globals
 # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
 # multilib clang* libraries (not runtime, not wrappers).
 
-PATCHES=(
-	"${FILESDIR}"/9999/prefix-dirs.patch
-)
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/sys-devel/clang/files/10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch b/sys-devel/clang/files/10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch
deleted file mode 100644
index 74b569ca4117..000000000000
--- a/sys-devel/clang/files/10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e0df57328dd084d38ea4aac0cfb129fc320eae3f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 19 Jun 2020 17:00:12 +0200
-Subject: [PATCH 4/4] [clang] Avoid linking c-index-test to duplicate libraries
-
-Use clang_target_link_libraries() to link libraries included
-in clang-cpp.so to avoid simultaneously linking to it and to split
-static libraries.  This prevents units from being included twice.
----
- clang/tools/c-index-test/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
-index ceef4b08637..d83d1091936 100644
---- a/clang/tools/c-index-test/CMakeLists.txt
-+++ b/clang/tools/c-index-test/CMakeLists.txt
-@@ -25,6 +25,9 @@ else()
-   target_link_libraries(c-index-test
-     PRIVATE
-     libclang
-+  )
-+  clang_target_link_libraries(c-index-test
-+    PRIVATE
-     clangAST
-     clangBasic
-     clangCodeGen
--- 
-2.27.0
-
diff --git a/sys-devel/clang/files/12.0.0/readd-reporter.patch b/sys-devel/clang/files/12.0.0/readd-reporter.patch
deleted file mode 100644
index 5f3f1646943e..000000000000
--- a/sys-devel/clang/files/12.0.0/readd-reporter.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
---- a/clang/tools/scan-view/CMakeLists.txt
-+++ b/clang/tools/scan-view/CMakeLists.txt
-@@ -5,6 +5,7 @@
- 
- set(ShareFiles
-       ScanView.py
-+      Reporter.py
-       startfile.py
-       bugcatcher.ico)
- 
-diff --git a/clang/tools/scan-view/share/Reporter.py b/clang/tools/scan-view/share/Reporter.py
-new file mode 100644
---- /dev/null
-+++ b/clang/tools/scan-view/share/Reporter.py
-@@ -0,0 +1,183 @@
-+#!/usr/bin/env python
-+# -*- coding: utf-8 -*-
-+
-+"""Methods for reporting bugs."""
-+
-+import subprocess, sys, os
-+
-+__all__ = ['ReportFailure', 'BugReport', 'getReporters']
-+
-+#
-+
-+class ReportFailure(Exception):
-+    """Generic exception for failures in bug reporting."""
-+    def __init__(self, value):        
-+        self.value = value
-+
-+# Collect information about a bug.
-+
-+class BugReport(object):
-+    def __init__(self, title, description, files):
-+        self.title = title
-+        self.description = description
-+        self.files = files
-+
-+# Reporter interfaces.
-+
-+import os
-+
-+import email, mimetypes, smtplib
-+from email import encoders
-+from email.message import Message
-+from email.mime.base import MIMEBase
-+from email.mime.multipart import MIMEMultipart
-+from email.mime.text import MIMEText
-+
-+#===------------------------------------------------------------------------===#
-+# ReporterParameter
-+#===------------------------------------------------------------------------===#
-+
-+class ReporterParameter(object):
-+  def __init__(self, n):
-+    self.name = n
-+  def getName(self):
-+    return self.name
-+  def getValue(self,r,bugtype,getConfigOption):
-+     return getConfigOption(r.getName(),self.getName())
-+  def saveConfigValue(self):
-+    return True
-+
-+class TextParameter (ReporterParameter):
-+  def getHTML(self,r,bugtype,getConfigOption):
-+    return """\
-+<tr>
-+<td class="form_clabel">%s:</td>
-+<td class="form_value"><input type="text" name="%s_%s" value="%s"></td>
-+</tr>"""%(self.getName(),r.getName(),self.getName(),self.getValue(r,bugtype,getConfigOption))
-+
-+class SelectionParameter (ReporterParameter):
-+  def __init__(self, n, values):
-+    ReporterParameter.__init__(self,n)
-+    self.values = values
-+    
-+  def getHTML(self,r,bugtype,getConfigOption):
-+    default = self.getValue(r,bugtype,getConfigOption)
-+    return """\
-+<tr>
-+<td class="form_clabel">%s:</td><td class="form_value"><select name="%s_%s">
-+%s
-+</select></td>"""%(self.getName(),r.getName(),self.getName(),'\n'.join(["""\
-+<option value="%s"%s>%s</option>"""%(o[0],
-+                                     o[0] == default and ' selected="selected"' or '',
-+                                     o[1]) for o in self.values]))
-+
-+#===------------------------------------------------------------------------===#
-+# Reporters
-+#===------------------------------------------------------------------------===#
-+
-+class EmailReporter(object):
-+    def getName(self):
-+        return 'Email'
-+
-+    def getParameters(self):
-+        return [TextParameter(x) for x in ['To', 'From', 'SMTP Server', 'SMTP Port']]
-+
-+    # Lifted from python email module examples.
-+    def attachFile(self, outer, path):
-+        # Guess the content type based on the file's extension.  Encoding
-+        # will be ignored, although we should check for simple things like
-+        # gzip'd or compressed files.
-+        ctype, encoding = mimetypes.guess_type(path)
-+        if ctype is None or encoding is not None:
-+            # No guess could be made, or the file is encoded (compressed), so
-+            # use a generic bag-of-bits type.
-+            ctype = 'application/octet-stream'
-+        maintype, subtype = ctype.split('/', 1)
-+        if maintype == 'text':
-+            fp = open(path)
-+            # Note: we should handle calculating the charset
-+            msg = MIMEText(fp.read(), _subtype=subtype)
-+            fp.close()
-+        else:
-+            fp = open(path, 'rb')
-+            msg = MIMEBase(maintype, subtype)
-+            msg.set_payload(fp.read())
-+            fp.close()
-+            # Encode the payload using Base64
-+            encoders.encode_base64(msg)
-+        # Set the filename parameter
-+        msg.add_header('Content-Disposition', 'attachment', filename=os.path.basename(path))
-+        outer.attach(msg)
-+
-+    def fileReport(self, report, parameters):
-+        mainMsg = """\
-+BUG REPORT
-+---
-+Title: %s
-+Description: %s
-+"""%(report.title, report.description)
-+
-+        if not parameters.get('To'):
-+            raise ReportFailure('No "To" address specified.')
-+        if not parameters.get('From'):
-+            raise ReportFailure('No "From" address specified.')
-+
-+        msg = MIMEMultipart()
-+        msg['Subject'] = 'BUG REPORT: %s'%(report.title)
-+        # FIXME: Get config parameters
-+        msg['To'] = parameters.get('To')
-+        msg['From'] = parameters.get('From')
-+        msg.preamble = mainMsg
-+
-+        msg.attach(MIMEText(mainMsg, _subtype='text/plain'))
-+        for file in report.files:
-+            self.attachFile(msg, file)
-+
-+        try:
-+            s = smtplib.SMTP(host=parameters.get('SMTP Server'),
-+                             port=parameters.get('SMTP Port'))
-+            s.sendmail(msg['From'], msg['To'], msg.as_string())
-+            s.close()
-+        except:
-+            raise ReportFailure('Unable to send message via SMTP.')
-+
-+        return "Message sent!"
-+
-+class BugzillaReporter(object):
-+    def getName(self):
-+        return 'Bugzilla'
-+    
-+    def getParameters(self):
-+        return [TextParameter(x) for x in ['URL','Product']]
-+
-+    def fileReport(self, report, parameters):
-+        raise NotImplementedError
-+ 
-+
-+class RadarClassificationParameter(SelectionParameter):
-+  def __init__(self):
-+    SelectionParameter.__init__(self,"Classification",
-+            [['1', 'Security'], ['2', 'Crash/Hang/Data Loss'],
-+             ['3', 'Performance'], ['4', 'UI/Usability'], 
-+             ['6', 'Serious Bug'], ['7', 'Other']])
-+
-+  def saveConfigValue(self):
-+    return False
-+    
-+  def getValue(self,r,bugtype,getConfigOption):
-+    if bugtype.find("leak") != -1:
-+      return '3'
-+    elif bugtype.find("dereference") != -1:
-+      return '2'
-+    elif bugtype.find("missing ivar release") != -1:
-+      return '3'
-+    else:
-+      return '7'
-+
-+###
-+
-+def getReporters():
-+    reporters = []
-+    reporters.append(EmailReporter())
-+    return reporters
-+
-
diff --git a/sys-devel/clang/files/9999/prefix-dirs.patch b/sys-devel/clang/files/9999/prefix-dirs.patch
deleted file mode 100644
index d8d79b8fb513..000000000000
--- a/sys-devel/clang/files/9999/prefix-dirs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-This mirrors cmake-*-prefix-dirs.patch
-
-It add EPREFIX to search paths for c/cxx headers.
-It also adds EPREFIX/MacOSX.sdk to search paths for c and Frameworks.
-Assumes that c++ lib and headers will be installed in the prefix.
-
-Also, a couple of args are populated by inspecting the SDK,
-so, default to EPREFIX/MacOSX.sdk when the sysroot is not specified.
-(This does NOT set sysroot).
-
---- a/clang/lib/Frontend/InitHeaderSearch.cpp	2020-11-30 12:53:42.000000000 -0600
-+++ b/clang/lib/Frontend/InitHeaderSearch.cpp	2020-11-30 13:57:52.000000000 -0600
-@@ -445,6 +445,9 @@
-   // All header search logic is handled in the Driver for Darwin.
-   if (triple.isOSDarwin()) {
-     if (HSOpts.UseStandardSystemIncludes) {
-+      // Add Gentoo Prefix framework dirs first
-+      AddPath("@GENTOO_PORTAGE_EPREFIX@/MacOSX.sdk/System/Library/Frameworks", System, true);
-+      AddPath("@GENTOO_PORTAGE_EPREFIX@/MacOSX.sdk/Library/Frameworks", System, true);
-       // Add the default framework include paths on Darwin.
-       AddPath("/System/Library/Frameworks", System, true);
-       AddPath("/Library/Frameworks", System, true);
---- a/clang/lib/Driver/ToolChains/Darwin.cpp	2020-10-07 05:10:48.000000000 -0500
-+++ b/clang/lib/Driver/ToolChains/Darwin.cpp	2020-11-30 12:57:15.000000000 -0600
-@@ -1737,9 +1737,9 @@
-                                          const ArgList &Args,
-                                          const Driver &TheDriver) {
-   const Arg *A = Args.getLastArg(options::OPT_isysroot);
--  if (!A)
--    return None;
--  StringRef isysroot = A->getValue();
-+  //if (!A)
-+  //  return None;
-+  StringRef isysroot = A ? A->getValue() : "@GENTOO_PORTAGE_EPREFIX@/MacOSX.sdk";
-   auto SDKInfoOrErr = driver::parseDarwinSDKInfo(VFS, isysroot);
-   if (!SDKInfoOrErr) {
-     llvm::consumeError(SDKInfoOrErr.takeError());
-@@ -1921,13 +1921,14 @@
-     return DriverArgs.getLastArgValue(options::OPT_isysroot);
-   if (!getDriver().SysRoot.empty())
-     return getDriver().SysRoot;
--  return "/";
-+  return "@GENTOO_PORTAGE_EPREFIX@/";
- }
- 
- void DarwinClang::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
-                                             llvm::opt::ArgStringList &CC1Args) const {
-   const Driver &D = getDriver();
- 
-+  // Sysroot is effectively Gentoo EPREFIX when -isysroot/-sysroot is not defined
-   llvm::StringRef Sysroot = GetHeaderSysroot(DriverArgs);
- 
-   bool NoStdInc = DriverArgs.hasArg(options::OPT_nostdinc);
-@@ -1969,6 +1970,10 @@
-     SmallString<128> P(Sysroot);
-     llvm::sys::path::append(P, "usr", "include");
-     addExternCSystemInclude(DriverArgs, CC1Args, P.str());
-+    // And add <sysroot>/MacOSX.sdk/usr/include.
-+    SmallString<128> Psdk(Sysroot);
-+    llvm::sys::path::append(Psdk, "MacOSX.sdk", "usr", "include");
-+    addExternCSystemInclude(DriverArgs, CC1Args, Psdk.str());
-   }
- }
- 
-@@ -2017,6 +2022,7 @@
-       DriverArgs.hasArg(options::OPT_nostdincxx))
-     return;
- 
-+  // Sysroot is effectively Gentoo EPREFIX when -isysroot/-sysroot is not defined
-   llvm::StringRef Sysroot = GetHeaderSysroot(DriverArgs);
- 
-   switch (GetCXXStdlibType(DriverArgs)) {