commit: 1b2b94f4ecc6daa0e28a8d0d1dc12730e9d28527 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jan 24 17:48:20 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 24 17:48:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2b94f4
dev-ml/camlzip: port to EAPI 7 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-ml/camlzip/camlzip-1.06.ebuild | 16 +++++++++------- dev-ml/camlzip/camlzip-1.07.ebuild | 17 ++++++++--------- dev-ml/camlzip/camlzip-1.10.ebuild | 9 ++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dev-ml/camlzip/camlzip-1.06.ebuild b/dev-ml/camlzip/camlzip-1.06.ebuild index 4fed4a00664..ea2362cc8b9 100644 --- a/dev-ml/camlzip/camlzip-1.06.ebuild +++ b/dev-ml/camlzip/camlzip-1.06.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit findlib eutils - -IUSE="+ocamlopt" +inherit findlib DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)" HOMEPAGE="http://forge.ocamlcore.org/projects/camlzip/"; @@ -14,9 +12,12 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1616/${P}.tar.gz"; SLOT="1/${PV}" LICENSE="LGPL-2.1" KEYWORDS="amd64 ppc x86" +IUSE="+ocamlopt" -RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?] - >=sys-libs/zlib-1.1.3" +RDEPEND=" + >=dev-lang/ocaml-4.05:=[ocamlopt?] + >=sys-libs/zlib-1.1.3 +" DEPEND="${RDEPEND}" src_compile() { @@ -28,6 +29,7 @@ src_compile() { src_install() { findlib_src_preinst + emake DESTDIR="${D}" install-findlib dodoc README Changes diff --git a/dev-ml/camlzip/camlzip-1.07.ebuild b/dev-ml/camlzip/camlzip-1.07.ebuild index 547fe00d0c8..448875803b1 100644 --- a/dev-ml/camlzip/camlzip-1.07.ebuild +++ b/dev-ml/camlzip/camlzip-1.07.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit findlib eutils versionator - -IUSE="+ocamlopt" +inherit findlib DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)" HOMEPAGE="https://github.com/xavierleroy/camlzip"; -SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(delete_all_version_separators ${PV}).tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" SLOT="1/${PV}" LICENSE="LGPL-2.1" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="+ocamlopt" RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?] - >=sys-libs/zlib-1.1.3" + >=sys-libs/zlib-1.1.3" DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}-rel$(delete_all_version_separators ${PV})" - src_compile() { emake all if use ocamlopt; then @@ -30,6 +28,7 @@ src_compile() { src_install() { findlib_src_preinst + emake DESTDIR="${D}" install-findlib dodoc README Changes diff --git a/dev-ml/camlzip/camlzip-1.10.ebuild b/dev-ml/camlzip/camlzip-1.10.ebuild index 181f9c64d19..244b689e332 100644 --- a/dev-ml/camlzip/camlzip-1.10.ebuild +++ b/dev-ml/camlzip/camlzip-1.10.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit findlib -IUSE="+ocamlopt" - DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)" HOMEPAGE="https://github.com/xavierleroy/camlzip"; SRC_URI="https://github.com/xavierleroy/camlzip/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" SLOT="1/${PV}" LICENSE="LGPL-2.1" KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +IUSE="+ocamlopt" RDEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3" @@ -24,8 +24,6 @@ QA_FLAGS_IGNORED=( "/usr/lib.*/ocaml/zip/zip.cmxs" ) -S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" - src_compile() { emake all if use ocamlopt; then @@ -35,6 +33,7 @@ src_compile() { src_install() { findlib_src_preinst + emake DESTDIR="${D}" install-findlib dosym zip/libcamlzip.a /usr/$(get_libdir)/ocaml/libcamlzip.a
