From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- www-client/epiphany/Manifest | 9 +-- www-client/epiphany/epiphany-41.3.ebuild | 87 ---------------------- www-client/epiphany/epiphany-42.0.ebuild | 86 --------------------- www-client/epiphany/epiphany-42.1.ebuild | 86 --------------------- www-client/epiphany/epiphany-42.2.ebuild | 2 +- .../files/41.3-fix-build-with-meson-0.61.1.patch | 35 --------- 6 files changed, 2 insertions(+), 303 deletions(-) delete mode 100644 www-client/epiphany/epiphany-41.3.ebuild delete mode 100644 www-client/epiphany/epiphany-42.0.ebuild delete mode 100644 www-client/epiphany/epiphany-42.1.ebuild delete mode 100644 www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch (limited to 'www-client/epiphany') diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index 3460ecd22aaf..ba906c28ca10 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -1,11 +1,4 @@ -AUX 41.3-fix-build-with-meson-0.61.1.patch 1106 BLAKE2B 78b69397c406793be23a2f267389baeb5f7cf73eeee6b27a5deda96a9fbd495a17836023ad8aa69fc0f8a0b8514983e1cc7bb42fed676e541b732db7f3c0f294 SHA512 2e8c9f62884b9d0684ec92f38112737fd67e2d21570f92cc3a3f500029169ad62630d227fff0e4bc8cd6fa0e9d72aa02c416c5805a7572f3c66b5f0801c4b7a2 AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23f33d809529a1f1b800ffdb3daf24780774766a16c1f45fff145dd5524c682293dd117b29582adeade7ae SHA512 79480bed41ff59f423087dfd6d0f5eaee665fcba6602c7876ed63397edeb6cf5fcb2ce9f2f91b375117e389ec2fcf6cba1cf1e8919efef2ccad3c84547b7824a -DIST epiphany-41.3.tar.xz 6153540 BLAKE2B bd95f643be4947818ebfafb1316a03c7c6cf118a45583f07e9fde60e32dabd63edf173673b86e454d9af066769950276cf77ea50fac8dd204fcae06c6ad04126 SHA512 1effef22291687c8ff2252eced24274db3b1f4afacfc3053a33cae85112759918f80d824bb02b7e17d95364eec0062cb3459a6079783d9c900874cc150ea98ba -DIST epiphany-42.0.tar.xz 6101296 BLAKE2B 768c2547d5e3644a43287522c7445fe23fe5a7af4e22dd0ff8959cd6c5e0537e593f1f6b81b10c603d8355bc1af6df36b60bdab70de1b60e7e40df758c956651 SHA512 225243cbae1659367e881991c191a766b47e0710a3e58c0eb56fba67ab8e527922a84e4663207a80d14da9c99102ea16c030f12f7444e6e2678b5c8cf7dc99e0 -DIST epiphany-42.1.tar.xz 6098392 BLAKE2B 2a0c4b47af6491c54bbb4f0c08971098a437cd575b6c510871f16344440f2da40740f49757eb5b6604eac2410de3e495e0087a749d4cadf86937e1bbb3839e07 SHA512 b7879a50237f65c5fdb895b11305866ca171cb726f2a4a81578515a91f0bb23cd12aa9bf6e6bac29a638e21b7a24b3b70dd024bacd0e2d67a36fa2b79180f945 DIST epiphany-42.2.tar.xz 6101892 BLAKE2B 81553836de2518b2aa490c34b238afe7dd71f63e5f9604ff98ada6663ad37d5a0457f5345574b776582c9ad7a728c0d221360af19cebc0157810757c8d09620b SHA512 3b7bcd9225f06caca547e8d822818e7d9b5a178028cd97b17b8e2474fec7337c4d6b4d718b3cf014784939d0b2f36e84305d6e9115521fdf762af178e5fc07d3 -EBUILD epiphany-41.3.ebuild 1994 BLAKE2B 98573353317a56cab47f0f419f1e0f19ea485ae68813e9058eb2b5dac1ca3576607406b33cc3809ff5216999423aa69f65eabb526aa7d1dd54887c5829fca8c9 SHA512 789a4c0338db5ddd26768a3496f576ece86d298c3d682f1b4144ed61a72e0336c49a4646b979aaf439b46d4d927cdf67ecd310b11edd2c5f7d2dffbe1abe9917 -EBUILD epiphany-42.0.ebuild 1942 BLAKE2B 219ae729fd9d23a48a3370d1b9d486a24eae6fb085e822280f52210db87631cd2117fdd9ac25f8c8d27514e2f355c17017c0a628c46d6b2faccf24f13c5732e9 SHA512 4b8429e5aaf18541fa05775bb1bfcfb3efba6d1e31d8c435ad5559bb5e8736f8217a07a1205fbed09ed4774da2cb5f4ad4fc542a0f1c6fbaa5ced55443313ac6 -EBUILD epiphany-42.1.ebuild 1942 BLAKE2B 219ae729fd9d23a48a3370d1b9d486a24eae6fb085e822280f52210db87631cd2117fdd9ac25f8c8d27514e2f355c17017c0a628c46d6b2faccf24f13c5732e9 SHA512 4b8429e5aaf18541fa05775bb1bfcfb3efba6d1e31d8c435ad5559bb5e8736f8217a07a1205fbed09ed4774da2cb5f4ad4fc542a0f1c6fbaa5ced55443313ac6 -EBUILD epiphany-42.2.ebuild 1942 BLAKE2B 219ae729fd9d23a48a3370d1b9d486a24eae6fb085e822280f52210db87631cd2117fdd9ac25f8c8d27514e2f355c17017c0a628c46d6b2faccf24f13c5732e9 SHA512 4b8429e5aaf18541fa05775bb1bfcfb3efba6d1e31d8c435ad5559bb5e8736f8217a07a1205fbed09ed4774da2cb5f4ad4fc542a0f1c6fbaa5ced55443313ac6 +EBUILD epiphany-42.2.ebuild 1939 BLAKE2B d190df9f7eae141ad1d96540a0796c24eb7ac5878c8f2a33ada4f794b3c3a1d925f26581998932e55d9f5e6bfc93686f593b9dc6a8253f128908e5670528f94a SHA512 ca7e3d82176e3957a57b1707aba92295c411cc4f76e282473d23fbcee8f7e99ea9ee103c45d51952fbcf307c7470858d00fe77c3a13051cf29ff1d3179057508 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/www-client/epiphany/epiphany-41.3.ebuild b/www-client/epiphany/epiphany-41.3.ebuild deleted file mode 100644 index a79f26b59101..000000000000 --- a/www-client/epiphany/epiphany-41.3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" -RESTRICT="!test? ( test )" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-libs/glib-2.67.1:2 - >=x11-libs/gtk+-3.24.0:3 - >=dev-libs/nettle-3.4:= - >=net-libs/webkit-gtk-2.33.2:4= - >=x11-libs/cairo-1.2 - >=app-crypt/gcr-3.5.5:=[gtk] - >=x11-libs/gdk-pixbuf-2.36.5:2 - gnome-base/gsettings-desktop-schemas - >=app-text/iso-codes-0.35 - >=dev-libs/json-glib-1.6 - app-arch/libarchive:= - >=dev-libs/libdazzle-3.37.1 - >=gui-libs/libhandy-1.1.0:1= - >=app-crypt/libsecret-0.19 - >=net-libs/libsoup-2.48.0:2.4 - >=dev-libs/libxml2-2.6.12:2 - >=dev-db/sqlite-3.22:3 - dev-libs/gmp:0= -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme -" -# appstream-glib needed for appdata.xml gettext translation -BDEPEND=" - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR) - "${FILESDIR}"/var-tmp-tests.patch - "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch -) - -src_configure() { - local emesonargs=( - -Ddeveloper_mode=false - -Dlibportal=disabled - # maybe enable later if network-sandbox is off, but in 3.32.4 the network test - # is commented out upstream anyway - -Dnetwork_tests=disabled - -Dtech_preview=false - $(meson_feature test unit_tests) - -Dsoup2=enabled - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version net-libs/webkit-gtk[jpeg2k]; then - ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k." - ewarn "Various image galleries/managers may be broken." - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/www-client/epiphany/epiphany-42.0.ebuild b/www-client/epiphany/epiphany-42.0.ebuild deleted file mode 100644 index cdecea5a8e9f..000000000000 --- a/www-client/epiphany/epiphany-42.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" -RESTRICT="!test? ( test )" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" - -DEPEND=" - >=dev-libs/glib-2.67.4:2 - >=x11-libs/gtk+-3.24.0:3 - >=dev-libs/nettle-3.4:= - >=net-libs/webkit-gtk-2.33.2:4= - >=x11-libs/cairo-1.2 - >=app-crypt/gcr-3.5.5:=[gtk] - >=x11-libs/gdk-pixbuf-2.36.5:2 - gnome-base/gsettings-desktop-schemas - >=app-text/iso-codes-0.35 - >=dev-libs/json-glib-1.6 - app-arch/libarchive:= - >=dev-libs/libdazzle-3.37.1 - >=gui-libs/libhandy-1.5.0:1= - >=app-crypt/libsecret-0.19 - >=net-libs/libsoup-2.48.0:2.4 - >=dev-libs/libxml2-2.6.12:2 - >=dev-db/sqlite-3.22:3 - dev-libs/gmp:0= -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme -" -# appstream-glib needed for appdata.xml gettext translation -BDEPEND=" - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR) - "${FILESDIR}"/var-tmp-tests.patch -) - -src_configure() { - local emesonargs=( - -Ddeveloper_mode=false - -Dlibportal=disabled - # maybe enable later if network-sandbox is off, but in 3.32.4 the network test - # is commented out upstream anyway - -Dnetwork_tests=disabled - -Dtech_preview=false - $(meson_feature test unit_tests) - -Dsoup2=enabled - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version net-libs/webkit-gtk[jpeg2k]; then - ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k." - ewarn "Various image galleries/managers may be broken." - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/www-client/epiphany/epiphany-42.1.ebuild b/www-client/epiphany/epiphany-42.1.ebuild deleted file mode 100644 index cdecea5a8e9f..000000000000 --- a/www-client/epiphany/epiphany-42.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" -RESTRICT="!test? ( test )" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" - -DEPEND=" - >=dev-libs/glib-2.67.4:2 - >=x11-libs/gtk+-3.24.0:3 - >=dev-libs/nettle-3.4:= - >=net-libs/webkit-gtk-2.33.2:4= - >=x11-libs/cairo-1.2 - >=app-crypt/gcr-3.5.5:=[gtk] - >=x11-libs/gdk-pixbuf-2.36.5:2 - gnome-base/gsettings-desktop-schemas - >=app-text/iso-codes-0.35 - >=dev-libs/json-glib-1.6 - app-arch/libarchive:= - >=dev-libs/libdazzle-3.37.1 - >=gui-libs/libhandy-1.5.0:1= - >=app-crypt/libsecret-0.19 - >=net-libs/libsoup-2.48.0:2.4 - >=dev-libs/libxml2-2.6.12:2 - >=dev-db/sqlite-3.22:3 - dev-libs/gmp:0= -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme -" -# appstream-glib needed for appdata.xml gettext translation -BDEPEND=" - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR) - "${FILESDIR}"/var-tmp-tests.patch -) - -src_configure() { - local emesonargs=( - -Ddeveloper_mode=false - -Dlibportal=disabled - # maybe enable later if network-sandbox is off, but in 3.32.4 the network test - # is commented out upstream anyway - -Dnetwork_tests=disabled - -Dtech_preview=false - $(meson_feature test unit_tests) - -Dsoup2=enabled - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version net-libs/webkit-gtk[jpeg2k]; then - ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k." - ewarn "Various image galleries/managers may be broken." - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/www-client/epiphany/epiphany-42.2.ebuild b/www-client/epiphany/epiphany-42.2.ebuild index cdecea5a8e9f..19e7f2c4789c 100644 --- a/www-client/epiphany/epiphany-42.2.ebuild +++ b/www-client/epiphany/epiphany-42.2.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-3+" SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" DEPEND=" >=dev-libs/glib-2.67.4:2 diff --git a/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch b/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch deleted file mode 100644 index 7b521c052574..000000000000 --- a/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://gitlab.gnome.org/GNOME/epiphany/-/commit/bfbb5f7bab38301d8a4a444173acdae8d9692146 -https://bugs.gentoo.org/831923 - -From: rvalue -Date: Wed, 24 Nov 2021 04:52:42 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -Part-of: ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 46df3fd80..eac6b8224 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,6 @@ install_data( - desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) - desktop = i18n.merge_file( -- 'desktop', - input: configure_file( - input: files('org.gnome.Epiphany.desktop.in.in'), - output: 'org.gnome.Epiphany.desktop.in', -@@ -32,7 +31,6 @@ desktop = i18n.merge_file( - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Epiphany.appdata.xml.in.in'), - output: 'org.gnome.Epiphany.appdata.xml.in', --- -GitLab - -- cgit v1.2.3