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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Alfredo Tupone" <tupone@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/
Date: Sun, 16 Jan 2022 19:05:46 +0000 (UTC)	[thread overview]
Message-ID: <1642359934.3e7e1c884b21f81461235974f76a004501b9db4b.tupone@gentoo> (raw)

commit:     3e7e1c884b21f81461235974f76a004501b9db4b
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 19:05:34 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 19:05:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7e1c88

dev-ml/opam-format: fix test DEPs

Closes: https://bugs.gentoo.org/794664
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/opam-format/opam-format-2.0.10.ebuild   |  9 +++++++--
 dev-ml/opam-format/opam-format-2.0.8-r2.ebuild |  9 +++++++--
 dev-ml/opam-format/opam-format-2.0.8-r3.ebuild |  9 +++++++--
 dev-ml/opam-format/opam-format-2.0.9.ebuild    |  7 ++++++-
 dev-ml/opam-format/opam-format-2.1.0.ebuild    | 15 +++++++++++++--
 dev-ml/opam-format/opam-format-2.1.1.ebuild    | 15 +++++++++++++--
 6 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/dev-ml/opam-format/opam-format-2.0.10.ebuild b/dev-ml/opam-format/opam-format-2.0.10.ebuild
index ace83b9a6ae8..613461beb70d 100644
--- a/dev-ml/opam-format/opam-format-2.0.10.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.10.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,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -26,6 +27,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 # 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" )

diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
index eb552240221e..d873c3e60ab6 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r2.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,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	<dev-lang/ocaml-4.12
@@ -27,6 +28,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 src_prepare() {
 	default

diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
index 32abb96a8b97..6de06692f9c1 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r3.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,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -26,6 +27,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 # 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" )

diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild
index 0f7882b1d5e3..db8f781018d3 100644
--- a/dev-ml/opam-format/opam-format-2.0.9.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild
@@ -16,7 +16,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -26,6 +27,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 # 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" )

diff --git a/dev-ml/opam-format/opam-format-2.1.0.ebuild b/dev-ml/opam-format/opam-format-2.1.0.ebuild
index 027845d265fc..4c2a08d6886d 100644
--- a/dev-ml/opam-format/opam-format-2.1.0.ebuild
+++ b/dev-ml/opam-format/opam-format-2.1.0.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
@@ -17,7 +17,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -27,6 +28,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
 
@@ -39,4 +44,10 @@ src_prepare() {
 		 (release
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
+	sed -i \
+		-e '/wrap-build-commands/d' \
+		-e '/wrap-install-commands/d' \
+		-e '/wrap-remove-commands/d' \
+		tests/reftests/opamroot-versions.test \
+		|| die
 }

diff --git a/dev-ml/opam-format/opam-format-2.1.1.ebuild b/dev-ml/opam-format/opam-format-2.1.1.ebuild
index 027845d265fc..4c2a08d6886d 100644
--- a/dev-ml/opam-format/opam-format-2.1.1.ebuild
+++ b/dev-ml/opam-format/opam-format-2.1.1.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
@@ -17,7 +17,8 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/opam-core-${PV}:=
@@ -27,6 +28,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
 
 PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
 
@@ -39,4 +44,10 @@ src_prepare() {
 		 (release
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
+	sed -i \
+		-e '/wrap-build-commands/d' \
+		-e '/wrap-install-commands/d' \
+		-e '/wrap-remove-commands/d' \
+		tests/reftests/opamroot-versions.test \
+		|| die
 }

next             reply	other threads:[~2022-01-16 19:05 UTC|newest]

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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ace83b9a6ae dfblob:613461beb70 dfblob:eb552240221
dfblob:d873c3e60ab dfblob:32abb96a8b9 dfblob:6de06692f9c
dfblob:0f7882b1d5e dfblob:db8f781018d dfblob:027845d265f
dfblob:4c2a08d6886 dfblob:027845d265f dfblob:4c2a08d6886 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-format/" )
	(help)

Reply instructions:

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

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

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

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

  git send-email \
    --in-reply-to=1642359934.3e7e1c884b21f81461235974f76a004501b9db4b.tupone@gentoo \
    --to=tupone@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox