commit: 85bf3c32b253356b73883f1f4ffecf60ab0ab251 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Thu Feb 4 12:58:39 2021 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Thu Feb 4 12:58:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bf3c32
dev-ml/ocamlbuild: merge 0.14.0 and 0.14.0-r1 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild | 2 +- dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild | 40 --------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild index bf4f3bb4acf..8ec83d02e23 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt test" RESTRICT="!test? ( test )" diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild deleted file mode 100644 index fc4760420dd..00000000000 --- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs" -HOMEPAGE="https://github.com/ocaml/ocamlbuild"; -SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+ocamlopt test" -RESTRICT="!test? ( test )" - -DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]" -RDEPEND="${DEPEND} - !<dev-ml/findlib-1.6.1-r1 -" -DEPEND="${DEPEND} - test? ( dev-ml/findlib )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch -) - -src_configure() { - emake -f configure.make Makefile.config \ - PREFIX="${EPREFIX}/usr" \ - BINDIR="${EPREFIX}/usr/bin" \ - LIBDIR="$(ocamlc -where)" \ - OCAML_NATIVE=$(usex ocamlopt true false) \ - OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \ - NATDYNLINK=$(usex ocamlopt true false) -} - -src_install() { - emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install - dodoc Changes -}
