[gentoo-commits] repo/gentoo:master commit in: dev-haskell/transformers-compat/

[Sergei Trofimovich]

commit:     abd62b5cbd3b0d322f310e6f546479e4b1caafc8
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 14:27:00 2015 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 14:27:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd62b5c

dev-haskell/transformers-compat: derive transformers flag, bug #560974

Bug: https://bugs.gentoo.org/show_bug.cgi?id=560974

Package-Manager: portage-2.2.22

 .../transformers-compat-0.4.0.4.ebuild                   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
index ae1319e..483ff7a 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
@@ -17,10 +17,10 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
-IUSE="+three"
+IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
-	three? ( >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] )
+	>=dev-haskell/mtl-2.1:=[profile?]
 	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
 "
 DEPEND="${RDEPEND}
@@ -28,8 +28,16 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
+	local tf_arg=()
+
+	has_version '=dev-haskell/transformers-0.3*' && \
+		tf_arg+=(--flag=three)
+
+	has_version '=dev-haskell/transformers-0.4*' && \
+		tf_arg+=(--flag=-three)
+
 	haskell-cabal_src_configure \
 		--flag=mtl \
-		$(cabal_flag three three) \
-		--flag=-two
+		--flag=-two \
+		${tf_arg[@]}
 }