Removed mozilla USE flag, fixing bug #159635. The firefox USE flag remains.

Package-Manager: portage-2.1.2_rc3-r9

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index fa3ca0520faeb85534d0029cff05382023f49cb7..cd5e732d91808d0464d4dd0a0e27d8135a0c4963 100644 (file)
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/gtk2hs
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.27 2006/04/07 21:29:31 araujo Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.28 2007/01/06 19:06:55 dcoutts Exp $
+
+  06 Jan 2007; Duncan Coutts <dcoutts@gentoo.org> gtk2hs-0.9.9.ebuild,
+  gtk2hs-0.9.10.ebuild, gtk2hs-0.9.10-r1.ebuild:
+  Removed mozilla USE flag, fixing bug #159635. The firefox USE flag remains.
+  Also block on ghc-6.6, we need a new upstream release for ghc-6.6 compat.
 
 *gtk2hs-0.9.10-r1 (07 Apr 2006)
 
@@ -14,19 +19,19 @@
   23 Feb 2006; Luis F. Araujo <araujo@gentoo.org> gtk2hs-0.9.10.ebuild:
   Fixed firefox useflag
 
-  20 Feb 2006; <duncan@gentoo.org> -gtk2hs-0.9.7.ebuild:
+  20 Feb 2006; <dcoutts@gentoo.org> -gtk2hs-0.9.7.ebuild:
   Remove old 0.9.7 version.
 
-  20 Feb 2006; <duncan@gentoo.org> +files/gtk2hs-0.9.10-ghc622.patch,
+  20 Feb 2006; <dcoutts@gentoo.org> +files/gtk2hs-0.9.10-ghc622.patch,
   gtk2hs-0.9.10.ebuild:
   Fix building with ghc-6.2.2. Fixes bug #115657.
 
-  14 Feb 2006; <duncan@gentoo.org> +files/gtk2hs-0.9.10-cflags.patch,
+  14 Feb 2006; <dcoutts@gentoo.org> +files/gtk2hs-0.9.10-cflags.patch,
   gtk2hs-0.9.10.ebuild:
   Added a patch to fix the use of CFLAGS which was causing problems on sparc.
   Marked ~sparc.
 
-  10 Feb 2006; <duncan@gentoo.org> -gtk2hs-0.9.6-r1.ebuild,
+  10 Feb 2006; <dcoutts@gentoo.org> -gtk2hs-0.9.6-r1.ebuild,
   -gtk2hs-0.9.8.ebuild:
   Remove old versions.
 
@@ -34,26 +39,26 @@
   -files/gtk2hs-0.9.7-ghc64.patch.gz, gtk2hs-0.9.7.ebuild:
   move compressed patches to the mirros
 
-  14 Dec 2005; <duncan@gentoo.org> gtk2hs-0.9.10.ebuild:
+  14 Dec 2005; <dcoutts@gentoo.org> gtk2hs-0.9.10.ebuild:
   Make the DEPEND include the RDEPEND.
 
-  12 Nov 2005; <duncan@gentoo.org> gtk2hs-0.9.10.ebuild:
+  12 Nov 2005; <dcoutts@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:
+  06 Nov 2005; <dcoutts@gentoo.org> gtk2hs-0.9.10.ebuild:
   Fix generation of cairo GHCi lib.
 
 *gtk2hs-0.9.10 (02 Nov 2005)
 
-  02 Nov 2005; <duncan@gentoo.org> +gtk2hs-0.9.10.ebuild:
+  02 Nov 2005; <dcoutts@gentoo.org> +gtk2hs-0.9.10.ebuild:
   Added new version.
 
 *gtk2hs-0.9.9 (31 Aug 2005)
 
-  31 Aug 2005; <duncan@gentoo.org> +gtk2hs-0.9.9.ebuild:
+  31 Aug 2005; <dcoutts@gentoo.org> +gtk2hs-0.9.9.ebuild:
   Added new version.
 
-  31 Aug 2005; <duncan@gentoo.org> gtk2hs-0.9.7.ebuild, gtk2hs-0.9.8.ebuild:
+  31 Aug 2005; <dcoutts@gentoo.org> gtk2hs-0.9.7.ebuild, gtk2hs-0.9.8.ebuild:
   Make gtk2hs-0.9.7 and gtk2hs-0.9.8 use only haddock-0.6 since they will not
   work with haddock-0.7.
 
@@ -62,11 +67,11 @@
 
 *gtk2hs-0.9.8 (24 Jun 2005)
 
-  24 Jun 2005; <duncan@gentoo.org> gtk2hs-0.9.7.ebuild,
+  24 Jun 2005; <dcoutts@gentoo.org> gtk2hs-0.9.7.ebuild,
   +gtk2hs-0.9.8.ebuild:
   New version.
 
-  20 May 2005; <duncan@gentoo.org> gtk2hs-0.9.7.ebuild:
+  20 May 2005; <dcoutts@gentoo.org> gtk2hs-0.9.7.ebuild:
   Added ~sparc to KEYWORDS.
 
   08 May 2005; Duncan Coutts <dcoutts@gentoo.org>

diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index f1da31417a37627ea96e75e0f1a2ae2c183afa95..279a4418f3abe22d92d5bd55043cc856d9e8259f 100644 (file)
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,43 +1,43 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8b39fd9339cc65f701d1597bac49f45d ChangeLog 3482
-RMD160 825fda4e488d1da870aa060f8d7a885676ff8ad8 ChangeLog 3482
-SHA256 fe505d74c30c50504637a67c72efb2d1f8596b1b572038948d66f3f13b523103 ChangeLog 3482
-MD5 d165e3eb925c10e6c6316aec5b6b7477 files/digest-gtk2hs-0.9.10 241
-RMD160 935c458d76ad82bde6181be1f45d59deb695926d files/digest-gtk2hs-0.9.10 241
-SHA256 501f52c81b4d0072d05c93246175010dc391d7bf6b3e8b36f3d6eeed99a436bd files/digest-gtk2hs-0.9.10 241
-MD5 d165e3eb925c10e6c6316aec5b6b7477 files/digest-gtk2hs-0.9.10-r1 241
-RMD160 935c458d76ad82bde6181be1f45d59deb695926d files/digest-gtk2hs-0.9.10-r1 241
-SHA256 501f52c81b4d0072d05c93246175010dc391d7bf6b3e8b36f3d6eeed99a436bd files/digest-gtk2hs-0.9.10-r1 241
-MD5 a0148d13d7414bb83ec383c7124ea654 files/digest-gtk2hs-0.9.9 64
-RMD160 0363b492a3048160b3ae3cd414bf15e54ef16957 files/digest-gtk2hs-0.9.9 64
-SHA256 6f6c55dfd880134a0fe7d0e247b9244c0c65212f0fa5ec9a42825065e7576dee files/digest-gtk2hs-0.9.9 64
+AUX gtk2hs-0.9.10-cflags.patch 1233 RMD160 eb5cb160a304cc4f5535be9a218549aaaad7c56c SHA1 68f3d351fa801f77f3ebce853919b604fbb26b18 SHA256 867b3dec0d2d0bea714f85eadcc4825dd1815f021feb53bb070d1f78e330ccef
 MD5 a9f993b40c06f3946a5ea7135e753bb3 files/gtk2hs-0.9.10-cflags.patch 1233
 RMD160 eb5cb160a304cc4f5535be9a218549aaaad7c56c files/gtk2hs-0.9.10-cflags.patch 1233
 SHA256 867b3dec0d2d0bea714f85eadcc4825dd1815f021feb53bb070d1f78e330ccef files/gtk2hs-0.9.10-cflags.patch 1233
+AUX gtk2hs-0.9.10-ghc622.patch 1440 RMD160 aa50f1a098efbb464993c2824314f79b58131ead SHA1 50522f3ab5ddcac4403953266b486098ae85179e SHA256 48d5b2565eb8a77658f0e6950e021cbf1a0c88ba2810fd8f4ece0c92d4d23b66
 MD5 1d88116a10dcaabba0212ade034f0815 files/gtk2hs-0.9.10-ghc622.patch 1440
 RMD160 aa50f1a098efbb464993c2824314f79b58131ead files/gtk2hs-0.9.10-ghc622.patch 1440
 SHA256 48d5b2565eb8a77658f0e6950e021cbf1a0c88ba2810fd8f4ece0c92d4d23b66 files/gtk2hs-0.9.10-ghc622.patch 1440
+AUX gtk2hs-0.9.10-store.patch 678 RMD160 9369b99cfca278e252ea6b5c25ba23bcb53603e8 SHA1 a4d4685b483612bd4ae78af2fac7efcaf5b36310 SHA256 e47de4d759ff4e68ef9d278ddb5d8db77c463a87ac964578fe929db0ba1cf06f
 MD5 7f8f0b73ff10730feb4320d63f0e5809 files/gtk2hs-0.9.10-store.patch 678
 RMD160 9369b99cfca278e252ea6b5c25ba23bcb53603e8 files/gtk2hs-0.9.10-store.patch 678
 SHA256 e47de4d759ff4e68ef9d278ddb5d8db77c463a87ac964578fe929db0ba1cf06f files/gtk2hs-0.9.10-store.patch 678
-MD5 338e4fc278d9ef07ff47aacdd05599bc gtk2hs-0.9.10-r1.ebuild 3615
-RMD160 3912848fc2f418354ce41228dfdbfc89812f41d6 gtk2hs-0.9.10-r1.ebuild 3615
-SHA256 422ba97de3ab699df4ea0ef1a3f05db7adeacd531387544a2649d304a7012935 gtk2hs-0.9.10-r1.ebuild 3615
-MD5 e68bd175dbd9ac56aa6cd5ef282970d2 gtk2hs-0.9.10.ebuild 3566
-RMD160 431fb2c562f61882821e6dddf42c9057626ba8a7 gtk2hs-0.9.10.ebuild 3566
-SHA256 b1550e9b94cbf20ba2471011bf078acf74d6da796f9f0fbd5d77a186db34364c gtk2hs-0.9.10.ebuild 3566
-MD5 05c2042c54431c623ff56c03e7b5c1f1 gtk2hs-0.9.9.ebuild 2698
-RMD160 6df67a58d8596e648acbdf6c2d369bf032f681ba gtk2hs-0.9.9.ebuild 2698
-SHA256 aa1337b8b7f89adb27b00e3ad5f73f20665c61cdd1853c651b82d0b661c9f43c gtk2hs-0.9.9.ebuild 2698
+DIST gtk2hs-0.9.10.tar.gz 830866 RMD160 2b0a5275b43c0b22588028ba7944622ff08fbbb6 SHA1 7f1632923e18af7cbbd0b6fe566841658960dfd0 SHA256 da99b248f3674acba43bd636d1c67813851290ed11860f7f99a44a882cdea924
+DIST gtk2hs-0.9.9.tar.gz 765222 RMD160 f048076a02bf4dabd0279c5311e7b79bed84287e SHA1 af307de49b6ad5cd9a397bb99a175a2913a3e061 SHA256 e62fa9795fd952826e1eab5b74ad125a72a38ce5c4cecb727f20da4a16c2d6f0
+EBUILD gtk2hs-0.9.10-r1.ebuild 3525 RMD160 2b1530490d11aae5d05482e93610de23a2726b8a SHA1 3bdf6bf5d26138e23f4d7aa9998dec8f70074616 SHA256 56a03176b63fab9ab605bffe8ee52f4e948cdd0f632ec03aae1f6229f239eed1
+MD5 e71265dc1b63050c300eecccae03deef gtk2hs-0.9.10-r1.ebuild 3525
+RMD160 2b1530490d11aae5d05482e93610de23a2726b8a gtk2hs-0.9.10-r1.ebuild 3525
+SHA256 56a03176b63fab9ab605bffe8ee52f4e948cdd0f632ec03aae1f6229f239eed1 gtk2hs-0.9.10-r1.ebuild 3525
+EBUILD gtk2hs-0.9.10.ebuild 3475 RMD160 b1495d1693c5fbcd747ae379957e0e67fccf4405 SHA1 53be29b1371ed324b5d1a5f48c1bae836a6762de SHA256 e7e6e9036d429fafc7904be196d6947ec2619e4737e8140a3e7ef3c1f26b5458
+MD5 8bea0cfb09ee4924d6016d414e03854f gtk2hs-0.9.10.ebuild 3475
+RMD160 b1495d1693c5fbcd747ae379957e0e67fccf4405 gtk2hs-0.9.10.ebuild 3475
+SHA256 e7e6e9036d429fafc7904be196d6947ec2619e4737e8140a3e7ef3c1f26b5458 gtk2hs-0.9.10.ebuild 3475
+EBUILD gtk2hs-0.9.9.ebuild 2464 RMD160 0bcaf58181001e9d47228d5c0dcec23c893db7f6 SHA1 fa6eeb6d962731bb3364a02f1a361e54ceeb2bb4 SHA256 81e781adbd51e1661c67a4d8d9f390c22d692fa14998b02aa1d141fe0008f93e
+MD5 8f475b8e9dd21e97b6e871a4b1ae24b4 gtk2hs-0.9.9.ebuild 2464
+RMD160 0bcaf58181001e9d47228d5c0dcec23c893db7f6 gtk2hs-0.9.9.ebuild 2464
+SHA256 81e781adbd51e1661c67a4d8d9f390c22d692fa14998b02aa1d141fe0008f93e gtk2hs-0.9.9.ebuild 2464
+MISC ChangeLog 3770 RMD160 fa804ceb7c3910369d106ebb16415351defb0cae SHA1 5d4d14bd5b7eb064684beee08328e21efe84ca3b SHA256 11e5a1c0761b67b879ef6b145a819c929f13d882b2ad8de099cc12fca0b8b505
+MD5 ee890825c3014a3de6c13243272dbd65 ChangeLog 3770
+RMD160 fa804ceb7c3910369d106ebb16415351defb0cae ChangeLog 3770
+SHA256 11e5a1c0761b67b879ef6b145a819c929f13d882b2ad8de099cc12fca0b8b505 ChangeLog 3770
+MISC metadata.xml 223 RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be SHA1 3be3a7139f7e71b712959fb7465f73d1bcb6ba07 SHA256 8c4b3cde4b0d254edca1f695296876df4ac96ca844d68e8152cfc5f6dbe39792
 MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
 RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be metadata.xml 223
 SHA256 8c4b3cde4b0d254edca1f695296876df4ac96ca844d68e8152cfc5f6dbe39792 metadata.xml 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENtmXdZ42PGEF17URAlU6AJ9onMMxSl1koyUGzm3LTFjrlo6d2ACcDegU
-BMRg/f2ft/kERL0a5ZvSpgs=
-=NKUE
------END PGP SIGNATURE-----
+MD5 d165e3eb925c10e6c6316aec5b6b7477 files/digest-gtk2hs-0.9.10 241
+RMD160 935c458d76ad82bde6181be1f45d59deb695926d files/digest-gtk2hs-0.9.10 241
+SHA256 501f52c81b4d0072d05c93246175010dc391d7bf6b3e8b36f3d6eeed99a436bd files/digest-gtk2hs-0.9.10 241
+MD5 d165e3eb925c10e6c6316aec5b6b7477 files/digest-gtk2hs-0.9.10-r1 241
+RMD160 935c458d76ad82bde6181be1f45d59deb695926d files/digest-gtk2hs-0.9.10-r1 241
+SHA256 501f52c81b4d0072d05c93246175010dc391d7bf6b3e8b36f3d6eeed99a436bd files/digest-gtk2hs-0.9.10-r1 241
+MD5 3637e0eeadfe2f6a0778a6256cb4a4f3 files/digest-gtk2hs-0.9.9 238
+RMD160 62a6c8c2be2d04e99a6fd66bfdf9bab64fa0412f files/digest-gtk2hs-0.9.9 238
+SHA256 07e2288414b25f678d9185d91ebb329615be28e2d10edd6790c8f4e804ac0ae6 files/digest-gtk2hs-0.9.9 238

diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9
index fa238bbca6443a910caf956aeff3e2aed56ec1ad..3530192df60eb986f69d3b24fb2ea9f2263d6397 100644 (file)
--- a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9
+++ b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9
@@ -1 +1,3 @@
 MD5 3276545190248d40c683cd42f51a1b6e gtk2hs-0.9.9.tar.gz 765222
+RMD160 f048076a02bf4dabd0279c5311e7b79bed84287e gtk2hs-0.9.9.tar.gz 765222
+SHA256 e62fa9795fd952826e1eab5b74ad125a72a38ce5c4cecb727f20da4a16c2d6f0 gtk2hs-0.9.9.tar.gz 765222

diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
index df15091df2a6e7d312a59449607fd85853a4232a..304c93a6362445ad0c0b1f39a8df0dd5771dd2cb 100644 (file)
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2006/04/07 21:29:31 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild,v 1.2 2007/01/06 19:06:55 dcoutts Exp $
 
 inherit base eutils ghc-package multilib autotools
 
@@ -13,16 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 #enable sparc when CFLAGS/-mcpu ebuild bug is fixed
 
-IUSE="doc glade gnome mozilla firefox"
+IUSE="doc glade gnome firefox"
 
 RDEPEND=">=virtual/ghc-5.04.3
+               !>=virtual/ghc-6.6
                amd64? ( || ( >=dev-lang/ghc-6.4.1 >=dev-lang/ghc-bin-6.4.1 ) )
                >=x11-libs/gtk+-2
                glade? ( >=gnome-base/libglade-2 )
                gnome? ( >=gnome-base/libglade-2
                                 >=x11-libs/gtksourceview-0.6
                                 >=gnome-base/gconf-2 )
-               mozilla? ( >=www-client/mozilla-1.4 )
                firefox? ( >=www-client/mozilla-firefox-1.0.4 )"
 DEPEND="${RDEPEND}
                doc? ( >=dev-haskell/haddock-0.7 )"
@@ -45,7 +45,6 @@ src_compile() {
                $(use glade || use gnome && echo --enable-libglade) \
                $(use_enable gnome gconf) \
                $(use_enable gnome sourceview) \
-               $(use_enable mozilla mozilla) \
                $(use_enable firefox firefox) \
                $(use_enable doc docs) \
                || die "Configure failed"
@@ -89,7 +88,7 @@ src_install() {
                $(use gnome && echo \
                        "${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
                        "${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}") \
-               $(use mozilla || use firefox && echo \
+               $(use firefox && echo \
                        "${D}/usr/$(get_libdir)/gtk2hs/mozembed.${pkgext}")
        ghc-install-pkg
 
@@ -107,7 +106,7 @@ src_install() {
                ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSgconf.a"
                ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSsourceview.a"
        fi
-       if use mozilla || use firefox; then
+       if use firefox; then
                ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSmozembed.a"
        fi
 }

diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
index 6263a3f8f6c496b0afe69b6105b75a2c06e4f2b8..73cebcc6124cc229693f1d25e44771c77821157c 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.8 2006/03/01 19:25:58 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild,v 1.9 2007/01/06 19:06:55 dcoutts Exp $
 
 inherit base eutils ghc-package multilib autotools
 
@@ -13,16 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 #enable sparc when CFLAGS/-mcpu ebuild bug is fixed
 
-IUSE="doc glade gnome mozilla firefox"
+IUSE="doc glade gnome firefox"
 
 RDEPEND=">=virtual/ghc-5.04.3
+               !>=virtual/ghc-6.6
                amd64? ( || ( >=dev-lang/ghc-6.4.1 >=dev-lang/ghc-bin-6.4.1 ) )
                >=x11-libs/gtk+-2
                glade? ( >=gnome-base/libglade-2 )
                gnome? ( >=gnome-base/libglade-2
                                 >=x11-libs/gtksourceview-0.6
                                 >=gnome-base/gconf-2 )
-               mozilla? ( >=www-client/mozilla-1.4 )
                firefox? ( >=www-client/mozilla-firefox-1.0.4 )"
 DEPEND="${RDEPEND}
                doc? ( >=dev-haskell/haddock-0.7 )"
@@ -44,7 +44,6 @@ src_compile() {
                $(use glade || use gnome && echo --enable-libglade) \
                $(use_enable gnome gconf) \
                $(use_enable gnome sourceview) \
-               $(use_enable mozilla mozilla) \
                $(use_enable firefox firefox) \
                $(use_enable doc docs) \
                || die "Configure failed"
@@ -88,7 +87,7 @@ src_install() {
                $(use gnome && echo \
                        "${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
                        "${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}") \
-               $(use mozilla || use firefox && echo \
+               $(use firefox && echo \
                        "${D}/usr/$(get_libdir)/gtk2hs/mozembed.${pkgext}")
        ghc-install-pkg
 
@@ -106,7 +105,7 @@ src_install() {
                ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSgconf.a"
                ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSsourceview.a"
        fi
-       if use mozilla || use firefox; then
+       if use firefox; then
                ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSmozembed.a"
        fi
 }

diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild
index 8c2e87f1495b551c274e5376010147da70233b1f..0714d271c9253b357e7595d322a2147ef30f5919 100644 (file)
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild,v 1.1 2005/08/31 10:15:22 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild,v 1.2 2007/01/06 19:06:55 dcoutts Exp $
 
 inherit base ghc-package multilib
 
@@ -14,14 +14,14 @@ KEYWORDS="-amd64 ~x86 ~ppc"
 #enable amd64 when ghc-6.4.1 is out
 #enable sparc when CFLAGS/-mcpu ebuild bug is fixed
 
-IUSE="doc gnome mozilla"
+IUSE="doc gnome"
 
 DEPEND=">=virtual/ghc-5.04
+               !>=virtual/ghc-6.6
                >=x11-libs/gtk+-2
                gnome? ( >=gnome-base/libglade-2
                                 >=x11-libs/gtksourceview-0.6
                                 >=gnome-base/gconf-2 )
-               mozilla? ( >=www-client/mozilla-1.4 )
                doc? ( >=dev-haskell/haddock-0.7 )"
 
 src_compile() {
@@ -30,7 +30,6 @@ src_compile() {
                `use_enable gnome libglade` \
                `use_enable gnome gconf` \
                `use_enable gnome sourceview` \
-               `use_enable mozilla mozilla` \
                `use_enable doc docs` \
                || die "Configure failed"
 
@@ -69,9 +68,7 @@ src_install() {
                $(useq gnome && echo \
                        "${D}/usr/$(get_libdir)/gtk2hs/glade.${pkgext}" \
                        "${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
-                       "${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}") \
-               $(useq mozilla && echo \
-                       "${D}/usr/$(get_libdir)/gtk2hs/mozembed.${pkgext}")
+                       "${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}")
        ghc-install-pkg
 
        # build ghci .o files from .a files
@@ -83,8 +80,5 @@ src_install() {
                ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSgconf.a
                ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSsourceview.a
        fi
-       if use mozilla; then
-               ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSmozembed.a
-       fi
 }