Bump haxml to 1.25

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

diff --git a/dev-haskell/haxml/ChangeLog b/dev-haskell/haxml/ChangeLog
index 7de1db5e4c509a2473d800ae91fd66cb8cf58512..4afaaeeff456cc713e7f479e00bd8e0cd7ad8611 100644 (file)
--- a/dev-haskell/haxml/ChangeLog
+++ b/dev-haskell/haxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/haxml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/ChangeLog,v 1.38 2014/07/02 10:05:36 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/ChangeLog,v 1.39 2014/12/14 09:00:46 gienah Exp $
+
+*haxml-1.25 (14 Dec 2014)
+
+  14 Dec 2014; Mark Wright <gienah@gentoo.org> +files/haxml-1.25-haddock.patch,
+  +haxml-1.25.ebuild:
+  Bump haxml to 1.25
 
 *haxml-1.24.1 (02 Jul 2014)
 

diff --git a/dev-haskell/haxml/Manifest b/dev-haskell/haxml/Manifest
index e2758ef3e14fbdf1d1b1cd5132317995fdf97cb9..2da3040769216df151c020199906c2dfb71539d1 100644 (file)
--- a/dev-haskell/haxml/Manifest
+++ b/dev-haskell/haxml/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA256
 
 AUX haxml-1.23.3-haddock.patch 732 SHA256 54dde3679969002e2e7b7591b26c708faa172bf7c1ed6d4a771c04904fd44bce SHA512 daf988ba8f836716249c37cf6b411383a1d6f20cca7ab6f8a20db7afc2c42866de0a4ab770f406aa5d9b77a4ba3da2c6c01982c26fb29e9224775914c1db2833 WHIRLPOOL ae72e633c0a6965e202923b0a7b7f19934a7bc3759dce9d54219d226ae77f2e7ef7bf7f207f110e51ea43a670bc5acc9c5269eb8221066908991b824cabc2ed0
+AUX haxml-1.25-haddock.patch 1492 SHA256 f6310965d0f2c804e7a5a4592cbcfc329a5638f7dae0d5143ac3481963401dab SHA512 3990df36b98632898066222c2bf8b8b9d8a7654cc9530c9831b5a30eb3745e019a34c51676e6f3f8fd2788caaa0ae21b5b25cf967e8c6e502c61714f9ae0c840 WHIRLPOOL a44179e7b7736f8866e4edfdd0b9191e4e41d8ffdc4aad95ace9be1e702c1cc832b6ac07a50dc80cdd1ba82dc11b8202c234fa57d95bfb00fce5edbaeea6e3d2
 DIST HaXml-1.24.1.tar.gz 142739 SHA256 5f258c7c6291ad54bb9a65280dd30efcbca3fc79a499d5b6575a753d3f7b78df SHA512 421f3a61e8eebf5ad915551c51dcd843a544e7959b93d6dd4ab2ffc6c20954f559da75dcfecc6fea838f80dc4d3c83243be3ce7a21e92bc165b3e0be120451bf WHIRLPOOL a60283d94937f0f5324b61ebd11c87c5d48a3ccc003e32ed85a95661a9f3980644c9491d558dfeb406b67c6374f4cdf923f5fe0e60639f4e0e0890c916077877
 DIST HaXml-1.24.tar.gz 143107 SHA256 b6f9b147f80dbac04b11633d0bd9309c7ce9d2b0cff67b83086212a4f0567ba2 SHA512 421864e4177b16f485b72d33210a67914c2040664d604db5cc70b356a518114f11dbcc1b1c8f300fd045338605613a14317bd5bf5f041a8e38990d3c5dc7e94c WHIRLPOOL 7d2bee34221d932847fb208003090997545e543ab29338673e3e23e0b895cfe982985e78ec68a17e9973ced866711d9fbc42b8a4beb14e99ef6b7d7fe3f6994e
+DIST HaXml-1.25.tar.gz 144134 SHA256 936abb254607aa270a1a3d4102a098041f71ef38290cfd7fb9f363c4d21e850a SHA512 3b71af91601e3a5df933007a986ba9bb81a9cffeeb57f1e520f27788b52ad1deaa28ac25731797a8c4754e87465a007752366af50922d7e6b3c1947497ec9963 WHIRLPOOL a0093da0776ed7a03197c8b222aa02ae5e360b9e0bba018a251990072fae3c331e0dfd5fda26098f26874e6a64a1a7cb0a2adb3aa81dfb67b6e840213d466544
 EBUILD haxml-1.24.1.ebuild 837 SHA256 bfff51ae9312711e3590bc094ab7b3a053f4b3ecab1c57a15f25608edbc9b934 SHA512 b199d579ff8dfab0b80b8014be0f7b5710f5ce93d41e775cf0c8457d633a2e019fcaba5d29e287fe2762c63cad6c055d60ad0adbecaf4f9a6383a2a881774ecb WHIRLPOOL 2d5cec88e50329603ef43c36bb04a5201ae1e9d4886d147cc48e13f2e045aa6b0e9eaba5cb09eb92a84beb9961fbbbd30e465b95e6f9fea5f2d9d326cbc45670
 EBUILD haxml-1.24.ebuild 884 SHA256 d8fb8fed9b3a7d33112d2536c52531fea3cd96083b034efca91108f121443b05 SHA512 4206484b1723f7542f46433933a95e4f445191a0baff97b3a7fa6e50adcaa4b03e1b9a94a78d663bfe2d1242966fdffabb9f9626caed4dd69ad758d6e8f52dad WHIRLPOOL d893218fc4c967484eb4ff6621d37c0199cdcd9a4bca406f4954ff8776e32968ecfb875563e3b13219727a4c1a048921f1672560b71a02289ce8e8a6bb9f53b2
-MISC ChangeLog 5587 SHA256 049d6dca47b0b5435759af3390359e3939a0ab8f94a286d9d4ff4150be0abeb1 SHA512 2a1d9defc2c8289db2a609e4c68a5a93b1ec2e718dc913159cdd34a0f73aa2d1c5ee71291ca72d2abeca42f4a93ff3411a2bcfad2cbeb04c4d404722e5f6c001 WHIRLPOOL cee9673fd7422f9fe9e638e031eb8a09159bb5eeeca6421711da4b29c5b5cce7236b7d537f8cc13436ba663dcd3c1c31897e6d52ea3c175b4bc4cccebd4b5c3b
+EBUILD haxml-1.25.ebuild 885 SHA256 31a16f732e7c0a056fc7d792b4e395945bb260e98cce194935397b425492eed8 SHA512 52ca418b534ba02e567841b6aec0fe7e06280e828e72126efbc4f77670f9d01fb0348e3e27a4d36e4791236c1f97de83bbd59f4b1156832a7068881726ba1242 WHIRLPOOL ea50cd00258deacc7d9bd2e2420731b75aaf2c1e7c2618057105da903a5c3f759972b59f7e42887a2b708ada7df5ba82155c2a9febdbd0e675f07656431cf6d4
+MISC ChangeLog 5738 SHA256 d97d037073f28ee4bf2982d0fe0d199b1ff97b55e99455007846399ef566663c SHA512 b1c147e3085df1fe9b79d6064ac44536ef10d20c88f6c7386534d5cdef82e231810b70a41246133b712e1829bfa5bf6e2c03507ae77fa8196e656da4ffb2816a WHIRLPOOL 8aeb5b009cd9f869b2035fe74f23fc6b552e4769232d36be098ae15ed83964eb975d11e6d653450e247258d6e3f879ccf7412ac1b70fdbac4f76482f7793340c
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlOz2XUACgkQoBEVQmGOlx/ragEAvr+pTjBmL0MVrmAJZxrwHo4k
-kUMp1rThypbv1q8S6T8A/jU8dGndIdyI0BqILNAmxrzh9yywTsjq35uYDvRBUF8/
-=hHQh
+iF4EAREIAAYFAlSNUcUACgkQoBEVQmGOlx/DgAD+PM3Q0ZCSi4HmVgNwZuNXkcGk
+2iT2dqkIEFmFKxYfVl4A/3mHF4m84vMTQSoJLHs20RJAupjKRB0k+7xYlqnMeIbu
+=9kCa
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/haxml/files/haxml-1.25-haddock.patch b/dev-haskell/haxml/files/haxml-1.25-haddock.patch
new file mode 100644 (file)
index 0000000..fbfdaf8
--- /dev/null
+++ b/dev-haskell/haxml/files/haxml-1.25-haddock.patch
@@ -0,0 +1,26 @@
+--- HaXml-1.25-orig/src/Text/XML/HaXml/Schema/TypeConversion.hs        2014-10-29 02:53:24.000000000 +1100
++++ HaXml-1.25/src/Text/XML/HaXml/Schema/TypeConversion.hs     2014-12-08 13:32:58.799433615 +1100
+@@ -38,7 +38,7 @@
+                                                   Just (Right
+                                                     (ComplexType
+                                                        {complex_name=Just t'}))
+-                                                  {-| t==t'-}
++                                                  {-  | t==t' -}
+                                                     -> (e:)
+                                                   _ -> id
+                   _                          -> id
+@@ -75,10 +75,10 @@
+     renameSimple n s@UnionOf{}    = s{ simple_name  = Just n }
+ 
+ 
+--- * For now, rather than walk the tree, giving typenames to nodes that were
+---   previously locally-typed, we will instead assume in the pretty-printer
+---   that it can always replace a missing typename with the element name, and
+---   have it resolve to something sensible.
++    -- * For now, rather than walk the tree, giving typenames to nodes that were
++    --   previously locally-typed, we will instead assume in the pretty-printer
++    --   that it can always replace a missing typename with the element name, and
++    --   have it resolve to something sensible.
+     renameLocals :: SchemaItem -> SchemaItem
+     renameLocals s = s
+ --  renameLocals (SchemaElement e)

diff --git a/dev-haskell/haxml/haxml-1.25.ebuild b/dev-haskell/haxml/haxml-1.25.ebuild
new file mode 100644 (file)
index 0000000..93fc326
--- /dev/null
+++ b/dev-haskell/haxml/haxml-1.25.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/haxml-1.25.ebuild,v 1.1 2014/12/14 09:00:46 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+MY_PN="HaXml"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Utilities for manipulating XML documents"
+HOMEPAGE="http://projects.haskell.org/HaXml/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/polyparse-1.10:=[profile?]
+       dev-haskell/random:=[profile?]
+       >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+       >=dev-haskell/cabal-1.2
+"
+PATCHES=("${FILESDIR}"/${PN}-1.25-haddock.patch)
+
+S="${WORKDIR}/${MY_P}"