Fixing libraries installation.

(Portage version: 2.0.51.22-r3)

4 files changed, 76 insertions, 6 deletions

diff --git a/dev-haskell/hs-plugins/ChangeLog b/dev-haskell/hs-plugins/ChangeLog
index 47d62f21430e..b779f85d415c 100644
--- a/dev-haskell/hs-plugins/ChangeLog
+++ b/dev-haskell/hs-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/hs-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/ChangeLog,v 1.7 2005/10/24 15:20:23 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/ChangeLog,v 1.8 2005/12/12 22:05:49 araujo Exp $
+
+*hs-plugins-0.9.10-r1 (12 Dec 2005)
+
+  12 Dec 2005; Luis f. Araujo <araujo@gentoo.org>
+  +hs-plugins-0.9.10-r1.ebuild:
+  Install libraries into the correct directory.
 
 *hs-plugins-0.9.10 (24 Oct 2005)
 
diff --git a/dev-haskell/hs-plugins/Manifest b/dev-haskell/hs-plugins/Manifest
index 8c5aa48cbb25..a7efb2738b5f 100644
--- a/dev-haskell/hs-plugins/Manifest
+++ b/dev-haskell/hs-plugins/Manifest
@@ -1,8 +1,10 @@
-MD5 0317a5e6d14bd22bc15d6ed12b474c3b ChangeLog 1007
-MD5 ca9b254d139eb304aefa5c8485e2a01f files/digest-hs-plugins-0.9.10 135
-MD5 cf6036e55a430934f50b03f1904f87cf files/digest-hs-plugins-0.9.6 134
-MD5 5a354330583e81ac898f6f5ec9f2dd9a files/digest-hs-plugins-0.9.8 134
-MD5 ac6c789a8e3d14cf053b00193d05a7f0 hs-plugins-0.9.10.ebuild 1538
+MD5 4ca2c06b0a742c82d0109cfac0b60076 ChangeLog 1175
 MD5 c61ca0ef9d84c675dfdefa1e1e1f33fe hs-plugins-0.9.6.ebuild 779
 MD5 1a599d524ebd834499dd7e64eaf71a4b hs-plugins-0.9.8.ebuild 1109
 MD5 271db8af4d4636c2b1ff7fcc2d903d71 metadata.xml 160
+MD5 ac6c789a8e3d14cf053b00193d05a7f0 hs-plugins-0.9.10.ebuild 1538
+MD5 e7e80aaf98dca8d68af15f55d4a53f97 hs-plugins-0.9.10-r1.ebuild 1626
+MD5 cf6036e55a430934f50b03f1904f87cf files/digest-hs-plugins-0.9.6 134
+MD5 5a354330583e81ac898f6f5ec9f2dd9a files/digest-hs-plugins-0.9.8 134
+MD5 ca9b254d139eb304aefa5c8485e2a01f files/digest-hs-plugins-0.9.10 135
+MD5 ca9b254d139eb304aefa5c8485e2a01f files/digest-hs-plugins-0.9.10-r1 135
diff --git a/dev-haskell/hs-plugins/files/digest-hs-plugins-0.9.10-r1 b/dev-haskell/hs-plugins/files/digest-hs-plugins-0.9.10-r1
new file mode 100644
index 000000000000..85172d151f3b
--- /dev/null
+++ b/dev-haskell/hs-plugins/files/digest-hs-plugins-0.9.10-r1
@@ -0,0 +1,2 @@
+MD5 501b9a2ee9da05ef65790ca4494e8da3 hs-plugins-0.9.10.tar.gz 220990
+MD5 2ba9b743f45c294bd32bd9e5ad44352b hs-plugins.html.tar.gz 24643
diff --git a/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild b/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..89c9795f644f
--- /dev/null
+++ b/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild,v 1.1 2005/12/12 22:05:49 araujo Exp $
+
+inherit ghc-package
+
+DESCRIPTION="Dynamically Loaded Haskell Plugins"
+HOMEPAGE="http://www.cse.unsw.edu.au/~dons/hs-plugins/"
+SRC_URI="ftp://ftp.cse.unsw.edu.au/pub/users/dons/${PN}/${P}.tar.gz
+	doc? ( http://www.cse.unsw.edu.au/~dons/${PN}/${PN}.html.tar.gz )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 -amd64" # currently broken on amd64
+IUSE="doc"
+
+DEPEND="virtual/ghc
+	>=dev-haskell/haskell-src-exts-0.2
+	dev-haskell/cabal"
+
+src_unpack() {
+	unpack ${A}
+	# Don't create a $(ghc-libdir)/hs-plugins/ subdirectory.
+	sed -i "s:\$(PREFIX)\/lib/hs-\$(PACKAGE):$(ghc-libdir):" ${S}/config.mk.in
+	# for package management
+	sed -i 's:\$(GHC_PKG) -u:\${GHC_PKGF} -u:' ${S}/Makefile
+
+	cabalversion=$(ghc-bestcabalversion)
+
+	sed -i "s:-package Cabal:-package ${cabalversion}:" \
+		${S}/src/plugins/Makefile
+
+	# Also specify an exact version of Cabal otherwise ghc-pkg defaults it to
+	# the minimum version which is just wrong. Should be fixed in ghc-6.4.1
+	sed -i "s/depends:\(.*\) Cabal/depends:\1 ${cabalversion}/" \
+		${S}/src/plugins/plugins.conf.in.cpp
+}
+
+src_compile() {
+	econf
+	# for package management
+	echo 'GHC_PKGF = ${GHC_PKG} --force -f '"${S}/$(ghc-localpkgconf)" >> config.mk
+	emake -j1
+}
+
+src_install() {
+	emake PREFIX=${D}/$(ghc-libdir) \
+		  LIBDIR=${D}/$(ghc-libdir) install
+	ghc-setup-pkg
+	#emake PREFIX=${D}/$(ghc-libdir) register # then we don't need --force in ghc-pkg
+	emake register
+	ghc-install-pkg
+
+	dodoc AUTHORS README TODO VERSION
+
+	if use doc; then
+		dohtml ${WORKDIR}/${PN}/*
+	fi
+}
+