Block epiphany-extensions, it no longer works with >epiphany-3.7 (bug #504186).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 31 insertions, 14 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/Manifest b/www-client/epiphany/Manifest
index 620d236ea230..6c5b7941bae9 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -15,14 +15,18 @@ DIST epiphany-2.30.6.tar.bz2 5927938 SHA256 278a5c00ce07e6a3ea440d289de22dbec3eb
 DIST epiphany-3.10.3.tar.xz 3088664 SHA256 c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7 SHA512 732e53ce67af886e164f16107e46a6000fe8f9a0b2b828c489f19bdd232d6450c32daadbf4c5c422e563e49727cbffd99371c9fab52d435412fc817dd1200b5d WHIRLPOOL ceeffa612d3315733c63bf4b6e808fee17da4aa1c541ae84bc878f0751ff61b8906954aa133198f7d34f059157dfedc9d0e87b742e2f591a0fbd6fb308cb1fa2
 DIST epiphany-3.8.2.tar.xz 2531592 SHA256 ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a SHA512 bf95de7828c57b82d57aef0a93764041b8fc1c463229fd772243b2fc6ca2e8f5743b48b0f8abb60e15ee6f9f28085f0959b0c711cfb22743c4962c0b0399ad22 WHIRLPOOL a36fc50093765b3a64fc9171e16facf84ff5d3f8933c15f3818df7e9c15a7636503626fe899948bff5716c67839aa8162b093238aa09ca617ec33c2448f1cb13
 EBUILD epiphany-2.30.6-r1.ebuild 2555 SHA256 c33e1fbb5b7e1eab17635dfe1366e700f7ec3d52c20baa4607f2222c4880680b SHA512 04439f27370575106ed9fee4353761fb2aab9e429c2c4631d6e367178c9b636eaee37152091e82f03726713c6655ad404f263724dc2a91ec49a1f9ffc6035349 WHIRLPOOL 597effacf7ed5d5f881ede096afc9f9b2077908eb4432c170dd26dc290573333e5f2d50dc5444ad692be40a1c68e6b5fbe851067a625766ce55af239ee169204
-EBUILD epiphany-3.10.3.ebuild 2036 SHA256 cdf2e5a1d4add4c428a35f307d137dc612483f0d1b3e053a9a8e75ee4138e0b1 SHA512 d9ea094a818e90710b4501940aee081a35328a13e9d4fe0c21190d2e487656f32d9f0216630601def420245ac12529787e2da1d45ff5bcd54d3e879028cb22ed WHIRLPOOL 798edd9b8737864b6c1222101e8da388862b6be4f9daef0822fa0143890dc07ee4267a7cd25e9c1eceac2ab34f8f2a8f82b7a6dcf59925099f70f214eb6da452
-EBUILD epiphany-3.8.2.ebuild 1914 SHA256 22d7b55c3b76f90fb5245a2274b45b42a0094147129c9bfb30107bff2c2e73d3 SHA512 649d1a125d78b11f80437934dbc6136e22d32735f62add55e14375637c7d8041395e295f7bf05039b1a0718ac5700250979ef1793192d327a9002e22d4fe5246 WHIRLPOOL 2955aed8a6dfbef25deb3d5fa1fd69bab0b077f2a6b555f0ede4467fce208a5795179be00735ee8fa9cb598fbf9b5391d6bd89cbe98bc1c5b16c62b7670a6e66
-MISC ChangeLog 58796 SHA256 1328882276097545b029b8e36d38443d64bbf3fc783a67d43e1dcf8ffe68e246 SHA512 0e69d0ed2ef4d951405543676831cd1cdc3626c2054f835b9aadf735437c4eb60552b4b9c602e92feff1d5d4b06c55bfd4f2388d5f7dbd6a627f7663e3b72c3e WHIRLPOOL 51ecb4e9887089591fa2cc09ad64e980296a089c42f6080f7dad6006e231c648fe6cf0631386af57cda3c2598bbc876658669e6ad9972dd7cc1a9ad4c3a59316
+EBUILD epiphany-3.10.3.ebuild 2196 SHA256 557de820a7ba646fe02c9515af975a32d582eb170db13763572050a535c03051 SHA512 f0b75972ce64027ad2c39c8bc427958dd31719e07147e2a047d2b586df39dea6bde72d91834a52a6e68a7d67f83745d6a9bc6fd79a8bb5c2242dc5b4583d9580 WHIRLPOOL df9e053715e1c936b987b8163e04fb6076da92904fcffaba3ad1c8c210ef945c195a737751bc20c0bb86ed1d9fc633fdf6857770ff9ea47b08ce7746f07823e4
+EBUILD epiphany-3.8.2.ebuild 2074 SHA256 2769aca1ffc84cf6a7e498baa1a269b787d8fe9baea391d4ce3b25beabbaaff4 SHA512 4d6bf806dbdfd439ecdcd7bbcafe0137e92f12d974d102ec53da84af31de03b507ea9284ffcec489c6e44590f93d2c21fbfde66a57c57d456404604d7f2dcff2 WHIRLPOOL 323a2d81cf39d365f08ad12a69945614a975a50179a9c6425cda5f981e34b6377be739527636a9ee388adcb85aac273675ce47500d2f0770199e2cd61b65cf6b
+MISC ChangeLog 58993 SHA256 bfebc8251260dc17d4cb5b01a2673afb409aa9f5a5de0c72173875bd09936abf SHA512 9dcc06b567ad91c30992336d49f9cbde0d4eedcc867ea7b342dd57ca8e949d86bb0805480b9e713ed96c3738f5cadf0dd895e87fc875b2ded94e784040a90b73 WHIRLPOOL d3a41ef3a87d43d4398b55ffdc3303c4d24ca8641acac7d84a39fc57926aa390f37f282289486bbe11181eb861171377e0c0f348c8dd51f8bc29fa83d0b9783e
 MISC metadata.xml 375 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9 SHA512 a2b21d647ee71d004b28a7e3058155955493bab0241b33b970f5ad1c25376e3d8b922d654bb15f4820d53c6856eda469aa9ad793b8ad4335e1c74957afa09bf3 WHIRLPOOL 997d8a11ae22c881d74ac708d7908c062672fb4fbca76f87aa2770df74f18a1ce02c3ba6567b2d925395532a68347d70e878542950b623806d14481681d566a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcWMoACgkQCaWpQKGI+9SYGQCePjGyIXVgKs4xen4qa5NXhhGU
-XDgAn31Dt4k/EzztbGTHrXl2HA4xbdtR
-=sbPv
+iQEcBAEBCAAGBQJTH8rsAAoJEJ0WA1zPCt1hfssH/2Q9s4PR1jpoR/KMlQjgWm7n
+ko0IsF/PbhQYiaxXjmo2Y7hYYvSLfo1bJAyLksOPofG3xJTDZ0G4VOR2VxSfza6f
+XHNYKKX8PBFHpi3lQ6/9xV0BB9a/e8SVvcR8NE+1bYqOyB+2+ldq9CwH85c2YbAR
+8yWN1DAmSrzjNDYn4dbSEkW1lAJvOeb0ZTjLd5fYS0b5hz9MXY9Mk7IIsr2nvFiW
+6hgCPwCsToCt+ALk0qdH1+BvRp3wSUpUkODBF6VSQDi2XjM4jtK/LPYKGf2jqcx6
+fs5jpMUnb9i0BcfZhAIxTzGrf5yUBsrlhFXsBorvBpQ65VsFFL26/vxmj1C1ltc=
+=ltn4
 -----END PGP SIGNATURE-----
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