Fixed bug #227519 (missing dev-haskell/parsec dep). Fixed parsec constraints, fixed...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-haskell/wash/ChangeLog b/dev-haskell/wash/ChangeLog
index ebd8adc55874cf6314331d91e09b1fb521911abf..895f55e3d18da40e0df680274e052cebb01e5078 100644 (file)
--- a/dev-haskell/wash/ChangeLog
+++ b/dev-haskell/wash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/wash
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.14 2008/01/26 20:17:16 dcoutts Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.15 2010/07/12 14:23:37 slyfox Exp $
+
+  12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> wash-2.12.ebuild,
+  +files/wash-2.12-ghc-io.patch:
+  Fixed bug #227519 (missing dev-haskell/parsec dep). Thanks to Evil Compile
+  Person <bugs@dev.gentooexperimental.org> for the report and thanks to
+  Sebastian Magrí <sebasmagri@gmail.com> for the fix.
 
   26 Jan 2008; Duncan Coutts <dcoutts@gentoo.org>
   -files/wash-2.5.6-ghc66.patch, -wash-2.0.6.ebuild, -wash-2.3.1.ebuild,

diff --git a/dev-haskell/wash/Manifest b/dev-haskell/wash/Manifest
index 25c526746c182ab0b1e95e02374401d084294b86..7cea286cc297da40f27fe12fc3cc62850ce4185f 100644 (file)
--- a/dev-haskell/wash/Manifest
+++ b/dev-haskell/wash/Manifest
@@ -1,4 +1,5 @@
+AUX wash-2.12-ghc-io.patch 397 RMD160 a71e336cb18f2bf6da45d4a6b962550d5f841523 SHA1 456b6f17de2014f376ac10164dfb9718770f6e5c SHA256 3a62f87522b18056cf4eae30fe359add13da0e881b4e3aebf108a267db7b1a19
 DIST WashNGo-2.12.tgz 337362 RMD160 53f0221345ae1de502991f17159cf8ecda84a9f3 SHA1 0a12cfdc6cda2bbb0507ab06aae2864ed6a210ca SHA256 3f3f9724cbab24cbc45816be12c503064020cc9ffd585069eb835e290c10ccb7
-EBUILD wash-2.12.ebuild 1698 RMD160 e991fd43fcdde6bcba0e5e80bc1e6c73009511ef SHA1 aec4475689937f8aab94d9c3cf3f42434305befe SHA256 d5667cfcfce2d2cd52fce1a5188f7b5a0c443987cd53b2035aa494ecc9d6a9ec
-MISC ChangeLog 2362 RMD160 6906b6854d816589be44be78fec44f79a93b7d17 SHA1 cd310aca688d74574938cd2a16ec06b912695b94 SHA256 6467d0277a88ecb29f0f02c8be87a5f16f975b62b227cf16dfe4d051ca1704b0
+EBUILD wash-2.12.ebuild 1869 RMD160 73fc4eee56c1e7f27853252b54000f0524813eef SHA1 634e09b550c43b89ebd5e26438880bc169f06a5c SHA256 1bbdadb3022922f17c6c02165e235da821e8b288610889f361716c54138dcb24
+MISC ChangeLog 2671 RMD160 2728413922e7881a72348741389e3b829775d946 SHA1 3aa92de95f519a55f9c78305fbe0965a1af3e37a SHA256 311009e44de35660e8f5a131058f6ca8fa646517a10cde7c8c9a8449e99405e8
 MISC metadata.xml 285 RMD160 15988fa26c91d66e822368f192c0ab541dbf1853 SHA1 e2ab5e4901e7d4fd8ad32143b781d8942b4c3dd4 SHA256 7a662b130d6c54436af26de89f516ebb376b381a03cccd2b4e339b86f0d16f7c

diff --git a/dev-haskell/wash/files/wash-2.12-ghc-io.patch b/dev-haskell/wash/files/wash-2.12-ghc-io.patch
new file mode 100644 (file)
index 0000000..fd8227e
--- /dev/null
+++ b/dev-haskell/wash/files/wash-2.12-ghc-io.patch
@@ -0,0 +1,13 @@
+diff --git a/WASH/Utility/BulkIO.hs b/WASH/Utility/BulkIO.hs
+index 2828bf4..fe8543f 100644
+--- a/WASH/Utility/BulkIO.hs
++++ b/WASH/Utility/BulkIO.hs
+@@ -6,7 +6,7 @@ import Ptr
+ import CString
+ import CTypes
+ import Foreign.Marshal.Alloc (mallocBytes, free)
+-import GHC.IO (hGetBuf, hPutBuf)
++import System.IO (hGetBuf, hPutBuf)
+                  
+ rawGetBytes :: Handle -> Int -> IO String
+ rawGetBytes h n =

diff --git a/dev-haskell/wash/wash-2.12.ebuild b/dev-haskell/wash/wash-2.12.ebuild
index aad1072cce05d97a882e3baffd5721449616e284..edc58454be02298c262c3a85206d068065328f49 100644 (file)
--- a/dev-haskell/wash/wash-2.12.ebuild
+++ b/dev-haskell/wash/wash-2.12.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.12.ebuild,v 1.1 2007/12/13 17:33:09 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.12.ebuild,v 1.2 2010/07/12 14:23:37 slyfox Exp $
+
+EAPI=1
 
 CABAL_FEATURES="profile haddock lib bin"
-inherit haskell-cabal check-reqs
+inherit check-reqs eutils haskell-cabal
 
 MY_PN="WashNGo"
 MY_P="${MY_PN}-${PV}"
@@ -18,6 +20,7 @@ KEYWORDS="~amd64 ~x86 ~sparc"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.6
+               dev-haskell/parsec:0
                dev-haskell/regex-compat"
 
 S="${WORKDIR}/${MY_P}"
@@ -37,7 +40,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-       unpack "${A}"
+       unpack ${A}
 
        cabal-mksetup
        sed -i -e "/Extensions/aGhc-Options: -O +RTS -M${CHECKREQS_MEMORY}m -RTS" \
@@ -51,6 +54,14 @@ src_unpack() {
                        ,containers' \
                "${S}/WASH.cabal"
        fi
+
+       # dislikes parsec-3
+       sed -i -e 's/parsec/parsec < 3/' \
+               "${S}/WASH.cabal"
+
+       cd "${S}"
+       epatch "${FILESDIR}/wash-2.12-ghc-io.patch"
+
 }
 
 src_install() {