sys-devel/llvm: Move patches around for 3.9.1

diff --git a/sys-devel/llvm/files/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch b/sys-devel/llvm/files/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
rename to sys-devel/llvm/files/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch

diff --git a/sys-devel/llvm/files/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch b/sys-devel/llvm/files/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
rename to sys-devel/llvm/files/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch

diff --git a/sys-devel/llvm/files/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch b/sys-devel/llvm/files/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
rename to sys-devel/llvm/files/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch

diff --git a/sys-devel/llvm/files/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
rename to sys-devel/llvm/files/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch

diff --git a/sys-devel/llvm/files/3.9.0/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch b/sys-devel/llvm/files/3.9.1/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch
rename to sys-devel/llvm/files/3.9.1/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch

diff --git a/sys-devel/llvm/files/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
rename to sys-devel/llvm/files/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch

diff --git a/sys-devel/llvm/files/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch b/sys-devel/llvm/files/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
rename to sys-devel/llvm/files/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch

diff --git a/sys-devel/llvm/files/3.9.0/clang/darwin_prefix-include-paths.patch b/sys-devel/llvm/files/3.9.1/clang/darwin_prefix-include-paths.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/clang/darwin_prefix-include-paths.patch
rename to sys-devel/llvm/files/3.9.1/clang/darwin_prefix-include-paths.patch

diff --git a/sys-devel/llvm/files/3.9.0/clang/default-libs.patch b/sys-devel/llvm/files/3.9.1/clang/default-libs.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/clang/default-libs.patch
rename to sys-devel/llvm/files/3.9.1/clang/default-libs.patch

diff --git a/sys-devel/llvm/files/3.9.0/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch b/sys-devel/llvm/files/3.9.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
rename to sys-devel/llvm/files/3.9.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch

diff --git a/sys-devel/llvm/files/3.9.0/lldb/six.patch b/sys-devel/llvm/files/3.9.1/lldb/six.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/lldb/six.patch
rename to sys-devel/llvm/files/3.9.1/lldb/six.patch

diff --git a/sys-devel/llvm/files/3.9.0/llvm-config-r1.patch b/sys-devel/llvm/files/3.9.1/llvm-config-r1.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.0/llvm-config-r1.patch
rename to sys-devel/llvm/files/3.9.1/llvm-config-r1.patch

diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
index 56a9d131e6e0e38afabfc803704ebcda5ccb179c..f9347dfb8ac2a1059d47201a5bbd71f614f6b92c 100644 (file)
--- a/sys-devel/llvm/llvm-3.4.2-r100.ebuild
+++ b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
@@ -106,7 +106,7 @@ src_prepare() {
 
                epatch "${FILESDIR}"/3.4.2/clang/gentoo-install.patch
                epatch "${FILESDIR}"/3.4.2/clang/darwin_build_fix.patch
-               epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+               epatch "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
                eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
        fi
 

diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index 762055be933aab193c27714c1389f29ec7ea0c2c..d9468a839d157dcde2fd986b0265501a27b96478 100644 (file)
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -172,7 +172,7 @@ src_prepare() {
                epatch "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
 
                epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch
-               epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+               epatch "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
                eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
        fi
 

diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild
index 9cd430212f192ffced33da76b30bc85092d28af2..27ad004e968e23b7b4ad7e58fd98815765a43cc8 100644 (file)
--- a/sys-devel/llvm/llvm-3.6.2.ebuild
+++ b/sys-devel/llvm/llvm-3.6.2.ebuild
@@ -176,7 +176,7 @@ src_prepare() {
                epatch "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
 
                epatch "${FILESDIR}"/3.7.1/clang/gentoo-install.patch
-               epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+               epatch "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
                eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
                # Fix build fails with using gcc-4.9 on Gentoo/FreeBSD, bug #548444

diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index ac91baf3d437285cf6c8d2dd054702a40b59eaf0..b1e9ceb1ddc48d36841fb8de5bb17b68e80857c5 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -157,17 +157,17 @@ src_prepare() {
        # Make ocaml warnings non-fatal, bug #537308
        sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
        # Fix libdir for ocaml bindings install, bug #559134
-       eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+       eapply "${FILESDIR}"/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
        # Do not build/install ocaml docs with USE=-doc, bug #562008
-       eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+       eapply "${FILESDIR}"/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
        # Make it possible to override Sphinx HTML install dirs
        # https://llvm.org/bugs/show_bug.cgi?id=23780
-       eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+       eapply "${FILESDIR}"/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
        # Prevent race conditions with parallel Sphinx runs
        # https://llvm.org/bugs/show_bug.cgi?id=23781
-       eapply "${FILESDIR}"/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+       eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
        # Prevent installing libgtest
        # https://llvm.org/bugs/show_bug.cgi?id=18341
@@ -202,7 +202,7 @@ src_prepare() {
 
                eapply "${FILESDIR}"/3.7.1/clang/gentoo-install.patch
 
-               eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+               eapply "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
                eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
                # Fix -isystem support in ccc-analyzer
@@ -223,7 +223,7 @@ src_prepare() {
                # Make it possible to override CLANG_LIBDIR_SUFFIX
                # (that is used only to find LLVMgold.so)
                # https://llvm.org/bugs/show_bug.cgi?id=23793
-               eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+               eapply "${FILESDIR}"/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
                # Fix git-clang-format shebang, bug #562688
                python_fix_shebang tools/clang/tools/clang-format/git-clang-format

diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 53dd9100947ce675f56438f2089e1197d8ce183c..9eff8cd66726a6b26dbfa2b8935240740cd1d8b0 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -157,17 +157,17 @@ src_prepare() {
        # Make ocaml warnings non-fatal, bug #537308
        sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
        # Fix libdir for ocaml bindings install, bug #559134
-       eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+       eapply "${FILESDIR}"/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
        # Do not build/install ocaml docs with USE=-doc, bug #562008
-       eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+       eapply "${FILESDIR}"/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
        # Make it possible to override Sphinx HTML install dirs
        # https://llvm.org/bugs/show_bug.cgi?id=23780
-       eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+       eapply "${FILESDIR}"/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
        # Prevent race conditions with parallel Sphinx runs
        # https://llvm.org/bugs/show_bug.cgi?id=23781
-       eapply "${FILESDIR}"/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+       eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
        # Prevent installing libgtest
        # https://llvm.org/bugs/show_bug.cgi?id=18341
@@ -178,7 +178,7 @@ src_prepare() {
 
        # Fix llvm-config for shared linking and sane flags
        # https://bugs.gentoo.org/show_bug.cgi?id=565358
-       eapply "${FILESDIR}"/3.9.0/llvm-config-r1.patch
+       eapply "${FILESDIR}"/3.9.1/llvm-config-r1.patch
 
        # Restore SOVERSIONs for shared libraries
        # https://bugs.gentoo.org/show_bug.cgi?id=578392
@@ -204,7 +204,7 @@ src_prepare() {
                # https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
                eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
 
-               eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+               eapply "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
                eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
                pushd "${S}"/tools/clang >/dev/null || die
@@ -220,7 +220,7 @@ src_prepare() {
 
                # Install clang runtime into /usr/lib/clang
                # https://llvm.org/bugs/show_bug.cgi?id=23792
-               eapply "${FILESDIR}"/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+               eapply "${FILESDIR}"/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
                eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
                # Do not force -march flags on arm platforms
@@ -230,7 +230,7 @@ src_prepare() {
                # Make it possible to override CLANG_LIBDIR_SUFFIX
                # (that is used only to find LLVMgold.so)
                # https://llvm.org/bugs/show_bug.cgi?id=23793
-               eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+               eapply "${FILESDIR}"/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
                # Fix git-clang-format shebang, bug #562688
                python_fix_shebang tools/clang/tools/clang-format/git-clang-format
@@ -259,7 +259,7 @@ src_prepare() {
                sed -e 's/add_subdirectory(readline)/#&/' \
                        -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
                # Do not install bundled six module
-               eapply "${FILESDIR}"/3.9.0/lldb/six.patch
+               eapply "${FILESDIR}"/3.9.1/lldb/six.patch
        fi
 
        # User patches

diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index 07d910bf3ef0c0f30fe661178ffa278f15ebb3d2..fb0575f215206a05cae3eeccfe833a8cd9788c00 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -158,17 +158,17 @@ src_prepare() {
        # Make ocaml warnings non-fatal, bug #537308
        sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
        # Fix libdir for ocaml bindings install, bug #559134
-       eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+       eapply "${FILESDIR}"/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
        # Do not build/install ocaml docs with USE=-doc, bug #562008
-       eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+       eapply "${FILESDIR}"/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
        # Make it possible to override Sphinx HTML install dirs
        # https://llvm.org/bugs/show_bug.cgi?id=23780
-       eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+       eapply "${FILESDIR}"/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
        # Prevent race conditions with parallel Sphinx runs
        # https://llvm.org/bugs/show_bug.cgi?id=23781
-       eapply "${FILESDIR}"/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+       eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
        # Prevent installing libgtest
        # https://llvm.org/bugs/show_bug.cgi?id=18341
@@ -199,7 +199,7 @@ src_prepare() {
                # https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
                eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
 
-               eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+               eapply "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
                eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
                eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch
@@ -209,7 +209,7 @@ src_prepare() {
 
                # Install clang runtime into /usr/lib/clang
                # https://llvm.org/bugs/show_bug.cgi?id=23792
-               eapply "${FILESDIR}"/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+               eapply "${FILESDIR}"/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
                eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
                # Do not force -march flags on arm platforms
@@ -219,7 +219,7 @@ src_prepare() {
                # Make it possible to override CLANG_LIBDIR_SUFFIX
                # (that is used only to find LLVMgold.so)
                # https://llvm.org/bugs/show_bug.cgi?id=23793
-               eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+               eapply "${FILESDIR}"/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
                # Fix git-clang-format shebang, bug #562688
                python_fix_shebang tools/clang/tools/clang-format/git-clang-format
@@ -244,7 +244,7 @@ src_prepare() {
                sed -e 's/add_subdirectory(readline)/#&/' \
                        -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
                # Do not install bundled six module
-               eapply "${FILESDIR}"/3.9.0/lldb/six.patch
+               eapply "${FILESDIR}"/3.9.1/lldb/six.patch
        fi
 
        # User patches

diff --git a/sys-devel/llvm/llvm-3.9.0-r1.ebuild b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
index 65d153e35877ebac74370be1e7853bc96618161d..905de6cef1f23db4bc5cb8ef74d2aabbd59f341a 100644 (file)
--- a/sys-devel/llvm/llvm-3.9.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
@@ -168,28 +168,28 @@ src_prepare() {
        python_setup
 
        # Fix libdir for ocaml bindings install, bug #559134
-       eapply "${FILESDIR}"/3.9.0/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+       eapply "${FILESDIR}"/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
        # Do not build/install ocaml docs with USE=-doc, bug #562008
-       eapply "${FILESDIR}"/3.9.0/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+       eapply "${FILESDIR}"/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
        # Make it possible to override Sphinx HTML install dirs
        # https://llvm.org/bugs/show_bug.cgi?id=23780
-       eapply "${FILESDIR}"/3.9.0/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+       eapply "${FILESDIR}"/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
        # Prevent race conditions with parallel Sphinx runs
        # https://llvm.org/bugs/show_bug.cgi?id=23781
-       eapply "${FILESDIR}"/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+       eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
        # Allow custom cmake build types (like 'Gentoo')
        eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
 
        # Fix llvm-config for shared linking and sane flags
        # https://bugs.gentoo.org/show_bug.cgi?id=565358
-       eapply "${FILESDIR}"/3.9.0/llvm-config-r1.patch
+       eapply "${FILESDIR}"/3.9.1/llvm-config-r1.patch
 
        # Restore SOVERSIONs for shared libraries
        # https://bugs.gentoo.org/show_bug.cgi?id=578392
-       eapply "${FILESDIR}"/3.9.0/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch
+       eapply "${FILESDIR}"/3.9.1/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch
 
        # support building llvm against musl-libc
        use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch
@@ -204,14 +204,14 @@ src_prepare() {
                # Automatically select active system GCC's libraries, bugs #406163 and #417913
                eapply "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
 
-               eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+               eapply "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
                eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
                eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch
 
                pushd "${S}"/tools/clang >/dev/null || die
                # be able to specify default values for -stdlib and -rtlib at build time
-               eapply "${FILESDIR}"/3.9.0/clang/default-libs.patch
+               eapply "${FILESDIR}"/3.9.1/clang/default-libs.patch
                popd >/dev/null || die
 
                sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
@@ -219,13 +219,13 @@ src_prepare() {
 
                # Install clang runtime into /usr/lib/clang
                # https://llvm.org/bugs/show_bug.cgi?id=23792
-               eapply "${FILESDIR}"/3.9.0/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
-               eapply "${FILESDIR}"/3.9.0/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+               eapply "${FILESDIR}"/3.9.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+               eapply "${FILESDIR}"/3.9.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
                # Make it possible to override CLANG_LIBDIR_SUFFIX
                # (that is used only to find LLVMgold.so)
                # https://llvm.org/bugs/show_bug.cgi?id=23793
-               eapply "${FILESDIR}"/3.9.0/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+               eapply "${FILESDIR}"/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
                # Fix git-clang-format shebang, bug #562688
                python_fix_shebang tools/clang/tools/clang-format/git-clang-format
@@ -246,7 +246,7 @@ src_prepare() {
                sed -e 's/add_subdirectory(readline)/#&/' \
                        -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
                # Do not install bundled six module
-               eapply "${FILESDIR}"/3.9.0/lldb/six.patch
+               eapply "${FILESDIR}"/3.9.1/lldb/six.patch
        fi
 
        # User patches