From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 989ED158086 for ; Thu, 7 Oct 2021 01:45:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3E9BE0A7C; Thu, 7 Oct 2021 01:45:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1935BE0A7C for ; Thu, 7 Oct 2021 01:45:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1CDF3431C0 for ; Thu, 7 Oct 2021 01:45:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D5CB114 for ; Thu, 7 Oct 2021 01:45:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1633571025.8cfd40d7cf6b67d78c9496ce0c0320562567e634.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp4/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild dev-ml/camlp4/camlp4-4.09_p1.ebuild dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild dev-ml/camlp4/camlp4-4.12-r1.ebuild dev-ml/camlp4/camlp4-4.12.ebuild dev-ml/camlp4/camlp4-4.13-r1.ebuild dev-ml/camlp4/camlp4-4.13.ebuild X-VCS-Directories: dev-ml/camlp4/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8cfd40d7cf6b67d78c9496ce0c0320562567e634 X-VCS-Branch: master Date: Thu, 7 Oct 2021 01:45:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d8a39f8-4c58-4d85-9582-2ecbdbd730a5 X-Archives-Hash: 73519b7ef6b13332a704525a6ab684e9 commit: 8cfd40d7cf6b67d78c9496ce0c0320562567e634 Author: Sam James gentoo org> AuthorDate: Thu Oct 7 01:43:05 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 7 01:43:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfd40d7 dev-ml/camlp4: fix collision with newer findlib Closes: https://bugs.gentoo.org/803275 Signed-off-by: Sam James gentoo.org> dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild | 8 +++++++- dev-ml/camlp4/{camlp4-4.09_p1.ebuild => camlp4-4.09_p1-r1.ebuild} | 8 +++++++- .../camlp4/{camlp4-4.10_p1-r1.ebuild => camlp4-4.10_p1-r2.ebuild} | 8 +++++++- dev-ml/camlp4/{camlp4-4.13.ebuild => camlp4-4.11_p1-r2.ebuild} | 8 +++++++- dev-ml/camlp4/{camlp4-4.12.ebuild => camlp4-4.12-r1.ebuild} | 8 +++++++- dev-ml/camlp4/{camlp4-4.11_p1-r1.ebuild => camlp4-4.13-r1.ebuild} | 8 +++++++- 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 8133a505cfb..f750a91aeb9 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 similarity index 83% rename from dev-ml/camlp4/camlp4-4.09_p1.ebuild rename to dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild index 80481b707c6..767b8bdf4e5 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 similarity index 83% rename from dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild rename to dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild index d7ad1f1cfbb..7e7539c01f6 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 similarity index 84% rename from dev-ml/camlp4/camlp4-4.13.ebuild rename to dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild index 8162ce77f93..ea9f15d7475 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.12.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild similarity index 83% rename from dev-ml/camlp4/camlp4-4.12.ebuild rename to dev-ml/camlp4/camlp4-4.12-r1.ebuild index 8162ce77f93..983c54d23b7 100644 --- a/dev-ml/camlp4/camlp4-4.12.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.11_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild similarity index 83% rename from dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild rename to dev-ml/camlp4/camlp4-4.13-r1.ebuild index 8162ce77f93..983c54d23b7 100644 --- a/dev-ml/camlp4/camlp4-4.11_p1-r1.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 }