Patch the build system so it builds the HaXml tools (fixes bug #124382)

Package-Manager: portage-2.1_pre4-r1

5 files changed, 81 insertions, 14 deletions

diff --git a/dev-haskell/haxml/ChangeLog b/dev-haskell/haxml/ChangeLog
index cf85d5184bfc..e60d57592929 100644
--- a/dev-haskell/haxml/ChangeLog
+++ b/dev-haskell/haxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/haxml
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/ChangeLog,v 1.8 2006/02/27 14:57:52 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/ChangeLog,v 1.9 2006/02/28 12:41:18 dcoutts Exp $
+
+*haxml-1.13-r1 (28 Feb 2006)
+
+  28 Feb 2006; Duncan Coutts <dcoutts@gentoo.org> haxml-1.13.ebuild,
+  +haxml-1.13-r1.ebuild:
+  Patch the build system so it builds the HaXml tools (fixes bug #124382).
 
   27 Feb 2006; Duncan Coutts <dcoutts@gentoo.org> haxml-1.12.ebuild,
   haxml-1.13.ebuild:
diff --git a/dev-haskell/haxml/Manifest b/dev-haskell/haxml/Manifest
index e2e7dacea3f2..e971bae9713f 100644
--- a/dev-haskell/haxml/Manifest
+++ b/dev-haskell/haxml/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 37f55fae9cbb63204c3f48b6024723f6 ChangeLog 1344
-RMD160 871baf5bf013ef958d9b7bbbfb318f31724099ca ChangeLog 1344
-SHA256 23366a09e361682eb362f31aff5ead23f3f4ed959c0efa97409f4843ea396da9 ChangeLog 1344
+MD5 25c2ca40d173211e61ce3370340f1b12 ChangeLog 1544
+RMD160 e4fe4077b89a2ff9756350d21b098420477edd16 ChangeLog 1544
+SHA256 6412e2f1ac8f60603e8b954a08251a623c740c120a902715134089bd2127451a ChangeLog 1544
 MD5 e227a216a5fd9a3e2caa1b975e528731 files/HaXml-1.12.cabal 1144
 RMD160 52358eebfecc174965d665d2a121fffa214d025d files/HaXml-1.12.cabal 1144
 SHA256 84e118a6c2206079d2a6c287e23fa271bd5455d0f9a25851ca4dceb6f5e40c3e files/HaXml-1.12.cabal 1144
@@ -13,19 +13,25 @@ SHA256 0a887942b8ec0d6be333d18fb441a9fa99a0877fa793be06eb33619457440681 files/di
 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
 MD5 796774c31a508ff78471239f9b574f63 haxml-1.12.ebuild 1830
 RMD160 23b675072d246d2239d2cc9a3fc81a728b82d62d haxml-1.12.ebuild 1830
 SHA256 c2e2dab85c4c95b1d2becc18c9320628b473945b360a9d7a63fdd0d7760fc1d3 haxml-1.12.ebuild 1830
-MD5 1278736be01405d51bb5d02131b76a70 haxml-1.13.ebuild 1056
-RMD160 f6a2ff61aa483a1fdbbbf661ffc953f347a4c4c9 haxml-1.13.ebuild 1056
-SHA256 4373a0ed9bbce62da42a0152874bdeca60982415adb2f01e00ba901f9c4d02ba haxml-1.13.ebuild 1056
+MD5 f077390cda636241496ead4eb571db29 haxml-1.13-r1.ebuild 1503
+RMD160 4e54c9b04818910194452f523e53ed77da8a1065 haxml-1.13-r1.ebuild 1503
+SHA256 1fd8bf9cc5a5d95f7cd4285e26974a1528c75f39a199e4abbf22f37134f114bd haxml-1.13-r1.ebuild 1503
+MD5 d5e3aea40207889fe622153541fd1a2e haxml-1.13.ebuild 1052
+RMD160 ccb1d986f124698cec1c7997a38dfbfcb529d47d haxml-1.13.ebuild 1052
+SHA256 832c2aebc8dcc9a7cfeb6feac55820d2de8914bb40e5c4ea07b5352e9d7d5f4c haxml-1.13.ebuild 1052
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEAxNi/B0cxt+cq+wRAo3RAJ9FB7Gu+Vfc7tcOCPyx+4giFdNuvQCfeyan
-1FPfizLowVy4eUTGvg54VRM=
-=azRX
+iD8DBQFEBETf/B0cxt+cq+wRAqjMAJ9lqlrwYrjeX/bHK3n+d27DYxSHigCgg/R6
+RUn1wahTZCuWN1F7yOO9O0I=
+=8E1Z
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haxml/files/digest-haxml-1.13-r1 b/dev-haskell/haxml/files/digest-haxml-1.13-r1
new file mode 100644
index 000000000000..33d397f957da
--- /dev/null
+++ b/dev-haskell/haxml/files/digest-haxml-1.13-r1
@@ -0,0 +1,3 @@
+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-r1.ebuild b/dev-haskell/haxml/haxml-1.13-r1.ebuild
new file mode 100644
index 000000000000..dd6b2fc96101
--- /dev/null
+++ b/dev-haskell/haxml/haxml-1.13-r1.ebuild
@@ -0,0 +1,52 @@
+# 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-r1.ebuild,v 1.1 2006/02/28 12:41:18 dcoutts Exp $
+
+CABAL_FEATURES="lib bin 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"
+
+	# The HaXml.cabal file doesn't build the tools, so we add them in:
+	for binary in Canonicalise DtdToHaskell MkOneOf Validate Xtract; do
+		echo                                >> "${S}/HaXml.cabal"
+		echo "executable:     ${binary}"    >> "${S}/HaXml.cabal"
+		echo "main-is:        ${binary}.hs" >> "${S}/HaXml.cabal"
+		echo "hs-source-dirs: src/tools"    >> "${S}/HaXml.cabal"
+		echo "extensions:     CPP"          >> "${S}/HaXml.cabal"
+	done
+}
+
+src_install() {
+	cabal_src_install
+
+	if use doc; then
+		dohtml -r docs/*
+		dodoc docs/icfp99.dvi docs/icfp99.ps.gz
+	fi
+}
+
diff --git a/dev-haskell/haxml/haxml-1.13.ebuild b/dev-haskell/haxml/haxml-1.13.ebuild
index aa01aac1d878..4b6ace2af392 100644
--- a/dev-haskell/haxml/haxml-1.13.ebuild
+++ b/dev-haskell/haxml/haxml-1.13.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2006/02/27 14:57:52 dcoutts Exp $
+# $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
@@ -16,7 +16,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-IUSE="doc"
+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
@@ -27,9 +27,9 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	base_src_unpack
+
 	# Text.PrettyPrint is already provided by ghc and produces a conflict
-	cd ${S}
-	rm -rf src/Text/PrettyPrint
+	rm -rf "${S}/src/Text/PrettyPrint"
 }
 
 src_install() {