New version to go with ghc-6.4.2

(Portage version: 2.1_pre9-r5)

5 files changed, 136 insertions, 1 deletions

diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index 82447b7a57e8..330293c8d6a7 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.15 2006/03/27 15:29:31 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.16 2006/05/03 22:22:30 dcoutts Exp $
+
+*cabal-1.1.4 (03 May 2006)
+
+  03 May 2006; Duncan Coutts <dcoutts@gentoo.org>
+  +files/cabal-1.1.4-make.patch, +cabal-1.1.4.ebuild:
+  New version to go with ghc-6.4.2
 
   27 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> cabal-1.1.3-r1.ebuild:
   Marked ~ia64
diff --git a/dev-haskell/cabal/cabal-1.1.4.ebuild b/dev-haskell/cabal/cabal-1.1.4.ebuild
new file mode 100644
index 000000000000..b99b42308a2b
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.1.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.4.ebuild,v 1.1 2006/05/03 22:22:30 dcoutts Exp $
+
+CABAL_FEATURES="bootstrap profile lib"
+inherit haskell-cabal eutils base
+
+DESCRIPTION="Haskell Common Architecture for Building Applications and Libraries"
+HOMEPAGE="http://haskell.org/cabal"
+SRC_URI="http://haskell.org/cabal/release/${P}/${P}.tar.gz"
+LICENSE="as-is"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="doc"
+
+DEPEND=">=virtual/ghc-6.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-make.patch"
+}
+
+src_compile() {
+	if ghc-cabal; then
+		make setup HC="$(ghc-getghc) -ignore-package Cabal"
+	else
+		make setup HC="$(ghc-getghc)"
+	fi
+	cabal-configure
+	cabal-build
+}
+
+src_install() {
+	cabal_src_install
+
+	# documentation (install directly; generation seems broken to me atm)
+	dohtml -r doc/users-guide
+	if use doc; then
+		dohtml -r doc/API
+		dohtml -r doc/pkg-spec-html
+		dodoc doc/pkg-spec.pdf
+	fi
+	dodoc changelog copyright README releaseNotes TODO
+}
+
+pkg_postinst () {
+	if ghc-cabal && ghc-package-exists "Cabal-1.0"; then
+	        ebegin "Unregistering ghc's built-in cabal "
+	        $(ghc-getghcpkg) unregister "Cabal-1.0" > /dev/null
+	        eend $?
+	fi
+	ghc-package_pkg_postinst
+}
+
diff --git a/dev-haskell/cabal/files/cabal-1.1.4-make.patch b/dev-haskell/cabal/files/cabal-1.1.4-make.patch
new file mode 100644
index 000000000000..5dc61c72bc32
--- /dev/null
+++ b/dev-haskell/cabal/files/cabal-1.1.4-make.patch
@@ -0,0 +1,66 @@
+Index: cabal-1.1.4/Makefile
+===================================================================
+--- cabal-1.1.4.orig/Makefile
++++ cabal-1.1.4/Makefile
+@@ -67,7 +67,7 @@ haddock: setup
+ 	./setup haddock
+ 
+ clean-doc:
+-	cd doc && make clean
++	cd doc && $(MAKE) clean
+ 
+ doc: haddock
+ 	docbook2html doc/Cabal.xml --output doc/users-guide
+@@ -86,11 +86,11 @@ clean-cabal:
+ 
+ clean-hunit:
+ 	-rm -f hunit-stamp hunitInstall-stamp
+-	cd tests/HUnit-1.0 && make clean
++	cd tests/HUnit-1.0 && $(MAKE) clean
+ 
+ clean-test:
+-	cd tests/A && make clean
+-	cd tests/wash2hs && make clean
++	cd tests/A && $(MAKE) clean
++	cd tests/wash2hs && $(MAKE) clean
+ 
+ remove: remove-cabal remove-hunit
+ remove-cabal:
+@@ -104,7 +104,7 @@ remove-hunit:
+ 
+ hunit: hunit-stamp
+ hunit-stamp:
+-	cd tests/HUnit-1.0 && make && ./setup configure --prefix=$(PREF) && ./setup build
++	cd tests/HUnit-1.0 && $(MAKE) && ./setup configure --prefix=$(PREF) && ./setup build
+ 	touch $@
+ 
+ hunitInstall: hunitInstall-stamp
+@@ -119,14 +119,14 @@ moduleTest:
+ 	$(HC) $(GHCFLAGS) $(ISPOSIX) -DDEBUG -odir dist/debug -hidir dist/debug -idist/debug/:src:tests/HUnit-1.0/src tests/ModuleTest.hs -o moduleTest 
+ 
+ tests: moduleTest clean
+-	cd tests/A && make clean
+-	cd tests/HUnit-1.0 && make clean
+-	cd tests/A && make
+-	cd tests/HUnit-1.0 && make
++	cd tests/A && $(MAKE) clean
++	cd tests/HUnit-1.0 && $(MAKE) clean
++	cd tests/A && $(MAKE)
++	cd tests/HUnit-1.0 && $(MAKE)
+ 
+ check:
+ 	rm -f moduleTest
+-	make moduleTest
++	$(MAKE) moduleTest
+ 	./moduleTest
+ 
+ # distribution...
+@@ -170,7 +170,7 @@ dist: haddock $(CABALBALL)
+ 	mv $(CABALBALL) $(TMPDISTLOC)
+ 	cd $(TMPDISTLOC) && tar -zxvf $(CABALBALL) && mv Cabal cabal
+ 	#mkdir $(TMPDISTLOC)/cabal/doc
+-	make doc
++	$(MAKE) doc
+ 	cp -r dist/doc/html $(TMPDISTLOC)/cabal/doc/API
+ 	cp -r doc/users-guide $(TMPDISTLOC)/cabal/doc/users-guide
+ 	cd ~/usr/doc/haskell/haskell-report/packages && docbook2html -o /tmp/pkg-spec-html pkg-spec.sgml && docbook2pdf pkg-spec.sgml -o /tmp
diff --git a/dev-haskell/cabal/files/digest-cabal-1.1.3-r1 b/dev-haskell/cabal/files/digest-cabal-1.1.3-r1
index 444d8b18b2f5..b32826824fc8 100644
--- a/dev-haskell/cabal/files/digest-cabal-1.1.3-r1
+++ b/dev-haskell/cabal/files/digest-cabal-1.1.3-r1
@@ -1 +1,3 @@
 MD5 9cf10b6067a7cedf0559bf4a3dabef3c cabal-1.1.3.tar.gz 382024
+RMD160 e361b676184d2f553cf5761c544ac4c32eefcb69 cabal-1.1.3.tar.gz 382024
+SHA256 5c45f0c5f58ba2c16140b72221798a604242f59a155a75111b4cfd31092f836c cabal-1.1.3.tar.gz 382024
diff --git a/dev-haskell/cabal/files/digest-cabal-1.1.4 b/dev-haskell/cabal/files/digest-cabal-1.1.4
new file mode 100644
index 000000000000..41384589c08e
--- /dev/null
+++ b/dev-haskell/cabal/files/digest-cabal-1.1.4
@@ -0,0 +1,3 @@
+MD5 a9adb06356c971577b93555de6ace137 cabal-1.1.4.tar.gz 406169
+RMD160 0c2b1a33af4512174cc6df6645662046427e9135 cabal-1.1.4.tar.gz 406169
+SHA256 1740abf0db8a6d18703e315a30ff81c51a06ec4a5f3a6c1927fa1530a0835b66 cabal-1.1.4.tar.gz 406169