New version.

(Portage version: 2.0.51.22-r3)

6 files changed, 76 insertions, 3 deletions

diff --git a/dev-haskell/c2hs/ChangeLog b/dev-haskell/c2hs/ChangeLog
index 3a07d52978fc..795f0376033d 100644
--- a/dev-haskell/c2hs/ChangeLog
+++ b/dev-haskell/c2hs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/c2hs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.7 2005/05/04 11:02:25 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.8 2005/12/05 13:20:36 dcoutts Exp $
+
+*c2hs-0.14.3 (05 Dec 2005)
+
+  05 Dec 2005; <duncan@gentoo.org> +files/cabalfix.patch,
+  +files/setupfix.patch, +c2hs-0.14.3.ebuild:
+  New version.
 
   04 May 2005; David Holm <dholm@gentoo.org> c2hs-0.13.4.ebuild:
   Added to ~ppc.
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 545a900a2037..273ac8061c19 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,6 +1,10 @@
-MD5 a3e7966b490a8c3e03decf3eaf8a7a96 ChangeLog 969
+MD5 bea983380fcd72dd87dac6c435a137fd c2hs-0.13.4.ebuild 1174
 MD5 8e59b2e9d91b7f046ac0e83c5f6e977b c2hs-0.13.1.ebuild 1248
+MD5 a3e7966b490a8c3e03decf3eaf8a7a96 ChangeLog 969
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 bea983380fcd72dd87dac6c435a137fd c2hs-0.13.4.ebuild 1174
+MD5 c538d93a70e57b73e8a933b040f821f3 c2hs-0.14.3.ebuild 718
+MD5 2d24b3a7b5d3d27084880a6faa45b326 files/setupfix.patch 750
+MD5 0df0f5912ce03cc5ed32d186ecb1e070 files/cabalfix.patch 471
 MD5 553c80abca37c62b17c9e593c4ffae4e files/digest-c2hs-0.13.1 63
 MD5 dc62b4df81f84c2afb705bb38bcf0888 files/digest-c2hs-0.13.4 63
+MD5 c43dd88a64b4d7717ef0fa3969851d23 files/digest-c2hs-0.14.3 63
diff --git a/dev-haskell/c2hs/c2hs-0.14.3.ebuild b/dev-haskell/c2hs/c2hs-0.14.3.ebuild
new file mode 100644
index 000000000000..dea4e216f940
--- /dev/null
+++ b/dev-haskell/c2hs/c2hs-0.14.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.14.3.ebuild,v 1.1 2005/12/05 13:20:36 dcoutts Exp $
+
+inherit base eutils haskell-cabal
+
+DESCRIPTION="An interface generator for Haskell"
+HOMEPAGE="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/"
+SRC_URI="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+
+DEPEND=">=virtual/ghc-6.0"
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/setupfix.patch"
+	epatch "${FILESDIR}/cabalfix.patch"
+}
+src_install() {
+	cabal_src_install
+	exeinto /usr
+	dobin c2hs/c2hs
+	insinto "/usr/lib/${P}"
+	doins "${S}/c2hs/lib/C2HS.hs"
+	exeinto "/usr/lib/${P}"
+	doexe dist/build/c2hs/c2hs
+}
diff --git a/dev-haskell/c2hs/files/cabalfix.patch b/dev-haskell/c2hs/files/cabalfix.patch
new file mode 100644
index 000000000000..4d1a09f413f5
--- /dev/null
+++ b/dev-haskell/c2hs/files/cabalfix.patch
@@ -0,0 +1,11 @@
+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/digest-c2hs-0.14.3 b/dev-haskell/c2hs/files/digest-c2hs-0.14.3
new file mode 100644
index 000000000000..1ade72700b52
--- /dev/null
+++ b/dev-haskell/c2hs/files/digest-c2hs-0.14.3
@@ -0,0 +1 @@
+MD5 f654b5950bdbeb4ddbea1fca1407ec57 c2hs-0.14.3.tar.gz 306118
diff --git a/dev-haskell/c2hs/files/setupfix.patch b/dev-haskell/c2hs/files/setupfix.patch
new file mode 100644
index 000000000000..6e70a8253e8a
--- /dev/null
+++ b/dev-haskell/c2hs/files/setupfix.patch
@@ -0,0 +1,19 @@
+--- Setup.hs	2005-07-14 09:58:25.000000000 +0200
++++ Setup.hs	2005-07-28 19:06:11.000000000 +0200
+@@ -8,15 +8,5 @@
+ import Distribution.Setup
+ import Distribution.Simple.LocalBuildInfo
+ 
+-main = defaultMainWithHooks defaultUserHooks {postInst = addWrapperAndLib}
++main = defaultMainWithHooks defaultUserHooks
+ 
+--- Install the c2hs shell script wrapper that passes the --data options as
+--- well as the `C2HS' library module.
+---
+--- * We need to do this via a shell script that has been munged by ./configure,
+---   as Cabal doesn't give us enough info (eg, no package name and version) to
+---   do it all in Haskell.
+---
+-addWrapperAndLib :: Args -> InstallFlags -> LocalBuildInfo -> IO ExitCode
+-addWrapperAndLib _ _ _ =
+-  system "./postInst.sh"