diff options
author | Duncan Coutts <dcoutts@gentoo.org> | 2006-02-18 18:28:13 +0000 |
---|---|---|
committer | Duncan Coutts <dcoutts@gentoo.org> | 2006-02-18 18:28:13 +0000 |
commit | 69e0e9cc022b2b95d1ebed7207544fee9d3b931c (patch) | |
tree | 5a0d0f1ee5f1428614843a52baac1ead1b8cae5f /dev-haskell/c2hs | |
parent | revision bump; Fixing default vprocunhide list (diff) | |
download | historical-69e0e9cc022b2b95d1ebed7207544fee9d3b931c.tar.gz historical-69e0e9cc022b2b95d1ebed7207544fee9d3b931c.tar.bz2 historical-69e0e9cc022b2b95d1ebed7207544fee9d3b931c.zip |
Fix for building with ghc-6.2.2. Remove old unused patch.
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'dev-haskell/c2hs')
-rw-r--r-- | dev-haskell/c2hs/ChangeLog | 6 | ||||
-rw-r--r-- | dev-haskell/c2hs/Manifest | 24 | ||||
-rw-r--r-- | dev-haskell/c2hs/c2hs-0.14.5.ebuild | 3 | ||||
-rw-r--r-- | dev-haskell/c2hs/files/cabalfix.patch | 11 | ||||
-rw-r--r-- | dev-haskell/c2hs/files/ghc622inc.patch | 9 |
5 files changed, 28 insertions, 25 deletions
diff --git a/dev-haskell/c2hs/ChangeLog b/dev-haskell/c2hs/ChangeLog index 302fdddd9935..eda9b712c257 100644 --- a/dev-haskell/c2hs/ChangeLog +++ b/dev-haskell/c2hs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/c2hs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.12 2006/02/16 13:14:26 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.13 2006/02/18 18:28:13 dcoutts Exp $ + + 18 Feb 2006; <duncan@gentoo.org> -files/cabalfix.patch, + +files/ghc622inc.patch, c2hs-0.14.5.ebuild: + Fix for building with ghc-6.2.2. Remove old unused patch. 16 Feb 2006; <duncan@gentoo.org> c2hs-0.14.5.ebuild: Add "bin" to CABAL_FEATURES in preparation for pending eclass updates. diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest index fbe2ddb282f5..6e3b1765e65d 100644 --- a/dev-haskell/c2hs/Manifest +++ b/dev-haskell/c2hs/Manifest @@ -1,24 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 b5e5197bbb7709c3b1549a992c310a39 ChangeLog 1537 -RMD160 96783cb73e94e72f51c3965769f241b2c33aaa2b ChangeLog 1537 -SHA256 284c34767db93f17c8dad9f1e687acee52fb09899df545833f5dd435f5fec550 ChangeLog 1537 +MD5 d74ad04267f366e01b34eec1d95c3b7a ChangeLog 1702 +RMD160 6958a2ea8feb27a9113e84a8205e1e84244c6b22 ChangeLog 1702 +SHA256 c65b9e1147c44dad207a7bf2fe47df6fd2618e3d3c0420213bd9aebc393bf894 ChangeLog 1702 MD5 bea983380fcd72dd87dac6c435a137fd c2hs-0.13.4.ebuild 1174 RMD160 a56821d3a73f0bc403da87cd6b53786f76836ff7 c2hs-0.13.4.ebuild 1174 SHA256 b2620af84f53908b89f1f9cb1e8c834697eb517190aee3f6149965ea5f9b8185 c2hs-0.13.4.ebuild 1174 -MD5 57a227284ae887250959858d131bed12 c2hs-0.14.5.ebuild 807 -RMD160 de8328de0e0501776f2522287bb0d9e5f7178409 c2hs-0.14.5.ebuild 807 -SHA256 75602ca3c2ad1a1ddc4ac64924f3211c68a257bbc9f361b70fc35aa56ba58d23 c2hs-0.14.5.ebuild 807 -MD5 0df0f5912ce03cc5ed32d186ecb1e070 files/cabalfix.patch 471 -RMD160 357b60f0825f2d818b5513c2e432ec5b307003a1 files/cabalfix.patch 471 -SHA256 a11d4c15110daf94306d14cff889d89cf2652421ac917749cad9f7a03a9121ed files/cabalfix.patch 471 +MD5 2bb486296cf10f2ac6bdbface2c461af c2hs-0.14.5.ebuild 845 +RMD160 ab3571c54823528b13be550e32751074bac42e7c c2hs-0.14.5.ebuild 845 +SHA256 ade5ad1dfcb57f8344f965891949e529b7c520caf9833aadebed0007e1963c5e c2hs-0.14.5.ebuild 845 MD5 dc62b4df81f84c2afb705bb38bcf0888 files/digest-c2hs-0.13.4 63 RMD160 664d172286fbde5d696063713192ce023986ce2d files/digest-c2hs-0.13.4 63 SHA256 6665b879e956ae048ad975fc30adda4af122946b699997fde226c0e64291f44f files/digest-c2hs-0.13.4 63 MD5 1034cadb28123b6daaadee519205a1dc files/digest-c2hs-0.14.5 235 RMD160 aa32aceff8c460ae9de5ce106a052a6223f04c15 files/digest-c2hs-0.14.5 235 SHA256 78c6e1b10db27ff2ae47a957c0f23a17f414b3b351d307d419cf41456496b4c1 files/digest-c2hs-0.14.5 235 +MD5 c8a98ff118a4a503ff48a06c0542ea2f files/ghc622inc.patch 302 +RMD160 3862908cb8d27b9378de12481be41615e1b95430 files/ghc622inc.patch 302 +SHA256 fc40c64271a1ef0639eb5af66579d367ad4eb77f64112f3d216c8c1fb857f83e files/ghc622inc.patch 302 MD5 2d24b3a7b5d3d27084880a6faa45b326 files/setupfix.patch 750 RMD160 34ed6f2ca48d0961f1a3baede8130c9c5559da80 files/setupfix.patch 750 SHA256 0ce4c198aac2cc1f131f6548e5281cbf19bcf72986c042383ed329a703da487f files/setupfix.patch 750 @@ -28,7 +28,7 @@ SHA256 2b30834e4d9f141a1e1b63457d4af1f6a8cb6d4a47f8dd3b14e726277079769b metadata -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFD9Hq8/B0cxt+cq+wRApd1AJ0a//eQGIBuZ42udbZRgv3bjsZz2QCeLjkb -FrxuTxol0AMHcN+mKR8Dg84= -=jYjD +iD8DBQFD92dL/B0cxt+cq+wRAnL3AJ995/XU5fTN0bsu75Tv8wkUO2zMCACfe1bJ +PeHZsXZek4GKrp6eMjwdlDc= +=Deyn -----END PGP SIGNATURE----- diff --git a/dev-haskell/c2hs/c2hs-0.14.5.ebuild b/dev-haskell/c2hs/c2hs-0.14.5.ebuild index 6fa42c0ca348..ceaaed161c11 100644 --- a/dev-haskell/c2hs/c2hs-0.14.5.ebuild +++ b/dev-haskell/c2hs/c2hs-0.14.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.14.5.ebuild,v 1.3 2006/02/16 13:14:26 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.14.5.ebuild,v 1.4 2006/02/18 18:28:13 dcoutts Exp $ CABAL_FEATURES="bin" inherit base eutils haskell-cabal @@ -20,6 +20,7 @@ src_unpack() { base_src_unpack cd "${S}" epatch "${FILESDIR}/setupfix.patch" + epatch "${FILESDIR}/ghc622inc.patch" } src_install() { cabal_src_install diff --git a/dev-haskell/c2hs/files/cabalfix.patch b/dev-haskell/c2hs/files/cabalfix.patch deleted file mode 100644 index 4d1a09f413f5..000000000000 --- a/dev-haskell/c2hs/files/cabalfix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur c2hs-0.14.1.orig/c2hs.cabal c2hs-0.14.1/c2hs.cabal ---- c2hs-0.14.1.orig/c2hs.cabal 2005-07-15 14:10:47.000000000 +0000 -+++ c2hs-0.14.1/c2hs.cabal 2005-12-04 21:30:55.000000000 +0000 -@@ -15,6 +15,7 @@ - libraries. It extracts C interface information from vanilla header - files and generates marshaling and signature code in Haskell. - Category: Development tool -+Build-Depends: base, haskell98 - - Executable: c2hs - Hs-Source-Dirs: base/admin diff --git a/dev-haskell/c2hs/files/ghc622inc.patch b/dev-haskell/c2hs/files/ghc622inc.patch new file mode 100644 index 000000000000..e2030c6dc682 --- /dev/null +++ b/dev-haskell/c2hs/files/ghc622inc.patch @@ -0,0 +1,9 @@ +--- c2hs-0.14.5.orig/c2hs.cabal 2006-02-18 18:12:23.000000000 +0000 ++++ c2hs-0.14.5/c2hs.cabal 2006-02-18 13:32:47.000000000 +0000 +@@ -76,5 +76,5 @@ + C2HSConfig + Version + Extensions: ForeignFunctionInterface +-Ghc-Options: -O ++Ghc-Options: -O -Ic2hs/toplevel + C-Sources: c2hs/toplevel/c2hs_config.c |