dev-ml/camlp4: fix collision with newer findlib

Closes: https://bugs.gentoo.org/803275
Signed-off-by: Sam James <sam@gentoo.org>

6 files changed, 42 insertions, 6 deletions

diff --git a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
index 8133a505cfb0..f750a91aeb91 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 src_configure() {
 	./configure \
@@ -38,4 +39,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+        if has_version ">=dev-ml/findlib-1.9" ; then
+                # See bug #803275
+                rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+        fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.09_p1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
index 80481b707c6d..767b8bdf4e56 100644
--- a/dev-ml/camlp4/camlp4-4.09_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
@@ -41,4 +42,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+        if has_version ">=dev-ml/findlib-1.9" ; then
+                # See bug #803275
+                rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+        fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
index d7ad1f1cfbb1..7e7539c01f64 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
@@ -41,4 +42,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+        if has_version ">=dev-ml/findlib-1.9" ; then
+                # See bug #803275
+                rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+        fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.13.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
index 8162ce77f937..ea9f15d74754 100644
--- a/dev-ml/camlp4/camlp4-4.13.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
 
@@ -43,4 +44,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+        if has_version ">=dev-ml/findlib-1.9" ; then
+		# See bug #803275
+                rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+        fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
index 8162ce77f937..983c54d23b78 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
 
@@ -43,4 +44,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+        if has_version ">=dev-ml/findlib-1.9" ; then
+                # See bug #803275
+                rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+        fi
 }
diff --git a/dev-ml/camlp4/camlp4-4.12.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
index 8162ce77f937..983c54d23b78 100644
--- a/dev-ml/camlp4/camlp4-4.12.ebuild
+++ b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
@@ -18,7 +18,8 @@ IUSE="+ocamlopt"
 DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
+	dev-ml/ocamlbuild
+	dev-ml/findlib:="
 
 QA_FLAGS_IGNORED='.*'
 
@@ -43,4 +44,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-META
 	dodoc CHANGES.md README.md
+
+        if has_version ">=dev-ml/findlib-1.9" ; then
+                # See bug #803275
+                rm "${ED}/usr/$(get_libdir)/ocaml/camlp4/META" || die
+        fi
 }