summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2008-07-16 11:47:06 +0000
committerRaúl Porcel <armin76@gentoo.org>2008-07-16 11:47:06 +0000
commit7ab3d5097d46c2b99df259734573143e43b87cfe (patch)
treecd9d02b00b10ea69cf0061ff43e748285f2c8499 /dev-haskell
parentDisable elf-dynstr-gc on ppc for now, as it breaks, bug #231021 (diff)
downloadgentoo-2-7ab3d5097d46c2b99df259734573143e43b87cfe.tar.gz
gentoo-2-7ab3d5097d46c2b99df259734573143e43b87cfe.tar.bz2
gentoo-2-7ab3d5097d46c2b99df259734573143e43b87cfe.zip
Fix mozilla deps again, bug #230670
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/gtk2hs/ChangeLog6
-rw-r--r--dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild9
-rw-r--r--dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild9
-rw-r--r--dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild9
4 files changed, 20 insertions, 13 deletions
diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index ee091a4c11e4..42c364c82600 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/gtk2hs
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.46 2008/05/28 19:20:32 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.47 2008/07/16 11:47:06 armin76 Exp $
+
+ 16 Jul 2008; Raúl Porcel <armin76@gentoo.org> gtk2hs-0.9.11.ebuild,
+ gtk2hs-0.9.12.ebuild, gtk2hs-0.9.12.1.ebuild:
+ Fix mozilla deps again, bug #230670
28 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
Removing Duncan Coutts (dcoutts) from metadata.xml (as per #85695).
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild
index 2eb6ee33862c..7493c10a9ada 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-2008 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.7 2008/03/17 15:25:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild,v 1.8 2008/07/16 11:47:06 armin76 Exp $
inherit base eutils ghc-package multilib toolchain-funcs versionator
@@ -23,9 +23,10 @@ RDEPEND=">=dev-lang/ghc-6.2
>=gnome-base/gconf-2
>=gnome-base/librsvg-2.16 )
opengl? ( x11-libs/gtkglext )
- seamonkey? ( =www-client/seamonkey-1* )
- firefox? ( =www-client/mozilla-firefox-2* )
- xulrunner? ( =net-libs/xulrunner-1.8* )"
+ xulrunner? ( =net-libs/xulrunner-1.8* )
+ !xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
+ !xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )"
+
DEPEND="${RDEPEND}
doc? ( >=dev-haskell/haddock-0.7 )"
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
index 15093b270eca..d7a1dba77d96 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-2008 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.7 2008/05/04 13:56:19 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.8 2008/07/16 11:47:06 armin76 Exp $
inherit base eutils ghc-package multilib toolchain-funcs versionator
@@ -23,9 +23,10 @@ RDEPEND=">=dev-lang/ghc-6.4
>=gnome-base/gconf-2 )
svg? ( >=gnome-base/librsvg-2.16 )
opengl? ( x11-libs/gtkglext )
- seamonkey? ( =www-client/seamonkey-1* )
- firefox? ( =www-client/mozilla-firefox-2* )
- xulrunner? ( =net-libs/xulrunner-1.8* )"
+ xulrunner? ( =net-libs/xulrunner-1.8* )
+ !xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
+ !xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )"
+
DEPEND="${RDEPEND}
doc? ( >=dev-haskell/haddock-0.8 )
dev-util/pkgconfig"
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
index 641be2a0e009..cd05f5893b9a 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-2008 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.7 2008/05/04 14:10:01 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v 1.8 2008/07/16 11:47:06 armin76 Exp $
inherit base eutils ghc-package multilib toolchain-funcs versionator
@@ -23,9 +23,10 @@ RDEPEND=">=dev-lang/ghc-6.2
>=gnome-base/gconf-2 )
svg? ( >=gnome-base/librsvg-2.16 )
opengl? ( x11-libs/gtkglext )
- seamonkey? ( =www-client/seamonkey-1* )
- firefox? ( =www-client/mozilla-firefox-2* )
- xulrunner? ( =net-libs/xulrunner-1.8* )"
+ xulrunner? ( =net-libs/xulrunner-1.8* )
+ !xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
+ !xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )"
+
DEPEND="${RDEPEND}
doc? ( >=dev-haskell/haddock-0.8 )"