Add fix for building uing cabal-1.1.4. Remove old revision.

(Portage version: 2.1_pre9-r5)
 (Signed Manifest commit)

3 files changed, 22 insertions, 67 deletions

diff --git a/dev-haskell/haxml/Manifest b/dev-haskell/haxml/Manifest
index a5ec069b232e..073e27dcbc9b 100644
--- a/dev-haskell/haxml/Manifest
+++ b/dev-haskell/haxml/Manifest
@@ -1,37 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 40e83d242027b83b70886b0e1aaa183c ChangeLog 1733
-RMD160 f90b196dae381fa119eafe198d98647409524440 ChangeLog 1733
-SHA256 3dd314085994f6e08ff22ccdeb42a16f2c634680a1300a594089e33059bb5c2d ChangeLog 1733
+AUX HaXml-1.12.cabal 1144 RMD160 52358eebfecc174965d665d2a121fffa214d025d SHA1 c3766298d49d8504f0552965e91750af44b04e0a SHA256 84e118a6c2206079d2a6c287e23fa271bd5455d0f9a25851ca4dceb6f5e40c3e size 1144
 MD5 e227a216a5fd9a3e2caa1b975e528731 files/HaXml-1.12.cabal 1144
 RMD160 52358eebfecc174965d665d2a121fffa214d025d files/HaXml-1.12.cabal 1144
 SHA256 84e118a6c2206079d2a6c287e23fa271bd5455d0f9a25851ca4dceb6f5e40c3e files/HaXml-1.12.cabal 1144
-MD5 7dcab883ee24e9b52f5210989f7de0ad files/digest-haxml-1.12 232
-RMD160 44371116d6f07166d4c12530a32cedcf04b89099 files/digest-haxml-1.12 232
-SHA256 0a887942b8ec0d6be333d18fb441a9fa99a0877fa793be06eb33619457440681 files/digest-haxml-1.12 232
-MD5 4a303982b8e921e447872cd48733b149 files/digest-haxml-1.13 232
-RMD160 c1a72b44d8209ade2ab63f6a7e530e3c11710696 files/digest-haxml-1.13 232
-SHA256 1bc876bb2aec4a049e9fb51d27bf42d36fe008f07e450c6996a88b040e45eb09 files/digest-haxml-1.13 232
-MD5 4a303982b8e921e447872cd48733b149 files/digest-haxml-1.13-r1 232
-RMD160 c1a72b44d8209ade2ab63f6a7e530e3c11710696 files/digest-haxml-1.13-r1 232
-SHA256 1bc876bb2aec4a049e9fb51d27bf42d36fe008f07e450c6996a88b040e45eb09 files/digest-haxml-1.13-r1 232
+DIST HaXml-1.12.tar.gz 433384 RMD160 2d055cd524f299886e6a39f18d81c8bbbfec0979 SHA256 513560e934ab46609aa0449b8f3c9386ad2b2b853511775c659dd90cf2d28c74 size 433384
+DIST HaXml-1.13.tar.gz 435809 RMD160 df1c371cf8727baf4286a550e43de22c14d2db00 SHA256 28af11504085e7a03a66f9e29feb2c141b19d9a067d74d5b41b509938a255f57 size 435809
+EBUILD haxml-1.12.ebuild 1830 RMD160 23b675072d246d2239d2cc9a3fc81a728b82d62d SHA1 b2f8ae12f4a1b3b290398d8f03de5ce08c10367d SHA256 c2e2dab85c4c95b1d2becc18c9320628b473945b360a9d7a63fdd0d7760fc1d3 size 1830
 MD5 796774c31a508ff78471239f9b574f63 haxml-1.12.ebuild 1830
 RMD160 23b675072d246d2239d2cc9a3fc81a728b82d62d haxml-1.12.ebuild 1830
 SHA256 c2e2dab85c4c95b1d2becc18c9320628b473945b360a9d7a63fdd0d7760fc1d3 haxml-1.12.ebuild 1830
-MD5 2e346ed3047d9f0b446c7472ee4981d3 haxml-1.13-r1.ebuild 1516
-RMD160 4eafb9a24ab22510e4152dd3df07dafeae47f4ff haxml-1.13-r1.ebuild 1516
-SHA256 9fa7e3e84839d6308fc22af9d7050b2e38bc11ffdf92fe05bd70bdcd7690791b haxml-1.13-r1.ebuild 1516
-MD5 d5e3aea40207889fe622153541fd1a2e haxml-1.13.ebuild 1052
-RMD160 ccb1d986f124698cec1c7997a38dfbfcb529d47d haxml-1.13.ebuild 1052
-SHA256 832c2aebc8dcc9a7cfeb6feac55820d2de8914bb40e5c4ea07b5352e9d7d5f4c haxml-1.13.ebuild 1052
+EBUILD haxml-1.13-r1.ebuild 1516 RMD160 39e6a031261daa308b5e6f63194a135f96eb0bc5 SHA1 34f7b20972a129bac09ef618a2f1d52a316595bd SHA256 526e78de489cdae00736ba6b2ff83de72f5efb77407f61ffb1cccb21c05fa03e size 1516
+MD5 69e531cf932b2180bfbe26b1ff8c6ef9 haxml-1.13-r1.ebuild 1516
+RMD160 39e6a031261daa308b5e6f63194a135f96eb0bc5 haxml-1.13-r1.ebuild 1516
+SHA256 526e78de489cdae00736ba6b2ff83de72f5efb77407f61ffb1cccb21c05fa03e haxml-1.13-r1.ebuild 1516
+MISC ChangeLog 1890 RMD160 7b953e547f3e67cc1732279f440d0e4cd81df198 SHA1 60be9611934250dc5c2b9e698d372751a1b9d110 SHA256 b8dd8a8ef69231994df022af64e729d7b98f9417e67f974fa573e888db39d92f size 1890
+MD5 841effded823ffc0e8a4c0af56dfbe55 ChangeLog 1890
+RMD160 7b953e547f3e67cc1732279f440d0e4cd81df198 ChangeLog 1890
+SHA256 b8dd8a8ef69231994df022af64e729d7b98f9417e67f974fa573e888db39d92f ChangeLog 1890
+MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 size 223
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
+MD5 7dcab883ee24e9b52f5210989f7de0ad files/digest-haxml-1.12 232
+RMD160 44371116d6f07166d4c12530a32cedcf04b89099 files/digest-haxml-1.12 232
+SHA256 0a887942b8ec0d6be333d18fb441a9fa99a0877fa793be06eb33619457440681 files/digest-haxml-1.12 232
+MD5 4a303982b8e921e447872cd48733b149 files/digest-haxml-1.13-r1 232
+RMD160 c1a72b44d8209ade2ab63f6a7e530e3c11710696 files/digest-haxml-1.13-r1 232
+SHA256 1bc876bb2aec4a049e9fb51d27bf42d36fe008f07e450c6996a88b040e45eb09 files/digest-haxml-1.13-r1 232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEKAV4/B0cxt+cq+wRAj4CAKCQLJfvV7tvT0gqIn7JycWGM8doxwCgiQSD
-ox7HyylwLNaRcjituNno0EE=
-=8Z5x
+iD8DBQFEWTek/B0cxt+cq+wRAnYjAJ9dVfggg+QmvjjnQBrdAssys5XAWwCfWFq4
+6M+hWU0qqoffn2VGBjAJY5w=
+=cdIz
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haxml/files/digest-haxml-1.13 b/dev-haskell/haxml/files/digest-haxml-1.13
deleted file mode 100644
index 33d397f957da..000000000000
--- a/dev-haskell/haxml/files/digest-haxml-1.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9801b55ea599ed426d8034b156afa304 HaXml-1.13.tar.gz 435809
-RMD160 df1c371cf8727baf4286a550e43de22c14d2db00 HaXml-1.13.tar.gz 435809
-SHA256 28af11504085e7a03a66f9e29feb2c141b19d9a067d74d5b41b509938a255f57 HaXml-1.13.tar.gz 435809
diff --git a/dev-haskell/haxml/haxml-1.13.ebuild b/dev-haskell/haxml/haxml-1.13.ebuild
deleted file mode 100644
index 4b6ace2af392..000000000000
--- a/dev-haskell/haxml/haxml-1.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/haxml-1.13.ebuild,v 1.3 2006/02/28 12:41:18 dcoutts Exp $
-
-CABAL_FEATURES="lib haddock"
-inherit base haskell-cabal
-
-MY_PN=HaXml
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Haskell utilities for parsing, filtering, transforming and generating XML documents"
-HOMEPAGE="http://www.haskell.org/HaXml/"
-SRC_URI="http://www.haskell.org/HaXml/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-IUSE=""
-
-# actually, >=ghc-5.02 should be ok (if not using cabal)
-# hugs and nhc98 are ok too, somebody might want to add support for them
-DEPEND=">=virtual/ghc-6.2
-		>=dev-haskell/cabal-1.1.3-r1"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	base_src_unpack
-
-	# Text.PrettyPrint is already provided by ghc and produces a conflict
-	rm -rf "${S}/src/Text/PrettyPrint"
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		dohtml -r docs/*
-		dodoc docs/icfp99.dvi docs/icfp99.ps.gz
-	fi
-}
-