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 1DA86158086 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 86D47E08BB; Sat, 6 Nov 2021 03:40:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 30B74E0898 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 DEFEA3430C3 for ; Sat, 6 Nov 2021 03:40:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19ABE1AE 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: <1636169949.b6c0dad4c5c045bb6012b4aed1db09fd333413ba.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/opam-format/opam-format-2.0.10.ebuild X-VCS-Directories: dev-ml/opam-format/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b6c0dad4c5c045bb6012b4aed1db09fd333413ba 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: 15dc6e72-d45a-4dfe-8485-c3aadd1318d8 X-Archives-Hash: d0c1dec17124339393791d1662645e70 commit: b6c0dad4c5c045bb6012b4aed1db09fd333413ba Author: Sam James gentoo org> AuthorDate: Sat Nov 6 03:39:09 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 6 03:39:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c0dad4 dev-ml/opam-format: fix 2.0.10 Signed-off-by: Sam James gentoo.org> dev-ml/opam-format/opam-format-2.0.10.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild index 027845d265f..ace83b9a6ae 100644 --- a/dev-ml/opam-format/opam-format-2.0.10.ebuild +++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild @@ -10,7 +10,6 @@ inherit dune DESCRIPTION="Core libraries for opam" 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}" OPAM_INSTALLER="${S}/opam-installer" @@ -28,7 +27,8 @@ RDEPEND=" DEPEND="${RDEPEND} dev-ml/cppo" -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