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

Package-Manager: portage-2.2.0_alpha77_p1/cvs/Linux x86_64

diff --git a/dev-haskell/dataenc/Manifest b/dev-haskell/dataenc/Manifest
index 546e7187d23049de2ec0afc38a8cbbe69b76d2dd..8549ed9f028584ee77a137b6abd3cd4471434b4b 100644 (file)
--- a/dev-haskell/dataenc/Manifest
+++ b/dev-haskell/dataenc/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX dataenc-0.14-ghc-7.2.patch 467 RMD160 9c07fc6fa6647aad61b9e96b39c3f0538c41b4f6 SHA1 d110d773de4b36e19e48ee04a15fd070f950938b SHA256 615120cbc327ae9be41f971cefa0f3c927d903b20e8958c77cd262b00bc53caa
 DIST dataenc-0.13.0.2.tar.gz 12511 RMD160 1ee6f529b3a17e36fdde2a244c5bcd90d31232d6 SHA1 6a737797973441da9150d34ca91707be3c0f4570 SHA256 e3d70a3c3d94490244e05c5b11d8455eb6fdbf4849a119bd52bae644fa2b217a
-DIST dataenc-0.14.tar.gz 12975 RMD160 3b623f2915c61e55729908fbc905951bfdaa884e SHA1 dd93af534d81d0b0de3c7480f2500cd6b2bbc69a SHA256 86472a04ba237b366062be26211cfc16296b96e86225a644a2995c6eeabf2261
+DIST dataenc-0.14.0.2.tar.gz 12914 RMD160 1d01ffa4dba6f75b0d2c4d4c2e0b70df8d99f697 SHA1 42b6c269cc2de9131d7337ae11d5866dcf140548 SHA256 abf067e438a800931c076cef80dea4f125210e1539f6b5cf1a05b4540411d5ff
 EBUILD dataenc-0.13.0.2.ebuild 643 RMD160 31cc665d385585e2a097ccc4985158b071bc696e SHA1 06173e6ed8209d59de3554b76a3538bdbd229175 SHA256 753e0b301df2115b575571bf90b6fba01eaabe5c3f8ddb8f185f22049263d1cf
-EBUILD dataenc-0.14.ebuild 778 RMD160 de986f1e1412153dc76c1839e28015a4413b50f8 SHA1 8826b7e6abea09dc17b663d66b33f6cf2b62aaf4 SHA256 e4f675a8e398e9b42468539c0719bfa9cb2d5f31a4fa9d7e01839f2230a63f18
-MISC ChangeLog 1639 RMD160 24cadd80d77a9a167f3613a9d5d46c196d94704b SHA1 89454a9edbb6dde4dc592e41c48101d6c8d33c0b SHA256 5656c3eb962482aa99cb6c4d9e4ee4f463ab6b422d45200321b7a12435a3f72a
+EBUILD dataenc-0.14.0.2.ebuild 734 RMD160 c5f946abefee2df113bd55fe9f0bca19a97066ab SHA1 71acac9e9ac03fb72be1167e759262d502728391 SHA256 ad0c198cc70ab50cd52ea61df1bc10aa9880487c8c9793937d46bb22845ebe1b
+MISC ChangeLog 1848 RMD160 7c0bddab9cc2b2aae8bd62992b620ab66e91ee4d SHA1 f956a56a8a1b5ec7ac5bdf6096218e1205d1f18c SHA256 37c9f1cc26dcc9a5d7b494121cfffd7e7d241a715e67277ebbe004aeb8f6b37a
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk46m/8ACgkQcaHudmEf86oYSACffGjL586m08kyPjD5tJ8vz8at
-EjEAnRYbCyY+LpiQyXVfhhXLKk+nL5i0
-=5WVw
+iEYEARECAAYFAk7bqPMACgkQcaHudmEf86pqGACdFU81kFGq9FIGhaeBKyy8nOsr
+rz8AnRjnFwRZGRV6olQzlvtWfG2FscoF
+=Oybr
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/hxt/ChangeLog b/dev-haskell/hxt/ChangeLog
index bed3d8c3442262eddc5004418b35db5c672a145b..179d2b0f5492b89f38f73ec3140332db453f03f0 100644 (file)
--- 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 (file)
index 0000000..8502913
--- /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 (file)
index f2a393c..0000000
--- 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 (file)
index 0000000..4671b0c
--- /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 8c66906af5318357b9d6d0120d731f59bab0771e..ad9326a8c4363dc430391ee829f060e9536bc266 100644 (file)
--- 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>