Version bump. Compatible with ghc-7.4 (fixes build breakage in bug #423499 by Diego Elio Pettenò).

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

3 files changed, 19 insertions, 33 deletions

diff --git a/dev-haskell/uulib/ChangeLog b/dev-haskell/uulib/ChangeLog
index a43fec2c00e5..7e4418feed54 100644
--- a/dev-haskell/uulib/ChangeLog
+++ b/dev-haskell/uulib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/uulib
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/ChangeLog,v 1.20 2011/12/18 19:57:19 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/ChangeLog,v 1.21 2012/06/27 20:45:25 slyfox Exp $
+
+*uulib-0.9.14 (27 Jun 2012)
+
+  27 Jun 2012; Sergei Trofimovich <slyfox@gentoo.org> +uulib-0.9.14.ebuild,
+  -uulib-0.9.10.ebuild, -uulib-0.9.2.ebuild:
+  Version bump. Compatible with ghc-7.4 (fixes build breakage in bug #423499 by
+  Diego Elio Pettenò).
 
   18 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> uulib-0.9.12.ebuild:
   x86 stable wrt bug #393775
diff --git a/dev-haskell/uulib/uulib-0.9.10.ebuild b/dev-haskell/uulib/uulib-0.9.14.ebuild
index 280736f9f8b6..4e09c0a4697d 100644
--- a/dev-haskell/uulib/uulib-0.9.10.ebuild
+++ b/dev-haskell/uulib/uulib-0.9.14.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.10.ebuild,v 1.2 2010/07/12 13:48:38 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.14.ebuild,v 1.1 2012/06/27 20:45:25 slyfox Exp $
 
-CABAL_FEATURES="lib profile haddock"
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
 inherit haskell-cabal
 
 DESCRIPTION="Haskell Utrecht Tools Library"
 HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
 SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.6.1"
+RDEPEND=">=dev-lang/ghc-6.10.1"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.1"
+		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/uulib/uulib-0.9.2.ebuild b/dev-haskell/uulib/uulib-0.9.2.ebuild
deleted file mode 100644
index a1719089166b..000000000000
--- a/dev-haskell/uulib/uulib-0.9.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.2.ebuild,v 1.11 2007/12/13 05:50:07 dcoutts Exp $
-
-CABAL_FEATURES="haddock lib"
-inherit base haskell-cabal
-
-DESCRIPTION="The Utrecht University parsing, printing and DData libraries"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem"
-SRC_URI="http://abaris.zoo.cs.uu.nl:8080/wiki/pub/HUT/Download/${P}-src.tar.gz"
-LICENSE="LGPL-2.1-UUST"
-SLOT="0"
-
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.2.2"
-
-src_unpack() {
-	base_src_unpack
-
-	# GHC 6.6 is stricter in some class instance stuff
-	sed -i 's/Extensions:/Extensions: UndecidableInstances/' "${S}/uulib.cabal"
-	echo "ghc-options: -fglasgow-exts" >> "${S}/uulib.cabal"
-}