[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: c5373bf9b170ac7c40a0172360050c3f096768c9
Author: Matoro Mahri matoro tk>
AuthorDate: Fri Jan 19 18:42:23 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 19 23:08:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5373bf9
dev-ml/opam-solver: Stabilize 2.0.10 arm, #896100
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
index eed36cce3802..3e8c086a960a 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: bdc9706a003118c373969e4fe2e444bdc6b0f039
Author: Sam James gentoo org>
AuthorDate: Fri Dec 22 05:02:29 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 22 05:04:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc9706a
dev-ml/opam-solver: Stabilize 2.0.10 ppc64, #896100
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
index d8d034658468..ceef47ee6757 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: d8d568921b8987245fb4b0cfa37d96395a2282a4
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat May 13 19:27:24 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat May 13 19:42:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d56892
dev-ml/opam-solver: stabilize 2.1.3 for amd64
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-solver/opam-solver-2.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
index 7a95cf1d6938..a6a362cb5691 100644
--- a/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
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 test"
RESTRICT="test" # sandbox not working
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 91aabe1a349921e333275afeda74bc1723c78120
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Mar 3 20:42:53 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Mar 3 20:47:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91aabe1a
dev-ml/opam-solver: add 2.1.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-solver/Manifest | 1 +
dev-ml/opam-solver/opam-solver-2.1.3.ebuild | 42 +
2 files changed, 43 insertions(+)
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 9c8e7ed9b794..13cb1b80d395 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -2,3 +2,4 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B
7cd201fe6bed2ae81fc8d9d0a7063b284621e5797
DIST opam-2.0.9.tar.gz 644429 BLAKE2B
d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659
SHA512
0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B
f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147
SHA512
e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
DIST opam-2.1.2.tar.gz 818848 BLAKE2B
ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c
SHA512
bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
+DIST opam-2.1.3.tar.gz 832450 BLAKE2B
c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf
SHA512
040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
diff --git a/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
new file mode 100644
index ..7a95cf1d6938
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz ->
opam-${PV}.tar.gz"
+SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz;
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="test" # sandbox not working
+
+RDEPEND="
+ ~dev-ml/opam-format-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+ >=dev-ml/mccs-1.1.4:=
+ >=dev-ml/dose3-6.0:=
+ dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/opam-client )"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+(dev
+ (flags (:standard -warn-error -3-9-33)))
+(release
+ (flags (:standard -warn-error -3-9-33
+ EOF
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 516d281891cf738aadc54579164f6c0b1fb590d4
Author: Sam James gentoo org>
AuthorDate: Thu Feb 23 23:37:42 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 23 23:37:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=516d2818
dev-ml/opam-solver: Stabilize 2.0.10 amd64, #896100
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
index aa993e87c76c..e557489dbd56 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: e71598b5dbc4a75ddbdb725898aee8621c01853b
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Nov 19 10:33:43 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Nov 19 10:33:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71598b5
dev-ml/opam-solver: Stabilize 2.1.2 ppc64, #859508
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-solver/opam-solver-2.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
index c2b572ca499c..c1e2675a92cc 100644
--- a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
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 test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: aaa128b28f303a13283d0371fb4eb1bb413a2974
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Nov 19 10:33:37 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Nov 19 10:33:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa128b2
dev-ml/opam-solver: Stabilize 2.1.2 arm64, #859508
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-solver/opam-solver-2.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
index 797385cf3118..c2b572ca499c 100644
--- a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
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 test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 36321eb122ccb101cfa11040fc5855f371850bc1
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Nov 19 10:33:32 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Nov 19 10:33:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36321eb1
dev-ml/opam-solver: Stabilize 2.1.2 arm, #859508
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-solver/opam-solver-2.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
index 8e3819e86743..797385cf3118 100644
--- a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
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 test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 248e8ad90fbefcd0b72b7dade40fee852804c280
Author: Sam James gentoo org>
AuthorDate: Sun Sep 18 00:37:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 18 00:37:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248e8ad9
dev-ml/opam-solver: Stabilize 2.1.2 x86, #859508
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
index e5f1d071ab9a..8e3819e86743 100644
--- a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
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 test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: b8b258a80a270552283e53f869d7b7e1d3ea1b6a
Author: Sam James gentoo org>
AuthorDate: Sun Sep 18 00:36:47 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 18 00:36:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8b258a8
dev-ml/opam-solver: Stabilize 2.1.2 amd64, #859508
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
index f7d57f853073..e5f1d071ab9a 100644
--- a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
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 test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 94013d85dfe9293bfb83c267b1c4b53131d4a651
Author: Sam James gentoo org>
AuthorDate: Sat Jul 23 23:28:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 23 23:51:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94013d85
dev-ml/opam-solver: drop 2.0.8, 2.0.8-r1, 2.1.0, 2.1.1
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/Manifest| 3 --
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 42 --
dev-ml/opam-solver/opam-solver-2.0.8.ebuild| 39
dev-ml/opam-solver/opam-solver-2.1.0.ebuild| 42 --
dev-ml/opam-solver/opam-solver-2.1.1.ebuild| 42 --
5 files changed, 168 deletions(-)
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 879ecc216aa3..9c8e7ed9b794 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,7 +1,4 @@
DIST opam-2.0.10.tar.gz 641739 BLAKE2B
7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776
SHA512
49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-DIST opam-2.0.8.tar.gz 643221 BLAKE2B
66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2
SHA512
14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
DIST opam-2.0.9.tar.gz 644429 BLAKE2B
d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659
SHA512
0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B
f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147
SHA512
e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
-DIST opam-2.1.0.tar.gz 825966 BLAKE2B
42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5
SHA512
c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
-DIST opam-2.1.1.tar.gz 818555 BLAKE2B
0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996
SHA512
fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
DIST opam-2.1.2.tar.gz 818848 BLAKE2B
ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c
SHA512
bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
deleted file mode 100644
index 5cd0e4230cb6..
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz ->
opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ~dev-ml/opam-format-${PV}:=
- dev-ml/opam-file-format:=
- dev-ml/re:=
- >=dev-ml/mccs-1.1.4:=
- >=dev-ml/dose3-6.0:=
- dev-ml/cudf:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ml/opam-client )"
-
-# Cherry-picked from
https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-src_prepare() {
- default
- cat <<- EOF >> "${S}/dune"
- (env
-(dev
- (flags (:standard -warn-error -3-9-33)))
-(release
- (flags (:standard -warn-error -3-9-33
- EOF
-}
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
deleted file mode 100644
index df51e641a02f..
--- a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: cb17086c0d543b10b06455e388e67cedc128a3f2
Author: Yongxiang Liang gmail com>
AuthorDate: Sun Apr 17 15:41:11 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Apr 18 21:06:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb17086c
dev-ml/opam-solver: Keyword 2.1.2 riscv, #835392
Signed-off-by: Yongxiang Liang gmail.com>
Signed-off-by: Jakov Smolić gentoo.org>
dev-ml/opam-solver/opam-solver-2.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
index be6f4bc9ddc8..f7d57f853073 100644
--- a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 5fc1a45eb46d96b83c8daaa12f5291e0a1b76758
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Jan 31 21:06:04 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Jan 31 21:06:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc1a45e
dev-ml/opam-solver: 2.1.2 bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-solver/Manifest | 1 +
dev-ml/opam-solver/opam-solver-2.1.2.ebuild | 42 +
2 files changed, 43 insertions(+)
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index f220f1c24723..879ecc216aa3 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -4,3 +4,4 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B
d96ee79685a8ee8ff82c7570a747c80e38d86e5137
DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B
f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147
SHA512
e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
DIST opam-2.1.0.tar.gz 825966 BLAKE2B
42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5
SHA512
c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
DIST opam-2.1.1.tar.gz 818555 BLAKE2B
0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996
SHA512
fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
+DIST opam-2.1.2.tar.gz 818848 BLAKE2B
ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c
SHA512
bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
diff --git a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
new file mode 100644
index ..be6f4bc9ddc8
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz ->
opam-${PV}.tar.gz"
+SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz;
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~dev-ml/opam-format-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+ >=dev-ml/mccs-1.1.4:=
+ >=dev-ml/dose3-6.0:=
+ dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/opam-client )"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+(dev
+ (flags (:standard -warn-error -3-9-33)))
+(release
+ (flags (:standard -warn-error -3-9-33
+ EOF
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 6f4d2a28b05711cf1e6b1eca1e7e17a4ac6802f8
Author: Sam James gentoo org>
AuthorDate: Tue Jan 18 12:23:42 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 18 12:23:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4d2a28
dev-ml/opam-solver: Stabilize 2.0.9 x86, #817749
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index 9dd373cc5af7..8ec107bfacc4 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: acb748c23f3c6cbbda230b290611011c1d24e4ab
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=acb748c2
dev-ml/opam-solver: Stabilize 2.0.9 ppc64, #817749
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index 64fe23d5a69c..9dd373cc5af7 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 0f4e8c816f3c210ac6f98d87865377807aff4a89
Author: Sam James gentoo org>
AuthorDate: Thu Jan 13 06:33:24 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 13 06:34:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4e8c81
dev-ml/opam-solver: Stabilize 2.0.9 arm64, #817749
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index 1926ca0aebab..64fe23d5a69c 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 01296372d3e353196cc40eb83e602d4bb1d7b708
Author: Sam James gentoo org>
AuthorDate: Tue Jan 11 00:44:43 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 11 00:44:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01296372
dev-ml/opam-solver: Stabilize 2.0.9 amd64, #817749
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index b38d9e316f4d..1926ca0aebab 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: adb241cf60367d227be9643299c2bb81f806f3c9
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Jan 10 20:07:45 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jan 10 20:07:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb241cf
dev-ml/opam-solver: Stabilize 2.0.9 ppc, #817749
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index 164855e66029..b38d9e316f4d 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: fafb2efc452eaae88fe90c6bcfe34c526ca787a5
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Jan 10 19:56:34 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jan 10 19:56:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fafb2efc
dev-ml/opam-solver: Stabilize 2.0.9 arm, #817749
Signed-off-by: Arthur Zamarin gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.9.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index aa993e87c76c..164855e66029 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-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
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 5720c24b53eeb81c1fa5080296676526e9bde095
Author: Sam James gentoo org>
AuthorDate: Sun Dec 19 11:02:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 19 11:02:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5720c24b
dev-ml/opam-solver: Stabilize 2.0.8-r1 x86, #804780
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index 5a8e924ec8fa..3d5ec893df9e 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 1427b594640e727526672fd618a6b07e93423f8c
Author: Sam James gentoo org>
AuthorDate: Sat Nov 6 03:39:28 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 6 03:39:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1427b594
dev-ml/opam-solver: fix 2.0.10
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
index 3ee659981fd..aa993e87c76 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
@@ -8,7 +8,6 @@ inherit dune
DESCRIPTION="opam solver"
HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz ->
opam-${PV}.tar.gz"
-SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz;
S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
@@ -28,7 +27,8 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-ml/opam-client )"
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+# Cherry-picked from
https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 0aa1ddf890f731f37690c669f4aff654bf84d0e0
Author: Sam James gentoo org>
AuthorDate: Sat Nov 6 03:35:40 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 6 03:35:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa1ddf8
dev-ml/opam-solver: add 2.1.1
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/Manifest | 1 +
dev-ml/opam-solver/opam-solver-2.1.1.ebuild | 42 +
2 files changed, 43 insertions(+)
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index ed498336536..f220f1c2472 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -3,3 +3,4 @@ DIST opam-2.0.8.tar.gz 643221 BLAKE2B
66510a18285f315fe95665e8ba2f334dd44211c716
DIST opam-2.0.9.tar.gz 644429 BLAKE2B
d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659
SHA512
0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B
f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147
SHA512
e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
DIST opam-2.1.0.tar.gz 825966 BLAKE2B
42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5
SHA512
c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
+DIST opam-2.1.1.tar.gz 818555 BLAKE2B
0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996
SHA512
fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
diff --git a/dev-ml/opam-solver/opam-solver-2.1.1.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.1.ebuild
new file mode 100644
index 000..3ee659981fd
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz ->
opam-${PV}.tar.gz"
+SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz;
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~dev-ml/opam-format-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+ >=dev-ml/mccs-1.1.4:=
+ >=dev-ml/dose3-6.0:=
+ dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/opam-client )"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+(dev
+ (flags (:standard -warn-error -3-9-33)))
+(release
+ (flags (:standard -warn-error -3-9-33
+ EOF
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: ae76f90ae1cad71a37a7b0a5f6d7fc50bdaf4aed
Author: Sam James gentoo org>
AuthorDate: Sat Nov 6 03:24:07 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 6 03:24:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae76f90a
dev-ml/opam-solver: add 2.0.10
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/Manifest | 1 +
dev-ml/opam-solver/opam-solver-2.0.10.ebuild | 42
2 files changed, 43 insertions(+)
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 0b145947da0..ed498336536 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,3 +1,4 @@
+DIST opam-2.0.10.tar.gz 641739 BLAKE2B
7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776
SHA512
49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
DIST opam-2.0.8.tar.gz 643221 BLAKE2B
66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2
SHA512
14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
DIST opam-2.0.9.tar.gz 644429 BLAKE2B
d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659
SHA512
0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B
f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147
SHA512
e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
diff --git a/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
new file mode 100644
index 000..3ee659981fd
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.0.10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz ->
opam-${PV}.tar.gz"
+SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz;
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~dev-ml/opam-format-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+ >=dev-ml/mccs-1.1.4:=
+ >=dev-ml/dose3-6.0:=
+ dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/opam-client )"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+(dev
+ (flags (:standard -warn-error -3-9-33)))
+(release
+ (flags (:standard -warn-error -3-9-33
+ EOF
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 8023f27cc51f4efd7824083928c801927c1826e2
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Oct 3 09:55:56 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Oct 3 09:57:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8023f27c
dev-ml/opam-solver: src_compile is in dune.eclass
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 4
dev-ml/opam-solver/opam-solver-2.0.9.ebuild| 4
dev-ml/opam-solver/opam-solver-2.1.0.ebuild| 4
3 files changed, 12 deletions(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index 29491beddbd..5a8e924ec8f 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -40,7 +40,3 @@ src_prepare() {
(flags (:standard -warn-error -3-9-33
EOF
}
-
-src_compile() {
- dune build @install --profile release || die
-}
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index 4a28e3ba255..aa993e87c76 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -40,7 +40,3 @@ src_prepare() {
(flags (:standard -warn-error -3-9-33
EOF
}
-
-src_compile() {
- dune build @install --profile release || die
-}
diff --git a/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
b/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
index c4fc4cb7fca..3ee659981fd 100644
--- a/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
@@ -40,7 +40,3 @@ src_prepare() {
(flags (:standard -warn-error -3-9-33
EOF
}
-
-src_compile() {
- dune build @install --profile release || die
-}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/files/
commit: 713294ebc1ee9520b371ed240edaf99b12ea1c95 Author: Sam James gentoo org> AuthorDate: Sat Oct 2 21:11:47 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 2 21:12:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713294eb dev-ml/opam-solver: drop useless patch Signed-off-by: Sam James gentoo.org> .../files/opam-solver-2.1.0-dose3-6.patch | 526 - 1 file changed, 526 deletions(-) diff --git a/dev-ml/opam-solver/files/opam-solver-2.1.0-dose3-6.patch b/dev-ml/opam-solver/files/opam-solver-2.1.0-dose3-6.patch deleted file mode 100644 index fd613125eed..000 --- a/dev-ml/opam-solver/files/opam-solver-2.1.0-dose3-6.patch +++ /dev/null @@ -1,526 +0,0 @@ -https://github.com/ocaml/opam/commit/9082b989f1c039a006fd58672de41f620a330e80 -https://github.com/ocaml/opam/commit/2e03a20abedb40cccb5295361649c64a8df46505 - -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: 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 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) - 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 ()); 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 * int package_map * conflict_case -@@ -463,7 +463,7 @@ let strong_and_weak_deps u deps = - (* From a CUDF dependency CNF, extract the set of packages that can possibly be -part of a solution. - -- This is much finer than [Common.CudfAdd.resolve_deps] which doesn't handle -+ This is much finer than [Dose_common.CudfAdd.resolve_deps] which doesn't handle -conjunctions of versions (see [Graph.of_universe] below) *) - let dependency_set u deps = - let strong_deps, weak_deps = strong_and_weak_deps u deps in -@@ -517,18 +517,18 @@ let _rec_strong_dependency_set u deps = - module Graph = struct - - module PG = struct --include Algo.Defaultgraphs.PackageGraph.G -+include Dose_algo.Defaultgraphs.PackageGraph.G - let succ g v = - try succ g v - with e -> OpamStd.Exn.fatal e; [] - end - -- module PO
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/, dev-ml/opam-solver/files/
commit: 7e71a5c252b35f23048b617671b15e82e54f3dc9 Author: Sam James gentoo org> AuthorDate: Sat Oct 2 05:51:11 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 2 21:10:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e71a5c2 dev-ml/opam-solver: add 2.1.0 Signed-off-by: Sam James gentoo.org> dev-ml/opam-solver/Manifest| 2 + .../files/opam-solver-2.1.0-dose3-6.patch | 526 + dev-ml/opam-solver/opam-solver-2.1.0.ebuild| 46 ++ 3 files changed, 574 insertions(+) diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest index a8c97c7a26f..0b145947da0 100644 --- a/dev-ml/opam-solver/Manifest +++ b/dev-ml/opam-solver/Manifest @@ -1,2 +1,4 @@ DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22 +DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608 +DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf diff --git a/dev-ml/opam-solver/files/opam-solver-2.1.0-dose3-6.patch b/dev-ml/opam-solver/files/opam-solver-2.1.0-dose3-6.patch new file mode 100644 index 000..fd613125eed --- /dev/null +++ b/dev-ml/opam-solver/files/opam-solver-2.1.0-dose3-6.patch @@ -0,0 +1,526 @@ +https://github.com/ocaml/opam/commit/9082b989f1c039a006fd58672de41f620a330e80 +https://github.com/ocaml/opam/commit/2e03a20abedb40cccb5295361649c64a8df46505 + +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: +--- 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 +--- 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) + +--- 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 ()); +--- 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
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: c5324d0c0270c3811d06ca17b32d71f5393434df
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 19:15:52 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 19:15:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5324d0c
dev-ml/opam-solver: Stabilize 2.0.8-r1 ppc, #804780
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index 627133b6af9..29491beddbd 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: c32f2e8ee46208ac2388b997608945839b0f77ab
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 19:15:29 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 19:15:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32f2e8e
dev-ml/opam-solver: Stabilize 2.0.8-r1 arm, #804780
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index 90bf679f755..7e7733021c4 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 407cb300493921a928625552c0c127e1722a74c8
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 19:15:40 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 19:15:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=407cb300
dev-ml/opam-solver: Stabilize 2.0.8-r1 ppc64, #804780
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index 7e7733021c4..627133b6af9 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 85aa2ec1d9a1ea9bf41a0ad2ed8464318ad43213
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 19:15:17 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 19:15:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85aa2ec1
dev-ml/opam-solver: Stabilize 2.0.8-r1 arm64, #804780
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index ca5317fcd7d..90bf679f755 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 8995c89d4906cb4d633b80109c1750f04a213c3b
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Oct 1 18:55:48 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Oct 1 18:55:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8995c89d
dev-ml/opam-solver: build with ocaml-4.12
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 4
dev-ml/opam-solver/opam-solver-2.0.9.ebuild| 4
2 files changed, 8 insertions(+)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index aa993e87c76..4a28e3ba255 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
(flags (:standard -warn-error -3-9-33
EOF
}
+
+src_compile() {
+ dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index aa993e87c76..4a28e3ba255 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
(flags (:standard -warn-error -3-9-33
EOF
}
+
+src_compile() {
+ dune build @install --profile release || die
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 096dd24e113cd68c800dedb5bc2fc28199932753
Author: Sam James gentoo org>
AuthorDate: Wed Jul 28 02:21:03 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 28 02:21:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=096dd24e
dev-ml/opam-solver: add 2.0.9
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/Manifest | 1 +
dev-ml/opam-solver/opam-solver-2.0.9.ebuild | 42 +
2 files changed, 43 insertions(+)
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 6022b2986d9..a8c97c7a26f 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1 +1,2 @@
DIST opam-2.0.8.tar.gz 643221 BLAKE2B
66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2
SHA512
14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+DIST opam-2.0.9.tar.gz 644429 BLAKE2B
d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659
SHA512
0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
new file mode 100644
index 000..aa993e87c76
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz ->
opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~dev-ml/opam-format-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+ >=dev-ml/mccs-1.1.4:=
+ >=dev-ml/dose3-6.0:=
+ dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/opam-client )"
+
+# Cherry-picked from
https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+(dev
+ (flags (:standard -warn-error -3-9-33)))
+(release
+ (flags (:standard -warn-error -3-9-33
+ EOF
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 11ae5e5600ccf7a674b46fa2b943755834e5fbf8
Author: Sam James gentoo org>
AuthorDate: Wed Jul 28 01:47:45 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 28 01:47:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ae5e56
dev-ml/opam-solver: Keyword 2.0.8-r1 x86, #788406
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index 3241b232186..aa993e87c76 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 72c76ff18ba74f2f2470b2db61f7326d419369fd
Author: Sam James gentoo org>
AuthorDate: Tue Jun 8 04:12:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 8 04:12:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c76ff1
dev-ml/opam-solver: restore keywords for arm/arm64/ppc/ppc64
Bug: https://bugs.gentoo.org/794844
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index d520ec1b78c..3241b232186 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/, dev-ml/opam-solver/files/
commit: 44a31e3306b4435bc9250118a8f36c2c8b75bad1
Author: Hank Leininger korelogic com>
AuthorDate: Wed May 5 17:33:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 6 23:55:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a31e33
dev-ml/opam-solver: 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.18, Repoman-3.0.3
Signed-off-by: Sam James gentoo.org>
.../files/debian-Port-to-Dose3-6.0.1.patch | 142 +
dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild | 42 ++
2 files changed, 184 insertions(+)
diff --git a/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000..a8af27416df
--- /dev/null
+++ b/dev-ml/opam-solver/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 call_external_solver command ~criteria ?timeout (_,
universe,_ as cudf) =
+
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 5b2d508a7417a663ca7cdd3552a18cbe1fc6647a
Author: Sam James gentoo org>
AuthorDate: Sun Mar 14 00:59:13 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 15 04:01:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2d508a
dev-ml/opam-solver: drop 2.0.7-r1
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/Manifest| 1 -
dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild | 40 --
2 files changed, 41 deletions(-)
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 39fe274747d..6022b2986d9 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,2 +1 @@
-DIST opam-2.0.7.tar.gz 636708 BLAKE2B
2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d
SHA512
2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
DIST opam-2.0.8.tar.gz 643221 BLAKE2B
66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2
SHA512
14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
diff --git a/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
deleted file mode 100644
index 3613f874ac6..000
--- a/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz ->
opam-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ~dev-ml/opam-format-${PV}:=
- dev-ml/opam-file-format:=
- dev-ml/re:=
- >=dev-ml/mccs-1.1.4:=
- dev-ml/dose3:=
- dev-ml/cudf:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-ml/opam-client )"
-
-S="${WORKDIR}/opam-${PV/_/-}"
-
-src_prepare() {
- default
- cat <<- EOF >> "${S}/dune"
- (env
-(dev
- (flags (:standard -warn-error -3-9-33)))
-(release
- (flags (:standard -warn-error -3-9-33
- EOF
-}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 9229c61f0adc6bb9995d1dad2f7737ccaed98d16
Author: Sam James gentoo org>
AuthorDate: Sun Mar 14 00:44:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 14 00:47:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9229c61f
dev-ml/opam-solver: Stabilize 2.0.8 arm64, #772833
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
index f6fe36b4e35..65a72574eb5 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 1569c37834e16e690b0838c9dff6fb9fe0dae809
Author: Sam James gentoo org>
AuthorDate: Sat Mar 13 14:05:18 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 13 14:05:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1569c378
dev-ml/opam-solver: Stabilize 2.0.8 ppc64, #772833
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
index f1e3fb60b9f..23d145fa85a 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: f75792cf25ff10ec9b57e3ca1ff31706fc606c71
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 4 14:28:06 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 4 14:28:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75792cf
dev-ml/opam-solver: 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-solver/opam-solver-2.0.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
index 6096c02041a..f1e3fb60b9f 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 6e1c4e00341f2e68b864ab0b4919aca12b5edb68
Author: Sam James gentoo org>
AuthorDate: Thu Feb 25 17:54:14 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 25 17:54:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1c4e00
dev-ml/opam-solver: Stabilize 2.0.8 x86, #772833
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
index 55a7dfe8fa6..6096c02041a 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: fce99c278f12740a4dbd3b8bceed8006299f79bc
Author: Sam James gentoo org>
AuthorDate: Thu Feb 25 13:09:09 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 25 13:09:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce99c27
dev-ml/opam-solver: Stabilize 2.0.8 ppc, #772833
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
index 5dbff3d50da..55a7dfe8fa6 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 517c72fa361e32d88166d84e2c2fe434aae622f1
Author: Sam James gentoo org>
AuthorDate: Mon Feb 8 17:19:49 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 8 17:20:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517c72fa
dev-ml/opam-solver: fix deps
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
.../{opam-solver-2.0.7.ebuild => opam-solver-2.0.7-r1.ebuild} | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
similarity index 87%
rename from dev-ml/opam-solver/opam-solver-2.0.7.ebuild
rename to dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
index 9183ce40afd..3613f874ac6 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.7-r1.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
@@ -16,9 +16,9 @@ IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
RDEPEND="
- dev-ml/opam-format:=
- dev-ml/opam-file-format:=
- dev-ml/re:=
+ ~dev-ml/opam-format-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
>=dev-ml/mccs-1.1.4:=
dev-ml/dose3:=
dev-ml/cudf:=
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: b41fb316c368b0ed33e2f066fd8e95d191461d44
Author: Sam James gentoo org>
AuthorDate: Mon Feb 8 17:03:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 8 17:20:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41fb316
dev-ml/opam-solver: 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-solver/Manifest | 1 +
dev-ml/opam-solver/opam-solver-2.0.8.ebuild | 39 +
2 files changed, 40 insertions(+)
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index db4db56c08e..39fe274747d 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1 +1,2 @@
DIST opam-2.0.7.tar.gz 636708 BLAKE2B
2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d
SHA512
2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
+DIST opam-2.0.8.tar.gz 643221 BLAKE2B
66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2
SHA512
14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
new file mode 100644
index 000..5dbff3d50da
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam;
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz ->
opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~dev-ml/opam-format-${PV}:=
+ dev-ml/opam-file-format:=
+ dev-ml/re:=
+ >=dev-ml/mccs-1.1.4:=
+ dev-ml/dose3:=
+ dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ml/opam-client )"
+
+src_prepare() {
+ default
+ cat <<- EOF >> "${S}/dune"
+ (env
+(dev
+ (flags (:standard -warn-error -3-9-33)))
+(release
+ (flags (:standard -warn-error -3-9-33
+ EOF
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: 8e0f4429570433d96cc196c496dc794dd61df067 Author: Sam James gentoo org> AuthorDate: Mon Feb 8 17:03:45 2021 + Commit: Sam James gentoo org> CommitDate: Mon Feb 8 17:20:54 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0f4429 dev-ml/opam-solver: add ml@ Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> dev-ml/opam-solver/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/dev-ml/opam-solver/metadata.xml b/dev-ml/opam-solver/metadata.xml index 970e090f0df..856df00497e 100644 --- a/dev-ml/opam-solver/metadata.xml +++ b/dev-ml/opam-solver/metadata.xml @@ -1,6 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> + + m...@gentoo.org + ML + gie...@gentoo.org Mark Wright
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: e1fdbffc5bc87d8e02ff4e9cab0f4390507bae7a
Author: Sam James gentoo org>
AuthorDate: Sat Oct 17 02:29:15 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 17 02:29:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fdbffc
dev-ml/opam-solver: Keyword 2.0.7 x86, #748576
Signed-off-by: Sam James gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
index 68547fe89e5..e65bfa33500 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.ta
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-solver/
commit: f679bc1d22e7adf9fc1c23cc1af9a80d44731334
Author: Mark Wright gentoo org>
AuthorDate: Thu Oct 15 12:02:54 2020 +
Commit: Mark Wright gentoo org>
CommitDate: Thu Oct 15 12:20:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f679bc1d
dev-ml/opam-solver: Fix QA MissingTestRestrict
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Mark Wright gentoo.org>
dev-ml/opam-solver/opam-solver-2.0.7.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
b/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
index 392000ef9f2..68547fe89e5 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64"
IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-ml/opam-format:=
