Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
Date: Sat, 06 Nov 2021 03:40:21
Message-Id: 1636169949.b6c0dad4c5c045bb6012b4aed1db09fd333413ba.sam@gentoo
1 commit: b6c0dad4c5c045bb6012b4aed1db09fd333413ba
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 6 03:39:09 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 6 03:39:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c0dad4
7
8 dev-ml/opam-format: fix 2.0.10
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-ml/opam-format/opam-format-2.0.10.ebuild | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild
16 index 027845d265f..ace83b9a6ae 100644
17 --- a/dev-ml/opam-format/opam-format-2.0.10.ebuild
18 +++ b/dev-ml/opam-format/opam-format-2.0.10.ebuild
19 @@ -10,7 +10,6 @@ inherit dune
20 DESCRIPTION="Core libraries for opam"
21 HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
22 SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
23 -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
24 S="${WORKDIR}/opam-${PV}"
25 OPAM_INSTALLER="${S}/opam-installer"
26
27 @@ -28,7 +27,8 @@ RDEPEND="
28 DEPEND="${RDEPEND}
29 dev-ml/cppo"
30
31 -PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
32 +# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
33 +PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
34
35 src_prepare() {
36 default