Version bump (ghc-7.4 compatible)

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

5 files changed, 77 insertions, 18 deletions

diff --git a/dev-haskell/cairo/ChangeLog b/dev-haskell/cairo/ChangeLog
index a2623f2a80fd..dbc165a195d3 100644
--- a/dev-haskell/cairo/ChangeLog
+++ b/dev-haskell/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/cairo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/ChangeLog,v 1.3 2011/06/21 11:01:35 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/ChangeLog,v 1.4 2012/05/13 08:37:32 slyfox Exp $
+
+*cairo-0.12.3 (13 May 2012)
+
+  13 May 2012; Sergei Trofimovich <slyfox@gentoo.org> +cairo-0.12.3.ebuild,
+  +files/cairo-0.12.3-fixincl.patch, metadata.xml:
+  Version bump (ghc-7.4 compatible)
 
   21 Jun 2011; Markos Chandras <hwoarang@gentoo.org> cairo-0.12.0.ebuild:
   Stable on amd64 wrt bug #314059
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 0306890f8afe..c8cfbddc2379 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1,24 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX cairo-0.12.3-fixincl.patch 747 RMD160 f37fba5e746d183fce935bef5d711498c9b1ec30 SHA1 2f5e5d8962f2b5c8be09ad2c7a743d9f6261afcd SHA256 d1e27a609da83fe801d4c98df4e822edb83899cc7374b8bbd198155e8aa65665
 DIST cairo-0.12.0.tar.gz 47495 RMD160 599303f5c57a26285a35589dafaa7dc272407f33 SHA1 bd252fbe6429d28b4f8e2337b2c8be02f1eec251 SHA256 29736aa5a6c7c3f4401c9ad53768a4806dbc0b3278be186aa95b4a8edcc25a58
+DIST cairo-0.12.3.tar.gz 50412 RMD160 c88a8087022149b994216eaf21083689d70ebd93 SHA1 f5d040894654d28428f85aba1c4b7de295178eb9 SHA256 8d6bfa6488b4baa87f6722685b437b755bb739351bf3168ae681e87d4032fe4d
 EBUILD cairo-0.12.0.ebuild 955 RMD160 1592d438e04330c909e56da08076d81bbc1ff750 SHA1 4fc3d708ff638a949935a1cb0904cae20cd8932a SHA256 f250a682b9638fff79d0e1914684b6a23c08bb3b7590e73be0be26d60c76ebe1
-MISC ChangeLog 603 RMD160 ca7e4dda80ac29cd2acdcb19da9d455934c1b73b SHA1 8a6ed727d08743497aba9799c3eb91dcd6dacf10 SHA256 a23eaaa0ffcadd40a2f22c15cc6cc25cd40c3aa8e559bce0b4e554df1d58bfbe
-MISC metadata.xml 226 RMD160 ce53ae962a9db6f84ca4bb78be2164eaae59ef7e SHA1 5339c9c3bb37552032524a26cbebf57b6f67ef29 SHA256 e5dc2b6b77ac9bf27c18c122bdce1f2e766bbe26979d753337459c3fe807b851
+EBUILD cairo-0.12.3.ebuild 996 RMD160 5bfec0c62ed742cd550906bda909457eb16c905c SHA1 9c9c0a9e5cb445ea4d6287fd6889f34232c33e26 SHA256 02a4aec739448260a5571e98297e6a52a58e934fd840b5f3b9e50a0a59291f74
+MISC ChangeLog 794 RMD160 b73ffe6582e17ce89ba0875366f48ed1b1afe7ae SHA1 0e433bf2d79d46f80ddc1182960baf60dba7d1e5 SHA256 b32adaa9eadc2b060ea1baad93a281661af5c109401b50518946dd4607fde249
+MISC metadata.xml 445 RMD160 bf06cbfd9f083c691680359f86612736b9e7a00f SHA1 046b0effd4dbcdbc3e3786daa916e6cbafd9ff68 SHA256 de19bba189f3bf007551683022f9fa146765a1fbf489b38777c931411b547e78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOAHpQAAoJEPqDWhW0r/LCpLwP/i7tZz8Bzi2A0WlZ8419VBzf
-4bvzZ4NOHzhOG5hJ8tesdqLGyKE5PyUjYzF+L2/1GcAsEHOtT/ZUgMXQB7J9JvSG
-EQnaBSvM8bvIFuVf/jeDHi82YW4zMIIy/N6f+S7yO/qq8tHpvfU+Xg3q0jJAbanD
-byxL7BL5nZD3fHqOQ+Vxtv4qVKvm/43t8JZxRE2Zx4fdpHA6MZ6Eb21G+XAiUxPc
-4yrfF82gxm13ap/UiVMLN9vULG+Ziv8I0VaZG1452SwWZy7wpWPS1xyL33m/Fyo/
-X4P72mWgixJokpfr32lB5uS6bnb8CTBQTtSacY9A/KqxWyZhK9Uedr99giSTeNDb
-fftK8da/iNGIsScngGgYGzRaIiB8n1UI4ZhWClde64r3O6nuYBih5dS2SSq7NAT/
-+ho8IS0HVvsfGIa2eHvJlQkuX00VYh/Nm8tw3bqD7gb9Ma3FCwddxKdxcB8FdFgX
-XNd3fyJQpvrFB1fvQoXqLc7pLQdGAt/MuW9vlBshOkRAteEGRAzQ5QzWJ4oUBeDK
-uCd7etuhyzT30NN7AL3q4vG8+KjMvECu2o2NZnk86pWxTZAMgEemaDrrmuxEr22D
-j0EzNZwVvt8q3z4VJj7Nn9CNKNzL5bDi+ISu+PwQ6Ry4f1ba/groRyPnWhq53Db5
-ZbXSm5Iyi3ALODkxnmXA
-=lyuh
+iEYEARECAAYFAk+vdAIACgkQcaHudmEf86oVqwCcCGe3nD+2hO0qe9pYr2gY8Fz0
+7ekAn2aSt8P+n5wuuDgVsuWveXeucKZH
+=apIu
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cairo/cairo-0.12.3.ebuild b/dev-haskell/cairo/cairo-0.12.3.ebuild
new file mode 100644
index 000000000000..557ba1ec58b4
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.12.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.ebuild,v 1.1 2012/05/13 08:37:32 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI=4
+
+#nocabaldep is for the fancy cabal-detection feature at build-time
+CABAL_FEATURES="lib profile haddock hscolour hoogle nocabaldep"
+inherit base haskell-cabal
+
+DESCRIPTION="Binding to the Cairo library."
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+svg"
+
+RDEPEND="dev-haskell/mtl
+		>=dev-lang/ghc-6.10.1
+		x11-libs/cairo[svg?]"
+DEPEND="${RDEPEND}
+		dev-haskell/gtk2hs-buildtools"
+
+PATCHES=("${FILESDIR}"/${P}-fixincl.patch)
+
+src_configure() {
+	# x11-libs/cairo seems to build pdf and ps by default
+	cabal_src_configure \
+		--flags=cairo_pdf \
+		--flags=cairo_ps \
+		$(cabal_flag svg cairo_svg)
+}
diff --git a/dev-haskell/cairo/files/cairo-0.12.3-fixincl.patch b/dev-haskell/cairo/files/cairo-0.12.3-fixincl.patch
new file mode 100644
index 000000000000..1b531a1932ea
--- /dev/null
+++ b/dev-haskell/cairo/files/cairo-0.12.3-fixincl.patch
@@ -0,0 +1,19 @@
+Fix include path on cabal-1.14
+
+Building cairo-0.12.3...
+Preprocessing library cairo-0.12.3...
+dist/build/Graphics/Rendering/Cairo/Matrix.h:1:26: fatal error: cairo-gtk2hs.h: No such file or directory
+compilation terminated.
+gtk2hsC2hs: Error during preprocessing custom header file
+diff --git a/cairo.cabal b/cairo.cabal
+index af7cee9..62fe84b 100644
+--- a/cairo.cabal
++++ b/cairo.cabal
+@@ -69,6 +69,7 @@ Library
+                           Graphics.Rendering.Cairo.Internal.Surfaces.PS
+                           Graphics.Rendering.Cairo.Internal.Surfaces.SVG
+         extensions:     ForeignFunctionInterface
++        Include-dirs: .
+         x-c2hs-Header:  cairo-gtk2hs.h
+         pkgconfig-depends: cairo >= 1.2.0
+         if flag(cairo_pdf)
diff --git a/dev-haskell/cairo/metadata.xml b/dev-haskell/cairo/metadata.xml
index 2f5607ea9893..adc163231c20 100644
--- a/dev-haskell/cairo/metadata.xml
+++ b/dev-haskell/cairo/metadata.xml
@@ -5,4 +5,9 @@
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<longdescription>
+		Cairo is a library to render high quality vector graphics. There
+		exist various backends that allows rendering to Gtk windows, PDF,
+		PS, PNG and SVG documents, amongst others.
+	</longdescription>
 </pkgmetadata>