sys-devel/clang: Reshuffle patches

diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild
index 672f7fc6097b6ec9702305a9ebad7ed32946a29d..469a613db91ae1d694bfac2c0eef51bb9be22e95 100644 (file)
--- a/sys-devel/clang/clang-4.0.1.ebuild
+++ b/sys-devel/clang/clang-4.0.1.ebuild
@@ -89,7 +89,7 @@ src_unpack() {
 
 src_prepare() {
        # fix finding compiler-rt libs
-       eapply "${FILESDIR}"/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
+       eapply "${FILESDIR}"/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
 
        # fix stand-alone doc build
        eapply "${FILESDIR}"/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch

diff --git a/sys-devel/clang/clang-5.0.2.ebuild b/sys-devel/clang/clang-5.0.2.ebuild
index 85f7d6b4404ea4731346d2872c472cc1071618b3..6e07de89a3b3e5d9d87af5ef584725f498ef5dfd 100644 (file)
--- a/sys-devel/clang/clang-5.0.2.ebuild
+++ b/sys-devel/clang/clang-5.0.2.ebuild
@@ -107,15 +107,15 @@ src_unpack() {
 
 src_prepare() {
        # fix finding compiler-rt libs
-       eapply "${FILESDIR}"/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
+       eapply "${FILESDIR}"/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
        # fix setting LD_LIBRARY_PATH for tests on *BSD
-       eapply "${FILESDIR}"/5.0.1/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
+       eapply "${FILESDIR}"/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
        # add Prefix include paths for Darwin
-       eapply "${FILESDIR}"/5.0.1/darwin_prefix-include-paths.patch
+       eapply "${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch
 
        cd tools/extra || die
        # fix setting LD_LIBRARY_PATH for tests on *BSD (extra part)
-       eapply "${FILESDIR}"/5.0.1/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
+       eapply "${FILESDIR}"/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
        cd ../.. || die
 
        cmake-utils_src_prepare

diff --git a/sys-devel/clang/clang-6.0.1.ebuild b/sys-devel/clang/clang-6.0.1.ebuild
index d42ae48d2ea2e75ac9ceeb2d5992437a5772d733..6cd2169e898acbd8e103c85847fa35bb1089ab49 100644 (file)
--- a/sys-devel/clang/clang-6.0.1.ebuild
+++ b/sys-devel/clang/clang-6.0.1.ebuild
@@ -70,7 +70,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 
 PATCHES=(
        # add Prefix include paths for Darwin
-       "${FILESDIR}"/5.0.1/darwin_prefix-include-paths.patch
+       "${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch
 
        # fix test failure with default-compiler-rt
        # https://bugs.gentoo.org/650316

diff --git a/sys-devel/clang/files/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch b/sys-devel/clang/files/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
similarity index 100%
rename from sys-devel/clang/files/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
rename to sys-devel/clang/files/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch

diff --git a/sys-devel/clang/files/5.0.1/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch b/sys-devel/clang/files/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
similarity index 100%
rename from sys-devel/clang/files/5.0.1/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
rename to sys-devel/clang/files/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch

diff --git a/sys-devel/clang/files/5.0.1/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch b/sys-devel/clang/files/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
similarity index 100%
rename from sys-devel/clang/files/5.0.1/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
rename to sys-devel/clang/files/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch

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