Revert

Package-Manager: portage-2.1.4.4

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index 121ae39205161edeaff6d2994cd8e24b1c27b66e..7824b5d2a9d72d2e4dd787d8014a3496441032b0 100644 (file)
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,11 +1,6 @@
 # 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.74 2008/03/14 17:22:51 armin76 Exp $
-
-  14 Mar 2008; Raúl Porcel <armin76@gentoo.org>
-  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
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.75 2008/03/14 17:48:25 armin76 Exp $
 
   14 Mar 2008; Raúl Porcel <armin76@gentoo.org>
   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 e325ae00340576baacedbbfe2a2100b979163254..79e848c0ce178da2ce997edaa6dea276678a15ac 100644 (file)
--- 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-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.8 2008/03/14 17:28:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.20.1.ebuild,v 1.9 2008/03/14 17:48:25 armin76 Exp $
 
 WANT_AUTOMAKE="1.10"
 inherit eutils gnome2 autotools
@@ -22,7 +22,7 @@ RDEPEND=">=www-client/epiphany-2.20
        app-text/opensp
        || (
                xulrunner? ( =net-libs/xulrunner-1.8* )
-               =www-client/mozilla-firefox-2*
+               =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 394219f80d7887e4423bcd40150849c3a02a3aa8..f7db60b5f94422851debd1b7289912c1ec816fd2 100644 (file)
--- 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.6 2008/03/14 17:28:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild,v 1.7 2008/03/14 17:48:25 armin76 Exp $
 
 WANT_AUTOMAKE="1.10"
 inherit eutils gnome2 autotools python versionator
@@ -21,7 +21,7 @@ RDEPEND=">=www-client/epiphany-2.20
        >=gnome-base/libglade-2
        app-text/opensp
        xulrunner? ( =net-libs/xulrunner-1.8* )
-       !xulrunner? ( =www-client/mozilla-firefox-2* )
+       !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/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 46c795e7ff938278e29bb612a86415466423bd7b..853a6b9c32f34ccdcf6697453d2e85648dfa0eec 100644 (file)
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,10 +1,6 @@
 # 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.151 2008/03/14 17:32:28 armin76 Exp $
-
-  14 Mar 2008; Raúl Porcel <armin76@gentoo.org> epiphany-2.20.3.ebuild:
-  Fix deps on =net-libs/xulrunner-1.8* and =www-client/mozilla-firefox-2.0*
-  wrt #213296
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.152 2008/03/14 17:46:44 armin76 Exp $
 
   10 Mar 2008; Mart Raudsepp <leio@gentoo.org>
   -files/epiphany-1.9.2-broken-firefox.patch, -epiphany-2.18.3.ebuild,

diff --git a/www-client/epiphany/epiphany-2.20.3.ebuild b/www-client/epiphany/epiphany-2.20.3.ebuild
index 0b42748a6d38df19a6b9c407978e878796882e86..689566f84ef16ebc4308d74b973bc6adc328c9df 100644 (file)
--- a/www-client/epiphany/epiphany-2.20.3.ebuild
+++ b/www-client/epiphany/epiphany-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/epiphany-2.20.3.ebuild,v 1.9 2008/03/14 17:32:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.20.3.ebuild,v 1.10 2008/03/14 17:46:44 armin76 Exp $
 
 inherit gnome2 eutils multilib
 
@@ -29,8 +29,8 @@ RDEPEND=">=dev-libs/glib-2.13.4
        >=gnome-base/gconf-2
        >=app-text/iso-codes-0.35
        networkmanager? ( net-misc/networkmanager )
-       !xulrunner? ( =www-client/mozilla-firefox-2* )
-       xulrunner? ( =net-libs/xulrunner-1.8* )
+       !xulrunner? ( >=www-client/mozilla-firefox-1.5 )
+       xulrunner? ( net-libs/xulrunner )
        python? (
                >=dev-lang/python-2.3
                >=dev-python/pygtk-2.7.1