Fixed bad inherit (bug #71461), and added new version based on ghc-package eclass (bug #69270).

5 files changed, 60 insertions, 17 deletions

diff --git a/dev-haskell/c2hs/ChangeLog b/dev-haskell/c2hs/ChangeLog
index 335dbea6f699..e98f07855704 100644
--- a/dev-haskell/c2hs/ChangeLog
+++ b/dev-haskell/c2hs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/c2hs
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.3 2004/09/28 00:25:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.4 2004/11/17 13:35:24 kosmikus Exp $
+
+*c2hs-0.13.4 (17 Nov 2004)
+
+  17 Nov 2004; Andres Loeh <kosmikus@gentoo.org> c2hs-0.13.1.ebuild,
+  +c2hs-0.13.4.ebuild:
+  Fixed bad inherit (bug #71461), and added new version based on ghc-package
+  eclass (bug #69270).
 
   28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Gentoo Technologies, Inc. -> Gentoo Foundation
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 755377c05774..acfb32c88d8d 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 babf145fa2a1bf1af170c2aa19a7fb6e ChangeLog 533
-MD5 44797121b59258c1a15e8de5f2ed7003 c2hs-0.13.1.ebuild 1246
+MD5 d2e776d8903fde40dbe4dd6ecd3413ed c2hs-0.13.4.ebuild 1145
+MD5 d91131049b84c57f093c18ab074f929f c2hs-0.13.1.ebuild 1228
+MD5 ef141e479e7eaac915608b9643cee5cb ChangeLog 754
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 553c80abca37c62b17c9e593c4ffae4e files/digest-c2hs-0.13.1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBWK9rI1lqEGTUzyQRAqe8AJ4rElwLTlU2HU9tIiaulif8wqP0HACgiPKf
-+2YWqF75qCkXmdc6vEez41s=
-=3xaM
------END PGP SIGNATURE-----
+MD5 dc62b4df81f84c2afb705bb38bcf0888 files/digest-c2hs-0.13.4 63
diff --git a/dev-haskell/c2hs/c2hs-0.13.1.ebuild b/dev-haskell/c2hs/c2hs-0.13.1.ebuild
index 22cca24ddf56..2a7c51fdfe37 100644
--- a/dev-haskell/c2hs/c2hs-0.13.1.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.13.1.ebuild,v 1.2 2004/08/24 09:25:33 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.13.1.ebuild,v 1.3 2004/11/17 13:35:24 kosmikus Exp $
 
 DESCRIPTION="An interface generator for Haskell"
 HOMEPAGE="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/"
@@ -8,8 +8,6 @@ SRC_URI="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-inherit base
-
 KEYWORDS="~x86"
 
 IUSE=""
@@ -17,7 +15,7 @@ IUSE=""
 DEPEND=">=virtual/ghc-6.2"
 
 src_unpack() {
-	base_src_unpack
+	unpack ${A}
 	# package config file apparently missing haskell98 dependency
 	sed -i "s:lang\":lang\",\"haskell98\":" ${S}/c2hs/c2hs.conf.in
 }
diff --git a/dev-haskell/c2hs/c2hs-0.13.4.ebuild b/dev-haskell/c2hs/c2hs-0.13.4.ebuild
new file mode 100644
index 000000000000..886972eab142
--- /dev/null
+++ b/dev-haskell/c2hs/c2hs-0.13.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.13.4.ebuild,v 1.1 2004/11/17 13:35:24 kosmikus Exp $
+
+inherit ghc-package
+
+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"
+
+IUSE=""
+
+DEPEND=">=virtual/ghc-6.0"
+
+src_unpack() {
+	unpack ${A}
+	# don't add ghc version to libdir
+	sed -i 's:-$(PCKVERSION)/$(SYS)::' ${S}/mk/config.mk.in \
+		|| die "config.mk.in patch didn't apply"
+	sed -i 's:-@C2HS_VERSION@/@SYS@::' ${S}/c2hs/c2hs.conf.in \
+		|| die "c2hs.conf.in patch didn't apply"
+}
+
+src_compile() {
+	econf \
+		--disable-add-package \
+		--libdir=$(ghc-libdir) \
+		|| die "configure failed"
+
+	# tested -j2; doesn't work
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	cp ${D}/$(ghc-libdir)/c2hs/c2hs.conf ${S}/$(ghc-localpkgconf)
+	ghc-makeghcilib ${D}/$(ghc-libdir)/c2hs/libc2hs.a
+	ghc-install-pkg
+}
+
diff --git a/dev-haskell/c2hs/files/digest-c2hs-0.13.4 b/dev-haskell/c2hs/files/digest-c2hs-0.13.4
new file mode 100644
index 000000000000..ebf58f45acac
--- /dev/null
+++ b/dev-haskell/c2hs/files/digest-c2hs-0.13.4
@@ -0,0 +1 @@
+MD5 a6c8a3b164c8abe944e762a732d03779 c2hs-0.13.4.tar.gz 372471