commit: 7c9bce27e20c323962a0a0becd6828778ff3e3cc
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 20:29:39 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 20:32:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9bce27
sys-devel/llvm: OCaml doc patch has been applied upstream
.../0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch | 0
sys-devel/llvm/llvm-3.7.1-r3.ebuild | 2 +-
sys-devel/llvm/llvm-3.8.0-r3.ebuild | 2 +-
sys-devel/llvm/llvm-3.8.1-r2.ebuild | 2 +-
sys-devel/llvm/llvm-3.8.1.ebuild | 2 +-
sys-devel/llvm/llvm-9999.ebuild | 2 --
6 files changed, 4 insertions(+), 6 deletions(-)
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 c35f38f..02635d1 100644
--- 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 5196fe4..7bd13a8 100644
--- 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 5fdffd0..7f096fc 100644
--- 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 c00669d..22ae082 100644
--- 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 1a7dc68..9a16879 100644
--- 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
