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 4E78B158088 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 88824E08CD; Sat, 6 Nov 2021 03:40:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D6A4E089C for ; Sat, 6 Nov 2021 03:40:19 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E5C93430C5 for ; Sat, 6 Nov 2021 03:40:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CB1F1B3 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: <1636169968.1427b594640e727526672fd618a6b07e93423f8c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/opam-solver/opam-solver-2.0.10.ebuild X-VCS-Directories: dev-ml/opam-solver/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1427b594640e727526672fd618a6b07e93423f8c 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: 1af44346-621e-4ec9-88c3-d02415db4612 X-Archives-Hash: 7b662fabfbb91f3c761488878d1d3c11 commit: 1427b594640e727526672fd618a6b07e93423f8c Author: Sam James gentoo org> AuthorDate: Sat Nov 6 03:39:28 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 6 03:39:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1427b594 dev-ml/opam-solver: fix 2.0.10 Signed-off-by: Sam James gentoo.org> dev-ml/opam-solver/opam-solver-2.0.10.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild index 3ee659981fd..aa993e87c76 100644 --- a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild +++ b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild @@ -8,7 +8,6 @@ inherit dune DESCRIPTION="opam solver" HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${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-${PV/_/-}" LICENSE="LGPL-2.1" @@ -28,7 +27,8 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-ml/opam-client )" -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" ) src_prepare() { default