6 files changed, 137 insertions, 6 deletions
diff --git a/dev-haskell/hxt/ChangeLog b/dev-haskell/hxt/ChangeLog
index fffad3011e5d..9f2cbb6bba29 100644
--- a/dev-haskell/hxt/ChangeLog
+++ b/dev-haskell/hxt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/hxt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/ChangeLog,v 1.2 2005/03/19 22:09:42 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/ChangeLog,v 1.3 2005/04/26 10:59:54 kosmikus Exp $
+
+*hxt-4.02-r1 (26 Apr 2005)
+
+  26 Apr 2005; Andres Loeh <kosmikus@gentoo.org> +hxt-4.02-r1.ebuild,
+  +hxt-5.00.ebuild:
+  New version. Direct upgrade from 4.02 to 5.00 is not possible, 4.02 has to
+  be unmerged first. Version 4.02-r1 does not suffer from this problem.
 
   19 Mar 2005; Andres Loeh <kosmikus@gentoo.org> hxt-4.02.ebuild:
   This ebuild is currently blocked by ghc-6.4 because of incompatibilities.
diff --git a/dev-haskell/hxt/Manifest b/dev-haskell/hxt/Manifest
index 13aa0bc2008d..a00ee2f9e9cd 100644
--- a/dev-haskell/hxt/Manifest
+++ b/dev-haskell/hxt/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 98f0153d4c2139e067863950b0698639 hxt-4.02-r1.ebuild 1350
 MD5 85e9eeb44ee7f85d5a1e6bd3d2cf7cc8 hxt-4.02.ebuild 1335
-MD5 bfe379678a2fcee2b9695cd38cbc7587 ChangeLog 589
+MD5 1f57e9dd4e4901c786570acb7f0ac195 hxt-5.00.ebuild 1398
+MD5 adb58e5f30d8c72a5ade0cc355ecdbca ChangeLog 857
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 2f65e69140f9283519e29cafc73dbd6b files/digest-hxt-4.02 60
+MD5 e064bb67857a00a0f1b538675605d8aa files/digest-hxt-5.00 60
+MD5 2f65e69140f9283519e29cafc73dbd6b files/digest-hxt-4.02-r1 60
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCPKQ4OKSBj1ObwosRAlQuAKCLnr9v5WWF+iXs2gFFVIih6T5VTgCeIhLD
-GHHvMFUE4EfPZVDOfpU2xKY=
-=E9Qn
+iD8DBQFCbh9ZOKSBj1ObwosRAlTEAJ407GlRmub4bR0SS8jsjpo6lzkxJQCfWJrH
+PJyQ2qtxXODVbdYA9lJyHZ0=
+=YV5b
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/hxt/files/digest-hxt-4.02-r1 b/dev-haskell/hxt/files/digest-hxt-4.02-r1
new file mode 100644
index 000000000000..3bd5dc2f1558
--- /dev/null
+++ b/dev-haskell/hxt/files/digest-hxt-4.02-r1
@@ -0,0 +1 @@
+MD5 f762fdeff0acb2f38ca44fa925c1de90 HXT-4.02.tar.gz 885865
diff --git a/dev-haskell/hxt/files/digest-hxt-5.00 b/dev-haskell/hxt/files/digest-hxt-5.00
new file mode 100644
index 000000000000..d03b97af0aba
--- /dev/null
+++ b/dev-haskell/hxt/files/digest-hxt-5.00
@@ -0,0 +1 @@
+MD5 edd1a2d4e88688f90e3cb77786739cc2 HXT-5.00.tar.gz 904941
diff --git a/dev-haskell/hxt/hxt-4.02-r1.ebuild b/dev-haskell/hxt/hxt-4.02-r1.ebuild
new file mode 100644
index 000000000000..1254065890cf
--- /dev/null
+++ b/dev-haskell/hxt/hxt-4.02-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-4.02-r1.ebuild,v 1.1 2005/04/26 10:59:54 kosmikus Exp $
+
+inherit fixheadtails base eutils ghc-package
+
+MY_P="HXT"
+MY_PV=${MY_P}-${PV}
+
+DESCRIPTION="A collection of tools for processing XML with Haskell"
+HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/"
+SRC_URI="http://www.fh-wedel.de/~si/HXmlToolbox/${MY_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+DEPEND=">=virtual/ghc-6.2
+	!>=virtual/ghc-6.4
+	doc? ( >=dev-haskell/haddock-0.6-r2 )"
+RDEPEND=">=virtual/ghc-6.2"
+
+S=${WORKDIR}/${MY_PV}
+
+src_unpack() {
+	base_src_unpack
+	ht_fix_file "${S}/src/Makefile"
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		emake doc || die "emake doc failed"
+	fi
+}
+
+src_test() {
+	make test || die "at least one test failed"
+}
+
+src_install() {
+	sed -i "s:/usr/local/lib/hxt:$(ghc-libdir)/${PF}:" ${S}/src/{netextra,hxt}-package.conf
+	sed -i "/ghc-pkg --update-package *$/d" ${S}/src/Makefile
+
+	ghc-setup-pkg ${S}/src/netextra-package.conf ${S}/src/hxt-package.conf
+	make install \
+		 GHC_INSTALL_DIR="${D}$(ghc-libdir)/${PF}" \
+		 || die "make install failed"
+
+	dodoc LICENSE README
+	if use doc; then
+		cd ${S}/doc
+		dodoc thesis.ps
+		dohtml -r *
+	fi
+	ghc-install-pkg
+}
diff --git a/dev-haskell/hxt/hxt-5.00.ebuild b/dev-haskell/hxt/hxt-5.00.ebuild
new file mode 100644
index 000000000000..4b14fb747fb3
--- /dev/null
+++ b/dev-haskell/hxt/hxt-5.00.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/hxt/hxt-5.00.ebuild,v 1.1 2005/04/26 10:59:54 kosmikus Exp $
+
+inherit fixheadtails base eutils ghc-package
+
+MY_PN="HXT"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A collection of tools for processing XML with Haskell"
+HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/"
+SRC_URI="http://www.fh-wedel.de/~si/HXmlToolbox/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+DEPEND=">=virtual/ghc-6.2
+	!>=virtual/ghc-6.4
+	!=dev-haskell/hxt-4.02
+	doc? ( >=dev-haskell/haddock-0.6-r2 )"
+RDEPEND=">=virtual/ghc-6.2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	base_src_unpack
+	ht_fix_file "${S}/src/Makefile"
+}
+
+src_compile() {
+	emake -j1 all || die "emake failed"
+	if use doc; then
+		emake doc || die "emake doc failed"
+	fi
+}
+
+src_test() {
+	emake -j1 test || die "at least one test failed"
+}
+
+src_install() {
+	sed -i "s:/usr/local/lib/hxt:$(ghc-libdir)/${PF}:" ${S}/src/hxt-package.conf
+	sed -i "/ghc-pkg --update-package *$/d" ${S}/src/Makefile
+	sed -i "/ghc-pkg --remove-package/d" ${S}/src/Makefile
+
+	ghc-setup-pkg ${S}/src/hxt-package.conf
+	emake install \
+		 GHC_INSTALL_DIR="${D}$(ghc-libdir)/${PF}" \
+		 || die "make install failed"
+
+	dodoc LICENSE README
+	if use doc; then
+		cd ${S}/doc
+		dodoc thesis.ps
+		dohtml -r *
+	fi
+	ghc-install-pkg
+}