From c5f690586c4aa70f3bc039a402efe4700deb36fd Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Mon, 21 Feb 2022 15:01:44 +0200 Subject: [PATCH] www-client/icecat: add 91.6.0, drop 91.4.0 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfred Wingate --- www-client/icecat/Manifest | 4 ++-- ...cecat-91.4.0.ebuild => icecat-91.6.0.ebuild} | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) rename www-client/icecat/{icecat-91.4.0.ebuild => icecat-91.6.0.ebuild} (98%) diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest index cfd6399..fe47f97 100644 --- a/www-client/icecat/Manifest +++ b/www-client/icecat/Manifest @@ -1,4 +1,4 @@ -DIST firefox-91esr-patches-02.tar.xz 16900 BLAKE2B 6b8ca8bca3c35c6ea80b947610906e36883522e265e655a18c16ae3d62512de8c2b68666639a65c45d4d2949047994bbd4fb5506b1062441ac4774b14291e0c5 SHA512 7382ed736b830a260cfb78a14c8c34409741949f9fdcc95d4cae2cb0f0b2909b6fff3a3acf32209528c07aed89cc275ee37c76e34fec1c89a920662ad42a3bfe DIST firefox-91esr-patches-04.tar.xz 17460 BLAKE2B 305d8b0bc8a4115a76e459afd8bc7987bdde2e76d4564faf664a92a4c6a95c975ce599c5ddde9bdafc3c37ca5c8758e0ef815364d0ce4dd5fd452ddae73a77eb SHA512 6073b31bb898fe61d72435b11deacb5e93a1744227e4704bb3012e0cb363792f3a965d72e7769c4aae3a25f0c81247b287ce145c81bbd0a87470a5438fede11e -DIST icecat-91.4.0-gnu1.tar.bz2 561745990 BLAKE2B 54c4f939512fc6c2925dd466214d9cb52eb98d7057f4c383a447697845824409ff9523c61330aef60b721066f34b5078b63980cd07ce4c5a1f76109a03b746c1 SHA512 11d311fd88634ec8be519241ac18a09a97b884f6b73b78aa8ac05ec65afae364e598b130d2af36a4c20d02c7f9f34a936eee12bacedc209c545ba25a1f14c17d +DIST firefox-91esr-patches-05j.tar.xz 17116 BLAKE2B 5db6d2d3d5432369d2cfcda1a2b542d70ac18c1af7013d91984054c9658d7e3f989527c3a248de53f2e8dc51a852a46477f9ad75e98db28f50f8609fcafe547c SHA512 42080a8e28014d5f8de7ff45e0128ab71747faad7a92f0f7094686125835c168751794bd0229f77290f075502c271af0171ffae2863325d10cc6e8a853a90d3e DIST icecat-91.5.0-gnu1.tar.bz2 568416455 BLAKE2B bbc4892c75ac4c0082fef89ea1b10ab88cd7619dc64a7bea0a2344f66d751569f4bd6a9b60b7f07789583040098cf9ff820d2bb9d2c93e19361eef493b77cfb6 SHA512 7de957f0171106539a876dea317794b0a3b05423b641d6f7d3c2b891278676d81a1d112ef9afbc82657f6f09c110fe32c32ff93fb6bf6f230a0505cfe80cf871 +DIST icecat-91.6.0-gnu1.tar.bz2 569356704 BLAKE2B 8855751a99e86eed6e0e254cb0984f67481eda7f1d85d357778c1516e4f3e266801422f4d2b478fd08a09ea36f632b61b9706ff2376b3910688defd644ab2238 SHA512 9e2cc46cd14c9b57cd492e99ab3443a341950cf726d86022e7861bb51b58e15e39736564c34247ecf3bfaa363da9227284e63a6873d2b894ca3951ce6d67ad10 diff --git a/www-client/icecat/icecat-91.4.0.ebuild b/www-client/icecat/icecat-91.6.0.ebuild similarity index 98% rename from www-client/icecat/icecat-91.4.0.ebuild rename to www-client/icecat/icecat-91.6.0.ebuild index 3a884e6..10c5571 100644 --- a/www-client/icecat/icecat-91.4.0.ebuild +++ b/www-client/icecat/icecat-91.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Ebuild is based on the Firefox ebuilds in the main repo @@ -6,11 +6,11 @@ EAPI="7" # Using Gentoos firefox patches as system libraries and lto are quite nice -FIREFOX_PATCHSET="firefox-91esr-patches-02.tar.xz" +FIREFOX_PATCHSET="firefox-91esr-patches-05j.tar.xz" LLVM_MAX_SLOT=13 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="ncurses,sqlite,ssl" WANT_AUTOCONF="2.1" @@ -22,7 +22,7 @@ inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \ virtualx xdg PATCH_URIS=( - https://dev.gentoo.org/~{polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} + https://dev.gentoo.org/~{juippis,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} ) SRC_URI=" @@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS} x86? ( >=dev-lang/nasm-2.13 ) buildtarball? ( ~www-client/makeicecat-"${PV}"[buildtarball] )" -CDEPEND=" +COMMON_DEPEND=" >=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk @@ -151,7 +151,7 @@ CDEPEND=" selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio )" -RDEPEND="${CDEPEND} +RDEPEND="${COMMON_DEPEND} jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( @@ -162,7 +162,7 @@ RDEPEND="${CDEPEND} ) selinux? ( sec-policy/selinux-mozilla )" -DEPEND="${CDEPEND} +DEPEND="${COMMON_DEPEND} x11-libs/libICE x11-libs/libSM pulseaudio? ( @@ -561,6 +561,9 @@ src_prepare() { # Allow user to apply any additional patches without modifing ebuild eapply_user + # Make cargo respect MAKEOPTS + export CARGO_BUILD_JOBS="$(makeopts_jobs)" + # Make LTO respect MAKEOPTS sed -i \ -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \