gentoo resync : 27.10.2018

3 files changed, 4 insertions, 81 deletions

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 16eb1a67bd00..b297c3d5b925 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,7 +1,5 @@
 DIST epiphany-3.26.7.tar.xz 4429308 BLAKE2B cdd8cf084631891e97585307c90bd67f45e71deb6564f54711deb8dfd39c09007732efeb22ad5be45c1b0af6af7be30cf13a9d90aa1e9506a2e997f6f3f8d854 SHA512 686c8825d476a4c6675dadd7a68bf72727714bc6fe01b4dbf67d39b2dc7e3f21d4f630417865800664a716d6316df8a97fde5201ec72c90f448fd6f0af4b49a0
-DIST epiphany-3.30.0.tar.xz 4528508 BLAKE2B 75d605a1117131bebaf0e0a7013ae4e9599b7058e26f4acf84140a6e345255cccac910cc9d5a2f90be0835f7dbaa6c77d16e127dfb5b1ae139ef179a20795444 SHA512 80ba03c67bd467e31e572afd4e8632232bc002c63e584e87bc6c3b74d23cd470f14e696080fd952a8617c6c07202eafff01bc97f72d9a06f0121d75565e667f3
-DIST epiphany-3.30.1.tar.xz 4528876 BLAKE2B 1dbb630128a9af975939d386b3113a41ef92ce1bb756a5407a216fa8f25f1dfcd051a11c54a034aeafd8ca5aa5ada7da83f3ecf825370801b04b10b7ef794c80 SHA512 37d6814d9dfb1f70e6cfd3395179b9e213eb79773c1fed238999d5c6ae34c0b93b6f93dff695eb959cb46e89a2cd6b705c1a294d1424c82137ba26d0b7a37503
+DIST epiphany-3.30.2.tar.xz 4528100 BLAKE2B 3b711df8aa3166c26f639658de188e730f346be7c9bdfc65a5064804c1b0e22a744aec6c559c4131125e8fb34e7bb80636f559c7257cca3ad044c6b810bbe657 SHA512 4edaa042357ad44f2069412508cff9524e6e397da868b78768b493d03d77d16807d78f074eb1a4b18fcc1143d3a63d21f3eb1c0f126a31290320016c76c5130e
 EBUILD epiphany-3.26.7.ebuild 1926 BLAKE2B 213faa2400f2c1eff31f7d37d37230ee8022642b60d19eea97cd4d037a72d296902e18b2358878aa4722ad5b6255de06fcaeb70a7c3a190e38e1cce5f8463c57 SHA512 c3c5887d9a71d936214cf20e921207d161a2f43b79e041d9639979afc64529a9654c40c2b5c08d5031a54d572170d9446284a6ea1c9c8cd43b6ea265f3a346f9
-EBUILD epiphany-3.30.0.ebuild 1561 BLAKE2B 476b4e0489917a78702f8548f3e9704de7259edfe244d6fef532c409961a5503b963ebc2b8e84c0b5e2e1530fba876f60868018bce597c35409e9bc0f7dde31b SHA512 8895ff2cf36458620e308d8cda505a9243acaab2c477f1a2967c04690e01ab51d06f21b125689a3ceed47ffedde5624c0a2fc81c002f01ec6686a9f34173119f
-EBUILD epiphany-3.30.1.ebuild 1561 BLAKE2B 476b4e0489917a78702f8548f3e9704de7259edfe244d6fef532c409961a5503b963ebc2b8e84c0b5e2e1530fba876f60868018bce597c35409e9bc0f7dde31b SHA512 8895ff2cf36458620e308d8cda505a9243acaab2c477f1a2967c04690e01ab51d06f21b125689a3ceed47ffedde5624c0a2fc81c002f01ec6686a9f34173119f
+EBUILD epiphany-3.30.2.ebuild 1679 BLAKE2B 18f6b7d0ddd0e8f5087a46f4918719751c2989627a4ffeb553191fcc9bd57a0cf933c501deda7901f7a2769cdfb96002a63d90c95f570a43318c193c9a8c860c SHA512 d44935ddd75fa9a076dd6be14753deaa5d10e427cdd36be8a543f07f2d8ab7b10ca88a308a7d0a716fd6f7609b1f40809b9caae6ced3c9054b922562d2241e50
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.30.1.ebuild b/www-client/epiphany/epiphany-3.30.1.ebuild
deleted file mode 100644
index b961e6b11920..000000000000
--- a/www-client/epiphany/epiphany-3.30.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.52.0:2
-	>=x11-libs/gtk+-3.22.13:3
-	>=dev-libs/nettle-3.2:=
-	>=net-libs/webkit-gtk-2.21.92:4=
-	>=x11-libs/cairo-1.2
-	>=dev-libs/libdazzle-3.28.0
-	>=app-crypt/gcr-3.5.5:=[gtk]
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	dev-libs/icu:=
-	>=app-text/iso-codes-0.35
-	>=dev-libs/json-glib-1.2.4
-	>=x11-libs/libnotify-0.5.1
-	>=app-crypt/libsecret-0.14
-	>=net-libs/libsoup-2.48:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	dev-db/sqlite:3
-	dev-libs/gmp:0=
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-# paxctl needed for bug #407085
-# appstream-glib needed for appdata.xml gettext translation
-DEPEND="${COMMON_DEPEND}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	sys-apps/paxctl
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddeveloper_mode=false
-		-Ddistributor_name=Gentoo
-		-Dtech_preview=false
-		$(meson_use test unit_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/www-client/epiphany/epiphany-3.30.0.ebuild b/www-client/epiphany/epiphany-3.30.2.ebuild
index b961e6b11920..995b38606697 100644
--- a/www-client/epiphany/epiphany-3.30.0.ebuild
+++ b/www-client/epiphany/epiphany-3.30.2.ebuild
@@ -36,7 +36,8 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/adwaita-icon-theme
-"
+	!<media-plugins/gst-plugins-opus-1.14.4-r1
+" # Ensure opusparse is present, if gstreamer support is included in webkit
 # paxctl needed for bug #407085
 # appstream-glib needed for appdata.xml gettext translation
 DEPEND="${COMMON_DEPEND}