sys-devel/llvm: OCaml install path patch has been merged upstream

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

diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index ef041e638b6dd07bba1a71f335f2af3a26a4e48d..5b809750bb8d2170a7fad5ee85da1cd895e4e5f5 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -141,7 +141,7 @@ 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}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+       eapply "${FILESDIR}"/3.9.0/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
 

diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
index 773c35330aed46c3eb47c38c3adf1b402624b832..7731a4baba214d8d47dacfd8998439926cbf01ae 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
@@ -142,7 +142,7 @@ 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}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+       eapply "${FILESDIR}"/3.9.0/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
 

diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index f0bb43b8974d60440ad643206f0042f96c0818fe..f16aca4a8c50a442ae991bd9afd427eaa7217e33 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -143,7 +143,7 @@ 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}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+       eapply "${FILESDIR}"/3.9.0/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
 

diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index 2e81b58da5824a8af7142374ddc44bc132c6efc1..036de496bb5f32bea21233f3c71b9a02b4914d92 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -142,7 +142,7 @@ 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}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+       eapply "${FILESDIR}"/3.9.0/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
 

diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild
index 454f997eb682a31fca44d99824fced8e53d401ef..a5269d33ce38b5c8154e385b185d4cba057a899c 100644 (file)
--- a/sys-devel/llvm/llvm-3.9.0.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0.ebuild
@@ -151,7 +151,7 @@ src_prepare() {
        python_setup
 
        # Fix libdir for ocaml bindings install, bug #559134
-       eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+       eapply "${FILESDIR}"/3.9.0/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
 

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 526f2530464f8d6ef7dfe2ea5959b5b6ee60f5ba..6af306ea7bc7d083fc80ab06cdab66ea7c081a3a 100644 (file)
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -96,9 +96,6 @@ src_prepare() {
        # Python is needed to run tests using lit
        python_setup
 
-       # Fix libdir for ocaml bindings install, bug #559134
-       eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
-
        # Prevent race conditions with parallel Sphinx runs
        # https://llvm.org/bugs/show_bug.cgi?id=23781
        eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch