[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 1049f070f7b254cc725f8fd5577b96ddfc5d50e7
Author: Matoro Mahri matoro tk>
AuthorDate: Fri Jan 19 18:42:22 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 19 23:08:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1049f070
dev-ml/opam-installer: Stabilize 2.0.10-r1 arm, #896100
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
index 7539dc4fc77a..a33b53110bc8 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: ff8753585c2e533f797b7b40db0d6a6c489ea59d
Author: Sam James gentoo org>
AuthorDate: Fri Dec 22 05:02:27 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 22 05:04:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff875358
dev-ml/opam-installer: Stabilize 2.0.10-r1 ppc64, #896100
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
index 3f72bdfa982e..8d3d7870ea48 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: c1bffe1a0bbe67e63356d78fedb984d2e51cb47f
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat May 13 19:37:14 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat May 13 19:42:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1bffe1a
dev-ml/opam-installer: stabilize 2.1.3 for amd64
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-installer/opam-installer-2.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
index f50ec263a8d2..e580796a2e99 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
@@ -17,7 +17,7 @@
OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt"
RESTRICT="test" # sandbox not working
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 5e67aa50b4d55868ae294a3b00cb52a86c9274d1
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 17 11:46:59 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 17 11:46:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e67aa50
dev-ml/opam-installer: Stabilize 2.1.2-r1 x86, #901649
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
index 70653473715d..5010cdd1712d 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
@@ -17,7 +17,7 @@
OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
IUSE="+ocamlopt"
PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 3db05342521969ad2917752033481e1a7db69483
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 17 11:32:30 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 17 11:32:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db05342
dev-ml/opam-installer: Stabilize 2.1.2-r1 ppc64, #901649
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
index 49fe46cbc672..70653473715d 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
@@ -17,7 +17,7 @@
OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~x86"
IUSE="+ocamlopt"
PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 95eb7e5d1430de62921203c0ba0aadbde00443d5
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 17 11:32:21 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 17 11:32:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95eb7e5d
dev-ml/opam-installer: Stabilize 2.1.2-r1 amd64, #901649
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
index 4d09247994f3..ce6573c24fa6 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@
OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt"
PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 3e3d547887059050c6f7d022be61d963a430727a
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 17 11:32:24 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 17 11:32:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e3d5478
dev-ml/opam-installer: Stabilize 2.1.2-r1 arm64, #901649
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
index ce6573c24fa6..b0fd5a2d9e1f 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
@@ -17,7 +17,7 @@
OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt"
PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 4395972d71f652583e21977751cbe764ce844805
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 17 11:32:27 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 17 11:32:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4395972d
dev-ml/opam-installer: Stabilize 2.1.2-r1 arm, #901649
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
index b0fd5a2d9e1f..49fe46cbc672 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
@@ -17,7 +17,7 @@
OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt"
PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: cf3e915410d941e5696d9cc45c11d79004f37629
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Mar 3 20:43:48 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Mar 3 20:47:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf3e9154
dev-ml/opam-installer: add 2.1.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-installer/Manifest| 1 +
dev-ml/opam-installer/opam-installer-2.1.3.ebuild | 41 +++
2 files changed, 42 insertions(+)
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 30cca71cee13..4f87075e8b29 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -2,3 +2,4 @@ DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B
f605064ebae7d327895729962a345a3c67
DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B
6bf7a52835512b3de5bcf0de24f5ba3a322f718e6b590902add5ca162e449e40fa3c27cff7b042240441c031303b24cf6b1a100d7f7c3c0cc275d47e60c0bce1
SHA512
05c6bd7e08f131c910871867590a6eb95b488d943ebbb0f93212f2101f09f54dcffd5d6492c9e2edf0485e3ee681815c6353d43ef185bc934fc8afb84d02cf5f
DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B
c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d
SHA512
9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B
fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db
SHA512
fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
+DIST opam-full-2.1.3.tar.gz 9618995 BLAKE2B
6f33e70c2e59be87b643840128b46441828d3d83888f5d321ac23d33b2fbc4d3163cb4303ac82a7f863abcc9300227bbc48bca3b8db5d6fbcebf0e6cf8869a5d
SHA512
fe3a3c86335830944683a39a34a9eb385037476853ab3e2a82b8571a9e2021830cccf25cbd5bb891d239f6a47584c1b1d91aa445e6e2a814847346c5cc526ff1
diff --git a/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
new file mode 100644
index ..f50ec263a8d2
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit dune
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${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-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test" # sandbox not working
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02.3:=
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-format-${PV}:=
+ >=dev-ml/dose3-6:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+src_configure() {
+ econf \
+ --prefix="${EPREFIX}/usr" \
+ --with-mccs \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --mandir="${EPREFIX}/usr/share/man"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 6e8c63125fa091c9c438ec2f8b3e3dbfd2b80578
Author: Sam James gentoo org>
AuthorDate: Thu Feb 23 23:37:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 23 23:37:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8c6312
dev-ml/opam-installer: Stabilize 2.0.10-r1 amd64, #896100
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
index b2702a3439af..7165f3fba757 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 882f338a8f95d35de2e5f0eccea6dee7b94a86b1
Author: Sam James gentoo org>
AuthorDate: Sat Jul 23 23:30:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 23 23:51:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882f338a
dev-ml/opam-installer: drop versions
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/Manifest | 3 --
.../opam-installer/opam-installer-2.0.8-r1.ebuild | 43
.../opam-installer/opam-installer-2.0.8-r2.ebuild | 42
.../opam-installer/opam-installer-2.0.8-r4.ebuild | 46 --
.../opam-installer/opam-installer-2.1.0-r1.ebuild | 40 ---
.../opam-installer/opam-installer-2.1.1-r1.ebuild | 40 ---
6 files changed, 214 deletions(-)
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index fcd39250269c..30cca71cee13 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,7 +1,4 @@
DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B
f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147
SHA512
e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B
6bf7a52835512b3de5bcf0de24f5ba3a322f718e6b590902add5ca162e449e40fa3c27cff7b042240441c031303b24cf6b1a100d7f7c3c0cc275d47e60c0bce1
SHA512
05c6bd7e08f131c910871867590a6eb95b488d943ebbb0f93212f2101f09f54dcffd5d6492c9e2edf0485e3ee681815c6353d43ef185bc934fc8afb84d02cf5f
-DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B
26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0
SHA512
f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B
c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d
SHA512
9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
-DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B
3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181
SHA512
2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
-DIST opam-full-2.1.1.tar.gz 9275192 BLAKE2B
b5729bc938633073efdf979f8e160c42aee682fe311b613d4d82be7add64b42506d1b6c107f3770fd8de4dc9eed7076f7774a34482d1956b8bd6315f551aea6d
SHA512
7876a015fc2a421f70f9e8fa35c7ce56397dde7b679f3aba73c2a38f4967afc410c707a00f0a107baf353efe8bb6d4eee0601a5e205dc05a0f9c3d2a0c4d44d8
DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B
fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db
SHA512
fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
deleted file mode 100644
index ca1a04c87a15..
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-OPAM_SKIP_VALIDATION=yes
-inherit opam
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz;
-S="${WORKDIR}/opam-full-${PV/_/-}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="
- >=dev-lang/ocaml-4.02.3
- dev-ml/cmdliner:=
- ~dev-ml/opam-format-${PV}
-"
-DEPEND="${RDEPEND}
- dev-ml/findlib"
-
-src_configure() {
- econf \
- --prefix="${EPREFIX}/usr" \
- --with-mccs \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --mandir="${EPREFIX}/usr/share/man"
-}
-
-src_compile() {
- sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
- emake lib-ext
- #passing -jX to the dune build leads to errors
- #see: https://github.com/ocaml/opam/issues/3585
- emake DUNE_PROMOTE_ARG="" -j1
-}
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
deleted file mode 100644
index 5b0c79226fb0..
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: f33c0460c5c24e60163c37b720a3a236852a2790
Author: Sam James gentoo org>
AuthorDate: Tue Jun 21 01:38:10 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 21 01:38:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33c0460
dev-ml/opam-installer: fix OCaml dep
Signed-off-by: Sam James gentoo.org>
...am-installer-2.0.10.ebuild => opam-installer-2.0.10-r1.ebuild} | 8
...m-installer-2.0.8-r3.ebuild => opam-installer-2.0.8-r4.ebuild} | 6 +++---
...opam-installer-2.0.9.ebuild => opam-installer-2.0.9-r1.ebuild} | 6 +++---
...opam-installer-2.1.1.ebuild => opam-installer-2.1.0-r1.ebuild} | 8
...opam-installer-2.1.0.ebuild => opam-installer-2.1.1-r1.ebuild} | 8
...opam-installer-2.1.2.ebuild => opam-installer-2.1.2-r1.ebuild} | 6 +++---
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.10.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
similarity index 90%
rename from dev-ml/opam-installer/opam-installer-2.0.10.ebuild
rename to dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
index a2b88905a299..b2702a3439af 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.10.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,10 +22,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
RDEPEND="
- >=dev-lang/ocaml-4.02.3
+ >=dev-lang/ocaml-4.02.3:=
dev-ml/cmdliner:=
- ~dev-ml/opam-format-${PV}
- >=dev-ml/dose3-6
+ ~dev-ml/opam-format-${PV}:=
+ >=dev-ml/dose3-6:=
"
DEPEND="${RDEPEND}
dev-ml/findlib"
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r4.ebuild
similarity index 93%
rename from dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
rename to dev-ml/opam-installer/opam-installer-2.0.8-r4.ebuild
index 104d1df09b4b..eab5b13a534a 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r4.ebuild
@@ -22,10 +22,10 @@ KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
RDEPEND="
- >=dev-lang/ocaml-4.02.3
+ >=dev-lang/ocaml-4.02.3:=
dev-ml/cmdliner:=
- ~dev-ml/opam-format-${PV}
- >=dev-ml/dose3-6
+ ~dev-ml/opam-format-${PV}:=
+ >=dev-ml/dose3-6:=
"
DEPEND="${RDEPEND}
dev-ml/findlib"
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.9-r1.ebuild
similarity index 93%
rename from dev-ml/opam-installer/opam-installer-2.0.9.ebuild
rename to dev-ml/opam-installer/opam-installer-2.0.9-r1.ebuild
index 104d1df09b4b..eab5b13a534a 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9-r1.ebuild
@@ -22,10 +22,10 @@ KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
RDEPEND="
- >=dev-lang/ocaml-4.02.3
+ >=dev-lang/ocaml-4.02.3:=
dev-ml/cmdliner:=
- ~dev-ml/opam-format-${PV}
- >=dev-ml/dose3-6
+ ~dev-ml/opam-format-${PV}:=
+ >=dev-ml/dose3-6:=
"
DEPEND="${RDEPEND}
dev-ml/findlib"
diff --git a/dev-ml/opam-installer/opam-installer-2.1.1.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.0-r1.ebuild
similarity index 89%
rename from dev-ml/opam-installer/opam-installer-2.1.1.ebuild
rename to dev-ml/opam-installer/opam-installer-2.1.0-r1.ebuild
index 1ea426a6380d..f8f6bf709969 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,10 +23,10 @@ IUSE="+ocamlopt"
PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
RDEPEND="
- >=dev-lang/ocaml-4.02.3
+ >=dev-lang/ocaml-4.02.3:=
dev-ml/cmdliner:=
- ~dev-ml/opam-format-${PV}
- >=dev-ml/dose3-6
+ ~dev-ml/opam-format-${PV}:=
+ >=dev-ml/dose3-6:=
"
DEPEND="${RDEPEND}
dev-ml/findlib"
diff --git a/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.1-r1.ebuild
similarity index 89%
rename from dev-ml/opam-installer/opam-installer-2.1.0.ebuild
rename to dev-ml/opam-installer/opam-installer-2.1.1-r1.ebuild
index 1ea426a6380d..f8f6bf709969 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
#
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: e8cdb016804e65caca991b7ae3cf5c4c65af01b1
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Feb 1 09:37:26 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Feb 1 09:37:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8cdb016
dev-ml/opam-installer: 2.1.2 bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-installer/Manifest| 1 +
dev-ml/opam-installer/opam-installer-2.1.2.ebuild | 40 +++
2 files changed, 41 insertions(+)
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 8f2c10b6c1c6..fcd39250269c 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -4,3 +4,4 @@ DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B
26348bdbb8bdc2fbf9d736286c1f4134ce06
DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B
c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d
SHA512
9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B
3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181
SHA512
2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
DIST opam-full-2.1.1.tar.gz 9275192 BLAKE2B
b5729bc938633073efdf979f8e160c42aee682fe311b613d4d82be7add64b42506d1b6c107f3770fd8de4dc9eed7076f7774a34482d1956b8bd6315f551aea6d
SHA512
7876a015fc2a421f70f9e8fa35c7ce56397dde7b679f3aba73c2a38f4967afc410c707a00f0a107baf353efe8bb6d4eee0601a5e205dc05a0f9c3d2a0c4d44d8
+DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B
fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db
SHA512
fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
diff --git a/dev-ml/opam-installer/opam-installer-2.1.2.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.2.ebuild
new file mode 100644
index ..d506458c738b
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit dune
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${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-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02.3
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-format-${PV}
+ >=dev-ml/dose3-6
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+src_configure() {
+ econf \
+ --prefix="${EPREFIX}/usr" \
+ --with-mccs \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --mandir="${EPREFIX}/usr/share/man"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 249710be6b4ee16d97e00a0523eda062a05cc73c
Author: Sam James gentoo org>
AuthorDate: Tue Jan 18 12:23:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 18 12:23:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249710be
dev-ml/opam-installer: Stabilize 2.0.9 x86, #817749
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
index 0d7748530ef7..aca6cfe9fc4a 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: f3513fe87113df2d94d01c53e26079f5ab116915
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Jan 13 20:24:52 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Jan 13 20:24:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3513fe8
dev-ml/opam-installer: Stabilize 2.0.9 ppc64, #817749
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
index 81fe573e074f..0d7748530ef7 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 40b71e90994c410f8f49fe43d85264fbe0327e85
Author: Sam James gentoo org>
AuthorDate: Thu Jan 13 06:33:27 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 13 06:34:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b71e90
dev-ml/opam-installer: Stabilize 2.0.9 arm64, #817749
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
index affb837429ae..81fe573e074f 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: efe4a31bff52563994654956581f651326622da8
Author: Sam James gentoo org>
AuthorDate: Tue Jan 11 00:44:47 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 11 00:44:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe4a31b
dev-ml/opam-installer: Stabilize 2.0.9 amd64, #817749
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
index 296a104f747e..affb837429ae 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 67b73abbd5b6bc37cf9f8acd568b41524663cf31
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Jan 10 20:07:44 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jan 10 20:07:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b73abb
dev-ml/opam-installer: Stabilize 2.0.9 ppc, #817749
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
index ac6d06fac673..296a104f747e 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ppc ~ppc64 ~x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 818c7bbc2afa86e2d48675a22eb8ed1aa9ef6eef
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Jan 10 19:56:33 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jan 10 19:56:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818c7bbc
dev-ml/opam-installer: Stabilize 2.0.9 arm, #817749
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.9.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
index a2b88905a299..ac6d06fac673 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: c44d34624a40c83f5e775678e4f080b604326a99
Author: Sam James gentoo org>
AuthorDate: Sat Nov 6 03:39:49 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 6 03:39:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44d3462
dev-ml/opam-installer: fix 2.0.10
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.10.ebuild | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.10.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.10.ebuild
index 1ea426a6380..a2b88905a29 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.10.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.10.ebuild
@@ -6,21 +6,20 @@ EAPI=7
# We are opam
OPAM_INSTALLER_DEP=" "
OPAM_SKIP_VALIDATION=yes
-inherit dune
+inherit opam
DESCRIPTION="Core installer for opam packages"
HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${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-full-${PV/_/-}"
-OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-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" )
RDEPEND="
>=dev-lang/ocaml-4.02.3
@@ -38,3 +37,10 @@ src_configure() {
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--mandir="${EPREFIX}/usr/share/man"
}
+
+src_compile() {
+ sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+ #passing -jX to the dune build leads to errors
+ #see: https://github.com/ocaml/opam/issues/3585
+ emake DUNE_PROMOTE_ARG="" -j1
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 5c12941dc7a47c6497869981ba769f3c9f8b4ffb
Author: Sam James gentoo org>
AuthorDate: Sat Nov 6 03:35:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 6 03:35:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c12941d
dev-ml/opam-installer: add 2.1.1
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/Manifest| 1 +
dev-ml/opam-installer/opam-installer-2.1.1.ebuild | 40 +++
2 files changed, 41 insertions(+)
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 97c8e1c8c00..8f2c10b6c1c 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -3,3 +3,4 @@ DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B
6bf7a52835512b3de5bcf0de24f5ba3a322
DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B
26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0
SHA512
f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B
c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d
SHA512
9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B
3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181
SHA512
2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
+DIST opam-full-2.1.1.tar.gz 9275192 BLAKE2B
b5729bc938633073efdf979f8e160c42aee682fe311b613d4d82be7add64b42506d1b6c107f3770fd8de4dc9eed7076f7774a34482d1956b8bd6315f551aea6d
SHA512
7876a015fc2a421f70f9e8fa35c7ce56397dde7b679f3aba73c2a38f4967afc410c707a00f0a107baf353efe8bb6d4eee0601a5e205dc05a0f9c3d2a0c4d44d8
diff --git a/dev-ml/opam-installer/opam-installer-2.1.1.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.1.ebuild
new file mode 100644
index 000..1ea426a6380
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit dune
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${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-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02.3
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-format-${PV}
+ >=dev-ml/dose3-6
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+src_configure() {
+ econf \
+ --prefix="${EPREFIX}/usr" \
+ --with-mccs \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --mandir="${EPREFIX}/usr/share/man"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 7f68124dc60890fa5d463246339712dcfe69b356
Author: Sam James gentoo org>
AuthorDate: Sat Nov 6 03:24:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 6 03:24:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f68124d
dev-ml/opam-installer: add 2.0.10
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/Manifest | 1 +
dev-ml/opam-installer/opam-installer-2.0.10.ebuild | 40 ++
2 files changed, 41 insertions(+)
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index f32e897aec2..97c8e1c8c00 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,4 +1,5 @@
DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B
f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147
SHA512
e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B
6bf7a52835512b3de5bcf0de24f5ba3a322f718e6b590902add5ca162e449e40fa3c27cff7b042240441c031303b24cf6b1a100d7f7c3c0cc275d47e60c0bce1
SHA512
05c6bd7e08f131c910871867590a6eb95b488d943ebbb0f93212f2101f09f54dcffd5d6492c9e2edf0485e3ee681815c6353d43ef185bc934fc8afb84d02cf5f
DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B
26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0
SHA512
f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B
c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d
SHA512
9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B
3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181
SHA512
2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
diff --git a/dev-ml/opam-installer/opam-installer-2.0.10.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.10.ebuild
new file mode 100644
index 000..1ea426a6380
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit dune
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${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-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02.3
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-format-${PV}
+ >=dev-ml/dose3-6
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+src_configure() {
+ econf \
+ --prefix="${EPREFIX}/usr" \
+ --with-mccs \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --mandir="${EPREFIX}/usr/share/man"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: c77c50b64aa09838b19ee99cd4aa4d86688e172e
Author: Sam James gentoo org>
AuthorDate: Thu Oct 14 09:44:05 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Oct 14 09:44:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77c50b6
dev-ml/opam-installer: Stabilize 2.0.8-r3 x86, #815910
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
index 2f86f0c6675..919e02b4134 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 9b530d76d24093b14aac9ec966dc45d31d228b36
Author: Sam James gentoo org>
AuthorDate: Sun Oct 3 07:05:09 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 3 07:11:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b530d76
dev-ml/opam-installer: forward stable keywords (modulo x86)
Needed to get newer dose3 compatibility. Apparently
x86 was forgotten about at some point...
Bug: https://bugs.gentoo.org/815910
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
index a2b88905a29..2f86f0c6675 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: eda4c15e8777bb834f0bf1e311944a268438c897
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 21:24:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 21:24:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda4c15e
dev-ml/opam-installer: fix patch filename for 2.1.0
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/Manifest| 1 +
dev-ml/opam-installer/opam-installer-2.1.0.ebuild | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index c8729eaf87e..f32e897aec2 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,3 +1,4 @@
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B
f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147
SHA512
e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B
26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0
SHA512
f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B
c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d
SHA512
9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B
3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181
SHA512
2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
diff --git a/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
b/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
index 5f923029c5e..1ea426a6380 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.0.ebuild
@@ -11,6 +11,7 @@ inherit dune
DESCRIPTION="Core installer for opam packages"
HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${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-full-${PV/_/-}"
OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
@@ -19,7 +20,7 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt"
-PATCHES=( "${FILESDIR}"/opam-solver-2.1.0-dose3-6.patch )
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/files/
commit: 6b47df26b992f36454449fdd37fd7a7c4020dfb2 Author: Sam James gentoo org> AuthorDate: Sat Oct 2 21:11:18 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 2 21:12:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b47df26 dev-ml/opam-installer: drop useless patches Signed-off-by: Sam James gentoo.org> dev-ml/opam-installer/files/foo.patch | 503 .../files/opam-solver-2.1.0-dose3-6.patch | 526 - 2 files changed, 1029 deletions(-) diff --git a/dev-ml/opam-installer/files/foo.patch b/dev-ml/opam-installer/files/foo.patch deleted file mode 100644 index f9500aea1ce..000 --- a/dev-ml/opam-installer/files/foo.patch +++ /dev/null @@ -1,503 +0,0 @@ -From 9082b989f1c039a006fd58672de41f620a330e80 Mon Sep 17 00:00:00 2001 -From: Kate -Date: Fri, 29 Jan 2021 02:56:21 + -Subject: [PATCH] Make opam-solver compatible with dose3 6.0 - -Dose_algo.Depsolver.check_request_using actually never used its ~criteria argument(!!) :exploding_head: - src/solver/opamBuiltin0install.ml.real | 2 +- - src/solver/opamBuiltinMccs.ml.real | 2 +- - src/solver/opamBuiltinZ3.ml.real | 4 +- - src/solver/opamCudf.ml | 88 +- - src/solver/opamCudf.mli| 4 +- - src/solver/opamCudfSolver.ml | 4 +- - src/solver/opamSolver.ml | 26 - 7 files changed, 65 insertions(+), 65 deletions(-) - -diff --git a/src/solver/opamBuiltin0install.ml.real b/src/solver/opamBuiltin0install.ml.real -index 96e676303a..e0aed617e0 100644 a/src/solver/opamBuiltin0install.ml.real -+++ b/src/solver/opamBuiltin0install.ml.real -@@ -115,4 +115,4 @@ let call ~criteria ?timeout:_ (preamble, universe, request) = - | Error problem -> - log "No solution. Solve took %.2f s" (timer ()); - log ~level:3 "%a" (OpamConsole.slog Opam_0install_cudf.diagnostics) problem; --raise Common.CudfSolver.Unsat -+raise Dose_common.CudfSolver.Unsat -diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real -index 5ae58a377a..b61cb17884 100644 a/src/solver/opamBuiltinMccs.ml.real -+++ b/src/solver/opamBuiltinMccs.ml.real -@@ -42,7 +42,7 @@ let call solver_backend ext ~criteria ?timeout cudf = - ~verbose:OpamCoreConfig.(abs !r.debug_level >= 2) - ?timeout criteria cudf - with -- | None -> raise Common.CudfSolver.Unsat -+ | None -> raise Dose_common.CudfSolver.Unsat - | Some (preamble, univ) -> Some preamble, univ - | exception Mccs.Timeout -> raise (Timeout None) - -diff --git a/src/solver/opamBuiltinZ3.ml.real b/src/solver/opamBuiltinZ3.ml.real -index e175393e9c..71600414b7 100644 a/src/solver/opamBuiltinZ3.ml.real -+++ b/src/solver/opamBuiltinZ3.ml.real -@@ -416,7 +416,7 @@ let call ~criteria ?timeout (preamble, universe, _ as cudf) = - match Z3.Optimize.check opt with - | UNSATISFIABLE -> - log "UNSAT"; --raise Common.CudfSolver.Unsat -+raise Dose_common.CudfSolver.Unsat - | UNKNOWN -> - log "UNKNOWN"; - (try -@@ -433,7 +433,7 @@ let call ~criteria ?timeout (preamble, universe, _ as cudf) = - in - Some preamble, universe - (* with -- * | (Timeout | Common.CudfSolver.Unsat | Failure _) as e -> raise e -+ * | (Timeout | Dose_common.CudfSolver.Unsat | Failure _) as e -> raise e -* | e -> -* OpamConsole.error "Z3 error: %s" (Printexc.to_string e); -* OpamConsole.errmsg "%s" (Printexc.get_backtrace ()); -diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml -index f282653354..6fde9caff8 100644 a/src/solver/opamCudf.ml -+++ b/src/solver/opamCudf.ml -@@ -24,7 +24,7 @@ let s_pinned = "pinned" - let s_version_lag = "version-lag" - - let opam_invariant_package_name = -- Common.CudfAdd.encode "=opam-invariant" -+ Dose_common.CudfAdd.encode "=opam-invariant" - - let opam_invariant_package_version = 1 - -@@ -55,7 +55,7 @@ let cudfnv2opam ?version_map ?cudf_universe (name,v) = - match nv with - | Some nv -> nv - | None -> --let name = OpamPackage.Name.of_string (Common.CudfAdd.decode name) in -+let name = OpamPackage.Name.of_string (Dose_common.CudfAdd.decode name) in - match version_map with - | Some vmap -> - let nvset = -@@ -394,7 +394,7 @@ let of_json = Json.package_of_json - (* Graph of cudf packages *) - module Package = struct - type t = Cudf.package -- include Common.CudfAdd -+ include Dose_common.CudfAdd - let to_string = string_of_package - let name_to_string t = t.Cudf.package - let version_to_string t = string_of_int t.Cudf.version -@@ -414,7 +414,7 @@ exception Solver_failure of string - exception Cyclic_actions of Action.t list list - - type conflict_case = -- | Conflict_dep of (unit -> Algo.Diagnostic.reason list) -+ | Conflict_dep of (unit -> Dose_algo.Diagnostic.reason list) - | Conflict_cycle of string list list - type conflict = - Cudf.universe
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/files/, dev-ml/opam-installer/
commit: 22234126cf5e702d5013aa5d9a3d54304dd757b9 Author: Sam James gentoo org> AuthorDate: Sat Oct 2 05:51:13 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 2 21:10:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22234126 dev-ml/opam-installer: add 2.1.0 Signed-off-by: Sam James gentoo.org> dev-ml/opam-installer/Manifest | 1 + dev-ml/opam-installer/files/foo.patch | 503 .../files/opam-solver-2.1.0-dose3-6.patch | 526 + dev-ml/opam-installer/opam-installer-2.1.0.ebuild | 39 ++ 4 files changed, 1069 insertions(+) diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest index d6e4ebdb9a8..c8729eaf87e 100644 --- a/dev-ml/opam-installer/Manifest +++ b/dev-ml/opam-installer/Manifest @@ -1,2 +1,3 @@ DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85 +DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B 3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181 SHA512 2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a diff --git a/dev-ml/opam-installer/files/foo.patch b/dev-ml/opam-installer/files/foo.patch new file mode 100644 index 000..f9500aea1ce --- /dev/null +++ b/dev-ml/opam-installer/files/foo.patch @@ -0,0 +1,503 @@ +From 9082b989f1c039a006fd58672de41f620a330e80 Mon Sep 17 00:00:00 2001 +From: Kate +Date: Fri, 29 Jan 2021 02:56:21 + +Subject: [PATCH] Make opam-solver compatible with dose3 6.0 + +Dose_algo.Depsolver.check_request_using actually never used its ~criteria argument(!!) :exploding_head: +--- + src/solver/opamBuiltin0install.ml.real | 2 +- + src/solver/opamBuiltinMccs.ml.real | 2 +- + src/solver/opamBuiltinZ3.ml.real | 4 +- + src/solver/opamCudf.ml | 88 +- + src/solver/opamCudf.mli| 4 +- + src/solver/opamCudfSolver.ml | 4 +- + src/solver/opamSolver.ml | 26 + 7 files changed, 65 insertions(+), 65 deletions(-) + +diff --git a/src/solver/opamBuiltin0install.ml.real b/src/solver/opamBuiltin0install.ml.real +index 96e676303a..e0aed617e0 100644 +--- a/src/solver/opamBuiltin0install.ml.real b/src/solver/opamBuiltin0install.ml.real +@@ -115,4 +115,4 @@ let call ~criteria ?timeout:_ (preamble, universe, request) = + | Error problem -> + log "No solution. Solve took %.2f s" (timer ()); + log ~level:3 "%a" (OpamConsole.slog Opam_0install_cudf.diagnostics) problem; +-raise Common.CudfSolver.Unsat ++raise Dose_common.CudfSolver.Unsat +diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real +index 5ae58a377a..b61cb17884 100644 +--- a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real +@@ -42,7 +42,7 @@ let call solver_backend ext ~criteria ?timeout cudf = + ~verbose:OpamCoreConfig.(abs !r.debug_level >= 2) + ?timeout criteria cudf + with +- | None -> raise Common.CudfSolver.Unsat ++ | None -> raise Dose_common.CudfSolver.Unsat + | Some (preamble, univ) -> Some preamble, univ + | exception Mccs.Timeout -> raise (Timeout None) + +diff --git a/src/solver/opamBuiltinZ3.ml.real b/src/solver/opamBuiltinZ3.ml.real +index e175393e9c..71600414b7 100644 +--- a/src/solver/opamBuiltinZ3.ml.real b/src/solver/opamBuiltinZ3.ml.real +@@ -416,7 +416,7 @@ let call ~criteria ?timeout (preamble, universe, _ as cudf) = + match Z3.Optimize.check opt with + | UNSATISFIABLE -> + log "UNSAT"; +-raise Common.CudfSolver.Unsat ++raise Dose_common.CudfSolver.Unsat + | UNKNOWN -> + log "UNKNOWN"; + (try +@@ -433,7 +433,7 @@ let call ~criteria ?timeout (preamble, universe, _ as cudf) = + in + Some preamble, universe + (* with +- * | (Timeout | Common.CudfSolver.Unsat | Failure _) as e -> raise e ++ * | (Timeout | Dose_common.CudfSolver.Unsat | Failure _) as e -> raise e +* | e -> +* OpamConsole.error "Z3 error: %s" (Printexc.to_string e); +* OpamConsole.errmsg "%s" (Printexc.get_backtrace ()); +diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml +index f282653354..6fde9caff8 100644 +--- a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml +@@ -24,7 +24,7 @@ let
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 47a302bbc72b7c780c5b4ac6daafa71429e59be2
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 19:15:56 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 19:15:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a302bb
dev-ml/opam-installer: Stabilize 2.0.8-r2 ppc, #804780
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
index b39933b7d36..739c1989676 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 7073ac5f7d1715496b329a8022ab32b315381563
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 19:15:44 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 19:15:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7073ac5f
dev-ml/opam-installer: Stabilize 2.0.8-r2 ppc64, #804780
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
index e882d9c0835..b39933b7d36 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 0338c0aa8cd66e0a8c34862c706429e79d51
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 19:15:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 19:15:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0338
dev-ml/opam-installer: Stabilize 2.0.8-r2 arm, #804780
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
index fceb85f1317..e882d9c0835 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: c3fa294882093dfa05c148874d4cfc69ddcbc47b
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 19:15:21 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 19:15:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3fa2948
dev-ml/opam-installer: Stabilize 2.0.8-r2 arm64, #804780
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
index 5c926bb69c2..fceb85f1317 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 34794730b0c2c610377bbb04f5d579d547e930b4
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Jul 29 06:43:09 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Jul 29 06:43:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34794730
dev-ml/opam-installer: x86 stable wrt bug #804780
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
index fa67d1f64af..0794b29319b 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 2ca90f4a11fe6fb3a7d7ad8d012ee3c4fbd8cbba
Author: Sam James gentoo org>
AuthorDate: Wed Jul 28 02:21:05 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 28 02:21:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca90f4a
dev-ml/opam-installer: add 2.0.9
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/Manifest| 1 +
dev-ml/opam-installer/opam-installer-2.0.9.ebuild | 46 +++
2 files changed, 47 insertions(+)
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index bf62be30f70..d6e4ebdb9a8 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1 +1,2 @@
DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B
26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0
SHA512
f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
+DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B
c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d
SHA512
9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
new file mode 100644
index 000..a2b88905a29
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit opam
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz;
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# 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" )
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02.3
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-format-${PV}
+ >=dev-ml/dose3-6
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+src_configure() {
+ econf \
+ --prefix="${EPREFIX}/usr" \
+ --with-mccs \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+ sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+ #passing -jX to the dune build leads to errors
+ #see: https://github.com/ocaml/opam/issues/3585
+ emake DUNE_PROMOTE_ARG="" -j1
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 6b97236b340ce0bbe55e6ac1d8e72d5557616dbb
Author: Sam James gentoo org>
AuthorDate: Wed Jul 28 01:47:47 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 28 01:47:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b97236b
dev-ml/opam-installer: Keyword 2.0.8-r3 x86, #788406
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
index 931de0a20eb..a2b88905a29 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
# 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" )
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 1cdb3707a863a8ea0cc7349595bc40244dee98f3
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Jun 29 18:24:41 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Jun 29 18:24:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cdb3707
dev-ml/opam-installer: rdepends on dose3
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
index 7bd84a692fe..931de0a20eb 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
# 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" )
@@ -25,6 +25,7 @@ RDEPEND="
>=dev-lang/ocaml-4.02.3
dev-ml/cmdliner:=
~dev-ml/opam-format-${PV}
+ >=dev-ml/dose3-6
"
DEPEND="${RDEPEND}
dev-ml/findlib"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/files/, dev-ml/opam-installer/
commit: 52d438422968d43ce090534d9e80b89e4f905754
Author: Hank Leininger korelogic com>
AuthorDate: Tue Jun 1 16:29:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 6 23:55:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d43842
dev-ml/opam-installer: patch for dose3-6.x compat
Lifted from Debian, see https://bugs.debian.org/982733
Signed-off-by: Hank Leininger korelogic.com>
Closes: https://bugs.gentoo.org/788265
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/20686
Signed-off-by: Sam James gentoo.org>
.../files/debian-Port-to-Dose3-6.0.1.patch | 142 +
.../opam-installer/opam-installer-2.0.8-r3.ebuild | 45 +++
2 files changed, 187 insertions(+)
diff --git a/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000..a8af27416df
--- /dev/null
+++ b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml | 5 -
+ src/solver/opamCudf.mli| 4 ++--
+ src/solver/opamCudfSolver.ml | 4 ++--
+ src/solver/opamSolver.ml | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (**)
+ (**)
+
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+
+diff --git a/src/client/opamAdminRepoUpgrade.ml
b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (**)
+ (**)
+
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real
b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+ ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+ ?timeout criteria cudf
+ with
+- | None -> raise Common.CudfSolver.Unsat
++ | None -> raise Dose_common.CudfSolver.Unsat
+ | Some (preamble, univ) -> Some preamble, univ
+ | exception Mccs.Timeout -> raise Timeout
+
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (**)
+ (**)
+
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+ let r =
+ Algo.Depsolver.check_request_using
+ ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+- ~criteria ~explain:true cudf_request
++ ~explain:true cudf_request
+ in
+ log "Solver call done in %.3f" (chrono ());
+ r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+ (** Graph of cudf packages *)
+
+- include module type of Algo.Defaultgraphs.PackageGraph.G
++ include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+
+ (** Build a graph from a CUDF universe. Warning: dependency edges are
towards
+ the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+
+ val make_conflicts:
+ version_map:int package_map -> Cudf.universe ->
+- Algo.Diagnostic.diagnosis -> ('a, conflict) result
++ Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+ version_map:int package_map -> Cudf.universe ->
+ string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 9c224ffba495bb0d8543c1c5769087e7d7cee31d
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon May 10 15:19:29 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon May 10 15:19:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c224ffb
dev-ml/opam-installer: remove building ext library (already in tree)
Closes: https://bugs.gentoo.org/787212
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
.../opam-installer/opam-installer-2.0.8-r2.ebuild | 42 ++
1 file changed, 42 insertions(+)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
new file mode 100644
index 000..fa67d1f64af
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit opam
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz;
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.02.3
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-format-${PV}
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+src_configure() {
+ econf \
+ --prefix="${EPREFIX}/usr" \
+ --with-mccs \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+ sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+ #passing -jX to the dune build leads to errors
+ #see: https://github.com/ocaml/opam/issues/3585
+ emake DUNE_PROMOTE_ARG="" -j1
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 159048087a89e4d10b7e75c7fa41f6197a09a197
Author: Sam James gentoo org>
AuthorDate: Sun Mar 14 00:59:01 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 15 04:01:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15904808
dev-ml/opam-installer: drop 2.0.7-r1
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/Manifest | 1 -
.../opam-installer/opam-installer-2.0.7-r1.ebuild | 46 --
2 files changed, 47 deletions(-)
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 5052fbfcb46..bf62be30f70 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,2 +1 @@
-DIST opam-full-2.0.7.tar.gz 7929123 BLAKE2B
100acc2c31e97e47b0b584f3a153283593351d49d5e9cdaca42fdcc025b135d9538bd327927950e7e0972b20f561a0ee3d1d1b5b4b87e1e6af31761e311081e7
SHA512
670af4935bba0679c65f6592b7a52b1d429b604eb261e40b13cf72312aeb0bab0c5a76829a555fc5379a0371c352692cbabc46b460fcd9bf32b3cfebdaeceb81
DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B
26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0
SHA512
f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
deleted file mode 100644
index 87658e669be..000
--- a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-OPAM_SKIP_VALIDATION=yes
-
-inherit opam
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz;
-S="${WORKDIR}/opam-full-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-lang/ocaml-4.02.3
- dev-ml/cmdliner:=
- ~dev-ml/opam-format-${PV}
-"
-DEPEND="${RDEPEND}
- dev-ml/findlib"
-
-OPAM_INSTALLER="${S}/opam-installer"
-
-src_configure() {
- econf \
- --prefix="${EPREFIX}/usr" \
- --with-mccs \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --mandir="${EPREFIX}/usr/share/man"
-}
-
-src_compile() {
- sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
- emake lib-ext
- #passing -jX to the dune build leads to errors
- #see: https://github.com/ocaml/opam/issues/3585
- emake DUNE_PROMOTE_ARG="" -j1
-}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: cc5e4e13c3a978d1577ded6c2ceb9eb280c4ba89
Author: Sam James gentoo org>
AuthorDate: Mon Mar 15 03:47:20 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 15 03:47:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5e4e13
dev-ml/opam-installer: Stabilize 2.0.8-r1 ppc, #772833
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
index 9d8a5620e52..71045308f5b 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 46c4a27c81205f41ffc41eb59a635c7ac0e4bd51
Author: Sam James gentoo org>
AuthorDate: Sun Mar 14 01:20:20 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 14 01:20:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c4a27c
dev-ml/opam-installer: Stabilize 2.0.8-r1 x86, #772833
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
index 6c722cc71e0..9d8a5620e52 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 2404b0e7e7462ae32eb8ad14408bad0cf0fce0c3
Author: Sam James gentoo org>
AuthorDate: Sun Mar 14 00:44:59 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 14 00:48:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2404b0e7
dev-ml/opam-installer: Stabilize 2.0.8-r1 arm64, #772833
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
index e2c9290ebf3..6c722cc71e0 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: deacc37c51b345ca076d0d6a7420ce10e266fafc
Author: Sam James gentoo org>
AuthorDate: Sat Mar 13 14:05:22 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 13 14:05:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deacc37c
dev-ml/opam-installer: Stabilize 2.0.8-r1 ppc64, #772833
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
index 7f1e1eb67e3..dd6ef887f68 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: a6042248296ffef41b2a4dd240a9fcafa9201f55
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 4 14:27:59 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 4 14:27:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6042248
dev-ml/opam-installer: amd64 stable wrt bug #772833
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
index 369358c1de0..7f1e1eb67e3 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
RDEPEND="
>=dev-lang/ocaml-4.02.3
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: e2472e2f186634e307c86a02f000d696e412a170
Author: Sam James gentoo org>
AuthorDate: Thu Feb 11 06:31:25 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 11 06:31:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2472e2f
dev-ml/opam-installer: Stabilize 2.0.7-r1 ppc, #769317
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
index fdab6bed235..87658e669be 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/opam-full-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: aad09f770db90a13ca42e0807ffc465883f51449
Author: Sam James gentoo org>
AuthorDate: Thu Feb 11 06:25:38 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 11 06:25:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad09f77
dev-ml/opam-installer: Stabilize 2.0.7-r1 x86, #769317
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
index cd293c11cb0..fdab6bed235 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/opam-full-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 8ba52a1cbdf6830e46b2b43d1515f06cd426f5b1
Author: Sam James gentoo org>
AuthorDate: Wed Feb 10 18:53:09 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 10 18:53:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba52a1c
dev-ml/opam-installer: Stabilize 2.0.7-r1 amd64, #769317
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
index e08df2da807..cd293c11cb0 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/opam-full-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 6a9cb88117af2bfbd14ac876d54a0b2fc7a14d5d
Author: Sam James gentoo org>
AuthorDate: Wed Feb 10 16:32:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 10 16:32:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9cb881
dev-ml/opam-installer: Stabilize 2.0.7-r1 ppc64, #769317
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
index eb52254c396..e08df2da807 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/opam-full-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 9edcd8f764d69bce2eb2c5d46dcb0bc38c10b08a
Author: Sam James gentoo org>
AuthorDate: Tue Feb 9 19:51:37 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 9 19:53:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9edcd8f7
dev-ml/opam-installer: fix opam-installer usage
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
.../{opam-installer-2.0.8.ebuild => opam-installer-2.0.8-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
similarity index 96%
rename from dev-ml/opam-installer/opam-installer-2.0.8.ebuild
rename to dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
index a6722cf81e7..369358c1de0 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
@@ -12,6 +12,7 @@ DESCRIPTION="Core installer for opam packages"
HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz;
S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: f9a7aac84cf9e7c65ac34c1d64a45a1c8d0ed936
Author: Sam James gentoo org>
AuthorDate: Mon Feb 8 17:07:38 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 8 17:20:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a7aac8
dev-ml/opam-installer: bump to 2.0.8
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-installer/Manifest| 1 +
dev-ml/opam-installer/opam-installer-2.0.8.ebuild | 38 +++
2 files changed, 39 insertions(+)
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index b9416004a3a..5052fbfcb46 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1 +1,2 @@
DIST opam-full-2.0.7.tar.gz 7929123 BLAKE2B
100acc2c31e97e47b0b584f3a153283593351d49d5e9cdaca42fdcc025b135d9538bd327927950e7e0972b20f561a0ee3d1d1b5b4b87e1e6af31761e311081e7
SHA512
670af4935bba0679c65f6592b7a52b1d429b604eb261e40b13cf72312aeb0bab0c5a76829a555fc5379a0371c352692cbabc46b460fcd9bf32b3cfebdaeceb81
+DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B
26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0
SHA512
f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
new file mode 100644
index 000..fad39a7a570
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit opam
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz;
+S="${WORKDIR}/opam-full-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-lang/ocaml-4.02.3"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+src_configure() {
+ econf \
+ --prefix="${EPREFIX}/usr" \
+ --with-mccs \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+ sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+ emake lib-ext
+ #passing -jX to the dune build leads to errors
+ #see: https://github.com/ocaml/opam/issues/3585
+ emake DUNE_PROMOTE_ARG="" -j1
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: 38aa6762c466b947e2dc72e4f37fd30eeafb0c41
Author: Sam James gentoo org>
AuthorDate: Mon Feb 8 17:16:59 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 8 17:20:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38aa6762
dev-ml/opam-installer: fix deps
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
...opam-installer-2.0.7.ebuild => opam-installer-2.0.7-r1.ebuild} | 8 ++--
dev-ml/opam-installer/opam-installer-2.0.8.ebuild | 6 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
similarity index 92%
rename from dev-ml/opam-installer/opam-installer-2.0.7.ebuild
rename to dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
index 59f744994a0..eb52254c396 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
@@ -12,17 +12,21 @@ inherit opam
DESCRIPTION="Core installer for opam packages"
HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz;
+S="${WORKDIR}/opam-full-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
-RDEPEND=">=dev-lang/ocaml-4.02.3"
+RDEPEND="
+ >=dev-lang/ocaml-4.02.3
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-format-${PV}
+"
DEPEND="${RDEPEND}
dev-ml/findlib"
-S="${WORKDIR}/opam-full-${PV/_/-}"
OPAM_INSTALLER="${S}/opam-installer"
src_configure() {
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
index fad39a7a570..a6722cf81e7 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
@@ -17,7 +17,11 @@ LICENSE="LGPL-2.1"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-RDEPEND=">=dev-lang/ocaml-4.02.3"
+RDEPEND="
+ >=dev-lang/ocaml-4.02.3
+ dev-ml/cmdliner:=
+ ~dev-ml/opam-format-${PV}
+"
DEPEND="${RDEPEND}
dev-ml/findlib"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/
commit: b613c4fa50102f316f7f0b885907dbe98404f3c7
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Jan 27 18:24:12 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Jan 27 18:24:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b613c4fa
dev-ml/opam-installer: add dep
Closes: https://bugs.gentoo.org/765400
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-installer/metadata.xml| 4
dev-ml/opam-installer/opam-installer-2.0.7.ebuild | 7 ---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dev-ml/opam-installer/metadata.xml
b/dev-ml/opam-installer/metadata.xml
index 970e090f0df..856df00497e 100644
--- a/dev-ml/opam-installer/metadata.xml
+++ b/dev-ml/opam-installer/metadata.xml
@@ -1,6 +1,10 @@
http://www.gentoo.org/dtd/metadata.dtd;>
+
+ m...@gentoo.org
+ ML
+
gie...@gentoo.org
Mark Wright
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
b/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
index 276428f9678..59f744994a0 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,8 +18,9 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
-DEPEND=">=dev-lang/ocaml-4.02.3"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-lang/ocaml-4.02.3"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
S="${WORKDIR}/opam-full-${PV/_/-}"
OPAM_INSTALLER="${S}/opam-installer"
