From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- www-client/epiphany/Manifest | 8 +-- www-client/epiphany/epiphany-3.24.5.ebuild | 75 --------------------- www-client/epiphany/epiphany-3.30.0.ebuild | 76 ++++++++++++++++++++++ www-client/epiphany/epiphany-3.30.1.ebuild | 76 ++++++++++++++++++++++ .../files/epiphany-3.14.0-unittest-2.patch | 45 ------------- .../files/epiphany-3.16.0-unittest-1.patch | 30 --------- 6 files changed, 156 insertions(+), 154 deletions(-) delete mode 100644 www-client/epiphany/epiphany-3.24.5.ebuild create mode 100644 www-client/epiphany/epiphany-3.30.0.ebuild create mode 100644 www-client/epiphany/epiphany-3.30.1.ebuild delete mode 100644 www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch delete mode 100644 www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch (limited to 'www-client/epiphany') diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index f3fe916eb09e..16eb1a67bd00 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -1,7 +1,7 @@ -AUX epiphany-3.14.0-unittest-2.patch 1725 BLAKE2B 1464841241c618137db834933094968d7769c513ecd8934f73e6522744175efb5d41e05be11ed629cf3072135de39a2c6f05c083d48ea219bc29952ac000487e SHA512 5ec81de76fb8bb1574e954d5bdffd81114c022d558573f049c415f037855b65c03e727fd3fa2ce557c12f3a17921dc655c60ef4e1ad06f3bc9a6a42e58ddde70 -AUX epiphany-3.16.0-unittest-1.patch 972 BLAKE2B bf27a8b68a9526ed3b481bae00c614dc57db57c2b6909a6e0d1936c86a395cf577cba8db8bc272a3485527118e69b0f8109ad1427f957b5b2eeff4437c954c5a SHA512 ec59eb312e7826306af76fc587fb9435c6ac2da96cd574df381829bda2e2f987a47afef9bdff0e8dc162fe63f43d1a744edc84b84ae387edd1279d77ebdfdc86 -DIST epiphany-3.24.5.tar.xz 3216736 BLAKE2B 8a4dd668606521d1b0144afc9ace8607f52eac457f0059e6087216323ec1132dbe1c755e40dfe9993bf685e5444db1268ada1cdf55edc04c51058fdd256c6047 SHA512 a8f203d182b8c87878a3272f8b4f642b0cf4128476e0727208135cfdffeb293425cf662c58820f0d3aed2e1b20fe6dc4cf5cbb8277a398c6f533a0bea34f40f2 DIST epiphany-3.26.7.tar.xz 4429308 BLAKE2B cdd8cf084631891e97585307c90bd67f45e71deb6564f54711deb8dfd39c09007732efeb22ad5be45c1b0af6af7be30cf13a9d90aa1e9506a2e997f6f3f8d854 SHA512 686c8825d476a4c6675dadd7a68bf72727714bc6fe01b4dbf67d39b2dc7e3f21d4f630417865800664a716d6316df8a97fde5201ec72c90f448fd6f0af4b49a0 -EBUILD epiphany-3.24.5.ebuild 1949 BLAKE2B f17b4603d8f1dbfc26cde3be0c333fa50d3147b61255d1d1618180d5578330a388ed866439e4506c83fb2b06dbc37cf767cd4e25cf2b2a971c222ab0613afecb SHA512 49dabbd617bf90f4af2dbb45d08d6c9a0854555a58a933872b15dca299e7bce9e9084fe07a51571be96d3310651475b0e95e4babf4cf0f7456aea0313fa42f3a +DIST epiphany-3.30.0.tar.xz 4528508 BLAKE2B 75d605a1117131bebaf0e0a7013ae4e9599b7058e26f4acf84140a6e345255cccac910cc9d5a2f90be0835f7dbaa6c77d16e127dfb5b1ae139ef179a20795444 SHA512 80ba03c67bd467e31e572afd4e8632232bc002c63e584e87bc6c3b74d23cd470f14e696080fd952a8617c6c07202eafff01bc97f72d9a06f0121d75565e667f3 +DIST epiphany-3.30.1.tar.xz 4528876 BLAKE2B 1dbb630128a9af975939d386b3113a41ef92ce1bb756a5407a216fa8f25f1dfcd051a11c54a034aeafd8ca5aa5ada7da83f3ecf825370801b04b10b7ef794c80 SHA512 37d6814d9dfb1f70e6cfd3395179b9e213eb79773c1fed238999d5c6ae34c0b93b6f93dff695eb959cb46e89a2cd6b705c1a294d1424c82137ba26d0b7a37503 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 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/www-client/epiphany/epiphany-3.24.5.ebuild b/www-client/epiphany/epiphany-3.24.5.ebuild deleted file mode 100644 index 873a5036a2b4..000000000000 --- a/www-client/epiphany/epiphany-3.24.5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit flag-o-matic gnome2 virtualx - -DESCRIPTION="GNOME webbrowser based on Webkit" -HOMEPAGE="https://wiki.gnome.org/Apps/Web" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="test" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" - -COMMON_DEPEND=" - >=dev-libs/glib-2.46.0:2[dbus] - >=x11-libs/gtk+-3.22.13:3 - >=net-libs/webkit-gtk-2.15.90:4= - >=x11-libs/cairo-1.2 - >=app-crypt/gcr-3.5.5:=[gtk] - >=x11-libs/gdk-pixbuf-2.36.5:2 - >=gnome-base/gnome-desktop-2.91.2:3= - dev-libs/icu:= - >=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 - >=app-text/iso-codes-0.35 - >=gnome-base/gsettings-desktop-schemas-0.0.1 -" -# epiphany-extensions support was removed in 3.7; let's not pretend it still works -RDEPEND="${COMMON_DEPEND} - x11-themes/adwaita-icon-theme - !www-client/epiphany-extensions -" -# paxctl needed for bug #407085 -DEPEND="${COMMON_DEPEND} - app-text/yelp-tools - dev-libs/appstream-glib - sys-apps/paxctl - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # https://bugzilla.gnome.org/show_bug.cgi?id=751591 - "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch - - # https://bugzilla.gnome.org/show_bug.cgi?id=751593 - "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch -) - -src_configure() { - # https://bugzilla.gnome.org/show_bug.cgi?id=778495 - append-cflags -std=gnu11 - - # httpseverywhere is experimental in 3.24; gnome bug #775575 - # firefox sync storage is not quite ready in 3.24; deps on hogweed/nettle - gnome2_src_configure \ - --enable-shared \ - --disable-static \ - --with-distributor-name=Gentoo \ - --without-libhttpseverywhere \ - --disable-firefox-sync \ - $(use_enable test tests) -} - -src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die - GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check -} diff --git a/www-client/epiphany/epiphany-3.30.0.ebuild b/www-client/epiphany/epiphany-3.30.0.ebuild new file mode 100644 index 000000000000..b961e6b11920 --- /dev/null +++ b/www-client/epiphany/epiphany-3.30.0.ebuild @@ -0,0 +1,76 @@ +# 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.1.ebuild b/www-client/epiphany/epiphany-3.30.1.ebuild new file mode 100644 index 000000000000..b961e6b11920 --- /dev/null +++ b/www-client/epiphany/epiphany-3.30.1.ebuild @@ -0,0 +1,76 @@ +# 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/files/epiphany-3.14.0-unittest-2.patch b/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch deleted file mode 100644 index 36dcb30ce3bd..000000000000 --- a/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3d2ca8dfb33f9dd658293d14d6b75983d1d2f57d Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Sun, 19 Oct 2014 23:06:29 +0200 -Subject: [PATCH 3/3] Disable broken tests - -Not the first time these are failing even though issue was reported -upstream. ---- - tests/ephy-file-helpers-test.c | 4 ++-- - tests/ephy-migration-test.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c -index bdf7455..718fa29 100644 ---- a/tests/ephy-file-helpers-test.c -+++ b/tests/ephy-file-helpers-test.c -@@ -341,8 +341,8 @@ main (int argc, char *argv[]) - g_test_add_func ("/lib/ephy-file-helpers/get_downloads_dir", - test_ephy_file_get_downloads_dir); - -- g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir", -- test_ephy_file_create_delete_dir); -+ /*g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir", -+ test_ephy_file_create_delete_dir);*/ - - g_test_add_func ("/lib/ephy-file-helpers/desktop_dir", - test_ephy_file_desktop_dir); -diff --git a/tests/ephy-migration-test.c b/tests/ephy-migration-test.c -index fab9ee7..64cdd65 100644 ---- a/tests/ephy-migration-test.c -+++ b/tests/ephy-migration-test.c -@@ -65,8 +65,8 @@ main (int argc, char *argv[]) - - g_test_add_func ("/lib/ephy-profile-utils/do_migration_simple", - test_do_migration_simple); -- g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid", -- test_do_migration_invalid); -+ /*g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid", -+ test_do_migration_invalid);*/ - - return g_test_run (); - } --- -2.1.2 - diff --git a/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch b/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch deleted file mode 100644 index baa8a421da13..000000000000 --- a/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7ed4a68e2106480f0984703f70b7c25734803161 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Sun, 10 May 2015 17:35:57 +0200 -Subject: [PATCH 2/3] Gentoo tests run in ${PORTAGE_TMPDIR} which is not - guaranteed to be /tmp - ---- - tests/ephy-file-helpers-test.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c -index 43d0009..0fcb585 100644 ---- a/tests/ephy-file-helpers-test.c -+++ b/tests/ephy-file-helpers-test.c -@@ -89,12 +89,7 @@ test_ephy_file_helpers_init (void) - - /* Cleanup dir left behind. */ - if (keep_dir) { -- /* As a safety measure, only try recursive delete on paths -- * prefixed with /tmp. */ -- if (g_str_has_prefix (tmp_dir, "/tmp")) - g_assert (ephy_file_delete_dir_recursively (tmp_dir, NULL)); -- else -- g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir); - } - - g_free (tmp_dir); --- -2.3.6 - -- cgit v1.2.3