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 CA8051382C5 for ; Wed, 21 Apr 2021 02:10:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03E6CE087C; Wed, 21 Apr 2021 02:10:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1109E087E for ; Wed, 21 Apr 2021 02:10:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D960D340F99 for ; Wed, 21 Apr 2021 02:10:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B51C736 for ; Wed, 21 Apr 2021 02:10:02 +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: <1618970984.46076d609969e34e68baa0250bd67d37365809e9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam/files/, dev-ml/opam/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/opam/files/stublibs.patch dev-ml/opam/opam-1.3.1-r2.ebuild X-VCS-Directories: dev-ml/opam/files/ dev-ml/opam/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 46076d609969e34e68baa0250bd67d37365809e9 X-VCS-Branch: master Date: Wed, 21 Apr 2021 02:10:02 +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: 55f59b53-1cee-4f45-bfd1-5dfd5f3f4a53 X-Archives-Hash: a8e55279283aac952778999a53edb7de commit: 46076d609969e34e68baa0250bd67d37365809e9 Author: Sam James gentoo org> AuthorDate: Wed Apr 21 00:39:03 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 21 02:09:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46076d60 dev-ml/opam: port to EAPI 7 Signed-off-by: Sam James gentoo.org> dev-ml/opam/files/stublibs.patch | 6 ++---- dev-ml/opam/opam-1.3.1-r2.ebuild | 32 +++++++++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch index 3cb61883233..69fb02913b5 100644 --- a/dev-ml/opam/files/stublibs.patch +++ b/dev-ml/opam/files/stublibs.patch @@ -1,7 +1,5 @@ -Index: opam-1.3.1/src/tools/opam_installer.ml -=================================================================== ---- opam-1.3.1.orig/src/tools/opam_installer.ml -+++ opam-1.3.1/src/tools/opam_installer.ml +--- a/src/tools/opam_installer.ml ++++ b/src/tools/opam_installer.ml @@ -312,7 +312,7 @@ let options = let mandir = mk_dir mandir in let libdir = mk_dir libdir in diff --git a/dev-ml/opam/opam-1.3.1-r2.ebuild b/dev-ml/opam/opam-1.3.1-r2.ebuild index 097961fdd58..e1d225ca5e6 100644 --- a/dev-ml/opam/opam-1.3.1-r2.ebuild +++ b/dev-ml/opam/opam-1.3.1-r2.ebuild @@ -1,12 +1,16 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit epatch +EAPI=7 DESCRIPTION="A source-based package manager for OCaml" HOMEPAGE="http://opam.ocaml.org/" +if [[ ${PV} != 9999 ]] ; then + SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/ocaml/opam.git" +fi LICENSE="LGPL-3-with-linking-exception" SLOT="0/${PV}" @@ -14,13 +18,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" IUSE="test" RESTRICT="!test? ( test )" -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/ocaml/opam.git" -fi - RDEPEND="dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= @@ -37,13 +34,14 @@ DEPEND="${RDEPEND} test? ( dev-vcs/git ) " -src_prepare() { - epatch "${FILESDIR}/stublibs.patch" -} +PATCHES=( + "${FILESDIR}"/stublibs.patch +) src_compile() { emake -j1 - cd doc + + cd doc || die emake man } @@ -53,5 +51,9 @@ src_test() { src_install() { default - emake DESTDIR="${D}" OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" libinstall + + emake \ + DESTDIR="${D}" \ + OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" \ + libinstall }