disable Firefox support the hard way and make seamonkey not depend on USE=xulrunner

Package-Manager: portage-2.1.6.7/cvs/Linux i686

5 files changed, 22 insertions, 14 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 2716cce5d114..cb0e3c576f10 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.50 2009/04/03 22:13:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.51 2009/04/07 10:50:56 fauli Exp $
+
+  07 Apr 2009; Christian Faulhammer <fauli@gentoo.org> gtk2hs-0.9.11.ebuild,
+  gtk2hs-0.9.12.ebuild, gtk2hs-0.9.12.1.ebuild:
+  disable Firefox support the hard way and make seamonkey not depend on
+  USE=xulrunner
 
   03 Apr 2009; Christian Faulhammer <fauli@gentoo.org> gtk2hs-0.9.11.ebuild,
   gtk2hs-0.9.12.ebuild, gtk2hs-0.9.12.1.ebuild:
diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index 35d8f3417062..95ebd394d8c5 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -5,15 +5,15 @@ AUX gtk2hs-0.9.12.1-librsvg-2.22.3.patch 335 RMD160 cf96ef312fda9388a3d4cf28058f
 DIST gtk2hs-0.9.11.tar.gz 980618 RMD160 c745020329fab493752d9055c4c8bca798b5d3e1 SHA1 6150312809e99ca3bcfc9f1f851d48a5253022ce SHA256 5da4c1fd7f0b66834e2aaf919d243928f63c15411e6289b2f31dfafb50848691
 DIST gtk2hs-0.9.12.1.tar.gz 1004661 RMD160 cd658027ed91b9550915e686d546e36b1b371c10 SHA1 a85f8568aa072e0c55da5889b2aabff92b8da3ae SHA256 4278078b786202fc64f86881c2b2517bdd589d5248bff2e9b7e6c1ffd2361f84
 DIST gtk2hs-0.9.12.tar.gz 997153 RMD160 bfc3ad81be80fdbbf1694493d93ddf863efbf6d8 SHA1 401638c5abfc357b648e4aa4b234874c116a52bb SHA256 b7427fca5d1958a829b2623715a9b16d4b08d67820df0b46ad32e5bd6e1f44d2
-EBUILD gtk2hs-0.9.11.ebuild 3001 RMD160 11f53a4226d56c1bc6f59b849ada35d244d23f25 SHA1 210e8605f64b66e866f1f2975ffb56fa9de5352c SHA256 91a313ff6a676426b43e860723ee4a25b7b375e9526fc7345d8c76e6426d2746
-EBUILD gtk2hs-0.9.12.1.ebuild 3275 RMD160 7304c4da2872edd33e15dec330a7615a13d156df SHA1 9ceaea31ba2eeb5cceb9f00bf4f1cf1ccf10b68f SHA256 e42752522e292abce08509b7683b86f6819cf01bcaa15bbb998c40af7bfa2423
-EBUILD gtk2hs-0.9.12.ebuild 3229 RMD160 d1691bdb065aaa6be979e0782229eb59275d7aa3 SHA1 41aeb35e618e894d33db5c6ae07df3a9a189ec77 SHA256 28b5b52cd6a72275060cc6c3e521c00d64e532b249da6f96b7c418952fb96f70
-MISC ChangeLog 7355 RMD160 635a21a79af40bb88e1d207d4374afb9b6b504de SHA1 a2559138918ac1366c4d2929e8582afee1f0ea09 SHA256 17746d5ee1478b5f3c02b6f26dc0bb592a2acca7ab96cc5b227e681121c8f99f
+EBUILD gtk2hs-0.9.11.ebuild 3008 RMD160 914ced2d703a406ab51d174d50658d25f2f6f844 SHA1 099422d1259ab4f822e9dad9c09ee6de42ef3e13 SHA256 9dc1066aceb1493ee25f5daf247cfe682fdea0e2cc2bf2f3dc6f357f06fdeb78
+EBUILD gtk2hs-0.9.12.1.ebuild 3281 RMD160 1f0c454b37a0face368b4d46983df2d16edff760 SHA1 80e5fca7fa3574d9ac40092b172efb84c74ac6a2 SHA256 a96d93efcfbc456b3a1d1f2eb8a841124238a65122139a60efc35d39fbe09876
+EBUILD gtk2hs-0.9.12.ebuild 3236 RMD160 1e31cffae94680361e5ba2aaa0c91881fb7b1b27 SHA1 6d48dfb7ba1cb56ab5b61608882f03483760a564 SHA256 cd59568c2537f2f21e10fb77a507635ba50e2e9d4205dc25eba77d22ee6b3f15
+MISC ChangeLog 7569 RMD160 5d47c8e05f901034dd8233dbe83f8bf5705a2bce SHA1 c7ff23b60dea85fa73237502f06b322aa1d3c397 SHA256 99a76e2c9caaa7dacca0d71fcb62db00a61f5a0cc01e3fab6c31990666af5e6b
 MISC metadata.xml 264 RMD160 d289d41d1d04ed1c3e574a29f53999457dbdc52c SHA1 475c909ed389f5e0508b5cd8e1373db2b96ce75b SHA256 743889dc0a1fac66b79afe2bbc2e61338d1d467aabc7b29977885d61c94a2a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknWijAACgkQNQqtfCuFnePutgCfWqYPJfsh1NvRMt5tKtmpL3X7
-Dv0An1NXFmiWrAiaF3Z6RCg04SBDrUL4
-=g54I
+iEYEARECAAYFAknbMDoACgkQNQqtfCuFnePXZACeNsKZI9YFk5aug86NTuOKCuHU
+4bMAn0Wltw1QwT4SRZPlC0vebWdVi3iq
+=n26M
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild
index b30c6dc93a0b..7eefc8356510 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild,v 1.9 2009/04/03 22:13:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild,v 1.10 2009/04/07 10:50:56 fauli Exp $
 
 inherit base eutils ghc-package multilib toolchain-funcs versionator
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-lang/ghc-6.2
 				>=gnome-base/librsvg-2.16 )
 		opengl? ( x11-libs/gtkglext )
 		xulrunner? ( =net-libs/xulrunner-1.8* )
-		!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )"
+		seamonkey? ( =www-client/seamonkey-1* )"
 
 DEPEND="${RDEPEND}
 		doc? ( >=dev-haskell/haddock-0.7 )"
@@ -40,6 +40,7 @@ src_compile() {
 		$(use_enable gnome sourceview) \
 		$(use_enable gnome svg) \
 		$(use_enable opengl opengl) \
+		--disable-firefox \
 		$(use_enable seamonkey seamonkey) \
 		$(use_enable xulrunner xulrunner) \
 		$(use_enable doc docs) \
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
index 1fcee8e2c45d..acc0012e5a51 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.10 2009/04/03 22:13:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.11 2009/04/07 10:50:56 fauli Exp $
 
 inherit base eutils ghc-package multilib toolchain-funcs versionator
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-lang/ghc-6.4
 		svg?   ( >=gnome-base/librsvg-2.16 )
 		opengl? ( x11-libs/gtkglext )
 		xulrunner? ( =net-libs/xulrunner-1.8* )
-		!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )"
+		seamonkey? ( =www-client/seamonkey-1* )"
 
 DEPEND="${RDEPEND}
 		doc? ( >=dev-haskell/haddock-0.8 )
@@ -53,6 +53,7 @@ src_compile() {
 		$(use_enable gnome sourceview) \
 		$(use_enable svg svg) \
 		$(use_enable opengl opengl) \
+		--disable-firefox \
 		$(use_enable seamonkey seamonkey) \
 		$(use_enable xulrunner xulrunner) \
 		$(use_enable doc docs) \
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
index 4a89f5b396d7..67d4cf087ad2 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v 1.9 2009/04/03 22:13:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v 1.10 2009/04/07 10:50:56 fauli Exp $
 
 inherit base eutils ghc-package multilib toolchain-funcs versionator
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-lang/ghc-6.2
 		svg?   ( >=gnome-base/librsvg-2.16 )
 		opengl? ( x11-libs/gtkglext )
 		xulrunner? ( =net-libs/xulrunner-1.8* )
-		!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )"
+		seamonkey? ( =www-client/seamonkey-1* )"
 
 DEPEND="${RDEPEND}
 		doc? ( >=dev-haskell/haddock-0.8 )"
@@ -48,6 +48,7 @@ src_compile() {
 		$(use_enable gnome sourceview) \
 		$(use_enable svg svg) \
 		$(use_enable opengl opengl) \
+		--disable-firefox \
 		$(use_enable seamonkey seamonkey) \
 		$(use_enable xulrunner xulrunner) \
 		$(use_enable doc docs) \