diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-03-12 02:49:01 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-03-12 02:49:01 +0000 |
| commit | e8a7a559013e7656ad10109244c8635abf498bdf (patch) | |
| tree | 05922d6f3ecc7625f7841c8734229175bc7d4f18 /www-client | |
| parent | epiphany-extenions-2.x requires epiphany-2.x (bug #504186, thanks to Juergen ... (diff) | |
| download | gentoo-2-e8a7a559013e7656ad10109244c8635abf498bdf.tar.gz gentoo-2-e8a7a559013e7656ad10109244c8635abf498bdf.tar.bz2 gentoo-2-e8a7a559013e7656ad10109244c8635abf498bdf.zip | |
Block epiphany-extensions, it no longer works with >epiphany-3.7 (bug #504186).
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/epiphany/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/epiphany/epiphany-3.10.3.ebuild | 10 | ||||
| -rw-r--r-- | www-client/epiphany/epiphany-3.8.2.ebuild | 12 |
3 files changed, 21 insertions, 8 deletions
diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog index 6e0202f84158..6227a3df9dd4 100644 --- a/www-client/epiphany/ChangeLog +++ b/www-client/epiphany/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/epiphany # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.303 2014/03/09 12:04:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.304 2014/03/12 02:49:01 tetromino Exp $ + + 12 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org> + epiphany-3.8.2.ebuild, epiphany-3.10.3.ebuild: + Block epiphany-extensions, it no longer works with >epiphany-3.7 (bug + #504186). 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> epiphany-3.10.3.ebuild: x86 stable, bug 499954 diff --git a/www-client/epiphany/epiphany-3.10.3.ebuild b/www-client/epiphany/epiphany-3.10.3.ebuild index 307db251718b..16f9e47f4585 100644 --- a/www-client/epiphany/epiphany-3.10.3.ebuild +++ b/www-client/epiphany/epiphany-3.10.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.10.3.ebuild,v 1.4 2014/03/09 12:04:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.10.3.ebuild,v 1.5 2014/03/12 02:49:01 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -17,7 +17,7 @@ SLOT="0" IUSE="+jit +nss test" KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -RDEPEND=" +COMMON_DEPEND=" >=app-crypt/gcr-3.5.5 >=app-crypt/libsecret-0.14 >=app-text/iso-codes-0.35 @@ -41,9 +41,13 @@ RDEPEND=" nss? ( dev-libs/nss ) " +# epiphany-extensions support was removed in 3.7; let's not pretend it still works +RDEPEND="${COMMON_DEPEND} + !www-client/epiphany-extensions +" # paxctl needed for bug #407085 # eautoreconf requires gnome-common-3.5.5 -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.50 sys-apps/paxctl sys-devel/gettext diff --git a/www-client/epiphany/epiphany-3.8.2.ebuild b/www-client/epiphany/epiphany-3.8.2.ebuild index b7589a0c2b42..6c26211b5675 100644 --- a/www-client/epiphany/epiphany-3.8.2.ebuild +++ b/www-client/epiphany/epiphany-3.8.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.8.2.ebuild,v 1.4 2013/12/08 19:41:14 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.8.2.ebuild,v 1.5 2014/03/12 02:49:01 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -17,7 +17,7 @@ SLOT="0" IUSE="+jit +nss test" KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -RDEPEND=" +COMMON_DEPEND=" >=app-crypt/gcr-3.5.5 >=app-crypt/libsecret-0.14 >=app-text/iso-codes-0.35 @@ -41,9 +41,13 @@ RDEPEND=" nss? ( dev-libs/nss ) " +# epiphany-extensions support was removed in 3.7; let's not pretend it still works +RDEPEND="${COMMON_DEPEND} + !www-client/epiphany-extensions +" # paxctl needed for bug #407085 # eautoreconf requires gnome-common-3.5.5 -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.50 sys-apps/paxctl sys-devel/gettext |