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

(Portage version: 2.1.2_rc3-r9)

5 files changed, 38 insertions, 39 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index fa3ca0520fae..cd5e732d9180 100644
--- 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/files/digest-gtk2hs-0.9.9 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9
index fa238bbca644..3530192df60e 100644
--- 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 df15091df2a6..304c93a63624 100644
--- 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 6263a3f8f6c4..73cebcc6124c 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-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 8c2e87f1495b..0714d271c925 100644
--- 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
 }