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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7257B15808A for ; Sat, 6 Nov 2021 03:40:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 771F4E0907; Sat, 6 Nov 2021 03:40:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50869E0907 for ; Sat, 6 Nov 2021 03:40:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BC58342CE8 for ; Sat, 6 Nov 2021 03:40:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FC101B8 for ; Sat, 6 Nov 2021 03:40:16 +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: <1636169989.c44d34624a40c83f5e775678e4f080b604326a99.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/opam-installer/opam-installer-2.0.10.ebuild X-VCS-Directories: dev-ml/opam-installer/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c44d34624a40c83f5e775678e4f080b604326a99 X-VCS-Branch: master Date: Sat, 6 Nov 2021 03:40:16 +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: 947e9b87-a57c-4225-90d7-6f7cee4cec52 X-Archives-Hash: f42ba7acd57fedcea7718fdac43c78ae commit: c44d34624a40c83f5e775678e4f080b604326a99 Author: Sam James gentoo org> AuthorDate: Sat Nov 6 03:39:49 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 6 03:39:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44d3462 dev-ml/opam-installer: fix 2.0.10 Signed-off-by: Sam James gentoo.org> dev-ml/opam-installer/opam-installer-2.0.10.ebuild | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dev-ml/opam-installer/opam-installer-2.0.10.ebuild b/dev-ml/opam-installer/opam-installer-2.0.10.ebuild index 1ea426a6380..a2b88905a29 100644 --- a/dev-ml/opam-installer/opam-installer-2.0.10.ebuild +++ b/dev-ml/opam-installer/opam-installer-2.0.10.ebuild @@ -6,21 +6,20 @@ EAPI=7 # We are opam OPAM_INSTALLER_DEP=" " OPAM_SKIP_VALIDATION=yes -inherit dune +inherit opam DESCRIPTION="Core installer for opam packages" HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" S="${WORKDIR}/opam-full-${PV/_/-}" -OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer" +OPAM_INSTALLER="${S}/opam-installer" LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="+ocamlopt" -PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) RDEPEND=" >=dev-lang/ocaml-4.02.3 @@ -38,3 +37,10 @@ src_configure() { --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --mandir="${EPREFIX}/usr/share/man" } + +src_compile() { + sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config + #passing -jX to the dune build leads to errors + #see: https://github.com/ocaml/opam/issues/3585 + emake DUNE_PROMOTE_ARG="" -j1 +}