Version bump (bug #316513 by Diego Elio Pettenò). Dropped sparc keyword (no depends).

(Portage version: 2.2.0_alpha77_p1/cvs/Linux x86_64)

5 files changed, 71 insertions, 50 deletions

diff --git a/dev-haskell/hxt/ChangeLog b/dev-haskell/hxt/ChangeLog
index bed3d8c34422..179d2b0f5492 100644
--- a/dev-haskell/hxt/ChangeLog
+++ b/dev-haskell/hxt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/hxt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/ChangeLog,v 1.12 2010/07/13 08:49:11 slyfox Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/ChangeLog,v 1.13 2011/12/04 16:59:13 slyfox Exp $
+
+*hxt-9.1.5 (04 Dec 2011)
+
+  04 Dec 2011; Sergei Trofimovich <slyfox@gentoo.org> -hxt-7.3.ebuild,
+  +files/hxt-9.1.4-ghc-7.2.patch, +hxt-9.1.5.ebuild, metadata.xml:
+  Version bump (bug #316513 by Diego Elio Pettenò). Dropped sparc keyword (no
+  depends).
 
   13 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> -hxt-4.02.ebuild,
   -hxt-4.02-r1.ebuild, -hxt-5.00.ebuild, -hxt-6.0.ebuild, -hxt-7.2.ebuild,
diff --git a/dev-haskell/hxt/files/hxt-9.1.4-ghc-7.2.patch b/dev-haskell/hxt/files/hxt-9.1.4-ghc-7.2.patch
new file mode 100644
index 000000000000..85029137e66d
--- /dev/null
+++ b/dev-haskell/hxt/files/hxt-9.1.4-ghc-7.2.patch
@@ -0,0 +1,10 @@
+--- hxt-9.1.4-orig/hxt.cabal	2011-08-16 21:02:36.000000000 +1000
++++ hxt-9.1.4/hxt.cabal	2011-08-16 22:50:06.698989683 +1000
+@@ -166,7 +166,6 @@
+  extensions: MultiParamTypeClasses DeriveDataTypeable FunctionalDependencies FlexibleInstances
+ 
+  build-depends: base       >= 4   && < 5,
+-                haskell98  >= 1   && < 2,
+                 containers >= 0.2 && < 1,
+                 directory  >= 1   && < 2,
+                 filepath   >= 1   && < 2,
diff --git a/dev-haskell/hxt/hxt-7.3.ebuild b/dev-haskell/hxt/hxt-7.3.ebuild
deleted file mode 100644
index f2a393c1ac43..000000000000
--- a/dev-haskell/hxt/hxt-7.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-7.3.ebuild,v 1.3 2010/07/13 08:49:11 slyfox Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal versionator
-
-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/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.6
-	>=dev-haskell/http-2006.7.7
-	>=dev-haskell/hunit-1.1
-	>=dev-haskell/network-1.0"
-
-src_unpack() {
-	unpack ${A}
-
-	# Oh ffs! The name of the licence file in the cabal file does not match
-	# the name of the file in the tarball so it fails at the install step.
-	sed -i -e 's/LICENCE/LICENSE/' "${S}/hxt.cabal"
-
-	if version_is_at_least "6.8" "$(ghc-version)"; then
-		sed -i -e '/build-depends:/a \
-			, process, containers, directory' \
-			"${S}/hxt.cabal"
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc README
-	if use doc; then
-		cd "${S}/doc"
-		dodoc thesis.pdf
-	fi
-}
diff --git a/dev-haskell/hxt/hxt-9.1.5.ebuild b/dev-haskell/hxt/hxt-9.1.5.ebuild
new file mode 100644
index 000000000000..4671b0cdcc76
--- /dev/null
+++ b/dev-haskell/hxt/hxt-9.1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-9.1.5.ebuild,v 1.1 2011/12/04 16:59:13 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A collection of tools for processing XML with Haskell."
+HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/index.html"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/binary-0.5 <dev-haskell/binary-1
+		>=dev-haskell/deepseq-1.1 <dev-haskell/deepseq-2
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
+		=dev-haskell/hxt-charproperties-9*
+		=dev-haskell/hxt-regex-xmlschema-9*
+		=dev-haskell/hxt-unicode-9*
+		>=dev-haskell/network-2.1 <dev-haskell/network-3
+		>=dev-haskell/parsec-2.1 <dev-haskell/parsec-4
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+PATCHES=("${FILESDIR}/${PN}-9.1.4-ghc-7.2.patch")
diff --git a/dev-haskell/hxt/metadata.xml b/dev-haskell/hxt/metadata.xml
index 8c66906af531..ad9326a8c436 100644
--- a/dev-haskell/hxt/metadata.xml
+++ b/dev-haskell/hxt/metadata.xml
@@ -1,8 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		The Haskell XML Toolbox bases on the ideas of HaXml and HXML,
+		but introduces a more general approach for processing XML with Haskell.
+		The Haskell XML Toolbox uses a generic data model for representing XML documents,
+		including the DTD subset and the document subset, in Haskell.
+		It contains a validating XML parser, a HTML parser, namespace support,
+		an XPath expression evaluator, an XSLT library, a RelaxNG schema validator
+		and funtions for serialization and deserialization of user defined data.
+		The library makes extensive use of the arrow approach for processing XML.
+		Since version 9 the toolbox is partitioned into various (sub-)packages.
+		This package contains the core functionality,
+		hxt-curl, hxt-tagsoup, hxt-relaxng, hxt-xpath, hxt-xslt, hxt-regex-xmlschema contain the extensions.
+		hxt-unicode contains encoding and decoding functions,
+		hxt-charproperties char properties for unicode and XML.
+	</longdescription>
 </pkgmetadata>