public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-repository/
Date: Sat,  2 Oct 2021 21:24:05 +0000 (UTC)	[thread overview]
Message-ID: <1633209838.e4efbfb64bdf554e467347f06d2c59b9dd368354.sam@gentoo> (raw)

commit:     e4efbfb64bdf554e467347f06d2c59b9dd368354
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  2 21:23:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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


             reply	other threads:[~2021-10-02 21:24 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-02 21:24 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-19 17:20 [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-repository/ Alfredo Tupone
2024-07-15 10:12 Alfredo Tupone
2024-01-19 23:08 Ionen Wolkens
2023-12-22  5:07 Sam James
2023-05-13 19:46 Alfredo Tupone
2023-03-03 21:16 Alfredo Tupone
2023-02-23 23:38 Sam James
2022-11-19 10:34 Arthur Zamarin
2022-11-19 10:34 Arthur Zamarin
2022-11-19 10:34 Arthur Zamarin
2022-09-18  0:37 Sam James
2022-09-18  0:37 Sam James
2022-07-23 23:52 Sam James
2022-04-18 21:07 Jakov Smolić
2022-01-31 20:48 Alfredo Tupone
2022-01-18 12:24 Sam James
2022-01-13 20:25 Arthur Zamarin
2022-01-13  6:34 Sam James
2022-01-11  0:45 Sam James
2022-01-10 20:07 Arthur Zamarin
2022-01-10 19:56 Arthur Zamarin
2021-12-19 11:02 Sam James
2021-11-06  3:40 Sam James
2021-11-06  3:36 Sam James
2021-11-06  3:36 Sam James
2021-10-03  9:58 Alfredo Tupone
2021-10-02 21:10 Sam James
2021-10-02 19:16 Sam James
2021-10-02 19:16 Sam James
2021-10-02 19:16 Sam James
2021-10-01 18:50 Alfredo Tupone
2021-07-28  2:38 Sam James
2021-07-28  1:48 Sam James
2021-06-08  4:12 Sam James
2021-03-15  4:02 Sam James
2021-03-14  0:48 Sam James
2021-03-13 14:05 Sam James
2021-03-04 14:28 Agostino Sarubbo
2021-02-25 17:54 Sam James
2021-02-25 13:09 Sam James
2021-02-08 17:21 Sam James
2021-02-08 17:21 Sam James
2021-02-08 17:21 Sam James
2020-10-17  2:31 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1633209838.e4efbfb64bdf554e467347f06d2c59b9dd368354.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox