Fix build failure against modern ghc. Fixes bug #257888 by Laszlo Papp and others.

Package-Manager: portage-2.2.0_alpha81_p1/cvs/Linux x86_64

4 files changed, 68 insertions, 7 deletions

diff --git a/dev-haskell/uuagc/ChangeLog b/dev-haskell/uuagc/ChangeLog
index 9c3dc255d05c..557fd3c6c23c 100644
--- a/dev-haskell/uuagc/ChangeLog
+++ b/dev-haskell/uuagc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/uuagc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/ChangeLog,v 1.16 2010/07/12 13:41:29 slyfox Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/ChangeLog,v 1.17 2011/12/18 12:39:59 slyfox Exp $
+
+  18 Dec 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/uuagc-0.9.1-split-base.patch, uuagc-0.9.1.ebuild:
+  Fix build failure against modern ghc. Fixes bug #257888 by Laszlo Papp and
+  others.
 
   12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> uuagc-0.9.5.ebuild:
   Fixed bug #227517 (missing dev-haskell/mtl dep). Thanks to Evil Compile
diff --git a/dev-haskell/uuagc/Manifest b/dev-haskell/uuagc/Manifest
index 5d81c985101c..dc2feb28bd8a 100644
--- a/dev-haskell/uuagc/Manifest
+++ b/dev-haskell/uuagc/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX uuagc-0.9.1-split-base.patch 1164 RMD160 c55cca3917fb3ea3e4491753af7f2af472ebda2d SHA1 694080e52cfab563a8dfbf13d57c77ffa4aed31b SHA256 b8b921ca48b3e4d1e21ceb606019c4550211f6e4521299a43e3961779534366f
 DIST uuagc-0.9.1-src.tar.gz 150063 RMD160 a587243244c6fded52a9e332ff7adf475cfe5671 SHA1 0b617d69cfe462e2bd28405c6ca26940cc041824 SHA256 5a7ea90f1eeb1a014275c6bd3fe5ea5d1c1effd10cca7472a7253cdebc5205c4
 DIST uuagc-0.9.24.tar.gz 253310 RMD160 924936adeb330d863eaf714acc460acc617914f3 SHA1 6dfb80181a2ff4c5e7826d2f138525f10c785460 SHA256 a183d10f83f944d09693c66736072168adca78518ae7776e0d2b3f5eff762a0f
 DIST uuagc-0.9.5-src.tar.gz 254523 RMD160 cccb1e7447a8949602e7cbf9b8cae5b9759d15a5 SHA1 44154202fa5e56cb63036b606dd7d2b5474e030d SHA256 e6e8e6040aa52279fcac3dcefca7c675cccce98e8d53f59ba0d6bb19cb3425ca
-EBUILD uuagc-0.9.1.ebuild 600 RMD160 701621fd837ece038f275cde3fcc9a2fc87afe65 SHA1 31311a6b9f06607662d0963a723972a0fcc2a497 SHA256 a7e4fb8b0bfc595c4326781fce45ed4adabd290fbbd30dec474c813992244610
+EBUILD uuagc-0.9.1.ebuild 679 RMD160 0a8690da0e64ec1563432c4efd037649d13bae23 SHA1 89f84151473489754679e8a39b902c0e061b923b SHA256 6dd8c14a47f0669ef63c8a645fc5212d184bb3549f0f205aa2cfa9473846244b
 EBUILD uuagc-0.9.24.ebuild 706 RMD160 38092a296c4398b3544f91517c260a8831110189 SHA1 d45a03acf5eedb0342b24ee295c906ba557bab03 SHA256 1001a1e6cf589cb07d0c2ca279e2efdc82390c777267246ce45869a95919e5a7
 EBUILD uuagc-0.9.5.ebuild 925 RMD160 5683a3f3572e71ce37ec8ac3ab90539373540869 SHA1 28b3c9011074f7cedc5293347f9910137a33f9ce SHA256 630b6babc8e6ab0bad0ab8cb12dd4ab9a2bdb7de483058f38f23a3b9d1d80e89
-MISC ChangeLog 2169 RMD160 ddf8ffaea03767ef00f76b63b855c2695d1434dd SHA1 430aa4e6eb9804726c08eb786bf527588e1e5e2d SHA256 934062de757634ed83a96b4488337a545536f04193ca12ef4fc9f5306e3c4604
+MISC ChangeLog 2370 RMD160 b358d75b2521fa80fdf50171740f8c3732cab245 SHA1 9ec79b905f1ff834c7ab2322b1c56f0702052e54 SHA256 da918188ebb4b2da0c983248d58481c31e5513fc0437375c02e806db16081f88
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk7t4CIACgkQcaHudmEf86oNEgCfQfNCHyFBhoRyxRROrhIns/Tm
+gRkAoIKz9K2lkYHiaQYbXtkgFptWG9DO
+=aBqc
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/uuagc/files/uuagc-0.9.1-split-base.patch b/dev-haskell/uuagc/files/uuagc-0.9.1-split-base.patch
new file mode 100644
index 000000000000..214c06ea37c1
--- /dev/null
+++ b/dev-haskell/uuagc/files/uuagc-0.9.1-split-base.patch
@@ -0,0 +1,40 @@
+diff --git a/uuagc.cabal b/uuagc.cabal
+index 5012e56..281e68f 100644
+--- a/uuagc.cabal
++++ b/uuagc.cabal
+@@ -3,7 +3,7 @@ version: 0.9.1
+ license: GPL
+ license-file: LICENSE
+ maintainer: Arthur Baars <arthurb@cs.uu.nl>
+-Build-Depends: base, haskell98, uulib
++Build-Depends: base, haskell98, uulib, directory
+ 
+ Executable:     uuagc
+ Main-Is:        Ag.hs
+@@ -31,5 +31,5 @@ Other-Modules: AbstractSyntax,
+       Streaming,
+       TokenDef,
+       Transform
+-Extensions: TypeSynonymInstances       
++Extensions: TypeSynonymInstances, MultiParamTypeClasses
+ Hs-Source-Dir: src
+diff --git a/uuagc.cabal.in b/uuagc.cabal.in
+index 754b4ba..9693be5 100644
+--- a/uuagc.cabal.in
++++ b/uuagc.cabal.in
+@@ -3,7 +3,7 @@ version: @VERSION@
+ license: GPL
+ license-file: LICENSE
+ maintainer: Arthur Baars <arthurb@cs.uu.nl>
+-Build-Depends: base, haskell98, uulib
++Build-Depends: base, haskell98, uulib, directory
+ 
+ Executable:     uuagc
+ Main-Is:        Ag.hs
+@@ -31,5 +31,5 @@ Other-Modules: AbstractSyntax,
+       Streaming,
+       TokenDef,
+       Transform
+-Extensions: TypeSynonymInstances       
++Extensions: TypeSynonymInstances, MultiParamTypeClasses
+ Hs-Source-Dir: src
diff --git a/dev-haskell/uuagc/uuagc-0.9.1.ebuild b/dev-haskell/uuagc/uuagc-0.9.1.ebuild
index d8ab6b7dfda4..3575bde46c3d 100644
--- a/dev-haskell/uuagc/uuagc-0.9.1.ebuild
+++ b/dev-haskell/uuagc/uuagc-0.9.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2007 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/uuagc/uuagc-0.9.1.ebuild,v 1.12 2007/10/31 13:10:21 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/uuagc-0.9.1.ebuild,v 1.13 2011/12/18 12:39:59 slyfox Exp $
+
+EAPI="4"
 
 CABAL_FEATURES="bin"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="The Utrecht University Attribute Grammar system"
 HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem"
@@ -16,3 +18,6 @@ IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.2.2
 		>=dev-haskell/uulib-0.9.1"
+RDEPEND=""
+
+PATCHES=("${FILESDIR}"/${PN}-0.9.1-split-base.patch)