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 E582B158018 for ; Sat, 2 Oct 2021 21:24:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35083E07F9; Sat, 2 Oct 2021 21:24:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18B90E07F9 for ; Sat, 2 Oct 2021 21:24:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 387C5342D08 for ; Sat, 2 Oct 2021 21:24:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6C2889 for ; Sat, 2 Oct 2021 21:24:05 +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: <1633209838.e4efbfb64bdf554e467347f06d2c59b9dd368354.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-repository/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/opam-repository/Manifest dev-ml/opam-repository/opam-repository-2.1.0.ebuild X-VCS-Directories: dev-ml/opam-repository/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e4efbfb64bdf554e467347f06d2c59b9dd368354 X-VCS-Branch: master Date: Sat, 2 Oct 2021 21:24:05 +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: 1f5f6166-5efb-44bf-b425-6158a21a417e X-Archives-Hash: 41095e7a66aaf3fb193182b1f8d823b1 commit: e4efbfb64bdf554e467347f06d2c59b9dd368354 Author: Sam James gentoo org> AuthorDate: Sat Oct 2 21:23:40 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 2 21:23:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4efbfb6 dev-ml/opam-repository: fix build with newer dose3 in 2.1.0 Signed-off-by: Sam James gentoo.org> dev-ml/opam-repository/Manifest | 1 + dev-ml/opam-repository/opam-repository-2.1.0.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest index 56d533d9552..0b145947da0 100644 --- a/dev-ml/opam-repository/Manifest +++ b/dev-ml/opam-repository/Manifest @@ -1,3 +1,4 @@ DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf diff --git a/dev-ml/opam-repository/opam-repository-2.1.0.ebuild b/dev-ml/opam-repository/opam-repository-2.1.0.ebuild index 7715c1f74d1..2e8d482d270 100644 --- a/dev-ml/opam-repository/opam-repository-2.1.0.ebuild +++ b/dev-ml/opam-repository/opam-repository-2.1.0.ebuild @@ -8,6 +8,7 @@ inherit dune DESCRIPTION="opam repository libraries" 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" @@ -24,8 +25,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" -# 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" ) +PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) src_prepare() { default