From 8cfd40d7cf6b67d78c9496ce0c0320562567e634 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 7 Oct 2021 02:43:05 +0100 Subject: dev-ml/camlp4: fix collision with newer findlib Closes: https://bugs.gentoo.org/803275 Signed-off-by: Sam James --- dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild | 8 +++++- dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild | 50 ++++++++++++++++++++++++++++++++ dev-ml/camlp4/camlp4-4.09_p1.ebuild | 44 ---------------------------- dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild | 44 ---------------------------- dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild | 50 ++++++++++++++++++++++++++++++++ dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild | 46 ------------------------------ dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild | 52 ++++++++++++++++++++++++++++++++++ dev-ml/camlp4/camlp4-4.12-r1.ebuild | 52 ++++++++++++++++++++++++++++++++++ dev-ml/camlp4/camlp4-4.12.ebuild | 46 ------------------------------ dev-ml/camlp4/camlp4-4.13-r1.ebuild | 52 ++++++++++++++++++++++++++++++++++ dev-ml/camlp4/camlp4-4.13.ebuild | 46 ------------------------------ 11 files changed, 263 insertions(+), 227 deletions(-) create mode 100644 dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild delete mode 100644 dev-ml/camlp4/camlp4-4.09_p1.ebuild delete mode 100644 dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild create mode 100644 dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild delete mode 100644 dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild create mode 100644 dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild create mode 100644 dev-ml/camlp4/camlp4-4.12-r1.ebuild delete mode 100644 dev-ml/camlp4/camlp4-4.12.ebuild create mode 100644 dev-ml/camlp4/camlp4-4.13-r1.ebuild delete mode 100644 dev-ml/camlp4/camlp4-4.13.ebuild (limited to 'dev-ml') 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-r1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild new file mode 100644 index 000000000000..767b8bdf4e56 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux" +IUSE="+ocamlopt" + +DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]" +RDEPEND="${DEPEND}" +DEPEND="${DEPEND} + dev-ml/ocamlbuild + dev-ml/findlib:=" + +S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" \ + || die +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + emake byte + use ocamlopt && emake native +} + +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.ebuild deleted file mode 100644 index 80481b707c6d..000000000000 --- a/dev-ml/camlp4/camlp4-4.09_p1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV=${PV/_p/+} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="System for writing extensible parsers for programming languages" -HOMEPAGE="https://github.com/camlp4/camlp4" -SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+ocamlopt" - -DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" - -S=${WORKDIR}/${P/_p/-} -PATCHES=( "${FILESDIR}/reload.patch" ) - -src_configure() { - ./configure \ - --bindir="${EPREFIX}/usr/bin" \ - --libdir="$(ocamlc -where)" \ - --pkgdir="$(ocamlc -where)" \ - || die -} - -src_compile() { - # Increase stack limit to 11GiB to avoid stack overflow error. - ulimit -s 11530000 - emake byte - use ocamlopt && emake native -} - -src_install() { - emake DESTDIR="${D}" install install-META - dodoc CHANGES.md README.md -} diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild deleted file mode 100644 index d7ad1f1cfbb1..000000000000 --- a/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV=${PV/_p/+} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="System for writing extensible parsers for programming languages" -HOMEPAGE="https://github.com/camlp4/camlp4" -SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+ocamlopt" - -DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" - -S=${WORKDIR}/${P/_p/-} -PATCHES=( "${FILESDIR}/reload.patch" ) - -src_configure() { - ./configure \ - --bindir="${EPREFIX}/usr/bin" \ - --libdir="$(ocamlc -where)" \ - --pkgdir="$(ocamlc -where)" \ - || die -} - -src_compile() { - # Increase stack limit to 11GiB to avoid stack overflow error. - ulimit -s 11530000 - emake byte - use ocamlopt && emake native -} - -src_install() { - emake DESTDIR="${D}" install install-META - dodoc CHANGES.md README.md -} diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild new file mode 100644 index 000000000000..7e7539c01f64 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+ocamlopt" + +DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" +RDEPEND="${DEPEND}" +DEPEND="${DEPEND} + dev-ml/ocamlbuild + dev-ml/findlib:=" + +S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" \ + || die +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + emake byte + use ocamlopt && emake native +} + +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.11_p1-r1.ebuild deleted file mode 100644 index 8162ce77f937..000000000000 --- a/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV=${PV/_p/+} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="System for writing extensible parsers for programming languages" -HOMEPAGE="https://github.com/camlp4/camlp4" -SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+ocamlopt" - -DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" - -QA_FLAGS_IGNORED='.*' - -S=${WORKDIR}/${P/_p/-} -PATCHES=( "${FILESDIR}/reload.patch" ) - -src_configure() { - ./configure \ - --bindir="${EPREFIX}/usr/bin" \ - --libdir="$(ocamlc -where)" \ - --pkgdir="$(ocamlc -where)" \ - || die -} - -src_compile() { - # Increase stack limit to 11GiB to avoid stack overflow error. - ulimit -s 11530000 - emake byte - use ocamlopt && emake native -} - -src_install() { - emake DESTDIR="${D}" install install-META - dodoc CHANGES.md README.md -} diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild new file mode 100644 index 000000000000..ea9f15d74754 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+ocamlopt" + +DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" +RDEPEND="${DEPEND}" +DEPEND="${DEPEND} + dev-ml/ocamlbuild + dev-ml/findlib:=" + +QA_FLAGS_IGNORED='.*' + +S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" \ + || die +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + emake byte + use ocamlopt && emake native +} + +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-r1.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild new file mode 100644 index 000000000000..983c54d23b78 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.12-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+ocamlopt" + +DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" +RDEPEND="${DEPEND}" +DEPEND="${DEPEND} + dev-ml/ocamlbuild + dev-ml/findlib:=" + +QA_FLAGS_IGNORED='.*' + +S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" \ + || die +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + emake byte + use ocamlopt && emake native +} + +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.ebuild deleted file mode 100644 index 8162ce77f937..000000000000 --- a/dev-ml/camlp4/camlp4-4.12.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV=${PV/_p/+} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="System for writing extensible parsers for programming languages" -HOMEPAGE="https://github.com/camlp4/camlp4" -SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+ocamlopt" - -DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" - -QA_FLAGS_IGNORED='.*' - -S=${WORKDIR}/${P/_p/-} -PATCHES=( "${FILESDIR}/reload.patch" ) - -src_configure() { - ./configure \ - --bindir="${EPREFIX}/usr/bin" \ - --libdir="$(ocamlc -where)" \ - --pkgdir="$(ocamlc -where)" \ - || die -} - -src_compile() { - # Increase stack limit to 11GiB to avoid stack overflow error. - ulimit -s 11530000 - emake byte - use ocamlopt && emake native -} - -src_install() { - emake DESTDIR="${D}" install install-META - dodoc CHANGES.md README.md -} diff --git a/dev-ml/camlp4/camlp4-4.13-r1.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild new file mode 100644 index 000000000000..983c54d23b78 --- /dev/null +++ b/dev-ml/camlp4/camlp4-4.13-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=${PV/_p/+} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="System for writing extensible parsers for programming languages" +HOMEPAGE="https://github.com/camlp4/camlp4" +SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+ocamlopt" + +DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" +RDEPEND="${DEPEND}" +DEPEND="${DEPEND} + dev-ml/ocamlbuild + dev-ml/findlib:=" + +QA_FLAGS_IGNORED='.*' + +S=${WORKDIR}/${P/_p/-} +PATCHES=( "${FILESDIR}/reload.patch" ) + +src_configure() { + ./configure \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="$(ocamlc -where)" \ + --pkgdir="$(ocamlc -where)" \ + || die +} + +src_compile() { + # Increase stack limit to 11GiB to avoid stack overflow error. + ulimit -s 11530000 + emake byte + use ocamlopt && emake native +} + +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.13.ebuild deleted file mode 100644 index 8162ce77f937..000000000000 --- a/dev-ml/camlp4/camlp4-4.13.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV=${PV/_p/+} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="System for writing extensible parsers for programming languages" -HOMEPAGE="https://github.com/camlp4/camlp4" -SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+ocamlopt" - -DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/ocamlbuild" - -QA_FLAGS_IGNORED='.*' - -S=${WORKDIR}/${P/_p/-} -PATCHES=( "${FILESDIR}/reload.patch" ) - -src_configure() { - ./configure \ - --bindir="${EPREFIX}/usr/bin" \ - --libdir="$(ocamlc -where)" \ - --pkgdir="$(ocamlc -where)" \ - || die -} - -src_compile() { - # Increase stack limit to 11GiB to avoid stack overflow error. - ulimit -s 11530000 - emake byte - use ocamlopt && emake native -} - -src_install() { - emake DESTDIR="${D}" install install-META - dodoc CHANGES.md README.md -} -- cgit v1.2.3-65-gdbad