commit:     e39d50d88e3d33a7e1671a6853ef0668378d3003
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 16:48:17 2021 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 16:48:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e39d50d8

www-client/chromium: security cleanup

Bug: https://bugs.gentoo.org/784554
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 www-client/chromium/Manifest                     |   1 -
 www-client/chromium/chromium-90.0.4430.72.ebuild | 926 -----------------------
 2 files changed, 927 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b3fb368ae2a..38b2078a423 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,4 @@
 DIST chromium-90-patchset-7.tar.xz 3892 BLAKE2B 
3ba169baaaf74b548749be3f845f505256cc9573f798e10929b5d1f0f534d739e657e3fa134c78ec3f7987a3b89adfc4bee0d1a6585ad8fe4bdc3ffd1181042c
 SHA512 
5e1aa834ee5668ee40fc3af5cda7325da710dd1a0dea7ce535e89e36fd7d321db63d520a9b6ce6372ed941473dff18d1276316567af810c18e1478a04d3f23f8
-DIST chromium-90.0.4430.72.tar.xz 917364932 BLAKE2B 
12813a6cd32c5ff2532d4d97d99e955d4ec7868c702e437039fd7daa806b8f9d77b96a2dc713438efcb5c1b14069ca3489b666e2c33daa3b0ac701c3038662b5
 SHA512 
b07943ac1535cce0d02046b6e79eb01809bfae95ad6eea3bc7d209ff41d54278ca6575462ea372f3014b434e4f1dc8e529aa752a77ec519659abd089e21506e3
 DIST chromium-90.0.4430.85.tar.xz 917373872 BLAKE2B 
4bac19ddacd1b4b54b02cb3075b2d3fa0e69883c7ee30c89deacad37be6b5b2f0fd166e6c56b8fd998854798ccad2716ea505349583c973c0085a16156002507
 SHA512 
90aac1f0b676e1ca5ccb9a362abb475945c1944686a8aba08509cde105a974ef115ca3ea56e3a88737bec7d0ae3ac1482d9c844cb14adc8f1bc06ac41ad60791
 DIST chromium-91-patchset-5.tar.xz 3648 BLAKE2B 
6c8636f63dc857886d09c8ed69b4c61adc627d2280decdf03b548be8ff2cb522ef0def7a240d1c3c9ee71920304a43af571e2146e2828b89c3b6f87373b8c4a1
 SHA512 
1554feec958291ad3140e2685683befe4b6e0b0ab6a8694c0e02d5b4bf4b7fcad410f17e72099653456fd95ed24a732dd28f2dcfaf146eb3bf68052e2342a481
 DIST chromium-91.0.4472.19.tar.xz 949006036 BLAKE2B 
affc7696fe6a55858a3eda9d5b69c858a75d81f72946e4159fef446175c8759e09f0c9cb3aaa8c603bd8f209af3585e074906d977187fde74b1efa8591cab5ee
 SHA512 
50f83970b7137a42a7742e756d0df2468a50147d2801bc35debcacfa956897725d91df5ffcbfa73ad668ba31d897c7b95d75e3005544c398c695b5731d275f9b

diff --git a/www-client/chromium/chromium-90.0.4430.72.ebuild 
b/www-client/chromium/chromium-90.0.4430.72.ebuild
deleted file mode 100644
index ff4555efaf8..00000000000
--- a/www-client/chromium/chromium-90.0.4430.72.ebuild
+++ /dev/null
@@ -1,926 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu 
he
-       hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl 
sr
-       sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils 
pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/";
-PATCHSET="7"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-       
https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
-       
https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon +hangouts headless 
+js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast 
selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine"
-REQUIRED_USE="
-       component-build? ( !suid )
-       screencast? ( wayland )
-"
-
-COMMON_X_DEPEND="
-       media-libs/mesa:=[gbm]
-       x11-libs/libX11:=
-       x11-libs/libXcomposite:=
-       x11-libs/libXcursor:=
-       x11-libs/libXdamage:=
-       x11-libs/libXext:=
-       x11-libs/libXfixes:=
-       >=x11-libs/libXi-1.6.0:=
-       x11-libs/libXrandr:=
-       x11-libs/libXrender:=
-       x11-libs/libXtst:=
-       x11-libs/libXScrnSaver:=
-       x11-libs/libxcb:=
-       vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
-"
-
-COMMON_DEPEND="
-       app-arch/bzip2:=
-       cups? ( >=net-print/cups-1.3.11:= )
-       dev-libs/expat:=
-       dev-libs/glib:2
-       >=dev-libs/libxml2-2.9.4-r3:=[icu]
-       dev-libs/nspr:=
-       >=dev-libs/nss-3.26:=
-       >=media-libs/alsa-lib-1.0.19:=
-       media-libs/fontconfig:=
-       media-libs/freetype:=
-       >=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-       media-libs/libjpeg-turbo:=
-       media-libs/libpng:=
-       pulseaudio? ( media-sound/pulseaudio:= )
-       system-ffmpeg? (
-               >=media-video/ffmpeg-4.3:=
-               || (
-                       media-video/ffmpeg[-samba]
-                       >=net-fs/samba-4.5.10-r1[-debug(-)]
-               )
-               >=media-libs/opus-1.3.1:=
-       )
-       sys-apps/dbus:=
-       sys-apps/pciutils:=
-       virtual/udev
-       x11-libs/cairo:=
-       x11-libs/gdk-pixbuf:2
-       x11-libs/pango:=
-       media-libs/flac:=
-       >=media-libs/libwebp-0.4.0:=
-       sys-libs/zlib:=[minizip]
-       kerberos? ( virtual/krb5 )
-       !headless? (
-               ${COMMON_X_DEPEND}
-               >=app-accessibility/at-spi2-atk-2.26:2
-               >=app-accessibility/at-spi2-core-2.26:2
-               >=dev-libs/atk-2.26
-               x11-libs/gtk+:3[X]
-               wayland? (
-                       dev-libs/wayland:=
-                       dev-libs/libffi:=
-                       screencast? ( media-video/pipewire:0/0.3 )
-                       x11-libs/gtk+:3[wayland,X]
-                       x11-libs/libdrm:=
-                       x11-libs/libxkbcommon:=
-               )
-       )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-       x11-misc/xdg-utils
-       virtual/opengl
-       virtual/ttf-fonts
-       selinux? ( sec-policy/selinux-chromium )
-       tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-       ${PYTHON_DEPS}
-       >=app-arch/gzip-1.7
-       app-arch/unzip
-       dev-lang/perl
-       >=dev-util/gn-0.1807
-       dev-vcs/git
-       >=dev-util/gperf-3.0.3
-       >=dev-util/ninja-1.7.2
-       >=net-libs/nodejs-7.6.0[inspector]
-       sys-apps/hwids[usb(+)]
-       >=sys-devel/bison-2.4.3
-       sys-devel/flex
-       virtual/pkgconfig
-       js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-       BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-       RDEPEND+=" >=sys-libs/libcxx-12"
-       DEPEND+=" >=sys-libs/libcxx-12"
-else
-       COMMON_DEPEND="
-               app-arch/snappy:=
-               dev-libs/libxslt:=
-               >=dev-libs/re2-0.2019.08.01:=
-               >=media-libs/openh264-1.6.0:=
-               system-icu? ( >=dev-libs/icu-68.1:= )
-       "
-       RDEPEND+="${COMMON_DEPEND}"
-       DEPEND+="${COMMON_DEPEND}"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-       EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-pre_build_checks() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               local -x CPP="$(tc-getCXX) -E"
-               if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-                       die "At least gcc 9.2 is required"
-               fi
-               # component build hangs with tcmalloc enabled due to sandbox 
issue, bug #695976.
-               if has usersandbox ${FEATURES} && use tcmalloc && use 
component-build; then
-                       die "Component build with tcmalloc requires 
FEATURES=-usersandbox."
-               fi
-               if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-                       CPP="${CHOST}-clang++ -E"
-                       if ! ver_test "$(clang-major-version)" -ge 12; then
-                               die "At least clang 12 is required"
-                       fi
-               fi
-       fi
-
-       # Check build requirements, bug #541816 and bug #471810 .
-       CHECKREQS_MEMORY="3G"
-       CHECKREQS_DISK_BUILD="8G"
-       if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-               if use custom-cflags || use component-build; then
-                       CHECKREQS_DISK_BUILD="25G"
-               fi
-               if ! use component-build; then
-                       CHECKREQS_MEMORY="16G"
-               fi
-       fi
-       check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-       pre_build_checks
-}
-
-pkg_setup() {
-       pre_build_checks
-
-       chromium_suid_sandbox_check_kernel_config
-
-       # nvidia-drivers does not work correctly with Wayland due to 
unsupported EGLStreams
-       if use wayland && ! use headless && has_version 
"x11-drivers/nvidia-drivers"; then
-               ewarn "Proprietary nVidia driver does not work with Wayland. 
You can disable"
-               ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in 
/etc/chromium/default."
-       fi
-}
-
-src_prepare() {
-       # Calling this here supports resumption via FEATURES=keepwork
-       python_setup
-
-       local PATCHES=(
-               "${WORKDIR}/patches"
-               "${FILESDIR}/chromium-89-EnumTable-crash.patch"
-               "${FILESDIR}/chromium-shim_headers.patch"
-       )
-
-       # seccomp sandbox is broken if compiled against >=sys-libs/glibc-2.33, 
bug #769989
-       if has_version -d ">=sys-libs/glibc-2.33"; then
-               ewarn "Adding experimental glibc-2.33 sandbox patch. Seccomp 
sandbox might"
-               ewarn "still not work correctly. In case of issues, try to 
disable seccomp"
-               ewarn "sandbox by adding --disable-seccomp-filter-sandbox to 
CHROMIUM_FLAGS"
-               ewarn "in /etc/chromium/default."
-               PATCHES+=(
-                       "${FILESDIR}/chromium-glibc-2.33.patch"
-               )
-       fi
-
-       default
-
-       mkdir -p third_party/node/linux/node-linux-x64/bin || die
-       ln -s "${EPREFIX}"/usr/bin/node 
third_party/node/linux/node-linux-x64/bin/node || die
-
-       local keeplibs=(
-               base/third_party/cityhash
-               base/third_party/double_conversion
-               base/third_party/dynamic_annotations
-               base/third_party/icu
-               base/third_party/nspr
-               base/third_party/superfasthash
-               base/third_party/symbolize
-               base/third_party/valgrind
-               base/third_party/xdg_mime
-               base/third_party/xdg_user_dirs
-               buildtools/third_party/libc++
-               buildtools/third_party/libc++abi
-               chrome/third_party/mozilla_security_manager
-               courgette/third_party
-               net/third_party/mozilla_security_manager
-               net/third_party/nss
-               net/third_party/quic
-               net/third_party/uri_template
-               third_party/abseil-cpp
-               third_party/angle
-               third_party/angle/src/common/third_party/base
-               third_party/angle/src/common/third_party/smhasher
-               third_party/angle/src/common/third_party/xxhash
-               third_party/angle/src/third_party/compiler
-               third_party/angle/src/third_party/libXNVCtrl
-               third_party/angle/src/third_party/trace_event
-               third_party/angle/src/third_party/volk
-               third_party/apple_apsl
-               third_party/axe-core
-               third_party/blink
-               third_party/boringssl
-               third_party/boringssl/src/third_party/fiat
-               third_party/breakpad
-               third_party/breakpad/breakpad/src/third_party/curl
-               third_party/brotli
-               third_party/catapult
-               third_party/catapult/common/py_vulcanize/third_party/rcssmin
-               third_party/catapult/common/py_vulcanize/third_party/rjsmin
-               third_party/catapult/third_party/beautifulsoup4
-               third_party/catapult/third_party/html5lib-python
-               third_party/catapult/third_party/polymer
-               third_party/catapult/third_party/six
-               third_party/catapult/tracing/third_party/d3
-               third_party/catapult/tracing/third_party/gl-matrix
-               third_party/catapult/tracing/third_party/jpeg-js
-               third_party/catapult/tracing/third_party/jszip
-               third_party/catapult/tracing/third_party/mannwhitneyu
-               third_party/catapult/tracing/third_party/oboe
-               third_party/catapult/tracing/third_party/pako
-               third_party/ced
-               third_party/cld_3
-               third_party/closure_compiler
-               third_party/crashpad
-               third_party/crashpad/crashpad/third_party/lss
-               third_party/crashpad/crashpad/third_party/zlib
-               third_party/crc32c
-               third_party/cros_system_api
-               third_party/dav1d
-               third_party/dawn
-               third_party/dawn/third_party/khronos
-               third_party/depot_tools
-               third_party/devscripts
-               third_party/devtools-frontend
-               third_party/devtools-frontend/src/front_end/third_party/acorn
-               third_party/devtools-frontend/src/front_end/third_party/axe-core
-               third_party/devtools-frontend/src/front_end/third_party/chromium
-               
third_party/devtools-frontend/src/front_end/third_party/codemirror
-               third_party/devtools-frontend/src/front_end/third_party/fabricjs
-               third_party/devtools-frontend/src/front_end/third_party/i18n
-               
third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-               
third_party/devtools-frontend/src/front_end/third_party/lighthouse
-               third_party/devtools-frontend/src/front_end/third_party/lit-html
-               
third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-               third_party/devtools-frontend/src/front_end/third_party/marked
-               
third_party/devtools-frontend/src/front_end/third_party/puppeteer
-               
third_party/devtools-frontend/src/front_end/third_party/wasmparser
-               third_party/devtools-frontend/src/third_party
-               third_party/dom_distiller_js
-               third_party/eigen3
-               third_party/emoji-segmenter
-               third_party/farmhash
-               third_party/fdlibm
-               third_party/fft2d
-               third_party/flatbuffers
-               third_party/freetype
-               third_party/fusejs
-               third_party/libgifcodec
-               third_party/liburlpattern
-               third_party/libzip
-               third_party/gemmlowp
-               third_party/google_input_tools
-               third_party/google_input_tools/third_party/closure_library
-               
third_party/google_input_tools/third_party/closure_library/third_party/closure
-               third_party/googletest
-               third_party/harfbuzz-ng/utils
-               third_party/hunspell
-               third_party/iccjpeg
-               third_party/inspector_protocol
-               third_party/jinja2
-               third_party/jsoncpp
-               third_party/jstemplate
-               third_party/khronos
-               third_party/leveldatabase
-               third_party/libXNVCtrl
-               third_party/libaddressinput
-               third_party/libaom
-               third_party/libaom/source/libaom/third_party/fastfeat
-               third_party/libaom/source/libaom/third_party/vector
-               third_party/libaom/source/libaom/third_party/x86inc
-               third_party/libavif
-               third_party/libgav1
-               third_party/libjingle
-               third_party/libphonenumber
-               third_party/libsecret
-               third_party/libsrtp
-               third_party/libsync
-               third_party/libudev
-               third_party/libva_protected_content
-               third_party/libvpx
-               third_party/libvpx/source/libvpx/third_party/x86inc
-               third_party/libwebm
-               third_party/libx11
-               third_party/libxcb-keysyms
-               third_party/libxml/chromium
-               third_party/libyuv
-               third_party/llvm
-               third_party/lottie
-               third_party/lss
-               third_party/lzma_sdk
-               third_party/mako
-               third_party/markupsafe
-               third_party/mesa
-               third_party/metrics_proto
-               third_party/minigbm
-               third_party/modp_b64
-               third_party/nasm
-               third_party/nearby
-               third_party/neon_2_sse
-               third_party/node
-               
third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-               third_party/one_euro_filter
-               third_party/opencv
-               third_party/openscreen
-               third_party/openscreen/src/third_party/mozilla
-               third_party/openscreen/src/third_party/tinycbor/src/src
-               third_party/ots
-               third_party/pdfium
-               third_party/pdfium/third_party/agg23
-               third_party/pdfium/third_party/base
-               third_party/pdfium/third_party/bigint
-               third_party/pdfium/third_party/freetype
-               third_party/pdfium/third_party/lcms
-               third_party/pdfium/third_party/libopenjpeg20
-               third_party/pdfium/third_party/libpng16
-               third_party/pdfium/third_party/libtiff
-               third_party/pdfium/third_party/skia_shared
-               third_party/perfetto
-               third_party/perfetto/protos/third_party/chromium
-               third_party/pffft
-               third_party/ply
-               third_party/polymer
-               third_party/private-join-and-compute
-               third_party/private_membership
-               third_party/protobuf
-               third_party/protobuf/third_party/six
-               third_party/pyjson5
-               third_party/qcms
-               third_party/rnnoise
-               third_party/s2cellid
-               third_party/schema_org
-               third_party/securemessage
-               third_party/shell-encryption
-               third_party/simplejson
-               third_party/skia
-               third_party/skia/include/third_party/skcms
-               third_party/skia/include/third_party/vulkan
-               third_party/skia/third_party/skcms
-               third_party/skia/third_party/vulkan
-               third_party/smhasher
-               third_party/sqlite
-               third_party/swiftshader
-               third_party/swiftshader/third_party/astc-encoder
-               third_party/swiftshader/third_party/llvm-subzero
-               third_party/swiftshader/third_party/marl
-               third_party/swiftshader/third_party/subzero
-               
third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-               third_party/tensorflow-text
-               third_party/tflite
-               third_party/tflite/src/third_party/eigen3
-               third_party/tflite/src/third_party/fft2d
-               third_party/tflite-support
-               third_party/tint
-               third_party/ruy
-               third_party/ukey2
-               third_party/unrar
-               third_party/usrsctp
-               third_party/utf
-               third_party/vulkan
-               third_party/web-animations-js
-               third_party/webdriver
-               third_party/webrtc
-               third_party/webrtc/common_audio/third_party/ooura
-               third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-               third_party/webrtc/modules/third_party/fft
-               third_party/webrtc/modules/third_party/g711
-               third_party/webrtc/modules/third_party/g722
-               third_party/webrtc/rtc_base/third_party/base64
-               third_party/webrtc/rtc_base/third_party/sigslot
-               third_party/widevine
-               third_party/woff2
-               third_party/wuffs
-               third_party/x11proto
-               third_party/xcbproto
-               third_party/zxcvbn-cpp
-               third_party/zlib/google
-               tools/grit/third_party/six
-               url/third_party/mozilla
-               v8/src/third_party/siphash
-               v8/src/third_party/valgrind
-               v8/src/third_party/utf8-decoder
-               v8/third_party/inspector_protocol
-               v8/third_party/v8
-
-               # gyp -> gn leftovers
-               base/third_party/libevent
-               third_party/speech-dispatcher
-               third_party/usb_ids
-               third_party/xdg-utils
-       )
-       if ! use system-ffmpeg; then
-               keeplibs+=( third_party/ffmpeg third_party/opus )
-       fi
-       if ! use system-icu; then
-               keeplibs+=( third_party/icu )
-       fi
-       if use tcmalloc; then
-               keeplibs+=( third_party/tcmalloc )
-       fi
-       if use wayland && ! use headless ; then
-               keeplibs+=( third_party/wayland )
-       fi
-       if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-               keeplibs+=( third_party/libxml )
-               keeplibs+=( third_party/libxslt )
-               keeplibs+=( third_party/openh264 )
-               keeplibs+=( third_party/re2 )
-               keeplibs+=( third_party/snappy )
-               if use system-icu; then
-                       keeplibs+=( third_party/icu )
-               fi
-       fi
-       if use arm64 || use ppc64 ; then
-               keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-       fi
-       # we need to generate ppc64 stuff because upstream does not ship it yet
-       # it has to be done before unbundling.
-       if use ppc64; then
-               pushd third_party/libvpx >/dev/null || die
-               mkdir -p source/config/linux/ppc64 || die
-               ./generate_gni.sh || die
-               popd >/dev/null || die
-       fi
-
-       # Remove most bundled libraries. Some are still needed.
-       build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" 
--do-remove || die
-}
-
-src_configure() {
-       # Calling this here supports resumption via FEATURES=keepwork
-       python_setup
-
-       local myconf_gn=""
-
-       # Make sure the build system will use the right tools, bug #340795.
-       tc-export AR CC CXX NM
-
-       if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-               # Force clang since gcc is pretty broken at the moment.
-               CC=${CHOST}-clang
-               CXX=${CHOST}-clang++
-               strip-unsupported-flags
-       fi
-
-       if tc-is-clang; then
-               myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-       else
-               if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-                       die "Compiling with sys-libs/libcxx requires clang."
-               fi
-               myconf_gn+=" is_clang=false"
-       fi
-
-       # Define a custom toolchain for GN
-       myconf_gn+=" 
custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-       if tc-is-cross-compiler; then
-               tc-export BUILD_{AR,CC,CXX,NM}
-               myconf_gn+=" 
host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-               myconf_gn+=" 
v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-       else
-               myconf_gn+=" 
host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-       fi
-
-       # GN needs explicit config for Debug/Release as opposed to inferring it 
from build directory.
-       myconf_gn+=" is_debug=false"
-
-       # Component build isn't generally intended for use by end users. It's 
mostly useful
-       # for development and debugging.
-       myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-       myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-       # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-       myconf_gn+=" enable_nacl=false"
-
-       # Use system-provided libraries.
-       # TODO: freetype -- remove sources 
(https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-       # TODO: use_system_hunspell (upstream changes needed).
-       # TODO: use_system_libsrtp (bug #459932).
-       # TODO: use_system_protobuf (bug #525560).
-       # TODO: use_system_ssl (http://crbug.com/58087).
-       # TODO: use_system_sqlite (http://crbug.com/22208).
-
-       # libevent: https://bugs.gentoo.org/593458
-       local gn_system_libraries=(
-               flac
-               fontconfig
-               freetype
-               # Need harfbuzz_from_pkgconfig target
-               #harfbuzz-ng
-               libdrm
-               libjpeg
-               libpng
-               libwebp
-               zlib
-       )
-       if use system-ffmpeg; then
-               gn_system_libraries+=( ffmpeg opus )
-       fi
-       if use system-icu; then
-               gn_system_libraries+=( icu )
-       fi
-       if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-               # unbundle only without libc++, because libc++ is not fully ABI 
compatible with libstdc++
-               gn_system_libraries+=( libxml )
-               gn_system_libraries+=( libxslt )
-               gn_system_libraries+=( openh264 )
-               gn_system_libraries+=( re2 )
-               gn_system_libraries+=( snappy )
-       fi
-       build/linux/unbundle/replace_gn_files.py --system-libraries 
"${gn_system_libraries[@]}" || die
-
-       # See dependency logic in third_party/BUILD.gn
-       myconf_gn+=" use_system_harfbuzz=true"
-
-       # Disable deprecated libgnome-keyring dependency, bug #713012
-       myconf_gn+=" use_gnome_keyring=false"
-
-       # Optional dependencies.
-       myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-       myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true 
false)"
-       myconf_gn+=" enable_widevine=$(usex widevine true false)"
-       myconf_gn+=" use_cups=$(usex cups true false)"
-       myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-       myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-       myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-       myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) 
rtc_pipewire_version=\"0.3\""
-
-       # TODO: link_pulseaudio=true for GN.
-
-       myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-       # Never use bundled gold binary. Disable gold linker flags for now.
-       # Do not use bundled clang.
-       # Trying to use gold results in linker crash.
-       myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
-
-       # Disable forced lld, bug 641556
-       myconf_gn+=" use_lld=false"
-
-       ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-       myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-       myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-       # Set up Google API keys, see 
http://www.chromium.org/developers/how-tos/api-keys .
-       # Note: these are for Gentoo use ONLY. For your own distribution,
-       # please get your own set of keys. Feel free to contact 
chrom...@gentoo.org
-       # for more info.
-       local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-       local google_default_client_id="329227923882.apps.googleusercontent.com"
-       local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-       myconf_gn+=" google_api_key=\"${google_api_key}\""
-       myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-       myconf_gn+=" 
google_default_client_secret=\"${google_default_client_secret}\""
-       local myarch="$(tc-arch)"
-
-       # Avoid CFLAGS problems, bug #352457, bug #390147.
-       if ! use custom-cflags; then
-               replace-flags "-Os" "-O2"
-               strip-flags
-
-               # Debug info section overflows without component build
-               # Prevent linker from running out of address space, bug #471810 
.
-               if ! use component-build || use x86; then
-                       filter-flags "-g*"
-               fi
-
-               # Prevent libvpx build failures. Bug 530248, 544702, 546984.
-               if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-                       filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 
-mno-avx -mno-avx2 -mno-fma -mno-fma4
-               fi
-       fi
-
-       if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-               append-flags -stdlib=libc++
-               append-ldflags -stdlib=libc++
-       fi
-
-       if [[ $myarch = amd64 ]] ; then
-               myconf_gn+=" target_cpu=\"x64\""
-               ffmpeg_target_arch=x64
-       elif [[ $myarch = x86 ]] ; then
-               myconf_gn+=" target_cpu=\"x86\""
-               ffmpeg_target_arch=ia32
-
-               # This is normally defined by compiler_cpu_abi in
-               # build/config/compiler/BUILD.gn, but we patch that part out.
-               append-flags -msse2 -mfpmath=sse -mmmx
-       elif [[ $myarch = arm64 ]] ; then
-               myconf_gn+=" target_cpu=\"arm64\""
-               ffmpeg_target_arch=arm64
-       elif [[ $myarch = arm ]] ; then
-               myconf_gn+=" target_cpu=\"arm\""
-               ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-       elif [[ $myarch = ppc64 ]] ; then
-               myconf_gn+=" target_cpu=\"ppc64\""
-               ffmpeg_target_arch=ppc64
-       else
-               die "Failed to determine target arch, got '$myarch'."
-       fi
-
-       # Make sure that -Werror doesn't get added to CFLAGS by the build 
system.
-       # Depending on GCC version the warnings are different and we don't want
-       # the build to fail because of that.
-       myconf_gn+=" treat_warnings_as_errors=false"
-
-       # Disable fatal linker warnings, bug 506268.
-       myconf_gn+=" fatal_linker_warnings=false"
-
-       # Bug 491582.
-       export TMPDIR="${WORKDIR}/temp"
-       mkdir -p -m 755 "${TMPDIR}" || die
-
-       # https://bugs.gentoo.org/654216
-       addpredict /dev/dri/ #nowarn
-
-       #if ! use system-ffmpeg; then
-       if false; then
-               local build_ffmpeg_args=""
-               if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-                       build_ffmpeg_args+=" --disable-asm"
-               fi
-
-               # Re-configure bundled ffmpeg. See bug #491378 for example 
reasons.
-               einfo "Configuring bundled ffmpeg..."
-               pushd third_party/ffmpeg > /dev/null || die
-               chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-                       --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} 
|| die
-               chromium/scripts/copy_config.sh || die
-               chromium/scripts/generate_gn.py || die
-               popd > /dev/null || die
-       fi
-
-       # Chromium relies on this, but was disabled in >=clang-10, 
crbug.com/1042470
-       append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-       # Disable unknown warning message from clang.
-       tc-is-clang && append-flags -Wno-unknown-warning-option
-
-       # Explicitly disable ICU data file support for system-icu builds.
-       if use system-icu; then
-               myconf_gn+=" icu_use_data_file=false"
-       fi
-
-       # Enable ozone wayland and/or headless support
-       if use wayland || use headless; then
-               myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-               myconf_gn+=" ozone_platform_headless=true"
-               if use headless; then
-                       myconf_gn+=" ozone_platform=\"headless\""
-                       myconf_gn+=" use_x11=false"
-               else
-                       myconf_gn+=" ozone_platform_wayland=true"
-                       myconf_gn+=" use_system_libdrm=true"
-                       myconf_gn+=" use_system_minigbm=true"
-                       myconf_gn+=" use_xkbcommon=true"
-                       myconf_gn+=" ozone_platform=\"wayland\""
-               fi
-       else
-               myconf_gn+=" use_ozone=false"
-       fi
-
-       # Enable official builds
-       myconf_gn+=" is_official_build=$(usex official true false)"
-       if use official; then
-               # Allow building against system libraries in official builds
-               sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-                       tools/generate_shim_headers/generate_shim_headers.py || 
die
-               # Disable CFI: unsupported for GCC, requires clang+lto+lld
-               myconf_gn+=" is_cfi=false"
-               # Disable PGO, because profile data is only compatible with 
>=clang-11
-               myconf_gn+=" chrome_pgo_phase=0"
-       fi
-
-       einfo "Configuring Chromium..."
-       set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-       echo "$@"
-       "$@" || die
-}
-
-src_compile() {
-       # Final link uses lots of file descriptors.
-       ulimit -n 2048
-
-       # Calling this here supports resumption via FEATURES=keepwork
-       python_setup
-
-       # https://bugs.gentoo.org/717456
-       local -x 
PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}"
-
-       #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build 
--gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-       # Build mksnapshot and pax-mark it.
-       local x
-       for x in mksnapshot v8_context_snapshot_generator; do
-               if tc-is-cross-compiler; then
-                       eninja -C out/Release "host/${x}"
-                       pax-mark m "out/Release/host/${x}"
-               else
-                       eninja -C out/Release "${x}"
-                       pax-mark m "out/Release/${x}"
-               fi
-       done
-
-       # Even though ninja autodetects number of CPUs, we respect
-       # user's options, for debugging with -j 1 or any other reason.
-       eninja -C out/Release chrome chromedriver
-       use suid && eninja -C out/Release chrome_sandbox
-
-       pax-mark m out/Release/chrome
-
-       # Build manpage; bug #684550
-       sed -e 's|@@PACKAGE@@|chromium-browser|g;
-               s|@@MENUNAME@@|Chromium|g;' \
-               chrome/app/resources/manpage.1.in > \
-               out/Release/chromium-browser.1 || die
-
-       # Build desktop file; bug #706786
-       sed -e 's|@@MENUNAME@@|Chromium|g;
-               s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-               s|@@PACKAGE@@|chromium-browser|g;
-               s|\(^Exec=\)/usr/bin/|\1|g;' \
-               chrome/installer/linux/common/desktop.template > \
-               out/Release/chromium-browser-chromium.desktop || die
-}
-
-src_install() {
-       local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-       exeinto "${CHROMIUM_HOME}"
-       doexe out/Release/chrome
-
-       if use suid; then
-               newexe out/Release/chrome_sandbox chrome-sandbox
-               fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-       fi
-
-       doexe out/Release/chromedriver
-
-       local sedargs=( -e
-                       "s:/usr/lib/:/usr/$(get_libdir)/:g;
-                       s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
-                       s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true 
false):g"
-       )
-       sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > 
chromium-launcher.sh || die
-       doexe chromium-launcher.sh
-
-       # It is important that we name the target "chromium-browser",
-       # xdg-utils expect it; bug #355517.
-       dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-       # keep the old symlink around for consistency
-       dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-       dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-       # Allow users to override command-line options, bug #357629.
-       insinto /etc/chromium
-       newins "${FILESDIR}/chromium.default" "default"
-
-       pushd out/Release/locales > /dev/null || die
-       chromium_remove_language_paks
-       popd
-
-       insinto "${CHROMIUM_HOME}"
-       doins out/Release/*.bin
-       doins out/Release/*.pak
-       (
-               shopt -s nullglob
-               local files=(out/Release/*.so out/Release/*.so.[0-9])
-               [[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-       )
-
-       if ! use system-icu; then
-               doins out/Release/icudtl.dat
-       fi
-
-       doins -r out/Release/locales
-       doins -r out/Release/resources
-
-       if [[ -d out/Release/swiftshader ]]; then
-               insinto "${CHROMIUM_HOME}/swiftshader"
-               doins out/Release/swiftshader/*.so
-       fi
-
-       # Install icons
-       local branding size
-       for size in 16 24 32 48 64 128 256 ; do
-               case ${size} in
-                       16|32) 
branding="chrome/app/theme/default_100_percent/chromium" ;;
-                               *) branding="chrome/app/theme/chromium" ;;
-               esac
-               newicon -s ${size} "${branding}/product_logo_${size}.png" \
-                       chromium-browser.png
-       done
-
-       # Install desktop entry
-       domenu out/Release/chromium-browser-chromium.desktop
-
-       # Install GNOME default application entry (bug #303100).
-       insinto /usr/share/gnome-control-center/default-apps
-       newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-       # Install manpage; bug #684550
-       doman out/Release/chromium-browser.1
-       dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-       readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-       xdg_icon_cache_update
-       xdg_desktop_database_update
-}
-
-pkg_postinst() {
-       xdg_icon_cache_update
-       xdg_desktop_database_update
-       readme.gentoo_print_elog
-
-       if use vaapi; then
-               elog "VA-API is disabled by default at runtime. Either enable 
it"
-               elog "by navigating to 
chrome://flags/#enable-accelerated-video-decode"
-               elog "inside Chromium or add --enable-accelerated-video-decode"
-               elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-       fi
-       if use screencast; then
-               elog "Screencast is disabled by default at runtime. Either 
enable it"
-               elog "by navigating to 
chrome://flags/#enable-webrtc-pipewire-capturer"
-               elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
-               elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-       fi
-}

Reply via email to