New version to go with ghc-6.4.2

Package-Manager: portage-2.1_pre9-r5

6 files changed, 169 insertions, 16 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/Manifest b/dev-haskell/cabal/Manifest
index 3b716ac5f8ee..50cfc6429df9 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,31 +1,49 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 297fdf3c849908f62219eb7492064f88 ChangeLog 1971
-RMD160 99f6c124c53de36cda50bc5483f4216813c8c951 ChangeLog 1971
-SHA256 08bad4ab59d69c01ce6f5c2faa18b07e4c25460262ba5b7e2da0c84ad475c742 ChangeLog 1971
+AUX cabal-1.1.3-ghc622.patch 678 RMD160 ed7decfd967a12476ad83892015767a37c5ce5ae SHA1 138db22abd979e08f4ff02060a30bc63d575a257 SHA256 d3524545844724687cf3377708d8cc381c06dbe71e618af884bac86361ea5479 size 678
+MD5 2e6b8d49e5fcb76309d8d67b08c53039 files/cabal-1.1.3-ghc622.patch 678
+RMD160 ed7decfd967a12476ad83892015767a37c5ce5ae files/cabal-1.1.3-ghc622.patch 678
+SHA256 d3524545844724687cf3377708d8cc381c06dbe71e618af884bac86361ea5479 files/cabal-1.1.3-ghc622.patch 678
+AUX cabal-1.1.4-make.patch 1972 RMD160 390e17aab566eadb0acda9777b6e2d36cc3bcef5 SHA1 e21972cf75fe5eabf24ea9864845228898bee0b5 SHA256 cee8833ac195f6da00bcdfdac0afe1805b44a4568b8f202f6e5f1cf591618d84 size 1972
+MD5 8d55f4a164602c00e9001cd325e89975 files/cabal-1.1.4-make.patch 1972
+RMD160 390e17aab566eadb0acda9777b6e2d36cc3bcef5 files/cabal-1.1.4-make.patch 1972
+SHA256 cee8833ac195f6da00bcdfdac0afe1805b44a4568b8f202f6e5f1cf591618d84 files/cabal-1.1.4-make.patch 1972
+DIST cabal-1.1.3.tar.gz 382024 RMD160 e361b676184d2f553cf5761c544ac4c32eefcb69 SHA256 5c45f0c5f58ba2c16140b72221798a604242f59a155a75111b4cfd31092f836c size 382024
+DIST cabal-1.1.4.tar.gz 406169 RMD160 0c2b1a33af4512174cc6df6645662046427e9135 SHA256 1740abf0db8a6d18703e315a30ff81c51a06ec4a5f3a6c1927fa1530a0835b66 size 406169
+EBUILD cabal-1.1.3-r1.ebuild 2127 RMD160 073b14d0f1457c891857ddc23d6be52d4d449ae5 SHA1 77b7dd2e0125f1721cfb6e17e5d337f6db8bc1fd SHA256 1a6cbd2d17c57153294a0854d59bd56ccf8fd251207531af79335f0d19d375ef size 2127
 MD5 4d36ca47fd38326762daef5b2931f58a cabal-1.1.3-r1.ebuild 2127
 RMD160 073b14d0f1457c891857ddc23d6be52d4d449ae5 cabal-1.1.3-r1.ebuild 2127
 SHA256 1a6cbd2d17c57153294a0854d59bd56ccf8fd251207531af79335f0d19d375ef cabal-1.1.3-r1.ebuild 2127
+EBUILD cabal-1.1.3.ebuild 1941 RMD160 cc6f2fab93325e300c85a703e0806ab9504793b6 SHA1 00b03955c13846a7f218a1ea1809bd881d74eb2e SHA256 96b131c14851b0959e706109b64a4f310b8bd5c566e40911e573c0c3bc34be3e size 1941
 MD5 6ebe79534e69fa74ebcb67629b65195a cabal-1.1.3.ebuild 1941
 RMD160 cc6f2fab93325e300c85a703e0806ab9504793b6 cabal-1.1.3.ebuild 1941
 SHA256 96b131c14851b0959e706109b64a4f310b8bd5c566e40911e573c0c3bc34be3e cabal-1.1.3.ebuild 1941
-MD5 2e6b8d49e5fcb76309d8d67b08c53039 files/cabal-1.1.3-ghc622.patch 678
-RMD160 ed7decfd967a12476ad83892015767a37c5ce5ae files/cabal-1.1.3-ghc622.patch 678
-SHA256 d3524545844724687cf3377708d8cc381c06dbe71e618af884bac86361ea5479 files/cabal-1.1.3-ghc622.patch 678
-MD5 1f8a58f0553f1d82dccd9d3f242faa3e files/digest-cabal-1.1.3 235
-RMD160 8544999d6a0a11b5dfdc338852250e3aaef6c80a files/digest-cabal-1.1.3 235
-SHA256 70df1f4fffe6febc4a1312823fe2961feeedcc65f2835147a545583cd79840ab files/digest-cabal-1.1.3 235
-MD5 b34aabec3ab15c7b74d940437870e91b files/digest-cabal-1.1.3-r1 63
-RMD160 e3bb9b6ef3ec2b83d0afabe1745a7cc95a8c0fa3 files/digest-cabal-1.1.3-r1 63
-SHA256 d2b9a4f3eb319f87f77edca078065d66dfc3a5167aa890534edb5793bead4b34 files/digest-cabal-1.1.3-r1 63
+EBUILD cabal-1.1.4.ebuild 1379 RMD160 7219bde0cc5d0981891317c992d2863784e1c358 SHA1 6ebdbb31ef39017d8bc808ee3862bc21f000ff02 SHA256 c383e7c32c9cd07ee4fae456f30d34783eb6f03ab6c8dbbf0e8391b3a383bac8 size 1379
+MD5 545146ea72b560c26475d08ee07430f4 cabal-1.1.4.ebuild 1379
+RMD160 7219bde0cc5d0981891317c992d2863784e1c358 cabal-1.1.4.ebuild 1379
+SHA256 c383e7c32c9cd07ee4fae456f30d34783eb6f03ab6c8dbbf0e8391b3a383bac8 cabal-1.1.4.ebuild 1379
+MISC ChangeLog 2139 RMD160 17a2f3a047345edce37cafab6621a259f509cfa5 SHA1 000c5133455b27bd17461a1166e3337f1b6f314d SHA256 0631071b1912de096f59858a34fffc6b43485831cbb40b57ff59f688f7574baf size 2139
+MD5 6be3ae4e7abda56b09da1105b2fa087e ChangeLog 2139
+RMD160 17a2f3a047345edce37cafab6621a259f509cfa5 ChangeLog 2139
+SHA256 0631071b1912de096f59858a34fffc6b43485831cbb40b57ff59f688f7574baf ChangeLog 2139
+MISC metadata.xml 231 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b SHA1 b77d396c72fd66ec7c09ae8de996a5ba50d9e482 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34 size 231
 MD5 36536d30381275b652c4a0b5590cf628 metadata.xml 231
 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b metadata.xml 231
 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34 metadata.xml 231
+MD5 1f8a58f0553f1d82dccd9d3f242faa3e files/digest-cabal-1.1.3 235
+RMD160 8544999d6a0a11b5dfdc338852250e3aaef6c80a files/digest-cabal-1.1.3 235
+SHA256 70df1f4fffe6febc4a1312823fe2961feeedcc65f2835147a545583cd79840ab files/digest-cabal-1.1.3 235
+MD5 1f8a58f0553f1d82dccd9d3f242faa3e files/digest-cabal-1.1.3-r1 235
+RMD160 8544999d6a0a11b5dfdc338852250e3aaef6c80a files/digest-cabal-1.1.3-r1 235
+SHA256 70df1f4fffe6febc4a1312823fe2961feeedcc65f2835147a545583cd79840ab files/digest-cabal-1.1.3-r1 235
+MD5 aada010179ae8865c61e0e14b969678e files/digest-cabal-1.1.4 235
+RMD160 32b736425341278f9af33a5de591fa56df86f751 files/digest-cabal-1.1.4 235
+SHA256 ca9a0feaf46da7cd7c8835e62188b2bb9cb641b54c1bda41579d85a17c680717 files/digest-cabal-1.1.4 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEKATU/B0cxt+cq+wRAvAQAJ9q9aGB4tZtBgyloLNmVxNviFyB6wCfTZ6i
-IDGlwmL8HUt9MEPeD05Pk4Q=
-=V/2y
+iD8DBQFEWSzO/B0cxt+cq+wRAnXLAJ0WVXbN1R//VhC46OwSgnD1eEMoxwCdHKOP
+PelQJpnTc6A+NPVPBr3wRDk=
+=6MRr
 -----END PGP SIGNATURE-----
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