Fix failure when USE="glade -gnome" (bug #112227)

Package-Manager: portage-2.0.51.22-r3

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 206a5ea4d13d3145cf89a1914fec6f405e5368ef..5afdbd06eb22b43868aa134a2a114495fb97aebe 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.17 2005/11/06 12:33:24 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.18 2005/11/12 10:51:11 dcoutts Exp $
+
+  12 Nov 2005; <duncan@gentoo.org> gtk2hs-0.9.10.ebuild:
+  Fix failure when USE="glade -gnome" (bug #112227)
 
   06 Nov 2005; <duncan@gentoo.org> gtk2hs-0.9.10.ebuild:
   Fix generation of cairo GHCi lib.

diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index 3f9a9aec684e54ca6f825accce090ac8ff89bac6..efef1189a56c50d5318a0cbbfb4df9f25a55cd03 100644 (file)
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8573dcaa0d24b65acc986d6ea19008b3 gtk2hs-0.9.8.ebuild 2691
-MD5 20a1667a6070cda23522f4c4b5374e24 gtk2hs-0.9.10.ebuild 3296
+MD5 6651e35a93758e17aa80f653b9b9017f gtk2hs-0.9.10.ebuild 3286
 MD5 7e30fe1183168a85eb624db45d97908c gtk2hs-0.9.7.ebuild 2835
-MD5 83632a51aef7ca5bdee49782cfe141e7 ChangeLog 2210
+MD5 9a0b2b9ca1e1c91ba853ee90cfafd2a8 ChangeLog 2320
 MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
 MD5 785d6c4be9c0d72fcc6f890a83cf601d gtk2hs-0.9.6-r1.ebuild 2698
 MD5 05c2042c54431c623ff56c03e7b5c1f1 gtk2hs-0.9.9.ebuild 2698
@@ -14,10 +11,3 @@ 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 503dec3816a4b1af45048502b9b3f46649fafdf2..2543c31f4da237a1ff905e1fa31d8565ba7ffec5 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.2 2005/11/06 12:33:24 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild,v 1.3 2005/11/12 10:51:11 dcoutts Exp $
 
 inherit base ghc-package multilib
 
@@ -30,8 +30,7 @@ src_compile() {
        econf \
                --enable-packager-mode \
                $(has_version '>=x11-libs/gtk+-2.8' && echo --enable-cairo) \
-               $(use_enable glade libglade) \
-               $(use_enable gnome libglade) \
+               $(use glade || use gnome && echo --enable-libglade) \
                $(use_enable gnome gconf) \
                $(use_enable gnome sourceview) \
                $(use_enable mozilla mozilla) \