[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/

["Sam James" <sam@gentoo.org>]

commit:     b6c0dad4c5c045bb6012b4aed1db09fd333413ba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  6 03:39:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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