sys-devel/llvm: OCaml doc patch has been applied upstream

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

diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index c35f38feca82199b60e354d8b75c9cff2ace5ba2..02635d1e52d0e470af39061def55158e670b68c7 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -143,7 +143,7 @@ src_prepare() {
        # Fix libdir for ocaml bindings install, bug #559134
        eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
        # Do not build/install ocaml docs with USE=-doc, bug #562008
-       eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+       eapply "${FILESDIR}"/3.8.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

diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
index 5196fe41612c93681ee6fb217b0ac19af0a7fd69..7bd13a8a87cf2777acbb58428ef3c579d803f5be 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
@@ -144,7 +144,7 @@ src_prepare() {
        # Fix libdir for ocaml bindings install, bug #559134
        eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
        # Do not build/install ocaml docs with USE=-doc, bug #562008
-       eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+       eapply "${FILESDIR}"/3.8.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

diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 5fdffd0facb42ed844409014ac0642ef41c37291..7f096fcfe21ad35e9c2f26e715cc74591cd72c01 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -145,7 +145,7 @@ src_prepare() {
        # Fix libdir for ocaml bindings install, bug #559134
        eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
        # Do not build/install ocaml docs with USE=-doc, bug #562008
-       eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+       eapply "${FILESDIR}"/3.8.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

diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index c00669d5db32e9f273c70400526340bf1fd7bb6d..22ae082f028f953c6fb5d55542e1019a5b81f1e2 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -144,7 +144,7 @@ src_prepare() {
        # Fix libdir for ocaml bindings install, bug #559134
        eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
        # Do not build/install ocaml docs with USE=-doc, bug #562008
-       eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+       eapply "${FILESDIR}"/3.8.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

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 1a7dc6815f9309533f540b297533cfe2bedb592e..9a1687985dec23ce4f3adc9fce398074641d9529 100644 (file)
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -94,8 +94,6 @@ src_prepare() {
        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
-       # Do not build/install ocaml docs with USE=-doc, bug #562008
-       eapply "${FILESDIR}"/9999/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