From: | Sam James <sam@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/ |
Date: | Sat, 06 Nov 2021 03:40:21 |
Message-Id: | 1636169968.1427b594640e727526672fd618a6b07e93423f8c.sam@gentoo |
1 | commit: 1427b594640e727526672fd618a6b07e93423f8c |
2 | Author: Sam James <sam <AT> gentoo <DOT> org> |
3 | AuthorDate: Sat Nov 6 03:39:28 2021 +0000 |
4 | Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 | CommitDate: Sat Nov 6 03:39:28 2021 +0000 |
6 | URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1427b594 |
7 | |
8 | dev-ml/opam-solver: fix 2.0.10 |
9 | |
10 | Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 | |
12 | dev-ml/opam-solver/opam-solver-2.0.10.ebuild | 4 ++-- |
13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
14 | |
15 | diff --git a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild |
16 | index 3ee659981fd..aa993e87c76 100644 |
17 | --- a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild |
18 | +++ b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild |
19 | @@ -8,7 +8,6 @@ inherit dune |
20 | DESCRIPTION="opam solver" |
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 | |
26 | LICENSE="LGPL-2.1" |
27 | @@ -28,7 +27,8 @@ RDEPEND=" |
28 | DEPEND="${RDEPEND} |
29 | test? ( dev-ml/opam-client )" |
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 |