From 203bf35cf60d5e6431e457d00f0d7892950e3972 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Fri, 14 Mar 2008 17:22:51 +0000 Subject: [PATCH] Fix deps on =net-libs/xulrunner-1.8* and =www-client/mozilla-firefox-2.0* wrt #213296 Package-Manager: portage-2.1.4.4 --- www-client/epiphany-extensions/ChangeLog | 7 ++++++- .../epiphany-extensions-2.20.1.ebuild | 8 ++++---- .../epiphany-extensions-2.20.3.ebuild | 6 +++--- www-client/galeon/ChangeLog | 7 ++++++- www-client/galeon/galeon-2.0.3.ebuild | 10 +++++----- www-client/galeon/galeon-2.0.4.ebuild | 6 +++--- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog index 13f16112382a..121ae3920516 100644 --- a/www-client/epiphany-extensions/ChangeLog +++ b/www-client/epiphany-extensions/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/epiphany-extensions # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.73 2008/03/14 15:24:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.74 2008/03/14 17:22:51 armin76 Exp $ + + 14 Mar 2008; Raúl Porcel + epiphany-extensions-2.20.1.ebuild, epiphany-extensions-2.20.3.ebuild: + Fix deps on =net-libs/xulrunner-1.8* and =www-client/mozilla-firefox-2.0* + wrt #213296 14 Mar 2008; Raúl Porcel epiphany-extensions-2.20.3.ebuild: diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.20.1.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.20.1.ebuild index e8814bde02fa..602264145d54 100644 --- a/www-client/epiphany-extensions/epiphany-extensions-2.20.1.ebuild +++ b/www-client/epiphany-extensions/epiphany-extensions-2.20.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.20.1.ebuild,v 1.6 2007/12/04 20:21:20 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.20.1.ebuild,v 1.7 2008/03/14 17:22:51 armin76 Exp $ WANT_AUTOMAKE="1.10" inherit eutils gnome2 autotools @@ -21,8 +21,8 @@ RDEPEND=">=www-client/epiphany-2.20 >=gnome-base/libglade-2 app-text/opensp || ( - xulrunner? ( net-libs/xulrunner ) - >=www-client/mozilla-firefox-1.5 + xulrunner? ( =net-libs/xulrunner-1.8* ) + =www-client/mozilla-firefox-2.0* ) pcre? ( >=dev-libs/libpcre-3.9-r2 ) >=dev-libs/dbus-glib-0.71 diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild index 2e0434fc5452..e7f6792e6468 100644 --- a/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild +++ b/www-client/epiphany-extensions/epiphany-extensions-2.20.3.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-extensions/epiphany-extensions-2.20.3.ebuild,v 1.4 2008/03/14 15:24:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild,v 1.5 2008/03/14 17:22:51 armin76 Exp $ WANT_AUTOMAKE="1.10" inherit eutils gnome2 autotools python versionator @@ -20,8 +20,8 @@ RDEPEND=">=www-client/epiphany-2.20 gnome-base/gconf >=gnome-base/libglade-2 app-text/opensp - xulrunner? ( net-libs/xulrunner ) - !xulrunner? ( >=www-client/mozilla-firefox-1.5 ) + xulrunner? ( =net-libs/xulrunner-1.8* ) + !xulrunner? ( =www-client/mozilla-firefox-2.0* ) pcre? ( >=dev-libs/libpcre-3.9-r2 ) >=dev-libs/dbus-glib-0.71 python? ( >=dev-python/pygtk-2.11 )" diff --git a/www-client/galeon/ChangeLog b/www-client/galeon/ChangeLog index 8b167638e3b7..f1c450a9ff28 100644 --- a/www-client/galeon/ChangeLog +++ b/www-client/galeon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/galeon # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.46 2008/02/29 11:37:49 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.47 2008/03/14 17:21:00 armin76 Exp $ + + 14 Mar 2008; Raúl Porcel galeon-2.0.3.ebuild, + galeon-2.0.4.ebuild: + Fix deps on =net-libs/xulrunner-1.8* and =www-client/mozilla-firefox-2.0* + wrt #213296 29 Feb 2008; Santiago M. Mola galeon-2.0.4.ebuild: amd64 stable wrt bug #210131 diff --git a/www-client/galeon/galeon-2.0.3.ebuild b/www-client/galeon/galeon-2.0.3.ebuild index 5a10d6ca0006..de24db58c3a6 100644 --- a/www-client/galeon/galeon-2.0.3.ebuild +++ b/www-client/galeon/galeon-2.0.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.3.ebuild,v 1.7 2007/10/31 12:40:15 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.3.ebuild,v 1.8 2008/03/14 17:21:00 armin76 Exp $ inherit gnome2 eutils @@ -12,10 +12,10 @@ LICENSE="GPL-2" IUSE="seamonkey xulrunner" KEYWORDS="amd64 ia64 ppc sparc x86" SLOT="0" -RDEPEND="xulrunner? ( >=net-libs/xulrunner-1.8 ) +RDEPEND="xulrunner? ( =net-libs/xulrunner-1.8* ) !xulrunner? ( seamonkey? ( www-client/seamonkey ) - !seamonkey? ( >=www-client/mozilla-firefox-1.5.0.4 ) + !seamonkey? ( =www-client/mozilla-firefox-2.0* ) ) >=dev-libs/glib-2 >=x11-libs/gtk+-2.4.0 @@ -37,7 +37,7 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog FAQ README README.ExtraPrefs THANKS TODO NEWS" src_unpack() { - unpack "${A}" + unpack ${A} cd "${S}" epatch "${FILESDIR}/galeon-2.0.1-imagebehaviour.diff" } diff --git a/www-client/galeon/galeon-2.0.4.ebuild b/www-client/galeon/galeon-2.0.4.ebuild index 1cb0e7beb439..0715e85cc8f6 100644 --- a/www-client/galeon/galeon-2.0.4.ebuild +++ b/www-client/galeon/galeon-2.0.4.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/galeon/galeon-2.0.4.ebuild,v 1.6 2008/02/29 11:37:49 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.4.ebuild,v 1.7 2008/03/14 17:21:00 armin76 Exp $ inherit gnome2 eutils @@ -12,10 +12,10 @@ LICENSE="GPL-2" IUSE="seamonkey xulrunner" KEYWORDS="amd64 ia64 ppc sparc x86" SLOT="0" -RDEPEND="xulrunner? ( >=net-libs/xulrunner-1.8 ) +RDEPEND="xulrunner? ( =net-libs/xulrunner-1.8* ) !xulrunner? ( seamonkey? ( www-client/seamonkey ) - !seamonkey? ( >=www-client/mozilla-firefox-1.5.0.4 ) + !seamonkey? ( =www-client/mozilla-firefox-2.0* ) ) >=dev-libs/glib-2 >=x11-libs/gtk+-2.4.0 -- 2.26.2