| 1 |
commit: f841ae21cc353743217a39bbfb0d5951021f5859 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 14 07:37:31 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 14 07:37:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f841ae21 |
| 7 |
|
| 8 |
dev-ml/opam: apply same dose patch as for other opam* in 2.1.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/817326 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ml/opam/Manifest | 1 + |
| 14 |
dev-ml/opam/opam-2.1.0.ebuild | 4 ++-- |
| 15 |
2 files changed, 3 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest |
| 18 |
index 56d533d9552..0b145947da0 100644 |
| 19 |
--- a/dev-ml/opam/Manifest |
| 20 |
+++ b/dev-ml/opam/Manifest |
| 21 |
@@ -1,3 +1,4 @@ |
| 22 |
DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9 |
| 23 |
DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 |
| 24 |
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 |
| 25 |
DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf |
| 26 |
|
| 27 |
diff --git a/dev-ml/opam/opam-2.1.0.ebuild b/dev-ml/opam/opam-2.1.0.ebuild |
| 28 |
index e882aefd038..c123071f54a 100644 |
| 29 |
--- a/dev-ml/opam/opam-2.1.0.ebuild |
| 30 |
+++ b/dev-ml/opam/opam-2.1.0.ebuild |
| 31 |
@@ -8,6 +8,7 @@ inherit dune |
| 32 |
DESCRIPTION="A source-based package manager for OCaml" |
| 33 |
HOMEPAGE="http://opam.ocaml.org/" |
| 34 |
SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz" |
| 35 |
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz" |
| 36 |
S="${WORKDIR}/opam-${PV/_/-}" |
| 37 |
|
| 38 |
LICENSE="LGPL-2.1-with-linking-exception" |
| 39 |
@@ -25,8 +26,7 @@ RDEPEND=" |
| 40 |
dev-ml/re:=" |
| 41 |
DEPEND="${RDEPEND}" |
| 42 |
|
| 43 |
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz |
| 44 |
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" ) |
| 45 |
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch ) |
| 46 |
|
| 47 |
src_prepare() { |
| 48 |
default |
Archives