summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2008-06-02 22:57:09 +0000
committerMart Raudsepp <leio@gentoo.org>2008-06-02 22:57:09 +0000
commitbda6098c5b0ef9d359a8bb877294799da69f4343 (patch)
tree83135195065bbc7242b1bfefbd0823a75f84ec6e /www-client/epiphany
parentamd64 stable and quoting fixed. (diff)
downloadgentoo-2-bda6098c5b0ef9d359a8bb877294799da69f4343.tar.gz
gentoo-2-bda6098c5b0ef9d359a8bb877294799da69f4343.tar.bz2
gentoo-2-bda6098c5b0ef9d359a8bb877294799da69f4343.zip
Fix deps to net-libs/xulrunner-1.8 or www-client/mozilla-firefox-2 - the configure options passed wanted =xul-1.8 anyway; a future revision will be made to work with xul-1.9
(Portage version: 2.1.5.2)
Diffstat (limited to 'www-client/epiphany')
-rw-r--r--www-client/epiphany/ChangeLog8
-rw-r--r--www-client/epiphany/epiphany-2.22.1.1.ebuild13
-rw-r--r--www-client/epiphany/epiphany-2.22.2.ebuild13
3 files changed, 21 insertions, 13 deletions
diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 07e9def89e01..0f969810baef 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/epiphany
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.157 2008/05/31 14:27:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.158 2008/06/02 22:57:09 leio Exp $
+
+ 02 Jun 2008; Mart Raudsepp <leio@gentoo.org> epiphany-2.22.1.1.ebuild,
+ epiphany-2.22.2.ebuild:
+ Fix deps to net-libs/xulrunner-1.8 or www-client/mozilla-firefox-2 - the
+ configure options passed wanted =xul-1.8 anyway; a future revision will be
+ made to work with xul-1.9
*epiphany-2.22.2 (31 May 2008)
diff --git a/www-client/epiphany/epiphany-2.22.1.1.ebuild b/www-client/epiphany/epiphany-2.22.1.1.ebuild
index 155aff982478..6afaa297cf1a 100644
--- a/www-client/epiphany/epiphany-2.22.1.1.ebuild
+++ b/www-client/epiphany/epiphany-2.22.1.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/www-client/epiphany/epiphany-2.22.1.1.ebuild,v 1.1 2008/04/10 22:36:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.1.1.ebuild,v 1.2 2008/06/02 22:57:09 leio Exp $
inherit gnome2 eutils multilib
@@ -12,9 +12,10 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="avahi doc networkmanager python spell xulrunner"
-# FIXME: add webkit/gecko switch possibility
-# dang: *after* webkit actually works.
-# this release should work with xulrunner 1.9 so not slotting right now
+# This release should work with xulrunner 1.9, but this revision is a
+# stable candidate, so stick with 1.8 here.
+# xulrunner-1.9 can be achieved via --with-engine=xulrunner, while
+# --with-engine=mozilla goes with 1.8
RDEPEND=">=dev-libs/glib-2.16.0
>=x11-libs/gtk+-2.12.0
@@ -31,8 +32,8 @@ RDEPEND=">=dev-libs/glib-2.16.0
>=app-text/iso-codes-0.35
avahi? ( >=net-dns/avahi-0.6.22 )
networkmanager? ( net-misc/networkmanager )
- !xulrunner? ( >=www-client/mozilla-firefox-1.5 )
- xulrunner? ( net-libs/xulrunner )
+ !xulrunner? ( =www-client/mozilla-firefox-2* )
+ xulrunner? ( =net-libs/xulrunner-1.8* )
python? (
>=dev-lang/python-2.3
>=dev-python/pygtk-2.7.1
diff --git a/www-client/epiphany/epiphany-2.22.2.ebuild b/www-client/epiphany/epiphany-2.22.2.ebuild
index c6ac2f63876e..184cf47cb096 100644
--- a/www-client/epiphany/epiphany-2.22.2.ebuild
+++ b/www-client/epiphany/epiphany-2.22.2.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/www-client/epiphany/epiphany-2.22.2.ebuild,v 1.1 2008/05/31 14:27:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.2.ebuild,v 1.2 2008/06/02 22:57:09 leio Exp $
inherit gnome2 eutils multilib
@@ -12,9 +12,10 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="avahi doc networkmanager python spell xulrunner"
-# FIXME: add webkit/gecko switch possibility
-# dang: *after* webkit actually works.
-# this release should work with xulrunner 1.9 so not slotting right now
+# This release should work with xulrunner 1.9, but this revision is a
+# stable candidate, so stick with 1.8 here.
+# xulrunner-1.9 can be achieved via --with-engine=xulrunner, while
+# --with-engine=mozilla goes with 1.8
RDEPEND=">=dev-libs/glib-2.16.0
>=x11-libs/gtk+-2.12.0
@@ -31,8 +32,8 @@ RDEPEND=">=dev-libs/glib-2.16.0
>=app-text/iso-codes-0.35
avahi? ( >=net-dns/avahi-0.6.22 )
networkmanager? ( net-misc/networkmanager )
- !xulrunner? ( >=www-client/mozilla-firefox-1.5 )
- xulrunner? ( net-libs/xulrunner )
+ !xulrunner? ( =www-client/mozilla-firefox-2* )
+ xulrunner? ( =net-libs/xulrunner-1.8* )
python? (
>=dev-lang/python-2.3
>=dev-python/pygtk-2.7.1