Fix generation of cairo GHCi lib.

Package-Manager: portage-2.0.51.22-r3

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 1963cfebe47092c82a1ffdaa76f3965a7ef386ef..206a5ea4d13d3145cf89a1914fec6f405e5368ef 100644 (file)
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.16 2005/11/05 16:20:37 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.17 2005/11/06 12:33:24 dcoutts Exp $
+
+  06 Nov 2005; <duncan@gentoo.org> gtk2hs-0.9.10.ebuild:
+  Fix generation of cairo GHCi lib.
 
 *gtk2hs-0.9.10 (02 Nov 2005)
 

diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index 0011420bde73508431ebf71d887f0cd902f997e0..3f9a9aec684e54ca6f825accce090ac8ff89bac6 100644 (file)
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,7 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 8573dcaa0d24b65acc986d6ea19008b3 gtk2hs-0.9.8.ebuild 2691
-MD5 e072b2ba13bbe6f51ebfcff9d8afe14b gtk2hs-0.9.10.ebuild 3272
+MD5 20a1667a6070cda23522f4c4b5374e24 gtk2hs-0.9.10.ebuild 3296
 MD5 7e30fe1183168a85eb624db45d97908c gtk2hs-0.9.7.ebuild 2835
-MD5 3c9b336ecc0a8c8cee7833b0e93f5204 ChangeLog 2116
+MD5 83632a51aef7ca5bdee49782cfe141e7 ChangeLog 2210
 MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
 MD5 785d6c4be9c0d72fcc6f890a83cf601d gtk2hs-0.9.6-r1.ebuild 2698
 MD5 05c2042c54431c623ff56c03e7b5c1f1 gtk2hs-0.9.9.ebuild 2698
@@ -11,3 +14,10 @@ MD5 6f7aca1981bfbd6384c83cea70a1e20c files/digest-gtk2hs-0.9.7 64
 MD5 3b88c846dd87e7256e9396fbe9682f1f files/digest-gtk2hs-0.9.8 64
 MD5 a0148d13d7414bb83ec383c7124ea654 files/digest-gtk2hs-0.9.9 64
 MD5 96674cbaf4f6bddf1517166b6e6f13a5 files/digest-gtk2hs-0.9.6-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDbfhh/B0cxt+cq+wRAm0lAJ0ahcvjPtA6rRBasTTpJxvAn0X4+gCgrKzl
+pgRYSmMJE6jdrz1XIL935N0=
+=aszT
+-----END PGP SIGNATURE-----

diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
index 35780f9aa9ec0ecc286ba4137861c34a8fcf61a5..503dec3816a4b1af45048502b9b3f46649fafdf2 100644 (file)
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild,v 1.1 2005/11/05 16:20:37 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild,v 1.2 2005/11/06 12:33:24 dcoutts Exp $
 
 inherit base ghc-package multilib
 
@@ -84,7 +84,7 @@ src_install() {
 
        # build ghci .o files from .a files
        ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSglib.a"
-       if use cairo; then
+       if has_version '>=x11-libs/gtk+-2.8'; then
                ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHScairo.a"
        fi
        ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSgtk.a"