Version bump.

(Portage version: 2.2.8_p51/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

10 files changed, 68 insertions, 283 deletions

diff --git a/dev-haskell/citeproc-hs/ChangeLog b/dev-haskell/citeproc-hs/ChangeLog
index 287372fd0d23..fb84ea7bf9c4 100644
--- a/dev-haskell/citeproc-hs/ChangeLog
+++ b/dev-haskell/citeproc-hs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-haskell/citeproc-hs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/ChangeLog,v 1.11 2013/09/28 12:27:16 gienah Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/ChangeLog,v 1.12 2014/02/21 19:54:59 slyfox Exp $
+
+*citeproc-hs-0.3.9 (21 Feb 2014)
+
+  21 Feb 2014; Sergei Trofimovich <slyfox@gentoo.org> +citeproc-hs-0.3.9.ebuild,
+  -citeproc-hs-0.3.2.ebuild, -citeproc-hs-0.3.4.ebuild,
+  -citeproc-hs-0.3.6.ebuild, -citeproc-hs-0.3.7.ebuild,
+  -citeproc-hs-0.3.8-r1.ebuild, -citeproc-hs-0.3.8-r2.ebuild,
+  -files/citeproc-hs-0.3.8-preproc.patch, metadata.xml:
+  Version bump.
 
 *citeproc-hs-0.3.8-r2 (28 Sep 2013)
 
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.2.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.2.ebuild
deleted file mode 100644
index 93b4c01a8ca8..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/citeproc-hs-0.3.2.ebuild,v 1.3 2012/12/07 10:35:20 slyfox Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://gorgias.mine.nu/repos/citeproc-hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils +network"
-
-RDEPEND="dev-haskell/json[generic]
-		dev-haskell/mtl
-		=dev-haskell/pandoc-types-1.8*
-		dev-haskell/parsec
-		dev-haskell/utf8-string
-		dev-haskell/xml
-		>=dev-lang/ghc-6.10.1
-		bibutils? ( >=dev-haskell/hs-bibutils-0.3 )
-		network? ( >=dev-haskell/network-2
-			>=dev-haskell/http-4000.0.9
-		)
-	"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.4.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.4.ebuild
deleted file mode 100644
index bdbf78e46426..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/citeproc-hs-0.3.4.ebuild,v 1.3 2012/12/07 10:35:20 slyfox Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://gorgias.mine.nu/repos/citeproc-hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils +network"
-
-RDEPEND="dev-haskell/json[generic]
-		dev-haskell/mtl
-		>=dev-haskell/pandoc-types-1.8
-		dev-haskell/parsec
-		dev-haskell/utf8-string
-		dev-haskell/xml
-		>=dev-lang/ghc-6.10.1
-		bibutils? ( >=dev-haskell/hs-bibutils-0.3 )
-		network? ( >=dev-haskell/network-2
-			>=dev-haskell/http-4000.0.9
-		)
-	"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.6.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.6.ebuild
deleted file mode 100644
index f80d75543860..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/citeproc-hs-0.3.6.ebuild,v 1.2 2012/12/06 22:54:59 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://gorgias.mine.nu/repos/citeproc-hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils hexpat +network"
-
-RDEPEND="dev-haskell/json:=[generic,profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-haskell/pandoc-types-1.8:=[profile?]
-		<dev-haskell/pandoc-types-1.11:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		dev-haskell/syb:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		!hexpat? ( dev-haskell/xml:=[profile?] )
-		hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
-		>=dev-lang/ghc-6.10.4:=
-		bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-		network? (
-			>=dev-haskell/http-4000.0.9:=[profile?]
-			>=dev-haskell/network-2:=[profile?]
-		)
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.7.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.7.ebuild
deleted file mode 100644
index e375ee68b096..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/citeproc-hs-0.3.7.ebuild,v 1.1 2013/02/09 19:15:55 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://gorgias.mine.nu/repos/citeproc-hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils hexpat +network"
-
-RDEPEND="dev-haskell/json:=[generic,profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-haskell/pandoc-types-1.8:=[profile?]
-		<dev-haskell/pandoc-types-1.11:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		dev-haskell/syb:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		!hexpat? ( dev-haskell/xml:=[profile?] )
-		hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
-		>=dev-lang/ghc-6.10.4:=
-		bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-		network? (
-			>=dev-haskell/http-4000.0.9:=[profile?]
-			>=dev-haskell/network-2:=[profile?]
-		)
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.8-r1.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.8-r1.ebuild
deleted file mode 100644
index f316aaa504ff..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.8-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/citeproc-hs-0.3.8-r1.ebuild,v 1.1 2013/07/25 19:10:53 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://gorgias.mine.nu/repos/citeproc-hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils +hexpat +network +small_base embed_data_files"
-
-RDEPEND="dev-haskell/json:=[generic,profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-haskell/pandoc-types-1.8:=[profile?]
-		<dev-haskell/pandoc-types-1.11:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		dev-haskell/syb:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-6.12.1:=
-		bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?]
-		)
-		embed_data_files? ( dev-haskell/file-embed:=[profile?]
-		)
-		hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?]
-		)
-		network? ( >=dev-haskell/http-4000.0.9:=[profile?]
-			>=dev-haskell/network-2:=[profile?]
-		)
-		!hexpat? ( dev-haskell/xml:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}"/${P}-preproc.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag small_base small_base) \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag network network) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag embed_data_files embed_data_files)
-}
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.8-r2.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.8-r2.ebuild
deleted file mode 100644
index 429e7924fd51..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.8-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/citeproc-hs-0.3.8-r2.ebuild,v 1.1 2013/09/28 12:27:16 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://gorgias.mine.nu/repos/citeproc-hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils +hexpat +network +small_base embed_data_files"
-
-RDEPEND="dev-haskell/json:=[generic,profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-haskell/pandoc-types-1.8:=[profile?]
-		<dev-haskell/pandoc-types-1.13:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		dev-haskell/syb:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-6.12.1:=
-		bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?]
-		)
-		embed_data_files? ( dev-haskell/file-embed:=[profile?]
-		)
-		hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?]
-		)
-		network? ( >=dev-haskell/http-4000.0.9:=[profile?]
-			>=dev-haskell/network-2:=[profile?]
-		)
-		!hexpat? ( dev-haskell/xml:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}"/${P}-preproc.patch)
-
-src_prepare() {
-	base_src_prepare
-	cabal_chdeps \
-		'pandoc-types >= 1.8 && < 1.11' 'pandoc-types >= 1.8 && < 1.13'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag small_base small_base) \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag network network) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag embed_data_files embed_data_files)
-}
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.9.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.9.ebuild
new file mode 100644
index 000000000000..53ce83d04300
--- /dev/null
+++ b/dev-haskell/citeproc-hs/citeproc-hs-0.3.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/citeproc-hs-0.3.9.ebuild,v 1.1 2014/02/21 19:54:59 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Citation Style Language implementation in Haskell"
+HOMEPAGE="http://gorgias.mine.nu/repos/citeproc-hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation"
+
+RDEPEND="dev-haskell/json:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/pandoc-types-1.8:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/syb:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-6.12.1:=
+	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
+	embed_data_files? ( dev-haskell/file-embed:=[profile?] )
+	hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
+	!hexpat? ( dev-haskell/xml:=[profile?] )
+	network? ( >=dev-haskell/http-4000.0.9:=[profile?]
+			>=dev-haskell/network-2:=[profile?] )
+	unicode_collation? ( dev-haskell/text:=[profile?]
+				dev-haskell/text-icu:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.2
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bibutils bibutils) \
+		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag hexpat hexpat) \
+		$(cabal_flag network network) \
+		$(cabal_flag small_base small_base) \
+		$(cabal_flag unicode_collation unicode_collation)
+}
diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.8-preproc.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.8-preproc.patch
deleted file mode 100644
index 25d01cca81c8..000000000000
--- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.8-preproc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix missing CPP language feature.
-
-call:
-    $ ./setup configure --ghc --prefix=/usr --with-compiler=/usr/bin/ghc --with-hc-pkg=/usr/bin/ghc-pkg --prefix=/usr --libdir=/usr/lib64 --libsubdir=citeproc-hs-0.3.8/ghc-7.6.3 --datadir=/usr/share/ --datasubdir=citeproc-hs-0.3.8/ghc-7.6.3 --with-haddock=/usr/bin/haddock --ghc-option=-O0 --ghc-option=-optl-Wl,-O1 --ghc-option=-optl-Wl,--as-needed --ghc-option=-optl-Wl,--hash-style=gnu --disable-executable-stripping --docdir=/usr/share/doc/citeproc-hs-0.3.8 --verbose --flags=small_base --flags=-bibutils --flags=-network --flags=-hexpat --flags=-embed_data_files
-failed as:
-    Preprocessing library citeproc-hs-0.3.8...
-    src/Text/CSL/Pickle.hs:27:2: lexical error at character 'i'
-
-Reported-by: Marc
-Gentoo-bug: http://bugs.gentoo.org/475084
-diff --git a/src/Text/CSL/Pickle.hs b/src/Text/CSL/Pickle.hs
-index 2d69e48..8c00530 100644
---- a/src/Text/CSL/Pickle.hs
-+++ b/src/Text/CSL/Pickle.hs
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE PatternGuards, CPP #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Pickle
diff --git a/dev-haskell/citeproc-hs/metadata.xml b/dev-haskell/citeproc-hs/metadata.xml
index 3a781e0a9eb0..da92cf25e8d4 100644
--- a/dev-haskell/citeproc-hs/metadata.xml
+++ b/dev-haskell/citeproc-hs/metadata.xml
@@ -5,6 +5,14 @@
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
+		<flag name="embed_data_files">Embed locale files into the library (needed for windows packaging)</flag>
+		<flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag>
+		<flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
+		<flag name="small_base">Choose the new smaller, split-up base package.</flag>
+		<flag name="unicode_collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
+	</use>
 	<longdescription>
 		citeproc-hs is a library for rendering
 		bibliographic reference citations into a variety
@@ -15,11 +23,4 @@
 		
 		For the API documentation please see &quot;Text.CSL&quot;.
 	</longdescription>
-	<use>
-		<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
-                <flag name="embed_data_files">Embed locale files into the library (needed for windows packaging)</flag>
-		<flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag>
-		<flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
-                <flag name="small_base">Choose the new smaller, split-up base package.</flag>
-	</use>
 </pkgmetadata>