public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/comonad/
Date: Mon, 14 Dec 2020 18:16:52 +0000 (UTC)	[thread overview]
Message-ID: <1607969808.1a7853d2a7d3f87f1ba8df4905db71fe9b31ec85.slyfox@gentoo> (raw)

commit:     1a7853d2a7d3f87f1ba8df4905db71fe9b31ec85
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 18:16:42 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 18:16:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a7853d2

dev-haskell/comonad: unconditionally enable USEs

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/739262
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/comonad/comonad-5.0.6.ebuild | 15 ++++++++-------
 dev-haskell/comonad/metadata.xml         | 18 +-----------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/dev-haskell/comonad/comonad-5.0.6.ebuild b/dev-haskell/comonad/comonad-5.0.6.ebuild
index 553ea56cb38..a7adcec857d 100644
--- a/dev-haskell/comonad/comonad-5.0.6.ebuild
+++ b/dev-haskell/comonad/comonad-5.0.6.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +distributive,+containers
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,25 +16,25 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+containers +distributive +test-doctests"
+IUSE="+test-doctests"
 
 RESTRICT=test # broken on USE=doc
 
-RDEPEND=">=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+RDEPEND=">=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
 	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
 	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
+	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18 ) )
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag distributive distributive) \
+		--flag=containers \
+		--flag=distributive \
 		$(cabal_flag test-doctests test-doctests)
 }

diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
index 6dc7bb65e52..f27d2907afb 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -6,22 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="test-doctests">
-			Run the doctests test suite
-		</flag>
-		<flag name="containers">
-			You can disable the use of the `containers` package
-			using `-f-containers`. Disabing this is an unsupported configuration, but it
-			may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="distributive">
-			You can disable the use of the `distributive`
-			package using `-f-distributive`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Distributive`
-		</flag>
+		<flag name="test-doctests">Run the doctests test suite</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">ekmett/comonad</remote-id>
-	</upstream>
 </pkgmetadata>


             reply	other threads:[~2020-12-14 18:16 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-14 18:16 Sergei Trofimovich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-07-31  4:10 [gentoo-commits] repo/gentoo:master commit in: dev-haskell/comonad/ Sam James
2020-12-17  7:29 Sergei Trofimovich
2020-12-17  7:29 Sergei Trofimovich
2020-09-12  9:30 Sergei Trofimovich
2019-12-15 11:16 Sergei Trofimovich
2019-12-15  0:00 Sergei Trofimovich
2019-07-18  6:18 Michał Górny
2016-02-26 22:30 Sergei Trofimovich

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=1607969808.1a7853d2a7d3f87f1ba8df4905db71fe9b31ec85.slyfox@gentoo \
    --to=slyfox@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