+- {assign var='duplicateDefaultValue' value='Type here the name of the new group'|@translate}
+ {if not empty($groups)}
+ {foreach from=$groups item=group}
+
+- {$group.NAME} >
++ {$group.NAME} >
+
+ {/foreach}
+ {/if}
diff --git a/www-apps/piwigo/files/piwigo-2.10.1-php7.4_deprecation.patch b/www-apps/piwigo/files/piwigo-2.10.1-php7.4_deprecation.patch
new file mode 100644
index 000000000000..45d572799507
--- /dev/null
+++ b/www-apps/piwigo/files/piwigo-2.10.1-php7.4_deprecation.patch
@@ -0,0 +1,56 @@
+From 6f49712b57a4cbe362c0f3d3a1e67267d298fe8b Mon Sep 17 00:00:00 2001
+From: Tomas Krizek
+Date: Tue, 3 Dec 2019 21:56:44 +0100
+Subject: [PATCH] include/functions_cookie: use proper brackets for offset
+ access
+
+Fixes #1134
+---
+ admin/site_update.php | 6 +++---
+ include/functions_cookie.inc.php | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/admin/site_update.php b/admin/site_update.php
+index 791a8d59e..e8fc78093 100644
+--- a/admin/site_update.php
++++ b/admin/site_update.php
+@@ -257,7 +257,7 @@
+ else
+ {
+ $insert['uppercats'] = $insert['id'];
+- $insert{'rank'} = $next_rank['NULL']++;
++ $insert['rank'] = $next_rank['NULL']++;
+ $insert['global_rank'] = $insert['rank'];
+ }
+
+@@ -268,7 +268,7 @@
+ );
+
+ // add the new category to $db_categories and $db_fulldirs array
+- $db_categories[$insert{'id'}] =
++ $db_categories[$insert['id']] =
+ array(
+ 'id' => $insert['id'],
+ 'parent' => (isset($parent)) ? $parent : Null,
+@@ -278,7 +278,7 @@
+ 'global_rank' => $insert['global_rank']
+ );
+ $db_fulldirs[$fulldir] = $insert['id'];
+- $next_rank[$insert{'id'}] = 1;
++ $next_rank[$insert['id']] = 1;
+ }
+ else
+ {
+diff --git a/include/functions_cookie.inc.php b/include/functions_cookie.inc.php
+index be9853d27..0eb159eb7 100644
+--- a/include/functions_cookie.inc.php
++++ b/include/functions_cookie.inc.php
+@@ -54,7 +54,7 @@ function cookie_path()
+ $scr = substr($scr,0,strrpos( $scr,'/'));
+
+ // add a trailing '/' if needed
+- if ((strlen($scr) == 0) or ($scr{strlen($scr)-1} !== '/'))
++ if ((strlen($scr) == 0) or ($scr[strlen($scr)-1] !== '/'))
+ {
+ $scr .= '/';
+ }
diff --git a/www-apps/piwigo/files/piwigo-2.10.1-php7.4_notice.patch b/www-apps/piwigo/files/piwigo-2.10.1-php7.4_notice.patch
new file mode 100644
index 000000000000..71b7c1a8e834
--- /dev/null
+++ b/www-apps/piwigo/files/piwigo-2.10.1-php7.4_notice.patch
@@ -0,0 +1,41 @@
+From f1d1b55d82e9f2d77c5b54422bced31f44370ce0 Mon Sep 17 00:00:00 2001
+From: Ben
+Date: Sun, 19 Jan 2020 18:28:16 +0100
+Subject: [PATCH] Fix PHP-7.4 Issue
+
+PHP-7.4 Issue = "Trying to access array offset on value of type null" in functions_category.inc.php
+---
+ include/functions_category.inc.php | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
+index 22997ee2f..64925a0c8 100644
+--- a/include/functions_category.inc.php
++++ b/include/functions_category.inc.php
+@@ -103,6 +103,8 @@ function get_categories_menu()
+ $result = pwg_query($query);
+ $cats = array();
+ $selected_category = isset($page['category']) ? $page['category'] : null;
++ $selected_category_id = isset($selected_category['id']) ? $selected_category['id'] : null;
++ $selected_category_id_uppercat = isset($selected_category['id_uppercat']) ? $selected_category['id_uppercat'] : null;
+ while ($row = pwg_db_fetch_assoc($result))
+ {
+ $child_date_last = @$row['max_date_last']> @$row['date_last'];
+@@ -122,8 +124,8 @@ function get_categories_menu()
+ ),
+ 'URL' => make_index_url(array('category' => $row)),
+ 'LEVEL' => substr_count($row['global_rank'], '.') + 1,
+- 'SELECTED' => $selected_category['id'] == $row['id'] ? true : false,
+- 'IS_UPPERCAT' => $selected_category['id_uppercat'] == $row['id'] ? true : false,
++ 'SELECTED' => $selected_category_id == $row['id'] ? true : false,
++ 'IS_UPPERCAT' => $selected_category_id_uppercat == $row['id'] ? true : false,
+ )
+ );
+ if ($conf['index_new_icon'])
+@@ -602,4 +604,4 @@ function remove_computed_category(&$cats, $cat)
+ unset($cats[$cat['cat_id']]);
+ }
+
+-?>
+\ No newline at end of file
++?>
diff --git a/www-apps/piwigo/piwigo-2.10.1.ebuild b/www-apps/piwigo/piwigo-2.10.1-r1.ebuild
similarity index 86%
rename from www-apps/piwigo/piwigo-2.10.1.ebuild
rename to www-apps/piwigo/piwigo-2.10.1-r1.ebuild
index 208eb4ede249..84e1dab03f39 100644
--- a/www-apps/piwigo/piwigo-2.10.1.ebuild
+++ b/www-apps/piwigo/piwigo-2.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,6 +22,11 @@ BDEPEND="app-arch/unzip"
REQUIRED_USE="|| ( gd imagemagick )"
+PATCHES=(
+ "${FILESDIR}"/${P}-css_vuln.patch
+ "${FILESDIR}"/${P}-php7.4_deprecation.patch
+ "${FILESDIR}"/${P}-php7.4_notice.patch
+ )
S=${WORKDIR}/${PN}
src_install() {
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index a36821597ef0..43e45e9d98b4 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e6fe40004766..39a34894c332 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,3 @@
-DIST chromium-80.0.3987.100.tar.xz 801377116 BLAKE2B 0c99b78794a0c04bcc45fd423d0fabb7db4c9e37ae446b46c33a7b4a98ecc1af9302680e84118809f01dd3bee50b68a301ff0bdd72c5704c028c7984bac812f3 SHA512 b8612693158f9a497723391ed80dd06b152ed71b29e2722a751f94b297e184f09f786405d2c5b460aff6f62c9c6292c673b36019ff72f1fb662cc418cc26127d
DIST chromium-80.0.3987.122.tar.xz 801340492 BLAKE2B 3f3015346120735c0d04268606fd61ddf57d63e042efe77d7e701fdc9609038a06cbc9380c6d90cb7324dc1679e62c86d971f36bd66f676bd2b16bc4c391bd0f SHA512 3a022c55f5745f2cfb7e28efb113f78ff686da638cd02f0585ef1ae8620f81ece864bc27b4e0a88daf3f409ff565a9b80b8859d1fd7d62c8b1d26cb8b311acc5
-DIST chromium-81.0.4044.26.tar.xz 791360936 BLAKE2B e7364ba1c3e1a586224fd2b15d5942f992d9b1a765a595225e985f273d33a784a1c67d613da842dd35021d3791bd34087073e50f122386c2d5ae23c4b320e0e8 SHA512 62884b6247d070e05e6e588d39b7a0f6027c3073d464fce9ca810df42f8c26d2d387479ab84d55ef6fd5c24e3311e299c3a0760497f48f528b7b288edc8878d4
-DIST chromium-82.0.4056.3.tar.xz 796919020 BLAKE2B 89d010fef567b3b3f76614f8097697f71b5b1222faaa9738c639001748d8fc103eef0c6b0c90154be36e2deeb5b7c2b1b5a61c9fe7c11836d8723819466c265e SHA512 83a160ffad9f9b10fb498b61e0f6427ee88fe73928d5956b60e7bd0690bb279c1fa749105c4996da67d1ade80d62e9ccad0b9a8bfb3691a17574ad22399ae55d
+DIST chromium-81.0.4044.34.tar.xz 791437908 BLAKE2B ca7f71e3e6b8982fa65fa812ce5856902b9dcf0d472b07d7fc9c9afd686348f893259413e5aacf67ad898d2e15d167b403613ae62573264fcd28e40db1460e30 SHA512 9ed2fa58799d038791ad7b705a60b2add0ff5d0c8200f29c111151380f87fabd15a024f9d480d18bdc9026ff2807bb054c7a81e2f06a3e4b7776b2a86a8d4dec
+DIST chromium-82.0.4068.4.tar.xz 803352676 BLAKE2B 64356b7c840d6ba955d2b7aced1faf85e05f19c9c0b39e8bf86529b86bba2e162404820f5710e9962c4d5e1325086becc3aebb0fdc2683b06231a2a0e8d7a6ae SHA512 ceb3b50ad4b38e969cf27c386d696665d773e73c000a1cd1ee158bbff86ae94b09a5fbe128547ed496e258ce8bfaf9bbf28b0d229254400c86afbe49fc7e8d8b
diff --git a/www-client/chromium/chromium-80.0.3987.100.ebuild b/www-client/chromium/chromium-80.0.3987.100.ebuild
deleted file mode 100644
index e44b887672d1..000000000000
--- a/www-client/chromium/chromium-80.0.3987.100.ebuild
+++ /dev/null
@@ -1,738 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-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="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
- >=app-accessibility/at-spi2-atk-2.26:2
- app-arch/bzip2:=
- cups? ( >=net-print/cups-1.3.11:= )
- >=dev-libs/atk-2.26
- dev-libs/expat:=
- dev-libs/glib:2
- system-icu? ( >=dev-libs/icu-65:= )
- >=dev-libs/libxml2-2.9.4-r3:=[icu]
- dev-libs/libxslt:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.26:=
- >=dev-libs/re2-0.2019.08.01:=
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
- >=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:=
- system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
- >=media-libs/openh264-1.6.0:=
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? (
- >=media-video/ffmpeg-4:=
- || (
- 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/gtk+:3[X]
- 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/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- app-arch/snappy:=
- media-libs/flac:=
- >=media-libs/libwebp-0.4.0:=
- sys-libs/zlib:=[minizip]
- kerberos? ( virtual/krb5 )
-"
-# 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? ( ! gn leftovers
- base/third_party/libevent
- third_party/adobe
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- third_party/yasm/run_yasm.py
- )
- 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 system-libvpx; then
- keeplibs+=( third_party/libvpx )
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
- fi
- if use tcmalloc; then
- keeplibs+=( third_party/tcmalloc )
- 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
- 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
- libxml
- libxslt
- openh264
- re2
- snappy
- yasm
- zlib
- )
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg opus )
- fi
- if use system-icu; then
- gn_system_libraries+=( icu )
- fi
- if use system-libvpx; then
- gn_system_libraries+=( libvpx )
- 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"
-
- # Optional dependencies.
- myconf_gn+=" closure_compile=$(usex closure-compile 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_gnome_keyring=$(usex gnome-keyring true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
- # 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 linux_use_bundled_binutils=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 chromium@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
-
- # Prevent linker from running out of address space, bug #471810 .
- if 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
- fi
- 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)
- 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
-
- # Explicitly disable ICU data file support for system-icu builds.
- if use system-icu; then
- myconf_gn+=" icu_use_data_file=false"
- 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
-
- #"${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" )
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.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
- doins out/Release/*.so
-
- 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
-}
diff --git a/www-client/chromium/chromium-80.0.3987.122.ebuild b/www-client/chromium/chromium-80.0.3987.122.ebuild
index 008f6402479f..e44b887672d1 100644
--- a/www-client/chromium/chromium-80.0.3987.122.ebuild
+++ b/www-client/chromium/chromium-80.0.3987.122.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
REQUIRED_USE="component-build? ( !suid )"
diff --git a/www-client/chromium/chromium-81.0.4044.26.ebuild b/www-client/chromium/chromium-81.0.4044.34.ebuild
similarity index 100%
rename from www-client/chromium/chromium-81.0.4044.26.ebuild
rename to www-client/chromium/chromium-81.0.4044.34.ebuild
diff --git a/www-client/chromium/chromium-82.0.4056.3.ebuild b/www-client/chromium/chromium-82.0.4068.4.ebuild
similarity index 99%
rename from www-client/chromium/chromium-82.0.4056.3.ebuild
rename to www-client/chromium/chromium-82.0.4068.4.ebuild
index af1778f7e9b7..a056ee3c4d4f 100644
--- a/www-client/chromium/chromium-82.0.4056.3.ebuild
+++ b/www-client/chromium/chromium-82.0.4068.4.ebuild
@@ -145,10 +145,9 @@ PATCHES=(
"${FILESDIR}/chromium-79-gcc-alignas.patch"
"${FILESDIR}/chromium-80-gcc-quiche.patch"
"${FILESDIR}/chromium-80-gcc-blink.patch"
- "${FILESDIR}/chromium-81-gcc-constexpr.patch"
- "${FILESDIR}/chromium-82-gcc-noexcept.patch"
- "${FILESDIR}/chromium-82-gcc-has-feature.patch"
- "${FILESDIR}/chromium-82-gcc-default.patch"
+ "${FILESDIR}/chromium-82-gcc-constexpr.patch"
+ "${FILESDIR}/chromium-82-gcc-private.patch"
+ "${FILESDIR}/chromium-82-include.patch"
)
pre_build_checks() {
diff --git a/www-client/chromium/files/chromium-82-gcc-constexpr.patch b/www-client/chromium/files/chromium-82-gcc-constexpr.patch
new file mode 100644
index 000000000000..139b458c1969
--- /dev/null
+++ b/www-client/chromium/files/chromium-82-gcc-constexpr.patch
@@ -0,0 +1,34 @@
+From 5812cd9bc2c15a034db24e0d2a43cc923d8a66cc Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz
+Date: Thu, 20 Feb 2020 13:00:16 +0100
+Subject: [PATCH] GCC: DOMRect constexpr equal operator depends on non constexpr operators
+
+Make accessors of DOMRectReadOnly constexpr so the equal operator can be
+also constexpr.
+
+../../third_party/blink/renderer/core/geometry/dom_rect.h: In function ‘constexpr bool blink::operator==(const blink::DOMRect&, const blink::DOMRect&)’:
+../../third_party/blink/renderer/core/geometry/dom_rect.h:38:15: error: call to non-‘constexpr’ function ‘double blink::DOMRectReadOnly::x() const’
+
+Bug: 819294
+Change-Id: Ic1fed89c5480ce4eedaaf7add2779d000b77cc48
+---
+
+diff --git a/third_party/blink/renderer/core/geometry/dom_rect_read_only.h b/third_party/blink/renderer/core/geometry/dom_rect_read_only.h
+index 77398f0..dda1f33 100644
+--- a/third_party/blink/renderer/core/geometry/dom_rect_read_only.h
++++ b/third_party/blink/renderer/core/geometry/dom_rect_read_only.h
+@@ -30,10 +30,10 @@
+
+ DOMRectReadOnly(double x, double y, double width, double height);
+
+- double x() const { return x_; }
+- double y() const { return y_; }
+- double width() const { return width_; }
+- double height() const { return height_; }
++ constexpr double x() const { return x_; }
++ constexpr double y() const { return y_; }
++ constexpr double width() const { return width_; }
++ constexpr double height() const { return height_; }
+
+ double top() const { return std::min(y_, y_ + height_); }
+ double right() const { return std::max(x_, x_ + width_); }
diff --git a/www-client/chromium/files/chromium-82-gcc-default.patch b/www-client/chromium/files/chromium-82-gcc-default.patch
deleted file mode 100644
index 2195a1d2923a..000000000000
--- a/www-client/chromium/files/chromium-82-gcc-default.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a089aa8aafa2cabc331df6ea450fb75b77e75ff7 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz
-Date: Wed, 12 Feb 2020 22:03:05 +0000
-Subject: [PATCH] libstdc++: explicitly declare default constructor of WTF::DequeIterator
-
-Using std::minmax_element on a WTF::Deque iterator with libstdc++ from
-GCC 5+ fails to compile:
-/usr/include/c++/9/bits/stl_algo.h:3334:24: error: no matching function for call to ‘WTF::DequeIterator::DequeIterator()’
- 3334 | _ForwardIterator __min{}, __max{};
-
-This is because it will try to create an iterator of the DequeIterator
-type with no parameters (or with an empty list of initializers), but
-that constructor is not available. So this changeset adds it.
-
-Bug: 957519
-
-Change-Id: I95e54a2fd95b19c0d439e9067105b7e388bdea61
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2051932
-Reviewed-by: Kentaro Hara
-Commit-Queue: José Dapena Paz
-Cr-Commit-Position: refs/heads/master@{#740842}
----
-
-diff --git a/third_party/blink/renderer/platform/wtf/deque.h b/third_party/blink/renderer/platform/wtf/deque.h
-index 29cce7c57..07233c4 100644
---- a/third_party/blink/renderer/platform/wtf/deque.h
-+++ b/third_party/blink/renderer/platform/wtf/deque.h
-@@ -236,6 +236,7 @@
- typedef T& reference;
- typedef std::bidirectional_iterator_tag iterator_category;
-
-+ DequeIterator() = default;
- DequeIterator(Deque* deque, wtf_size_t index)
- : Base(deque, index) {}
-
diff --git a/www-client/chromium/files/chromium-82-gcc-has-feature.patch b/www-client/chromium/files/chromium-82-gcc-has-feature.patch
deleted file mode 100644
index 592d0cdb3b96..000000000000
--- a/www-client/chromium/files/chromium-82-gcc-has-feature.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a148e5ed2151c6458f8c4cff44634146f803afe5 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz
-Date: Wed, 12 Feb 2020 22:00:35 +0000
-Subject: [PATCH] GCC: do not use __has_feature in UnsanitizedAtomic
-
-GCC fails to build as unsanitized_atomic.cc is using a Clang only
-compiler macro: __has_feature:
-
- ../../third_party/blink/renderer/platform/heap/unsanitized_atomic.cc:9:18: error: missing binary operator before token "("
- 9 | #if __has_feature(address_sanitizer)
- | ^
-
-Bug: 819294
-Change-Id: Id1ef4972e61d82739b115398458fd238736de4a9
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2052106
-Reviewed-by: Anton Bikineev
-Commit-Queue: José Dapena Paz
-Cr-Commit-Position: refs/heads/master@{#740841}
----
-
-diff --git a/third_party/blink/renderer/platform/heap/unsanitized_atomic.cc b/third_party/blink/renderer/platform/heap/unsanitized_atomic.cc
-index 8481d63..5ed251d 100644
---- a/third_party/blink/renderer/platform/heap/unsanitized_atomic.cc
-+++ b/third_party/blink/renderer/platform/heap/unsanitized_atomic.cc
-@@ -6,7 +6,9 @@
-
- #include "cstdint"
-
--#if __has_feature(address_sanitizer)
-+#include "base/compiler_specific.h"
-+
-+#if HAS_FEATURE(address_sanitizer)
- #error "Must be built without asan."
- #endif
-
diff --git a/www-client/chromium/files/chromium-82-gcc-noexcept.patch b/www-client/chromium/files/chromium-82-gcc-noexcept.patch
deleted file mode 100644
index ee7d65537fc0..000000000000
--- a/www-client/chromium/files/chromium-82-gcc-noexcept.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/components/paint_preview/browser/paint_preview_client.cc b/components/paint_preview/browser/paint_preview_client.cc
-index a02605a..abe0e3a 100644
---- a/components/paint_preview/browser/paint_preview_client.cc
-+++ b/components/paint_preview/browser/paint_preview_client.cc
-@@ -98,7 +98,7 @@ PaintPreviewClient::PaintPreviewData::PaintPreviewData() = default;
- PaintPreviewClient::PaintPreviewData::~PaintPreviewData() = default;
-
- PaintPreviewClient::PaintPreviewData& PaintPreviewClient::PaintPreviewData::
--operator=(PaintPreviewData&& rhs) noexcept = default;
-+operator=(PaintPreviewData&& rhs) = default;
-
- PaintPreviewClient::PaintPreviewData::PaintPreviewData(
- PaintPreviewData&& other) noexcept = default;
diff --git a/www-client/chromium/files/chromium-82-gcc-private.patch b/www-client/chromium/files/chromium-82-gcc-private.patch
new file mode 100644
index 000000000000..278f5b1d97a9
--- /dev/null
+++ b/www-client/chromium/files/chromium-82-gcc-private.patch
@@ -0,0 +1,47 @@
+From 1931db04cf4b3737adfb99edf86cbf68d740511b Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz
+Date: Thu, 20 Feb 2020 11:41:29 +0100
+Subject: [PATCH] GNU stdc++: media::MediaError default constructor should be public
+
+On building with GNU stdc++ we get this error building:
+ gen/media/mojo/mojom/media_types.mojom.cc:1161:55: required from here
+ /usr/include/c++/9/bits/stl_construct.h:75:7: error: ‘media::MediaError::MediaError()’ is private within this context
+
+This is because the serialization code will eventually call, in this case,
+the default constructor because of the implementation of stl_uninitialized
+that is used to create an std::vector. This is invoked from
+static bool mojo::ArrayTraits >::Resize(std::vector<_Tp>&, size_t)
+and what it does is constructing a temporary vector like this:
+ std::vector temp(size);
+
+But this is requiring calling the default constructor of T (in this case
+MediaError) for all the elements up to size-1.
+
+Bug: 957519
+Change-Id: Ie3a28b9734f16c5155b9500003838510be0a748d
+---
+
+diff --git a/media/base/media_error.h b/media/base/media_error.h
+index d3ba96c..56daaec 100644
+--- a/media/base/media_error.h
++++ b/media/base/media_error.h
+@@ -40,6 +40,9 @@
+ // successful returns.
+ class MEDIA_EXPORT MediaError {
+ public:
++ // Default constructor can be used for MediaError::Ok();
++ MediaError();
++
+ // Convenience function to return |kOk|.
+ // OK won't have a message, trace, or data associated with them, and DCHECK
+ // if they are added.
+@@ -110,9 +113,6 @@
+ }
+
+ private:
+- // Default constructor can be used for MediaError::Ok();
+- MediaError();
+-
+ // Private helper to add the current stack frame to the error trace.
+ void AddFrame(const base::Location& location);
+
diff --git a/www-client/chromium/files/chromium-82-include.patch b/www-client/chromium/files/chromium-82-include.patch
new file mode 100644
index 000000000000..9a39ae2e8d56
--- /dev/null
+++ b/www-client/chromium/files/chromium-82-include.patch
@@ -0,0 +1,28 @@
+From 046deafc60a31f485a96773dc5ea5b0eb2ed15f1 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz
+Date: Mon, 24 Feb 2020 16:24:33 +0000
+Subject: [PATCH] IWYU: missing include for std::string in csp_source_list.h
+
+Build error in GCC:
+../../services/network/public/cpp/content_security_policy/csp_source_list.h:19:6: error: ‘string’ in namespace ‘std’ does not name a type
+
+Bug: 819294
+Change-Id: I9c8665050cae038530a79323b65932a124adf2a1
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2067074
+Commit-Queue: Lucas Gadani
+Reviewed-by: Lucas Gadani
+Cr-Commit-Position: refs/heads/master@{#743946}
+---
+
+diff --git a/services/network/public/cpp/content_security_policy/csp_source_list.h b/services/network/public/cpp/content_security_policy/csp_source_list.h
+index 0cd3971..6df1891 100644
+--- a/services/network/public/cpp/content_security_policy/csp_source_list.h
++++ b/services/network/public/cpp/content_security_policy/csp_source_list.h
+@@ -5,6 +5,7 @@
+ #ifndef SERVICES_NETWORK_PUBLIC_CPP_CONTENT_SECURITY_POLICY_CSP_SOURCE_LIST_H_
+ #define SERVICES_NETWORK_PUBLIC_CPP_CONTENT_SECURITY_POLICY_CSP_SOURCE_LIST_H_
+
++#include
+ #include
+
+ #include "base/component_export.h"
diff --git a/www-client/chromium/files/chromium-compiler-r12.patch b/www-client/chromium/files/chromium-compiler-r12.patch
index 18f597f7e34e..833abe2828cb 100644
--- a/www-client/chromium/files/chromium-compiler-r12.patch
+++ b/www-client/chromium/files/chromium-compiler-r12.patch
@@ -1,17 +1,17 @@
-From 4ee82d093d26ab2fcdb989fd62f55b0588afdde0 Mon Sep 17 00:00:00 2001
+From 137de121a36f9349ad8435fee57940facef82878 Mon Sep 17 00:00:00 2001
From: Mike Gilbert
-Date: Sat, 15 Feb 2020 12:11:49 +0000
+Date: Fri, 26 Feb 2020 10:09:23 +0000
Subject: [PATCH] Disable various compiler configs
---
- build/config/compiler/BUILD.gn | 70 ++++++++++++----------------------
- 1 file changed, 25 insertions(+), 45 deletions(-)
+ build/config/compiler/BUILD.gn | 67 ++++++++++++----------------------
+ 1 file changed, 23 insertions(+), 44 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index e40194e..f2bd02e 100644
+index 85bc736..a85bd12 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -260,8 +260,6 @@ config("compiler") {
+@@ -261,8 +261,6 @@ config("compiler") {
configs += [
# See the definitions below.
@@ -20,7 +20,7 @@ index e40194e..f2bd02e 100644
":compiler_codegen",
":compiler_deterministic",
]
-@@ -486,26 +484,6 @@ config("compiler") {
+@@ -487,26 +485,6 @@ config("compiler") {
}
}
@@ -37,7 +37,7 @@ index e40194e..f2bd02e 100644
- "-instcombine-lower-dbg-declare=0",
- ]
-
-- if (target_os != "chromeos") {
+- if (!is_chromeos && default_toolchain != "//build/toolchain/cros:target") {
- # TODO(https://crbug.com/1049161): Remove '-DCLANG_SPAWN_CC1=ON' from build.py instead
- # once this change has marinated a bit.
- cflags += [ "-fintegrated-cc1" ]
@@ -47,7 +47,7 @@ index e40194e..f2bd02e 100644
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
-@@ -1452,6 +1430,12 @@ config("default_warnings") {
+@@ -1442,6 +1420,12 @@ config("default_warnings") {
cflags_cc += [ "-Wno-class-memaccess" ]
}
@@ -60,7 +60,7 @@ index e40194e..f2bd02e 100644
# -Wunused-local-typedefs is broken in gcc,
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
cflags += [ "-Wno-unused-local-typedefs" ]
-@@ -1577,7 +1561,7 @@ config("chromium_code") {
+@@ -1572,7 +1556,7 @@ config("chromium_code") {
defines = [ "_HAS_NODISCARD" ]
}
} else {
@@ -69,7 +69,7 @@ index e40194e..f2bd02e 100644
if (treat_warnings_as_errors) {
cflags += [ "-Werror" ]
-@@ -1586,10 +1570,6 @@ config("chromium_code") {
+@@ -1581,10 +1565,6 @@ config("chromium_code") {
# well.
ldflags = [ "-Werror" ]
}
@@ -80,7 +80,7 @@ index e40194e..f2bd02e 100644
# In Chromium code, we define __STDC_foo_MACROS in order to get the
# C99 macros on Mac and Linux.
-@@ -1598,15 +1578,6 @@ config("chromium_code") {
+@@ -1593,15 +1573,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS",
]
@@ -96,7 +96,7 @@ index e40194e..f2bd02e 100644
if (is_mac) {
cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2010,7 +1981,8 @@ config("default_stack_frames") {
+@@ -1993,7 +1964,8 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@@ -104,19 +104,9 @@ index e40194e..f2bd02e 100644
+config("optimize") { }
+config("xoptimize") {
if (is_win) {
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772
- if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -2036,7 +2008,8 @@ config("optimize") {
- }
-
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
- if (is_win) {
- # Favor size over speed, /O1 must be before the common flags. The GYP
- # build also specifies /Os and /GF but these are implied by /O1.
-@@ -2059,7 +2032,8 @@ config("optimize_no_wpo") {
+ # Favor size over speed, /O1 must be before the common flags.
+ # /O1 implies /Os and /GF.
+@@ -2016,7 +1988,8 @@ config("optimize") {
}
# Turn off optimizations.
@@ -126,7 +116,7 @@ index e40194e..f2bd02e 100644
if (is_win) {
cflags = [
"/Od", # Disable optimization.
-@@ -2093,7 +2067,8 @@ config("no_optimize") {
+@@ -2050,7 +2023,8 @@ config("no_optimize") {
# Turns up the optimization level. On Windows, this implies whole program
# optimization and link-time code generation which is very expensive and should
# be used sparingly.
@@ -136,7 +126,7 @@ index e40194e..f2bd02e 100644
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2132,7 +2107,8 @@ config("optimize_max") {
+@@ -2089,7 +2063,8 @@ config("optimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@@ -146,7 +136,7 @@ index e40194e..f2bd02e 100644
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2162,7 +2138,8 @@ config("optimize_speed") {
+@@ -2119,7 +2094,8 @@ config("optimize_speed") {
}
}
@@ -156,7 +146,7 @@ index e40194e..f2bd02e 100644
cflags = [ "-O1" ] + common_optimize_on_cflags
ldflags = common_optimize_on_ldflags
visibility = [ ":default_optimization" ]
-@@ -2278,7 +2255,8 @@ config("win_pdbaltpath") {
+@@ -2235,7 +2211,8 @@ config("win_pdbaltpath") {
}
# Full symbols.
@@ -166,7 +156,7 @@ index e40194e..f2bd02e 100644
if (is_win) {
if (use_goma || is_clang) {
# Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2388,7 +2366,8 @@ config("symbols") {
+@@ -2361,7 +2338,8 @@ config("symbols") {
# Minimal symbols.
# This config guarantees to hold symbol for stack trace which are shown to user
# when crash happens in unittests running on buildbot.
@@ -176,7 +166,7 @@ index e40194e..f2bd02e 100644
if (is_win) {
# Functions, files, and line tables only.
cflags = []
-@@ -2443,7 +2422,8 @@ config("minimal_symbols") {
+@@ -2416,7 +2394,8 @@ config("minimal_symbols") {
}
# No symbols.
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 8f83dfc7d43e..b2cff3c7ca61 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_81.0.4044.26-1_amd64.deb 67241120 BLAKE2B e0040da20c106d2a39054121a7fd6a5b99459c74271b3c1071e4737f701e87706643a37682438b5374bf761be31c73a29a9290bf7903763cf93169339a8d2ad0 SHA512 ba2e6b917a79ddf0d9010e9df5a10f28a5c42f32d2a0748e360eec2f937cf4096a9a36cbfacda8593c3632b4aeba220fb8d0ccd7bc204d89c801a004eb7af6f9
+DIST google-chrome-beta_81.0.4044.34-1_amd64.deb 66708676 BLAKE2B d647a2998b334d155a0c30de768cb315bb0740d33e4add13bce3f7efdccad1e9e25944b0d21aaf6a1aa47325fe20183d41f83f26e7104f8a697fbaf0af690bca SHA512 867e86358142bc685821faa3fa074d3a47cc47c1d1d070a3d8c54b0d5c8323efd9939d3fc6bb8b91afcca1b872498b986f6bde942b063d9187fa72fcd1d92d81
diff --git a/www-client/google-chrome-beta/google-chrome-beta-81.0.4044.26.ebuild b/www-client/google-chrome-beta/google-chrome-beta-81.0.4044.34.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-81.0.4044.26.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-81.0.4044.34.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 099f00c86a72..a94de66dfd7e 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_82.0.4062.3-1_amd64.deb 67834818 BLAKE2B 53c73c6d5a108edbbe740d262b34c131b322bd39d772aa5ef0776aa7f22b770991fdf76b05211b2ad3bab8763641f14c7281524159b99b6e92c3e10f4c303b93 SHA512 c5fd5aaafc31cb716fd364c2c39aa50c01956c7cde747422172e77fb55ef82b8e1c5c3539defb712591b9ddb7b09492a2c5ae4313f4ee1a8ffc5b78f81b26d35
+DIST google-chrome-unstable_82.0.4068.4-1_amd64.deb 68621040 BLAKE2B b2b3a7716dcbb1b46d4d4f90e3e69b1c9a4768afa9aa01bc37389c13dc8c7857e451039bafec410831fbc3dd9f8306a4395d175914ff2057afd316983bbb6c18 SHA512 893c67d2b1ca58d834a8874d57f9d8e6484ac37e115c44be2b1f4a581daadbf2075448b52ec95ed87e6e5f890e33de718951137bafe326e6332a3029c0dc24d7
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-82.0.4062.3.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-82.0.4068.4.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-82.0.4062.3.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-82.0.4068.4.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index e4cccc07f9c5..405638d03ae7 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1 +1 @@
-DIST google-chrome-stable_80.0.3987.116-1_amd64.deb 63860304 BLAKE2B 8dc0478311ecc26d9459d0766f7d8733ef0d7a15775648197350f5712f0af6151f4c553913d4f8b2edaf84740e38a7d1d53c4d9fc6f8cc5c27439ed60c35b0ff SHA512 d645fbb7b573a5907a6e067ad6d256f308b20f02286a49104fcb740e624ff301d8f1282795b8188f0c3f01418b6ad4d1c3681da62e2b3fe00e39f3257679bf9d
+DIST google-chrome-stable_80.0.3987.122-1_amd64.deb 63111826 BLAKE2B a03e547db371c9a15034d6b45d3a40327697685e4df3f39ffc9d0f32bbf39f8c9c7c0da5779326200b0399ad61b29304fbed41f755480cc6a7e7cf33e91af7fa SHA512 dc9e6ab4cda866e19b13f90613efb8915993346dc8dfa00aba84e200b9a90633759226788cc18105a8d240951b17a7c753f9f380fceb8ce0beaed7315c6ba47a
diff --git a/www-client/google-chrome/google-chrome-80.0.3987.116.ebuild b/www-client/google-chrome/google-chrome-80.0.3987.122.ebuild
similarity index 100%
rename from www-client/google-chrome/google-chrome-80.0.3987.116.ebuild
rename to www-client/google-chrome/google-chrome-80.0.3987.122.ebuild
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 5a094087d313..5819508fc705 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,2 @@
-DIST qutebrowser-1.8.1.tar.gz 3605606 BLAKE2B 5f60de24738aa9cab88149193c6ce884c663edaed6e018ce56d582eac5489af2f889d8a8074949165e4302847dda61695039d95df4dc992516d3b4e42b2abe8e SHA512 5fff6a8590bb4fd26815984310e5ce57201eed9a4a1fb788594d70e64e00a666563851b376bbac78cb175d64ffbe34a032521db31ae389958fab796ee9c26c78
+DIST qutebrowser-1.10.1.tar.gz 3096307 BLAKE2B d574660451563c16b82f968aafa6443e90e9b341628f508afc957e8ce263037ee564d236a2656e47b59e9d4d4d9347b21b41b752bf429e72df1a0961b491e411 SHA512 cc0a4743d3902f4263a844f810e6a7519a96a500306aabf75f54ed2389fa69fca05d634ab00ef49d091fa7986f9cabe61331a62a7f061a92f2a24eaf73d6e22c
DIST qutebrowser-1.8.3.tar.gz 3634523 BLAKE2B c36abcbd99767e3dbc7113d6432c5b7b2e4062e8b2892dbc15c4ffcde1d7b8f2d918674e3f5f0acf6b5e45eef794019f0cda1d9462da614ece8d1582952a0a95 SHA512 9a3dc3040d1236c81933263e031db4d44c86be206c54f0787a73b2dd7d32d6e742f9ac80626163515e917fbc9fa1588f76afcb21f4b3d31f47ba386d06c3c6e7
diff --git a/www-client/qutebrowser/qutebrowser-1.8.1.ebuild b/www-client/qutebrowser/qutebrowser-1.10.1.ebuild
similarity index 80%
rename from www-client/qutebrowser/qutebrowser-1.8.1.ebuild
rename to www-client/qutebrowser/qutebrowser-1.10.1.ebuild
index 74d2ceada806..456e8dc250d3 100644
--- a/www-client/qutebrowser/qutebrowser-1.8.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.10.1.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit desktop distutils-r1 eutils xdg-utils
@@ -21,16 +22,15 @@ DEPEND="
app-text/asciidoc
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
RDEPEND="
- dev-python/attrs[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+ >=dev-python/attrs-19.3.0[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+ >=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
- || ( (
- >=dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
- =dev-python/pyyaml-3.12[${PYTHON_USEDEP},libyaml]
+ >=dev-python/PyQt5-5.14.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ >=dev-python/PyQtWebEngine-5.14.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.3[${PYTHON_USEDEP},libyaml]
"
# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
diff --git a/www-client/qutebrowser/qutebrowser-1.8.3.ebuild b/www-client/qutebrowser/qutebrowser-1.8.3.ebuild
index b824ba54fcd9..b7fa15c6a63e 100644
--- a/www-client/qutebrowser/qutebrowser-1.8.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.8.3.ebuild
@@ -27,11 +27,8 @@ RDEPEND="
>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
>=dev-python/pygments-2.4.2[${PYTHON_USEDEP}]
>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
- || ( (
- >=dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
- =dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
>=dev-python/pyyaml-5.1.2[${PYTHON_USEDEP},libyaml]
"
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index d50e01d3cf03..759f00f43867 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -27,16 +27,15 @@ DEPEND="
app-text/asciidoc
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
RDEPEND="
- dev-python/attrs[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+ >=dev-python/attrs-19.3.0[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+ >=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
- || ( (
- >=dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
- =dev-python/pyyaml-3.12[${PYTHON_USEDEP},libyaml]
+ >=dev-python/PyQt5-5.14.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ >=dev-python/PyQtWebEngine-5.14.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.3[${PYTHON_USEDEP},libyaml]
"
# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index fc6042668b50..61b365602ac5 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/shellinabox/metadata.xml b/www-misc/shellinabox/metadata.xml
index 1a5ec634fb68..0f746a67cd9a 100644
--- a/www-misc/shellinabox/metadata.xml
+++ b/www-misc/shellinabox/metadata.xml
@@ -9,9 +9,6 @@
shell-tools@gentoo.orgGentoo Shell Tools Project
-
shellinabox/shellinabox
diff --git a/www-misc/vdradmin-am/files/vdradmin-3.6.10.conf b/www-misc/vdradmin-am/files/vdradmin-3.6.10.conf
new file mode 100644
index 000000000000..1895b9c51dd8
--- /dev/null
+++ b/www-misc/vdradmin-am/files/vdradmin-3.6.10.conf
@@ -0,0 +1,19 @@
+# Settings for vdradmin-am
+
+# Use ssl connection
+# Allowed values: yes no
+# SSL using will disable non SSL connections
+#SSL=no
+
+# Use the ipv6 protocol [EXPERIMENTAL]
+# Allowed values: yes no
+#IPV6=no
+
+# Enable Logging
+# Allowed values: syslog file no
+# Setting this value to file will log to /var/log/vdradmin/vdradmind.log
+#LOGGING=no
+
+# Set loglevel
+# Allowed values: 0-7
+#LOGLEVEL=4
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
new file mode 100644
index 000000000000..0e82c2c70929
--- /dev/null
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ssl-cert systemd
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
+SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 ssl"
+
+DEPEND="acct-group/vdradmin
+ acct-user/vdradmin
+ dev-lang/perl
+ dev-perl/Template-Toolkit
+ dev-perl/libwww-perl
+ dev-perl/URI
+ dev-perl/CGI
+ dev-perl/Locale-gettext
+ virtual/perl-IO-Compress
+ ipv6? ( dev-perl/IO-Socket-INET6 )
+ ssl? ( dev-perl/IO-Socket-SSL )
+ virtual/perl-libnet
+ dev-perl/Authen-SASL
+ dev-perl/Digest-HMAC"
+RDEPEND="${DEPEND}"
+
+ETC_DIR="/etc/vdradmin"
+CERTS_DIR="/etc/vdradmin/certs"
+LIB_DIR="/usr/share/vdradmin"
+VDRADMIN_USER="vdradmin"
+VDRADMIN_GROUP="vdradmin"
+
+create_ssl_cert() {
+ # The ssl-cert eclass is not flexible enough, so do some steps manually
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
+ SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+ gen_cnf || return 1
+
+ gen_key 1 || return 1
+ gen_csr 1 || return 1
+ gen_crt 1 || return 1
+}
+
+src_unpack() {
+ unpack ${A}
+ cp "${FILESDIR}"/vdradmind.service "${WORKDIR}"/vdradmind.service
+}
+
+src_prepare() {
+ default
+
+ sed -i vdradmind.pl \
+ -e "s-FILES_IN_SYSTEM = 0;-FILES_IN_SYSTEM = 1;-g" || die
+
+ if use ipv6; then
+ sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \
+ -i "${WORKDIR}"/vdradmind.service || die
+ fi
+
+ if use ssl; then
+ sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ssl:" \
+ -i "${WORKDIR}"/vdradmind.service || die
+ fi
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
+ newconfd "${FILESDIR}"/vdradmin-3.6.10.conf vdradmin
+
+ systemd_dounit "${WORKDIR}"/vdradmind.service
+ systemd_dotmpfilesd "${FILESDIR}"/vdradmind.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/vdradmin-3.6.6.logrotate vdradmin
+
+ newbin vdradmind.pl vdradmind
+
+ insinto "${LIB_DIR}"/template
+ doins -r "${S}"/template/*
+
+ insinto "${LIB_DIR}"/lib/Template/Plugin
+ doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
+
+ insinto /usr/share/locale/
+ doins -r "${S}"/locale/*
+
+ newman vdradmind.pl.1 vdradmind.8
+
+ dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS
+ docinto contrib
+ dodoc "${S}"/contrib/*
+
+ keepdir "${ETC_DIR}"
+ fowners "${VDRADMIN_USER}":"${VDRADMIN_GROUP}" "${ETC_DIR}"
+
+ use ssl && keepdir "${CERTS_DIR}" && \
+ fowners "${VDRADMIN_USER}":"${VDRADMIN_GROUP}" "${CERTS_DIR}"
+}
+
+pkg_preinst() {
+ install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
+ "${ED}"${ETC_DIR}/vdradmind.conf || die
+
+ if [[ -f "${EROOT}"${ETC_DIR}/vdradmind.conf ]]; then
+ cp "${EROOT}"${ETC_DIR}/vdradmind.conf \
+ "${ED}"${ETC_DIR}/vdradmind.conf || die
+ else
+ elog
+ elog "Creating a new config-file."
+ echo
+
+ cat <<-EOF > "${ED}"${ETC_DIR}/vdradmind.conf
+ VDRCONFDIR = "${EROOT}"/etc/vdr
+ VIDEODIR = "${EROOT}"/var/vdr/video
+ EPG_FILENAME = "${EROOT}"/var/vdr/video/epg.data
+ EPGIMAGES = "${EROOT}"/var/vdr/video/epgimages
+ PASSWORD = gentoo-vdr
+ USERNAME = gentoo-vdr
+ EOF
+ # Feed it with newlines
+ yes "" \
+ | "${ED}"/usr/bin/vdradmind --cfgdir "${ED}"${ETC_DIR} --config \
+ |sed -e 's/: /: \n/g'
+
+ [[ ${PIPESTATUS[1]} == "0" ]] \
+ || die "Failed to create initial configuration."
+
+ elog
+ elog "Created default user/password: gentoo-vdr/gentoo-vdr"
+ elog
+ elog "You can run \"emerge --config ${PN}\" if the default-values"
+ elog "do not match your installation or change them in the Setup-Menu"
+ elog "of the Web-Interface."
+ fi
+}
+
+pkg_postinst() {
+ if use ipv6; then
+ elog
+ elog "To make use of the ipv6 protocol"
+ elog "you need to enable it in ${EROOT}/etc/conf.d/vdradmin"
+ fi
+
+ if use ssl; then
+ elog
+ elog "To use ssl connection to your vdr"
+ elog "you need to enable it in ${EROOT}/etc/conf.d/vdradmin"
+
+ if [[ ! -f "${EROOT}"${CERTS_DIR}/server-cert.pem || \
+ ! -f "${EROOT}"${CERTS_DIR}/server-key.pem ]]; then
+ create_ssl_cert
+ local base=$(get_base 1)
+ install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+ "${base}".key "${EROOT}"${CERTS_DIR}/server-key.pem || die
+ install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+ "${base}".crt "${EROOT}"${CERTS_DIR}/server-cert.pem || die
+ fi
+ fi
+
+ elog
+ elog "To extend ${PN} you can emerge"
+ elog "media-plugins/vdr-epgsearch to search the EPG,"
+ elog "media-plugins/vdr-streamdev for livetv streaming and/or"
+ elog "media-video/vdr with USE=\"liemikuutio/vasarajanauloja/none\" "
+ elog "(depend on your vdr version) to rename recordings"
+ elog "on the machine running the VDR you connect to with ${PN}."
+}
+
+pkg_config() {
+ "${EROOT}"/usr/bin/vdradmind -c
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index ea2c1b01aea6..a01f3234a4f2 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index e30236cb8ed8..7842f9b0f513 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_81.0.4044.26-1_amd64.deb 67241120 BLAKE2B e0040da20c106d2a39054121a7fd6a5b99459c74271b3c1071e4737f701e87706643a37682438b5374bf761be31c73a29a9290bf7903763cf93169339a8d2ad0 SHA512 ba2e6b917a79ddf0d9010e9df5a10f28a5c42f32d2a0748e360eec2f937cf4096a9a36cbfacda8593c3632b4aeba220fb8d0ccd7bc204d89c801a004eb7af6f9
-DIST google-chrome-stable_80.0.3987.116-1_amd64.deb 63860304 BLAKE2B 8dc0478311ecc26d9459d0766f7d8733ef0d7a15775648197350f5712f0af6151f4c553913d4f8b2edaf84740e38a7d1d53c4d9fc6f8cc5c27439ed60c35b0ff SHA512 d645fbb7b573a5907a6e067ad6d256f308b20f02286a49104fcb740e624ff301d8f1282795b8188f0c3f01418b6ad4d1c3681da62e2b3fe00e39f3257679bf9d
-DIST google-chrome-unstable_82.0.4062.3-1_amd64.deb 67834818 BLAKE2B 53c73c6d5a108edbbe740d262b34c131b322bd39d772aa5ef0776aa7f22b770991fdf76b05211b2ad3bab8763641f14c7281524159b99b6e92c3e10f4c303b93 SHA512 c5fd5aaafc31cb716fd364c2c39aa50c01956c7cde747422172e77fb55ef82b8e1c5c3539defb712591b9ddb7b09492a2c5ae4313f4ee1a8ffc5b78f81b26d35
+DIST google-chrome-beta_81.0.4044.34-1_amd64.deb 66708676 BLAKE2B d647a2998b334d155a0c30de768cb315bb0740d33e4add13bce3f7efdccad1e9e25944b0d21aaf6a1aa47325fe20183d41f83f26e7104f8a697fbaf0af690bca SHA512 867e86358142bc685821faa3fa074d3a47cc47c1d1d070a3d8c54b0d5c8323efd9939d3fc6bb8b91afcca1b872498b986f6bde942b063d9187fa72fcd1d92d81
+DIST google-chrome-stable_80.0.3987.122-1_amd64.deb 63111826 BLAKE2B a03e547db371c9a15034d6b45d3a40327697685e4df3f39ffc9d0f32bbf39f8c9c7c0da5779326200b0399ad61b29304fbed41f755480cc6a7e7cf33e91af7fa SHA512 dc9e6ab4cda866e19b13f90613efb8915993346dc8dfa00aba84e200b9a90633759226788cc18105a8d240951b17a7c753f9f380fceb8ce0beaed7315c6ba47a
+DIST google-chrome-unstable_82.0.4068.4-1_amd64.deb 68621040 BLAKE2B b2b3a7716dcbb1b46d4d4f90e3e69b1c9a4768afa9aa01bc37389c13dc8c7857e451039bafec410831fbc3dd9f8306a4395d175914ff2057afd316983bbb6c18 SHA512 893c67d2b1ca58d834a8874d57f9d8e6484ac37e115c44be2b1f4a581daadbf2075448b52ec95ed87e6e5f890e33de718951137bafe326e6332a3029c0dc24d7
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-80.0.3987.116.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-80.0.3987.122.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-80.0.3987.116.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-80.0.3987.122.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-81.0.4044.26_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-81.0.4044.34_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-81.0.4044.26_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-81.0.4044.34_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-82.0.4062.3_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-82.0.4068.4_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-82.0.4062.3_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-82.0.4068.4_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 9a9b2eb2d5f1..2ccb1de64df2 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index f0fd9221c3da..535dd0e9be03 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,2 +1,4 @@
DIST puma-3.12.2.tar.gz 218109 BLAKE2B 82224c3a9c1b2c8e903e5f02a8b43effab820581abbaea5bea9c537eb36e39deb34d6f7d62d9fc42e1e5a6f3c153583d8e009c73864a9e57c39e2d31387b2813 SHA512 b0721dc9b380f1932a60a8ac2e1f0ef3869c735359e9a9e1e37bb118ebc3f550a24bd3e544142513ebeb1ee37ae01a41ec67e71e1d182faec0bb6ed4a60bafcf
+DIST puma-3.12.4.tar.gz 219148 BLAKE2B d9fcef62474a1522c29f13fb2572c99bd6d4217bc94febb9c4fe6e699808ad0002fcd88dfd16884a5a9c7296e4d6dd08bc50ce7278f41608678feb18e3a034b4 SHA512 302505512b04c68f9794461b0e7693cd3ff4dfb325b18e50f0f659649c7f504f55765437382557c65bce45d32a1710ab16a875d1fc6d143d4ca297d2b2333108
DIST puma-4.3.1.tar.gz 239800 BLAKE2B 123dcb71dd310a960555fe801530586a39ef6876d9019549eb66590195ab1f450999d5365cf9ebbf2f057f2c641739f3fcdf743f5de076d7e637b0b17210410c SHA512 cbb5fc187d3aebfa255d3d0f2d897e109f50e18feadedbf02b73a350555dcbcfbfd91c0a810c11d6d3ac2ec26103479a53eed3fae77c96f1ae6cc2814960de46
+DIST puma-4.3.3.tar.gz 241756 BLAKE2B a6ff66a449bf04110b4a6e9bdaa740f1144076290f1733922ecab45b5b7e6115ee1f7431b280401adb866838b539b943a35a5955f6d7cf51075941e05451e655 SHA512 1ee81c8d144466a75d5110fd3545527c36af51d2e191c171a985944206524c10a2b4e35fb535e2a1a0a3af5d460a7071ceb9233fae8dc81784643c6b9dc06e6e
diff --git a/www-servers/puma/puma-3.12.4.ebuild b/www-servers/puma/puma-3.12.4.ebuild
new file mode 100644
index 000000000000..feb027e475e6
--- /dev/null
+++ b/www-servers/puma/puma-3.12.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="https://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+ test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+all_ruby_prepare() {
+ eapply "${FILESDIR}/${PN}-3.12.1-ruby26-waitpid.patch"
+
+ sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
+
+ # Avoid test failing inconsistently
+ sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die
+
+ # Avoid test that trigger a bug in ruby very easily and lead to
+ # failure. This affects all current puma versions in combination
+ # with the latest ruby versions, so we add this new version anyway
+ # while allowing these tests to fail.
+ # https://github.com/puma/puma/pull/1345
+ rm -f test/test_puma_server_ssl.rb || die
+
+ # Use correct ruby version
+ sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
+ -e 's/localhost/127.0.0.1/' test/shell/* || die
+ sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext/puma_http11
+ cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+ einfo "Running test suite"
+ ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+
+ einfo "Running integration tests"
+ pushd test/shell
+ #sh run.sh || die
+ popd
+}
diff --git a/www-servers/puma/puma-4.3.3.ebuild b/www-servers/puma/puma-4.3.3.ebuild
new file mode 100644
index 000000000000..184d12b0c48f
--- /dev/null
+++ b/www-servers/puma/puma-4.3.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="https://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+ test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+ruby_add_rdepend "dev-ruby/nio4r:2"
+
+all_ruby_prepare() {
+ sed -e '/bundler/ s:^:#:' \
+ -e '/prove/ s:^:#:' \
+ -i test/helper.rb || die
+
+ # Avoid tests failing inconsistently
+ sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration_pumactl.rb || die
+ sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
+
+ # Loosen timing on flakey test
+ #sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die
+
+ # Use correct ruby version
+ sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die
+
+ # Avoid launcher tests since they make assumptions about bundler use
+ rm -f test/test_launcher.rb || die
+
+ sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
+ -e 's/localhost/127.0.0.1/' test/shell/* || die
+ sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext/puma_http11
+ cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+ einfo "Running test suite"
+ ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+
+ einfo "Running integration tests"
+ pushd test/shell
+ #sh run.sh || die
+ popd
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index bd849bc0f4b4..e1398f240816 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,5 @@
-DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
-DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0
-DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
-DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
+DIST apache-tomcat-7.0.100-src.tar.gz 5265444 BLAKE2B 9c706e6a50e13cd8f542669e2d80f8940816976cfb84f62c3e17bbe6f0cc6d76d6fcdd18ec69e706ce27552aa66041833f6ae7bba8e671e187de3246e90a25c5 SHA512 53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57
+DIST apache-tomcat-8.5.51-src.tar.gz 5661227 BLAKE2B 711de5678903941a5261693972906f2d0fca2c9d3219e62d3186e5d71a2e3cb4da0a5028e62790a26dad2d244246c2f41c74f18e17d52ec0af070f0d5842ca3f SHA512 8529d2e7d83a863fe88ed4ee8ec29b673e5df4bea53231412c0d89e2384d3939b9d1f29350a4ca46966ab5d4a0d3178ed5d2caa50aa766092a3ab8f28dd27592
+DIST apache-tomcat-9.0.31-src.tar.gz 5812430 BLAKE2B 7ef0f989860b046b4ddbacde50013284a623eb9d81e2c3465b0e04ec9c934a5319293677919ab758243a352fc60cb6691b51f946d8c5a36360b9108dafc5dfe3 SHA512 a0ba9e46a3d2a4cf708e6e29b4647c041495e45865ce5c679c9dcfee77181373a2d3034222701d0f15d5c7e71e6aa3cc7db236c66ba069b3e3660a948b44342f
DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
diff --git a/www-servers/tomcat/tomcat-7.0.96.ebuild b/www-servers/tomcat/tomcat-7.0.100.ebuild
similarity index 97%
rename from www-servers/tomcat/tomcat-7.0.96.ebuild
rename to www-servers/tomcat/tomcat-7.0.100.ebuild
index ad19069fd89c..8fa804171b41 100644
--- a/www-servers/tomcat/tomcat-7.0.96.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.100.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source test"
@@ -24,7 +24,7 @@ ECJ_SLOT="4.5"
SAPI_SLOT="3.0"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}"
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
virtual/jre"
DEPEND="${COMMON_DEP}
@@ -47,7 +47,7 @@ src_prepare() {
java-pkg_clean
- eapply "${FILESDIR}/${PN}-7.0.94-build.xml.patch"
+ eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-7.0.99.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild
deleted file mode 100644
index 4df8f1204b9f..000000000000
--- a/www-servers/tomcat/tomcat-7.0.99.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}"
-RDEPEND="${COMMON_DEP}
- virtual/jre"
-DEPEND="${COMMON_DEP}
- virtual/jdk:1.8
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
- default
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- java-pkg_clean
-
- eapply "${FILESDIR}/${P}-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.47.ebuild b/www-servers/tomcat/tomcat-8.5.51.ebuild
similarity index 97%
rename from www-servers/tomcat/tomcat-8.5.47.ebuild
rename to www-servers/tomcat/tomcat-8.5.51.ebuild
index 729cd12dcdf1..688cb7615768 100644
--- a/www-servers/tomcat/tomcat-8.5.47.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.51.ebuild
@@ -24,13 +24,13 @@ ECJ_SLOT="4.5"
SAPI_SLOT="3.1"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}"
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.8"
+ virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
>=dev-java/ant-core-1.9.13
- >=virtual/jdk-1.8
+ virtual/jdk:1.8
test? (
>=dev-java/ant-junit-1.9:0
dev-java/easymock:3.2
@@ -52,7 +52,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- eapply "${FILESDIR}/${P}-build.xml.patch"
+ eapply "${FILESDIR}/${PN}-8.5.47-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-9.0.27.ebuild b/www-servers/tomcat/tomcat-9.0.31.ebuild
similarity index 97%
rename from www-servers/tomcat/tomcat-9.0.27.ebuild
rename to www-servers/tomcat/tomcat-9.0.31.ebuild
index b8e080bf0d7e..b0c29cb19e68 100644
--- a/www-servers/tomcat/tomcat-9.0.27.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.31.ebuild
@@ -33,14 +33,14 @@ SAPI_SLOT="4.0"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
dev-java/glassfish-xmlrpc-api:0
- ~dev-java/tomcat-servlet-api-${PV}
+ ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
dev-java/wsdl4j:0"
RDEPEND="${COMMON_DEP}
- >=virtual/jre-11"
+ virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
>=dev-java/ant-core-1.9.13
- >=virtual/jdk-11
+ virtual/jdk:1.8
test? (
>=dev-java/ant-junit-1.9:0
dev-java/easymock:3.2
@@ -75,7 +75,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- eapply "${FILESDIR}/${P}-build.xml.patch"
+ eapply "${FILESDIR}/${PN}-9.0.27-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 31c31383e087..e0f6316ed7a9 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 595a4718f709..85307c5fc729 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,2 +1,3 @@
DIST goffice-0.10.41.tar.xz 2381656 BLAKE2B 7d73b892d91f917e3a47058f508094a16bb50860686dcf33c68ac8028b40e7ba74cc276f276672f29ddafef73b03887cf6280a2812305bd9b24ae3021c319d25 SHA512 d4b6a30b2b5d92e7500a1810626d20a2d4e5f66c1a879c904fe57df384bf4a480de322e9ae0a5fe7a44e73e060d9a33da6d56cd051c3d6cb1ebf0eae09fda2f8
DIST goffice-0.10.43.tar.xz 2381804 BLAKE2B 60e305620118f80595a0dfec8192648273f845c9f868142adb957796ee291e1e53b0f3d3f2446064d8014ec54e7008ac03eca7f2f4925efa00ff42b98810371b SHA512 979ccf67fe08d09a2cf0413b4674a44208aa5f4802ab086a463ea2b449fc8c9d1c96dea7234c8e715064cf1726a47d2a5428728a2ff0d00759d5fe7017dc709f
+DIST goffice-0.10.46.tar.xz 2397976 BLAKE2B a05696cde60b1cb1ee915bebd3a6e99d1f0a31dc232481615a1c6bbc05ee5433cdebfb05d96160026b260c752c2cfb11c0aecc338079cda66fd40b653fb8b0d1 SHA512 23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3
diff --git a/x11-libs/goffice/goffice-0.10.46.ebuild b/x11-libs/goffice/goffice-0.10.46.ebuild
new file mode 100644
index 000000000000..12d2ce5eb098
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.46.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org libtool
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# FIXME: add lasem to tree
+RDEPEND="
+ >=app-text/libspectre-0.2.6:=
+ >=dev-libs/glib-2.40.0:2
+ >=dev-libs/libxml2-2.4.12:2
+ dev-libs/libxslt
+ >=gnome-base/librsvg-2.22:2
+ >=gnome-extra/libgsf-1.14.24:=[introspection?]
+ >=x11-libs/cairo-1.10:=[svg]
+ >=x11-libs/gdk-pixbuf-2.22:2
+ >=x11-libs/gtk+-3.20:3
+ >=x11-libs/pango-1.24:=
+ x11-libs/libXext:=
+ x11-libs/libXrender:=
+ introspection? (
+ >=dev-libs/gobject-introspection-1:=
+ >=gnome-extra/libgsf-1.14.23:=
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.12
+ >=dev-util/intltool-0.35
+ virtual/perl-Compress-Raw-Zlib
+ virtual/perl-Getopt-Long
+ virtual/perl-IO-Compress
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --disable-gtk-doc \
+ --disable-maintainer-mode \
+ --without-lasem \
+ --with-gtk \
+ --with-config-backend=gsettings \
+ $(use_enable introspection)
+}
+
+src_install() {
+ default
+ dodoc MAINTAINERS
+
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d4696b4ad573..3cffb35e1933 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index e45500887673..b85f63c50cf4 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1 +1 @@
-DIST py3status-3.25.tar.gz 405276 BLAKE2B 9ff163f8ff037eedda29e7479bc637c9e3ddee1edb0848bdb61b32702ad8855745340beca7f5895612209d05bae838ce71a17521ded50cb61f2516669b740009 SHA512 114c510fc3126256af49f9fd7a141ebc86fe8306cf10094c1c9e9980757bf8f23e0ddb131d54aaa8acdcb5b98f0a230e9c2f0584ea09a68b779be5b66bc865b2
+DIST py3status-3.27.tar.gz 405154 BLAKE2B 9ee094145623520a63412f90dfaac1a2bd017d1785c0e987b9c7c527afa37d2604755fa646c2506c4950079a4b5f956e67a776fa71e4ba21a07caa918780d58f SHA512 4b7c64cd3ec1f9e255e94dd144e1b83a25dce5a661727c3664148f0c6e25cef14ed10237653dcb70706f29be549acb9ed8c1c1d7734b7bd44d02ff957b4bf664
diff --git a/x11-misc/py3status/py3status-3.25.ebuild b/x11-misc/py3status/py3status-3.27.ebuild
similarity index 94%
rename from x11-misc/py3status/py3status-3.25.ebuild
rename to x11-misc/py3status/py3status-3.27.ebuild
index 9b33b20bb0f9..f08967d407b9 100644
--- a/x11-misc/py3status/py3status-3.25.ebuild
+++ b/x11-misc/py3status/py3status-3.27.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 5cdecc2bf0f2..3d431b545899 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1 +1,2 @@
DIST xwallpaper-0.6.2.tar.xz 82600 BLAKE2B 2e2b1121fcc2481c4a1e3c78e357534b9609b4435c4364f22dbed78ee0de7c671d2044403c22d22b494a9c89efd17d843f32b296c863df3c0f5d7b3673ae361f SHA512 3713038ffe8fe1da117dc64db6e3c8642fe663473d1e9078963890fa08f21af6ace60e08773e23e6025fcf2116563e24c76d07a66ba02537b38aafa9ac99f395
+DIST xwallpaper-0.6.3.tar.xz 82780 BLAKE2B 485a8d65ae48ee33e22ee199e693268b94f88a38e4f9d56445eab68b2563422824a1dcf4ac4b73d37ae1e51820e1619dcc654f7b50ce889ca13f28d0273d03ae SHA512 8ec6159a44ad08e57c634b0fb6dcc5945fc855796cb4507126248dc1d6c7c406eec1412335828d358eb47d5b9085a2028508d3fd4af75e0767369a8cf40f36f8
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.3.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.3.ebuild
new file mode 100644
index 000000000000..2b1e1615823f
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [ ${PV} == "9999" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
+else
+ SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="jpeg png seccomp xpm"
+
+RDEPEND="
+ x11-libs/pixman
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( media-libs/libpng:0= )
+ seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+ xpm? ( x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+src_configure() {
+ local myconf=(
+ $(use_with jpeg)
+ $(use_with png)
+ $(use_with seccomp)
+ $(use_with xpm)
+ --with-randr
+ )
+ econf "${myconf[@]}"
+}
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index 1fd0759173fb..2b1e1615823f 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
else
SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
fi
LICENSE="ISC"
@@ -44,7 +44,6 @@ src_configure() {
$(use_with seccomp)
$(use_with xpm)
--with-randr
- --with-zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
)
econf "${myconf[@]}"
}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 273e53472a48..0f2d7881a919 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
new file mode 100644
index 000000000000..f95e7e5ccbe0
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
@@ -0,0 +1,23 @@
+diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h
+--- wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h 1999-04-11 07:35:53.000000000 +0200
++++ wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h 2020-03-01 16:13:29.843346352 +0100
+@@ -28,7 +28,7 @@
+ /* Global variable */
+ /*******************/
+
+-Display *display;
++extern Display *display;
+
+ /***********************/
+ /* Function Prototypes */
+diff -Naur wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c
+--- wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c 1999-04-11 07:35:53.000000000 +0200
++++ wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c 2020-03-01 16:13:38.172348429 +0100
+@@ -91,6 +91,7 @@
+ char URL[1024];
+ int ForceUpdate2;
+
++Display *display;
+
+ void ParseCMDLine(int argc, char *argv[]);
+ void pressEvent(XButtonEvent *xev);
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
index 568c3f7524fb..9bd5996db7f1 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -36,6 +36,7 @@ S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}"
src_unpack() {
unpack ${MY_P_ORIG}.tar.gz
epatch "${DISTDIR}"/${MY_P_PATCH}.gz
+ epatch "${FILESDIR}"/${P}-gcc-10.patch
# need to apply patches from Debian first, do NOT change the order
cd "${S}" || die
diff --git a/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-10.patch b/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-10.patch
new file mode 100644
index 000000000000..9656e5cd837d
--- /dev/null
+++ b/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-10.patch
@@ -0,0 +1,39 @@
+diff -Naur wmbinclock-0.5.orig/wmBinClock.c wmbinclock-0.5/wmBinClock.c
+--- wmbinclock-0.5.orig/wmBinClock.c 2005-06-21 19:57:58.000000000 +0200
++++ wmbinclock-0.5/wmBinClock.c 2020-03-01 16:01:16.622171968 +0100
+@@ -72,6 +72,13 @@
+ int GotFirstClick3, GotDoubleClick3;
+ int DblClkDelay;
+
++Display *display;
++Window Root;
++Window iconwin, win;
++int screen;
++int DisplayDepth;
++GC NormalGC;
++
+ void IntToBinary(int x, int *str[]);
+ void PrintHelp(char err[]);
+
+diff -Naur wmbinclock-0.5.orig/xutils.h wmbinclock-0.5/xutils.h
+--- wmbinclock-0.5.orig/xutils.h 2005-02-04 23:06:34.000000000 +0100
++++ wmbinclock-0.5/xutils.h 2020-03-01 16:01:24.721173796 +0100
+@@ -18,12 +18,12 @@
+ /*
+ * Global variable
+ */
+-Display *display;
+-Window Root;
+-Window iconwin, win;
+-int screen;
+-int DisplayDepth;
+-GC NormalGC;
++extern Display *display;
++extern Window Root;
++extern Window iconwin, win;
++extern int screen;
++extern int DisplayDepth;
++extern GC NormalGC;
+
+
+
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
index 77d11a2018b0..5d9f17b2c38f 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,6 +19,8 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
+
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
INCDIR="-I/usr/include/X11" LIBDIR="" \
diff --git a/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch b/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch
new file mode 100644
index 000000000000..f4e522fe5cff
--- /dev/null
+++ b/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch
@@ -0,0 +1,27 @@
+diff -Naur wmdots.orig/wmdots/wmdots.c wmdots/wmdots/wmdots.c
+--- wmdots.orig/wmdots/wmdots.c 1999-10-11 21:39:11.000000000 +0200
++++ wmdots/wmdots/wmdots.c 2020-03-01 16:08:39.492275206 +0100
+@@ -315,6 +315,9 @@
+ // 10,30,&y_off,-5,30,10
+ // };
+
++Display *display;
++Window Root, iconwin, win;
++
+ // -----------------------------------------------------------------------
+ // draw a point at x/y in specified colour
+
+diff -Naur wmdots.orig/wmgeneral/wmgeneral.h wmdots/wmgeneral/wmgeneral.h
+--- wmdots.orig/wmgeneral/wmgeneral.h 1998-10-16 02:16:59.000000000 +0200
++++ wmdots/wmgeneral/wmgeneral.h 2020-03-01 16:08:45.412276631 +0100
+@@ -36,8 +36,8 @@
+ /* Global variable */
+ /*******************/
+
+-Display *display;
+-Window Root, iconwin, win;
++extern Display *display;
++extern Window Root, iconwin, win;
+
+
+ /***********************/
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
index 5aaba6401e1c..7c4b91c7072a 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
@@ -21,6 +21,10 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${PN}"
src_prepare() {
+ pushd "${WORKDIR}" || die
+ eapply "${FILESDIR}"/${P}-gcc-10.patch
+ popd || die
+
default
eapply "${FILESDIR}"/${P}-stringh.patch
sed -e "s|cc|$(tc-getCC)|g" \
diff --git a/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch b/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch
new file mode 100644
index 000000000000..9d25464c8eac
--- /dev/null
+++ b/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch
@@ -0,0 +1,36 @@
+diff -Naur Src.orig/wmFrog.c Src/wmFrog.c
+--- Src.orig/wmFrog.c 2010-12-01 19:48:50.000000000 +0100
++++ Src/wmFrog.c 2020-03-01 15:54:30.428083446 +0100
+@@ -77,6 +77,12 @@
+ char* folder;
+ int needsUpdate = 1;
+
++Display *display;
++Window Root;
++Window iconwin, win;
++int screen;
++int DisplayDepth;
++
+ /*
+ * main
+ */
+diff -Naur Src.orig/xutils.h Src/xutils.h
+--- Src.orig/xutils.h 2010-08-04 20:28:46.000000000 +0200
++++ Src/xutils.h 2020-03-01 15:54:37.027084834 +0100
+@@ -18,11 +18,11 @@
+ /*
+ * Global variable
+ */
+-Display *display;
+-Window Root;
+-Window iconwin, win;
+-int screen;
+-int DisplayDepth;
++extern Display *display;
++extern Window Root;
++extern Window iconwin, win;
++extern int screen;
++extern int DisplayDepth;
+
+
+
diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild
index b3b8ab1a8a4d..fa1b1ed45fc2 100644
--- a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild
+++ b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/Src"
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
DOCS=( ../{CHANGES,HINTS} )
src_prepare() {
diff --git a/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch b/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch
new file mode 100644
index 000000000000..e9477899b1b9
--- /dev/null
+++ b/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch
@@ -0,0 +1,23 @@
+diff -Naur src.orig/wmgeneral.h src/wmgeneral.h
+--- src.orig/wmgeneral.h 2017-12-06 15:00:16.000000000 +0100
++++ src/wmgeneral.h 2020-03-01 16:03:18.293199660 +0100
+@@ -38,7 +38,7 @@
+ /* Global variable */
+ /*******************/
+
+-Display *display;
++extern Display *display;
+
+ /***********************/
+ /* Function Prototypes */
+diff -Naur src.orig/wmsysmon.c src/wmsysmon.c
+--- src.orig/wmsysmon.c 2017-12-06 15:00:16.000000000 +0100
++++ src/wmsysmon.c 2020-03-01 16:03:32.992203044 +0100
+@@ -138,6 +138,7 @@
+ time_t curtime;
+ time_t prevtime;
+
++Display *display;
+
+ kernel_versions Get_Kernel_version(void);
+ void usage(void);
diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
index b01c8bde4910..4a1faee41b23 100644
--- a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
@@ -18,6 +18,7 @@ DEPEND="x11-libs/libX11
x11-libs/libXpm"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
DOCS=( ../ChangeLog ../README )
S=${WORKDIR}/${P}/src
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f042bd3951a9..d2373cf3393f 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index fc14f9aea695..fb5b2559632b 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1 +1,2 @@
DIST metacity-3.32.0.tar.xz 2055388 BLAKE2B c8ed41e44b0a4890129fe7e79e2dcd486c986541c6b19b8873264f2c179b98c17095f19fbd93290ad253571d0c9ae5f5367df1fe1ba2ac68685139680a2e3afd SHA512 2260411b9ab07fcd1aee8152d700f1e2aa7f1f0753cae6dab82a55cac2cac186a5c9f42377a311a6f90a53ba8ba200d9f5d73a770abc76b558896cd58c30abde
+DIST metacity-3.34.1.tar.xz 2055708 BLAKE2B c1bac27f83d26718fa3d02f777a627324efc3e3eaffbf385a84dd97960adc30e84090f511500fe96a4fbbb373da80a38eaba4c5e14910fbcf8783857c0767ef2 SHA512 e9234ad0aee9fe27cf1c2030e31d8f2c292ae2ee2e9b8546ed86e396152faa9dc4cc67fa8321a0c3d3bf577a83bc143111c6ac225f423db243347a6a760695ee
diff --git a/x11-wm/metacity/metacity-3.34.1.ebuild b/x11-wm/metacity/metacity-3.34.1.ebuild
new file mode 100644
index 000000000000..bc7f2172a507
--- /dev/null
+++ b/x11-wm/metacity/metacity-3.34.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME Flashback window manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+libcanberra vulkan xinerama"
+KEYWORDS="~amd64"
+
+# TODO: libgtop could be optional, but no knob
+RDEPEND="
+ >=dev-libs/glib-2.44.0:2
+ >=x11-libs/gtk+-3.22.0:3[X]
+ >=x11-libs/pango-1.2.0[X]
+ >=x11-libs/libXcomposite-0.3
+ >=gnome-base/gsettings-desktop-schemas-3.3.0
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXdamage
+ libcanberra? ( media-libs/libcanberra[gtk3] )
+ >=x11-libs/startup-notification-0.7
+ x11-libs/libXcursor
+ gnome-base/libgtop:2=
+ x11-libs/libX11
+ xinerama? ( x11-libs/libXinerama )
+ x11-libs/libXrandr
+ x11-libs/libXext
+ x11-libs/libICE
+ x11-libs/libSM
+ gnome-extra/zenity
+ vulkan? ( media-libs/vulkan-loader )
+"
+DEPEND="${RDEPEND}
+ vulkan? ( dev-util/vulkan-headers )
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.4
+ x11-base/xorg-proto
+ virtual/pkgconfig
+" # autoconf-archive for eautoreconf
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable libcanberra canberra) \
+ $(use_enable xinerama) \
+ $(use_enable vulkan)
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index acdf8cbe590a..7a35e41d9909 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -2,3 +2,5 @@ DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef
DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5
DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269
+DIST mutter-3.34.4-patchset.tar.xz 7216 BLAKE2B 6a9d503a8da80a9255649150c1256ea0d1459b11c0803728553f6699f0bb54b56161a411e9dec3725e5cd4230531c90b0160ef702083285443849c9ec4ca8278 SHA512 b592a6ded20c61c15fe8dc5a69fb73e81143975632237a32329bbf40239bdc2c392aef4676cd8800f7ad39eb16e8f159b0cec87c8bd035302db0a8001ddeda2e
+DIST mutter-3.34.4.tar.xz 2791624 BLAKE2B cd7ea49333dc50574f993f15638504eac0d0a6f1e85f34a617accbabcec71f02244ce6cd292c968def302652707e21692d94dcccb01d59b3661220c90cefd802 SHA512 6cae8473071d9ab105a3635cee314157a268894fc3b18e53857e097223a9c2677e1cd51b10b501a3b85f74c83470c2ce87986972218f9833c9f6ad31b1910f6a
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 4da93b48e48d..9bd58e53b934 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -9,5 +9,6 @@
Rely on sys-auth/elogind as logind provider for Wayland sessionsEnable OpenGL ES 2.0 supportEnable support for remote desktop and screen cast using media-video/pipewire
+ Enable profiling data capture support using dev-util/sysprof-capture
diff --git a/x11-wm/mutter/mutter-3.34.4.ebuild b/x11-wm/mutter/mutter-3.34.4.ebuild
new file mode 100644
index 000000000000..d7277a90b8c6
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.34.4.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+ wayland? ( ^^ ( elogind systemd ) udev )
+ test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+ x11-libs/libX11
+ >=x11-libs/gtk+-3.19.8:3[X,introspection?]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/pango-1.30[introspection?]
+ >=dev-libs/fribidi-1.0.0
+ >=x11-libs/cairo-1.14[X]
+ >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
+ >=dev-libs/glib-2.61.1:2
+ gnome-base/gnome-settings-daemon
+ >=dev-libs/json-glib-0.12.0[introspection?]
+ gnome-base/gnome-desktop:3=
+ >=x11-libs/libXcomposite-0.4
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ >=x11-libs/libXfixes-3
+ >=x11-libs/libXi-1.7.4
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ x11-misc/xkeyboard-config
+ >=x11-libs/libxkbcommon-0.4.3[X]
+ x11-libs/libXrender
+ >=x11-libs/libXrandr-1.5.0
+ x11-libs/libxcb
+ x11-libs/libXinerama
+ x11-libs/libXau
+ x11-libs/libICE
+ >=dev-libs/atk-2.5.3[introspection?]
+ >=media-libs/libcanberra-0.26
+ media-libs/mesa[X(+),egl]
+ wayland? (
+ >=dev-libs/wayland-protocols-1.18
+ >=dev-libs/wayland-1.13.0
+ x11-libs/libdrm:=
+ >=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+ >=dev-libs/libinput-1.4
+ systemd? ( sys-apps/systemd )
+ elogind? ( sys-auth/elogind )
+ x11-base/xorg-server[wayland]
+ )
+ udev? ( >=dev-libs/libgudev-232:=
+ >=virtual/libudev-232-r1:= )
+ x11-libs/libSM
+ input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+ >=x11-libs/startup-notification-0.7
+ screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+ gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+ x11-base/xorg-proto
+ sysprof? ( dev-util/sysprof-capture:3
+ dev-util/sysprof:0/3 )
+" # FIXME: only sysprof-capture should do, but a dbus interface file is needed
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+BDEPEND="
+ dev-libs/wayland
+ >=dev-util/meson-0.50.0
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? ( app-text/docbook-xml-dtd:4.5 )
+ wayland? ( >=sys-kernel/linux-headers-4.4
+ x11-base/xorg-server )
+"
+
+PATCHES=(
+ # Some patches from gnome-3-34 branch on top of 3.34.4
+ "${WORKDIR}"/patches/
+
+ "${FILESDIR}"/3.32-eglmesaext-include.patch
+)
+
+src_configure() {
+ # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+ local emesonargs=(
+ -Dopengl=true
+ #opengl_libname
+ #gles2_libname
+ $(meson_use wayland gles2)
+ -Degl=true
+ -Dglx=true
+ $(meson_use wayland)
+ $(meson_use wayland native_backend)
+ $(meson_use screencast remote_desktop)
+ -Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
+ -Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
+ $(meson_use udev)
+ $(meson_use input_devices_wacom libwacom)
+ -Dpango_ft2=true
+ -Dstartup_notification=true
+ -Dsm=true
+ $(meson_use introspection)
+ $(meson_use test cogl_tests)
+ $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+ $(meson_use test clutter_tests)
+ $(meson_use test tests)
+ $(meson_use sysprof profiler)
+ -Dinstalled_tests=false
+ #verbose # Let upstream choose default for verbose mode
+ #xwayland_path
+ # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+ #xwayland_grab_default_access_rules
+ )
+ meson_src_configure
+}
+
+src_test() {
+ glib-compile-schemas "${BUILD_DIR}"/data
+ GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index e599686a1cc1..a45b2b25a0f6 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index 0af910ec5267..69627ddf702f 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1 +1,2 @@
DIST xfce4-clipman-plugin-1.4.3.tar.bz2 492784 BLAKE2B f52dc92976e0b826b7aab2b8a3b9e099bb31e3d670911608d7a39c9805b011bb4c77db1fb01379e3244682a4bcefba617e246cc9ade50ecd275ea554d928385f SHA512 28bc8e2be8dd3eac13a7988b68933ce84dd8cc756f0a19636cd5850d6e36714a73ad9650a28ebfc54d9ad3adb23c242abf89806124b4e00fe7d1701be1b52414
+DIST xfce4-clipman-plugin-1.4.4.tar.bz2 460114 BLAKE2B c3a6d8a9a3f36367bddf3803b86dc4bd5bf2dff94d675695caf95010c563b96b69ce4015d83568e9500f8f5d579f41ef8c5ce94804ecd58baa04f7cc9aa54f16 SHA512 4cb798faab4efdc7a5013cffd06ce527efbda4ba5b96063734d261a864f22075a2d6dd1f79a33c8bdfb39ceea8f89af3daac023aaed8a5a386c70604e8a77965
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild
new file mode 100644
index 000000000000..d763b3de7d1f
--- /dev/null
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A clipboard manager plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="qrcode"
+
+RDEPEND=">=dev-libs/glib-2.32:2=
+ >=x11-libs/gtk+-3.14:3=
+ x11-libs/libXtst:=
+ >=xfce-base/libxfce4ui-4.12:=
+ >=xfce-base/libxfce4util-4.12:=
+ >=xfce-base/xfce4-panel-4.12:=
+ >=xfce-base/xfconf-4.10:=
+ qrcode? ( >=media-gfx/qrencode-3.3.0:= )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-base/xorg-proto"
+
+src_configure() {
+ local myconf=(
+ $(use_enable qrcode libqrencode)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}