Verison bump. Fixes FEATURES=test case (bug #294306 by Diego Elio Pettenò)

(Portage version: 2.2.0_alpha77_p1/cvs/Linux x86_64)

2 files changed, 39 insertions, 12 deletions

diff --git a/dev-haskell/missingh/ChangeLog b/dev-haskell/missingh/ChangeLog
index 86b74becba29..a7d52d8d2485 100644
--- a/dev-haskell/missingh/ChangeLog
+++ b/dev-haskell/missingh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/missingh
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.16 2010/08/09 17:46:14 kolmodin Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.17 2011/12/04 18:20:15 slyfox Exp $
+
+*missingh-1.1.1.0 (04 Dec 2011)
+
+  04 Dec 2011; Sergei Trofimovich <slyfox@gentoo.org> +missingh-1.1.1.0.ebuild,
+  -missingh-1.1.0.3.ebuild:
+  Verison bump. Fixes FEATURES=test case (bug #294306 by Diego Elio Pettenò)
 
   09 Aug 2010; Lennart Kolmodin <kolmodin@gentoo.org>
   missingh-1.1.0.3.ebuild:
diff --git a/dev-haskell/missingh/missingh-1.1.0.3.ebuild b/dev-haskell/missingh/missingh-1.1.1.0.ebuild
index ccbe43f1c83d..3fe1f8911ce4 100644
--- a/dev-haskell/missingh/missingh-1.1.0.3.ebuild
+++ b/dev-haskell/missingh/missingh-1.1.1.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-1.1.0.3.ebuild,v 1.2 2010/08/09 17:46:14 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-1.1.1.0.ebuild,v 1.1 2011/12/04 18:20:14 slyfox Exp $
 
-CABAL_FEATURES="bin lib profile haddock"
-inherit haskell-cabal
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit eutils haskell-cabal
 
 MY_PN="MissingH"
 MY_P="${MY_PN}-${PV}"
@@ -15,7 +17,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
+IUSE="test"
 
 # testpack dependency is a workaround for cabal-1.8 bug, which pulls
 # depends even for 'Buildable: false' target
@@ -29,18 +31,37 @@ RDEPEND=">=dev-lang/ghc-6.10
 
 DEPEND=">=dev-haskell/cabal-1.2.3
 		virtual/libiconv
-		${RDEPEND}"
+		${RDEPEND}
+		test? ( dev-haskell/testpack
+			dev-haskell/quickcheck:1
+			dev-haskell/hunit )"
 
 # libiconv is needed for the trick below to make it compile with ghc-6.12
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack $A
-	cd "${S}"
-
+src_prepare() {
 	# (non-ASCII non-UTF-8 source breaks hscolour)
 	cd src/System/Time
 	mv ParseDate.hs ParseDate.hs.ISO-8859-1
 	iconv -f ISO-8859-1 -t UTF-8 -c ParseDate.hs.ISO-8859-1 > ParseDate.hs || die "unable to recode ParseDate.hs to UTF-8"
 }
+
+src_configure() {
+	cabal_src_configure $(cabal_flag test buildtests)
+}
+
+src_test() {
+	# default tests
+	haskell-cabal_src_test || die "cabal test failed"
+
+	# built custom tests
+	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
+}
+
+src_install() {
+	cabal_src_install
+
+	# if tests were enabled, make sure the unit test driver is deleted
+	rm -f "${D}/usr/bin/runtests"
+}