diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest index 5720c1f..7bc324b 100644 --- a/www-client/icecat/Manifest +++ b/www-client/icecat/Manifest @@ -1,4 +1,3 @@ -DIST firefox-91esr-patches-05j.tar.xz 17116 BLAKE2B 5db6d2d3d5432369d2cfcda1a2b542d70ac18c1af7013d91984054c9658d7e3f989527c3a248de53f2e8dc51a852a46477f9ad75e98db28f50f8609fcafe547c SHA512 42080a8e28014d5f8de7ff45e0128ab71747faad7a92f0f7094686125835c168751794bd0229f77290f075502c271af0171ffae2863325d10cc6e8a853a90d3e DIST firefox-91esr-patches-06j.tar.xz 17668 BLAKE2B ebe51e06197b70b0f0661724e1ccf2f2aaf0e0eb4576e795963c6a0f9c32f293825b8d2a487dcadd8e5e1cb5db7c756016c50f34e6bc6df451b44e54ef76686e SHA512 3af533a49c5e4a6fdb5be2225256655d402055332ba98f3aa159fcc78c4a9901a541b63d68cb02440f55ede04858388881118f655efebc75b18c316e0ab522a7 -DIST icecat-91.7.0-gnu1.tar.bz2 569508756 BLAKE2B c77f5d35c148d88eac58c8db195041605f34a14d29c58279875c6599791596e2eaf96c999d7842f1942859fec571e506d9f3c031b211a85dfd3dd4a16d035bdb SHA512 59172d5f07722406349f2f49cd7411b71da674d1afe2840b75fde09682d53158f3c24c5ca71d971d9f5b70ae6a3b95b28818a788a3887fa897c13ff67193fa6e DIST icecat-91.8.0-gnu1.tar.bz2 569227383 BLAKE2B e7d644db85dd721636be3e14b10ad0939b00f902cf107ee508427c627a23b0e149b93a09199f01534fa13a12e16164c8d2472566a0798a998c4f4bda44e7c546 SHA512 1c55418e4c14bec7d8e79e8e4daa919d0e17629a5117593392bc32c4b5973bd7ccc69a38d3f2ff4c13c9ccbd3d890de0c5eea95e33a212b87129eef4552af081 +DIST icecat-91.9.0-gnu1.tar.bz2 570259323 BLAKE2B cf03b4cf8febacd10a74f4f35ec23758e7bf9193975165613dd2fc797aa380c05b1d5d6ac73e7de2a4325b81425b6c5cd4ada0387e2ef8310d96c1a84aa7db34 SHA512 484711228e8615d54f7b2b46fdf76af6c1ea33ec5f43588edd94df073b0460e6cb4befe5f2cb7ed4836ee5336ac6bd11413b6f84dd645e52058cb919ed1b783e diff --git a/www-client/icecat/icecat-91.7.0.ebuild b/www-client/icecat/icecat-91.9.0.ebuild similarity index 97% rename from www-client/icecat/icecat-91.7.0.ebuild rename to www-client/icecat/icecat-91.9.0.ebuild index 3929d76..195c926 100644 --- a/www-client/icecat/icecat-91.7.0.ebuild +++ b/www-client/icecat/icecat-91.9.0.ebuild @@ -6,7 +6,7 @@ EAPI="7" # Using Gentoos firefox patches as system libraries and lto are quite nice -FIREFOX_PATCHSET="firefox-91esr-patches-05j.tar.xz" +FIREFOX_PATCHSET="firefox-91esr-patches-06j.tar.xz" LLVM_MAX_SLOT=13 @@ -81,14 +81,6 @@ BDEPEND="${PYTHON_DEPS} pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) - ( - sys-devel/clang:11 - sys-devel/llvm:11 - clang? ( - =sys-devel/lld-11* - pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) - ) - ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) @@ -115,7 +107,7 @@ COMMON_DEPEND=" >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 - x11-libs/libxcb + x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext @@ -468,6 +460,8 @@ pkg_setup() { eerror " - Manually switch rust version using 'eselect rust' to match used LLVM version" eerror " - Switch to dev-lang/rust[system-llvm] which will guarantee matching version" eerror " - Build ${CATEGORY}/${PN} without USE=lto" + eerror " - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole " + eerror " llvm/clang/lld/rust chain depending on your @world updates)" die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!" fi fi @@ -545,7 +539,18 @@ src_unpack() { } src_prepare() { - use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch + if use lto; then + rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die + fi + + if use system-av1 && has_version "