summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Coutts <dcoutts@gentoo.org>2005-11-06 12:33:24 +0000
committerDuncan Coutts <dcoutts@gentoo.org>2005-11-06 12:33:24 +0000
commit5529392f64cbd1b2c73f764143979a3f1586040d (patch)
treebba8ab669de5f2f932824d66a8b576b49eede625 /dev-haskell
parentfix remote hole in linux-ftpd-ssl - security bug #111573 (diff)
downloadgentoo-2-5529392f64cbd1b2c73f764143979a3f1586040d.tar.gz
gentoo-2-5529392f64cbd1b2c73f764143979a3f1586040d.tar.bz2
gentoo-2-5529392f64cbd1b2c73f764143979a3f1586040d.zip
Fix generation of cairo GHCi lib.
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/gtk2hs/ChangeLog5
-rw-r--r--dev-haskell/gtk2hs/Manifest2
-rw-r--r--dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild4
3 files changed, 7 insertions, 4 deletions
diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 1963cfebe470..206a5ea4d13d 100644
--- 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 0011420bde73..2289b93bf134 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,5 +1,5 @@
MD5 8573dcaa0d24b65acc986d6ea19008b3 gtk2hs-0.9.8.ebuild 2691
-MD5 e072b2ba13bbe6f51ebfcff9d8afe14b gtk2hs-0.9.10.ebuild 3272
+MD5 36c60b21e6459f7bf814cf256749cb69 gtk2hs-0.9.10.ebuild 3296
MD5 7e30fe1183168a85eb624db45d97908c gtk2hs-0.9.7.ebuild 2835
MD5 3c9b336ecc0a8c8cee7833b0e93f5204 ChangeLog 2116
MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
index 35780f9aa9ec..503dec3816a4 100644
--- 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"