+- {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 63d05da380ad..ff18b4a9f887 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,24 +10,22 @@ AUX chromium-80-include.patch 1495 BLAKE2B a5ed4a0df55a24498b3e88c191ecf8f87873b
AUX chromium-80-unbundle-libxml.patch 2990 BLAKE2B 63068fef2333d9d111bfe66a78efd71088c76b08b4e5014b244012df682024ceb0db8441254481189fc449f16cbeab7f650c8cab30f9d37dedf89c2dbea1bae9 SHA512 87ef07a35a103c5b4293301705a09a60199d569fceeab1e3188c7b96067d39f237441209f4448a791dc5675321f609ee5c02fdda1081af38e50adcd15de4e0b6
AUX chromium-81-gcc-constexpr.patch 717 BLAKE2B 22a13605d2680456614e7ef53fff585b731e21b3504fc8cc5a06d87bf4edba2580a756b878069eefc4cbbc928f1c32e38b808fcb4bb36588bf81ed63d816b0df SHA512 b94847dd15f32b8b2c400eee2b461dd532b0fca8429417b648ed41270175ea7aadbc8a839ddc29c9bac8ff0d52575a696e2cb7f769b34d1ab211e97b29600107
AUX chromium-81-gcc-noexcept.patch 732 BLAKE2B 0ec2e5b360ceeb28e9cd8ace4a94ebf8296f4d102159817c7b0f81037b0f4cb9c20cce3de5dc38559ee5e6cdcaa737d689f2bd2fe1f30c01d4e1edddfbbf5a3d SHA512 6f8f0e2662f1603c37f9b4fd10545e1860cd04abe733f427be705d198133e190693998ab96882407a48f32662cf96b2fb63b8f890b0fe1aa424e19f577f8e7bd
-AUX chromium-82-gcc-default.patch 1584 BLAKE2B 4785f075a5dc4b872037675d2a164749808ddce90887d14d647998cbfeee7c20247583eb31ddb93e8045bad9ddb7886095e9dc5ac3a979c8d4ad122363238ba1 SHA512 4ba9003f1d2f20b7d6a02138c8921fcbea9a3bd0eb48ecc44a43f7ba4820df46100efe8070982aa7884fb1469dfa7ac4b633744a4bcb0641c8411a9010a0a039
-AUX chromium-82-gcc-has-feature.patch 1332 BLAKE2B 275d415cf147bdb49d78cf499b06035b04b492c1202d61df1052477573668ac02df2259d13e4f57433e4e63f2544a31152df6b2844def9b58a79c00213a4b1b1 SHA512 fbc50d3e1082ce00762e1f47195b4055e4cad33c97bc2ab78af7526f4302b2d196291b0f76ad519609e7aea646e2d26a83dbe7318b3bbec15957d6ad71d4dd73
-AUX chromium-82-gcc-noexcept.patch 732 BLAKE2B 5f694d8823e549ae74a86af80824bda30dd76457c42a4a8b45231639e3a07d5d0835bd33da45cc08d6699fbbef2999c128d9d3c6f86b6b9d29a03ea8a9bfdb40 SHA512 ed8cc5acd5c9b8101041a566d100a95772b18cd966d64a7ac89ffd5b55227d6368a2c14f3a30b905586ef092cddb2e3e2ffa93b9f45ca00f88fe1998d8f4627b
+AUX chromium-82-gcc-constexpr.patch 1596 BLAKE2B 757d91cf96c5274948bcefd259a27d8d13e8ac80ad0a3712298ade6f0606bd28d5e4a67bab7e9afd657fcb33213f8c2f469c85047f97d12a29fac78689e19127 SHA512 03f25ddc07b49a23179887515dc7128827a61de008c47735b2144cd6bef5513c65c8ce12391b398de6fd99219137d8983fb57f8dcdee73444f5e133a81b0138d
+AUX chromium-82-gcc-private.patch 1782 BLAKE2B 765e423114b905d396ac05338d6b964fb803bf71c5e0ba432a89d045ab6a42b0de3bc797bbad01818fcfc12c693327cc56bdacaf4f2a3b0532bcc58bb2c561b1 SHA512 8b4055c9593af63f80c7c3f35b397183f9342ad4c054985376e07a1884549090b8b5bca43e5c7e1ef7ccbeaceb76bb8123ad4c8cbc85a9883aff146f27a0e4e1
+AUX chromium-82-include.patch 1275 BLAKE2B a2de8fd11f5aac52aae35e850a865260b84ee9549c61acffa6372d9667672d32e98945f76765a7217b8bea0fee5992906d05408714182853d7493225e9e69bf1 SHA512 fa5076869989905b43c0e2fbd638b2e4a4c9e7b606e16d32ca8e8ecfe78dcf0a560a48a82458c5dce1146494cde630161b103c659a2823d1a6b60e0180304f9a
AUX chromium-blink-style_format.patch 1043 BLAKE2B 9ad25d1bd0574535ac347b7eff9d03ecbb1727003ec303864aefa76aef33f031256ad44c826cbcbf2687967ceb438c46b183472cc579de3be97b4d0faf122750 SHA512 f09f118b950c2f37f6cb51b02568ea6fc7f3f030e51903eb69357b7723b48eefbf3cadd4dcb9d8b3872f0151a63f8992f164f2a3d55d54ec182a918fa325defb
AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
AUX chromium-compiler-r10.patch 5917 BLAKE2B a16ea6a1eee56a7de06f82e161536dab19a507f675fe8268b5a455bf36b9f5e6c1df02de73b303ab61e33153f06f118e22623d01f654d4a7c88ca8c3f8326401 SHA512 e64f9f75e685868cb8da8851e84362952a18e5dbca674c853a41feb582bdd4dc59219727f2c77440ec2030e21d7b436f144c552c30b2a4960cbe0da32c6f6c5e
AUX chromium-compiler-r11.patch 5942 BLAKE2B 199efeda0e70377193fe5209f580eab6caca6bec1dc0b06fdbca0ecbb70101f6ac8187c26afa4b00bc9116aa8a85e50fbbf8e3a5461a1d6c8d74edb4a4b0a3b3 SHA512 f9080a90d064d72d375ab78250e1f0147856641953adefe09b1dee8771b464b102d6ad02ef7be384d55b0953b9a861fb41973966ad564858a71d85811f5a783f
-AUX chromium-compiler-r12.patch 6169 BLAKE2B a8d51c96bef38568820a7ce7f78b4c4586aad2d5d80df3f1f37acea596dffecbc5925667db59195f659c47f8ece87789f817e5afc345dfefef3c2fc40c48aa0a SHA512 9a12fe30dbd02a5998c6b85b0caa59dd8bc03ab2102aa61edc95bacdd289e0a9228cab6dc5bc5c1eda1cb0eae8c974f02c3b23317b65b85d837485d7805cf129
+AUX chromium-compiler-r12.patch 5816 BLAKE2B 0335dfb8845201594b455990896267506395f223cd9aa2206bc8ef63e7b2f14892e2a995e49cdfcb4484f1ddb29c43704154e947362f1ceb9549fde0307d51cb SHA512 402c6d365b3fa14e24cdd35f7cd5d87c0d4f0c051dbbaa4fd59664b89a1c083b5ebc765990e9145fdf3396c9dd97bfb5b3431d0a6e5b8249857016e17b1786d7
AUX chromium-fix-char_traits.patch 355 BLAKE2B 5269c43c4d36dc1cd190aedc04e3172fbef0048484ac7e4db15fffd69009c8ba02f0ed786c64b292fbbcd2409ad70545817cd7d45a2cb51fd76bf72250ca0018 SHA512 85ab70f168f56c01e01bdf210d107bebd7c344e95dcb692a19a0f7883ed6aec5325b38c35cd3c9b37c1915820d5e8d401e8ee92c289436fb8bc8341c3c6007a8
AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
AUX chromium-unbundle-zlib-r1.patch 515 BLAKE2B f3263f7450a940449d7edc0aef46a888248e0245a71797435a985fda8ef3c1abb8823a5a363cff1db0e2d09715942322e5d5ae9ab3554a5a3aeb2db748102a97 SHA512 89d62431e11cf8f3b48afdf9a133a8532916d445676de12acb48b0aaca3aa45106e25de399e7ee37a6220b0766c0ea65f10da219d4bb9a7a02275b4364e493ad
AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-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
-EBUILD chromium-80.0.3987.100.ebuild 22611 BLAKE2B 6623fedce3b2cf17ee25a51ae7c5d9df6f478f7680feabde116b1f9cbfcc68b5490549d45e6ea1e8c216c987d124f139886ebd0625c8546554275be900edd32a SHA512 2594994649dd244cfe21aa9b5f2bffd6ec6435921b6875fb556ff0fae012cb363c3f3cf9a37b39d8fec4475b06762119dddd5ffbe2beb39a590efb9ee2fc333e
-EBUILD chromium-80.0.3987.122.ebuild 22612 BLAKE2B 54dfe1e51d3c8b8bb045aa3a328460aee549cad1ca685da35d8ce6f57ca241592be197ec471a2637e43b67cf96e27afbe377528eb215963cf1f6e79adcd8690e SHA512 d8529e8a66d88572baeb31b60f3801a8a3598ed72498c27ba57d152a7883d192dcbdcc4256628077695857cdc657211c2e2e6b02d0784df8eec88e8da3076512
-EBUILD chromium-81.0.4044.26.ebuild 22676 BLAKE2B 369d9526792d7957151390df7451104eed2b9f3f6de19169c9dff1a3a7054cc00adcd4bab9596456a1fa214ac62b7bc999da1fa530a0e9bbc811a4aeac500681 SHA512 4ef6c40adece3534af6da7c82b04680f5c348be8195b62c2cfd9bafac83d8ce3f4916d688de96e351639377550a14ac84cf81c0a90e8180e01a82343c82ed6e0
-EBUILD chromium-82.0.4056.3.ebuild 22870 BLAKE2B 21a178151851c544d90d0417ce5d7d3105702761d458d77ef9826e8fd4c149918fb26c3914a207496ad948fe92ba39f26dacd9e692f27c6307a1d6a4d74ad395 SHA512 47c172185059eb64303cceb64f7214c955dd6d691ff63e3945158200c7d7cd4b9f4064c03b6e99487ca67b71883baf10adb58517c77c1677613549e69dea4180
+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
+EBUILD chromium-80.0.3987.122.ebuild 22611 BLAKE2B 6623fedce3b2cf17ee25a51ae7c5d9df6f478f7680feabde116b1f9cbfcc68b5490549d45e6ea1e8c216c987d124f139886ebd0625c8546554275be900edd32a SHA512 2594994649dd244cfe21aa9b5f2bffd6ec6435921b6875fb556ff0fae012cb363c3f3cf9a37b39d8fec4475b06762119dddd5ffbe2beb39a590efb9ee2fc333e
+EBUILD chromium-81.0.4044.34.ebuild 22676 BLAKE2B 369d9526792d7957151390df7451104eed2b9f3f6de19169c9dff1a3a7054cc00adcd4bab9596456a1fa214ac62b7bc999da1fa530a0e9bbc811a4aeac500681 SHA512 4ef6c40adece3534af6da7c82b04680f5c348be8195b62c2cfd9bafac83d8ce3f4916d688de96e351639377550a14ac84cf81c0a90e8180e01a82343c82ed6e0
+EBUILD chromium-82.0.4068.4.ebuild 22816 BLAKE2B 6414d7d894d255fd7b4be07234527477ac1a5dd63b1161b60d36b15b17207b7558e827572c4c45e6c3e81507394650a978fd64333f5ee23fcf2555dfe4fdf1a7 SHA512 1354a89689bb0f587de89886f815b20eaaa69be09e413b29b8773764ef289e81c5f9b4466715adb145f5215271110926ad12b860b59aade4e91fcfbda2f52a0e
MISC metadata.xml 1351 BLAKE2B fb5be12f788385e19aa41ab929c0c0f2744a61cc83b19ed973174cee564043a871f68fadb721ee91d688020aa1daba5fb2bca4535c53630bd88cc0ede527ef53 SHA512 ae812473401017ce399461a829e7182e6e28c56b01c1da926883bd3edf751fa804dc88f429c77a3f533647b2115c960a7bba21572735dcf3d039a6d87fabf51d
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? ( !=app-arch/gzip-1.7
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- dev-util/gn
- dev-vcs/git
- >=dev-util/gperf-3.0.3
- >=dev-util/ninja-1.7.2
- >=net-libs/nodejs-7.6.0[inspector]
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- closure-compile? ( virtual/jre )
- virtual/pkgconfig
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
- BDEPEND+=" >=sys-devel/clang-7"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-"
-
-PATCHES=(
- "${FILESDIR}/chromium-compiler-r10.patch"
- "${FILESDIR}/chromium-fix-char_traits.patch"
- "${FILESDIR}/chromium-unbundle-zlib-r1.patch"
- "${FILESDIR}/chromium-77-system-icu.patch"
- "${FILESDIR}/chromium-78-protobuf-export.patch"
- "${FILESDIR}/chromium-79-gcc-alignas.patch"
- "${FILESDIR}/chromium-80-unbundle-libxml.patch"
- "${FILESDIR}/chromium-80-include.patch"
- "${FILESDIR}/chromium-80-gcc-quiche.patch"
- "${FILESDIR}/chromium-80-gcc-permissive.patch"
- "${FILESDIR}/chromium-80-gcc-blink.patch"
- "${FILESDIR}/chromium-80-gcc-abstract.patch"
- "${FILESDIR}/chromium-80-gcc-incomplete-type.patch"
-)
-
-pre_build_checks() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- local -x CPP="$(tc-getCXX) -E"
- if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
- die "At least gcc 8.0 is required"
- fi
- # component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
- if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
- die "Component build with tcmalloc requires FEATURES=-usersandbox."
- fi
- if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
- if use component-build; then
- die "Component build with clang requires fuzzer headers."
- fi
- fi
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- CHECKREQS_DISK_BUILD="7G"
- if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
- CHECKREQS_DISK_BUILD="25G"
- if ! use component-build; then
- CHECKREQS_MEMORY="16G"
- fi
- fi
- check-reqs_pkg_setup
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- default
-
- mkdir -p third_party/node/linux/node-linux-x64/bin || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- local keeplibs=(
- base/third_party/cityhash
- base/third_party/double_conversion
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- buildtools/third_party/libc++
- buildtools/third_party/libc++abi
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/mozilla_security_manager
- net/third_party/nss
- net/third_party/quic
- net/third_party/uri_template
- third_party/abseil-cpp
- third_party/angle
- third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/smhasher
- third_party/angle/src/common/third_party/xxhash
- third_party/angle/src/third_party/compiler
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/trace_event
- third_party/angle/third_party/glslang
- third_party/angle/third_party/spirv-headers
- third_party/angle/third_party/spirv-tools
- third_party/angle/third_party/vulkan-headers
- third_party/angle/third_party/vulkan-loader
- third_party/angle/third_party/vulkan-tools
- third_party/angle/third_party/vulkan-validation-layers
- third_party/apple_apsl
- third_party/axe-core
- third_party/blink
- third_party/boringssl
- third_party/boringssl/src/third_party/fiat
- third_party/breakpad
- third_party/breakpad/breakpad/src/third_party/curl
- third_party/brotli
- third_party/cacheinvalidation
- third_party/catapult
- third_party/catapult/common/py_vulcanize/third_party/rcssmin
- third_party/catapult/common/py_vulcanize/third_party/rjsmin
- third_party/catapult/third_party/beautifulsoup4
- third_party/catapult/third_party/html5lib-python
- third_party/catapult/third_party/polymer
- third_party/catapult/third_party/six
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jpeg-js
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/catapult/tracing/third_party/oboe
- third_party/catapult/tracing/third_party/pako
- third_party/ced
- third_party/cld_3
- third_party/closure_compiler
- third_party/crashpad
- third_party/crashpad/crashpad/third_party/lss
- third_party/crashpad/crashpad/third_party/zlib
- third_party/crc32c
- third_party/cros_system_api
- third_party/dav1d
- third_party/dawn
- third_party/depot_tools
- third_party/devscripts
- third_party/devtools-frontend
- third_party/devtools-frontend/src/third_party
- third_party/dom_distiller_js
- third_party/emoji-segmenter
- third_party/flatbuffers
- third_party/freetype
- third_party/libgifcodec
- third_party/glslang
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/googletest
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jsoncpp
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libXNVCtrl
- third_party/libaddressinput
- third_party/libaom
- third_party/libaom/source/libaom/third_party/vector
- third_party/libaom/source/libaom/third_party/x86inc
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libsync
- third_party/libudev
- third_party/libwebm
- third_party/libxml/chromium
- third_party/libyuv
- third_party/llvm
- third_party/lss
- third_party/lzma_sdk
- third_party/markupsafe
- third_party/mesa
- third_party/metrics_proto
- third_party/modp_b64
- third_party/nasm
- third_party/node
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
- third_party/one_euro_filter
- third_party/openscreen
- third_party/openscreen/src/third_party/tinycbor/src/src
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/pdfium/third_party/skia_shared
- third_party/perfetto
- third_party/pffft
- third_party/ply
- third_party/polymer
- third_party/private-join-and-compute
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/pyjson5
- third_party/qcms
- third_party/rnnoise
- third_party/s2cellid
- third_party/sfntly
- third_party/simplejson
- third_party/skia
- third_party/skia/include/third_party/skcms
- third_party/skia/include/third_party/vulkan
- third_party/skia/third_party/skcms
- third_party/skia/third_party/vulkan
- third_party/smhasher
- third_party/spirv-headers
- third_party/SPIRV-Tools
- third_party/sqlite
- third_party/swiftshader
- third_party/swiftshader/third_party/llvm-7.0
- third_party/swiftshader/third_party/llvm-subzero
- third_party/swiftshader/third_party/marl
- third_party/swiftshader/third_party/subzero
- third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
- third_party/unrar
- third_party/usrsctp
- third_party/vulkan
- third_party/web-animations-js
- third_party/webdriver
- third_party/webrtc
- third_party/webrtc/common_audio/third_party/fft4g
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor
- third_party/webrtc/modules/third_party/fft
- third_party/webrtc/modules/third_party/g711
- third_party/webrtc/modules/third_party/g722
- third_party/webrtc/rtc_base/third_party/base64
- third_party/webrtc/rtc_base/third_party/sigslot
- third_party/widevine
- third_party/woff2
- third_party/wuffs
- third_party/zlib/google
- tools/grit/third_party/six
- url/third_party/mozilla
- v8/src/third_party/siphash
- v8/src/third_party/valgrind
- v8/src/third_party/utf8-decoder
- v8/third_party/inspector_protocol
- v8/third_party/v8
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/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 f506786e8e29..668cf719d13a 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_81.0.4044.26-1_amd64.deb 67241120 BLAKE2B e0040da20c106d2a39054121a7fd6a5b99459c74271b3c1071e4737f701e87706643a37682438b5374bf761be31c73a29a9290bf7903763cf93169339a8d2ad0 SHA512 ba2e6b917a79ddf0d9010e9df5a10f28a5c42f32d2a0748e360eec2f937cf4096a9a36cbfacda8593c3632b4aeba220fb8d0ccd7bc204d89c801a004eb7af6f9
-EBUILD google-chrome-beta-81.0.4044.26.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-beta_81.0.4044.34-1_amd64.deb 66708676 BLAKE2B d647a2998b334d155a0c30de768cb315bb0740d33e4add13bce3f7efdccad1e9e25944b0d21aaf6a1aa47325fe20183d41f83f26e7104f8a697fbaf0af690bca SHA512 867e86358142bc685821faa3fa074d3a47cc47c1d1d070a3d8c54b0d5c8323efd9939d3fc6bb8b91afcca1b872498b986f6bde942b063d9187fa72fcd1d92d81
+EBUILD google-chrome-beta-81.0.4044.34.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
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 bafa2a406048..03229c6a66dd 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_82.0.4062.3-1_amd64.deb 67834818 BLAKE2B 53c73c6d5a108edbbe740d262b34c131b322bd39d772aa5ef0776aa7f22b770991fdf76b05211b2ad3bab8763641f14c7281524159b99b6e92c3e10f4c303b93 SHA512 c5fd5aaafc31cb716fd364c2c39aa50c01956c7cde747422172e77fb55ef82b8e1c5c3539defb712591b9ddb7b09492a2c5ae4313f4ee1a8ffc5b78f81b26d35
-EBUILD google-chrome-unstable-82.0.4062.3.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-unstable_82.0.4068.4-1_amd64.deb 68621040 BLAKE2B b2b3a7716dcbb1b46d4d4f90e3e69b1c9a4768afa9aa01bc37389c13dc8c7857e451039bafec410831fbc3dd9f8306a4395d175914ff2057afd316983bbb6c18 SHA512 893c67d2b1ca58d834a8874d57f9d8e6484ac37e115c44be2b1f4a581daadbf2075448b52ec95ed87e6e5f890e33de718951137bafe326e6332a3029c0dc24d7
+EBUILD google-chrome-unstable-82.0.4068.4.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
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 b2596ef69a5f..9b955e6ed665 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_80.0.3987.116-1_amd64.deb 63860304 BLAKE2B 8dc0478311ecc26d9459d0766f7d8733ef0d7a15775648197350f5712f0af6151f4c553913d4f8b2edaf84740e38a7d1d53c4d9fc6f8cc5c27439ed60c35b0ff SHA512 d645fbb7b573a5907a6e067ad6d256f308b20f02286a49104fcb740e624ff301d8f1282795b8188f0c3f01418b6ad4d1c3681da62e2b3fe00e39f3257679bf9d
-EBUILD google-chrome-80.0.3987.116.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-stable_80.0.3987.122-1_amd64.deb 63111826 BLAKE2B a03e547db371c9a15034d6b45d3a40327697685e4df3f39ffc9d0f32bbf39f8c9c7c0da5779326200b0399ad61b29304fbed41f755480cc6a7e7cf33e91af7fa SHA512 dc9e6ab4cda866e19b13f90613efb8915993346dc8dfa00aba84e200b9a90633759226788cc18105a8d240951b17a7c753f9f380fceb8ce0beaed7315c6ba47a
+EBUILD google-chrome-80.0.3987.122.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
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 f300b165e1a0..d7fb97b47169 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
-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
-EBUILD qutebrowser-1.8.1.ebuild 2265 BLAKE2B 9bc4f138c5d1fecf676e3bf3ae19dc99b423738079c89f78e7bb4464b06bb417dbe82affb64f02bf895eec661dd9d832b8793243bc56204364eddff6ff818b56 SHA512 9150a63f0f6a3f4e897854d935cc2181b742162313ab8c1ad121f62540fe4b4c82e473bc84d6c46d5798b91c5737ad78f20504728bf488d163f2496f1bdd4fe2
-EBUILD qutebrowser-1.8.3.ebuild 2372 BLAKE2B 7cd8628d876603b1aacb06860c12b7d255f99fff475425e3b91a09342bd035d1e6552aee7d9dd30a2e2d3d74d10621d7357d0f8ae10ffa1db6e22d581d277fe7 SHA512 3ca7eef0914170d8a5d96c4261dac01b292b318551c1d4aa586adb63f1a791c15111fa3c173826c396c0939e34bd9be51a98cffcb9d4d2d470d0e2426c923c15
-EBUILD qutebrowser-9999.ebuild 2485 BLAKE2B 958189a09e6c02089a6f8a4508286956238397bd1ea01b771dac5de6ec8b4385b66c15c2268e9771f175bcec98ac7bfc3e3c762ae6b3eb4f05c3edab2a8ff52e SHA512 911d8bbd39822d8ded419678d7c9706caa96346bae2cb75a7ad4cc1ef9b7e8deabda00ea0c1591c476fc5de72e95e2f8c691d84d4a0ef8f791351eb0a85a91bd
+EBUILD qutebrowser-1.10.1.ebuild 2278 BLAKE2B 2fc864ef50847997f5d34fd998626aa5dc70f7c7d5b71c4e9fa67f983e8ba4ddf0384dac141127261c17bf335d2531e69a8017ca09a426e19fdf0499731e2c7c SHA512 3bbc36cfbc98e3a5c5804abc52b899e7599d0108616b5501fef6ff796e3c9f2405759e4ad7bf956fff0116eed686c3d6f897441a9c802e8e9c2a3b39d4cfedea
+EBUILD qutebrowser-1.8.3.ebuild 2234 BLAKE2B de6f00ea75a05364de008b217604c1de044f452f156556c72b65d39a95c502a98840face1d7eec79d614c3fb30e15eb0d72d1d5432ffa9fdf844dbc48e144ad0 SHA512 91e134fc094ec11921abf993acf3c9f45b732e290e8a6ceb0279e60c7095ddffdc5d26d6f1df07fba91f427d2acc1e02e16b390c37cd8ff08b4014447353bf6a
+EBUILD qutebrowser-9999.ebuild 2463 BLAKE2B 19b7e456cb5c66a5d2dfd5d3c554cf810a4774e94e03562881aabe9f73bf31919de36318a58c0153881cb7dc55676b1111b5d79731e69b6bd6cd44f81d24e94c SHA512 988000329752a588e6c98453d27b2de14acedaa1672f228174257964f60c8471666fc6211f8ea4bdebf6b248a7f49108e804784e592eef38f5ca548d715dd2d0
MISC metadata.xml 604 BLAKE2B c597b4466b3954d0c328b376636a8dca286c212c3e857692ee5f039d94cb89c42cbb10e764c5323948cdb7a3d1fd11648bb057f65b7ee7b2e899529d294f7972 SHA512 92eeea88dbe246d8211a84d616772600aaeee95d9e135eb9b5ea38e488f844440ba97373fa302ee52f8486d7d1dae4c5008ce3e1ceaf3062e9d406b1ff0cb565
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/Manifest b/www-misc/shellinabox/Manifest
index b2415578fe56..dd338e9275f6 100644
--- a/www-misc/shellinabox/Manifest
+++ b/www-misc/shellinabox/Manifest
@@ -7,4 +7,4 @@ EBUILD shellinabox-2.20-r1.ebuild 2694 BLAKE2B bad035b871d10f39c919dd96a857335f0
EBUILD shellinabox-2.20-r2.ebuild 2673 BLAKE2B 626f9e847d8a884c0b9cfd60f0d471feeedc22d31fed5767aa999ccd1f20123e629eb46c1fc99ccb0d2422136ba893a2a230b013b0a4b961e34bfd4a4acd67c0 SHA512 28e163e20225f8e06b0bed77d06dd9cbae92973090f121c1d8aef93307776c41618bc96185dff247507bef21045a0af08456b77466c44f9af3a6812e73b5425e
EBUILD shellinabox-2.20-r3.ebuild 2679 BLAKE2B 8eebe74aa6ad393427fa5546b7813c1a3217b9ad83dac44ebebfa88207040420d62fb6bf7dd034d5e65b4f3550a69e0c09b4f6d57d66016588c81e6dd22d1f86 SHA512 50e3079d5e77f6073f728f84bd5630a7933da41f9a9526e24bd8b24185f2a826f345d258df464259ce58d4a8401e9a8a65fa9d22660b3ed6691caa286151be5c
EBUILD shellinabox-2.20-r4.ebuild 2589 BLAKE2B b9ba84b7b64c1ada9b1abd9098d191090bae59635b0e9d1253582c3ff46c27615847995ecf017c7e89a224802857a0241ba513c8f632250a1befc5e80ed4ad17 SHA512 e2f1c90a0919289ffc2b6c746070e16ba106daa2110c656d8e79d1f2d5f433aa0dc97134a3ea78b46eab32a4e556b4fda5035842c9e4ceb43bfc8c8cf4718254
-MISC metadata.xml 526 BLAKE2B 35b2638ace4b739a89974a6d9fcff93530172088c5a8ec49bff2f9949fd44220aeb8d1bffbed2d56b0550963625e99d52582926741517e612269495ca88242e8 SHA512 c9986b020184cb4393a1934b30dc2fce77ef6e926bd3f1f2f474adc201ae8302fe759c2b64e2775506b3ec0a097f10891490c39b9928359f31886d7818c8b64d
+MISC metadata.xml 465 BLAKE2B 0ab32d3a194f7f96d0620b0aaec34770f7bf66e82362e7cb71cba720de389005e42e0d97104e86f919cb666a6932e681ab2a1c0db794efcaeda07fd184eef05c SHA512 d49b6f84a6b79de40d86bbb7ec47f0f47fdae0b862e98302093f32d220115c8bebeb28477909919e252d5d48b6f64e8b5d2303f0367c19c5ed816d9a17ad60f9
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
-
- Enable PAM support.
- shellinabox/shellinabox
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index a5cc55e3cbdf..69162daa2eba 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -1,3 +1,4 @@
+AUX vdradmin-3.6.10.conf 387 BLAKE2B ababdd27b66bcbcb47ea5e69774b659c2319d3c9d8756bbbfde64c738b75d0a497778a1a6b3529f118f54519ad3895bd4ec51a613d74273a11b64f8f1e8739a2 SHA512 9308c97fd5354c16ffeb8ddaf983710d4e72a443e30ade596d1f0cd3133e28173062ac30efc18e8ec8fdd0ee9747083f697bd52865624dc3e8c8d64b0d3c8cfc
AUX vdradmin-3.6.6.conf 557 BLAKE2B d5a9991ec16a87986bb9674d1c9b2450f8b34832e45984c731b49f4bb4c55f767e353066b38aa679d78b316431d1ad5d135dedacd9050929fe570da0d9e58455 SHA512 253ad76deb8c4b5d8ca69464381a7322efa6c638bb78049db8dce3dfc44aaa9a36e37ac62d0ac945418dd4afbde573b0b11ecab3ace149c06a8ded2c4832afe6
AUX vdradmin-3.6.6.logrotate 116 BLAKE2B 5db1b231a4a821689c8f6198e02f56e8c8dfb89c56abf6fc4630f59081d34b222f7437186b6cdb169e2a7929c26c8bf86e3f1ae037a57bffdcdb1becca4af8b6 SHA512 27d730b67210adf314c53e87fb4ba7e6ab0a1461db0f8ddb517878341badcb27531eaedc8034ba2e72572bbaa8db07c61781be6063aaee7ef63043d4d5979b98
AUX vdradmin-3.6.7.init 1860 BLAKE2B e8e93378a56a2a2118a5a3ac0cd879690a09c5508a54d6eb0cf7e827c915df2bcbd894fc53f4eee75eaebba0826e6712fbf3a0c1975101799a0d4575b6679fbb SHA512 73a175c7ae8f233442dedc5d2d94a81a4a63d3973c4548d508496f2d99e06eeb0683f51b8621ee8cefd5111ad2240c90d7225b96fef96b15e618b21418136731
@@ -5,6 +6,7 @@ AUX vdradmind.conf 92 BLAKE2B 14d1abac4f0718dcf0679ffaab81f2d1867cdca3f3cf8534dd
AUX vdradmind.service 278 BLAKE2B 58b7aca123f3dc6ac00eeed25a241cd4315b93abff33ef66a0a227623a5bfd6fb5c234166a55d66f0d4a7762ab0c9c720f8e2031bf52789a52edc3d07d61bfa2 SHA512 e862d5a54e0f9b1b8c3604933ccea840e1256fac49f1b93cd7c6446f9aa4f6b8371fbd8d8b767574efe2420c7141e7af0cd5578733311a94377db8797de32b28
DIST vdradmin-am-3.6.10.tar.bz2 606665 BLAKE2B c475b36c840548b6e0d50b2095ce3278b0b526af856c891a25d28bb2f0cb9f950aa9979533a6b6425a2a36a594dc5d6a075fca7713eb1f59071fec854582cf5b SHA512 f7546f79b786ca383c0846656e74bd69dc9faf57fe5794ffd68776123497ec2a96c2f131801e3d5d19247ac36eaa896801e1ac9cd11291418abb518ba208e597
DIST vdradmin-am-3.6.9.tar.bz2 562006 BLAKE2B d04d7c0c3254942a388fe0f7b9832fb83f5b6c36af8e9021da8b1e5480d0a507c14da3b55590ea3ba4f58e58c7de9f36cc2a3c5f94168be605477244f62da987 SHA512 1c84ce56da238db6ab2a2fc3d59582945440436e174b3998c21b6bcb5b99c914a195728aa24fef7de8841c3be09b6e9976497acd873e768aab5fdaacddd473d5
+EBUILD vdradmin-am-3.6.10-r1.ebuild 4745 BLAKE2B ae6dcfccc5c4ee3bb42f860cb576dc952086c45cb8418bcedae3e3bcdeb99b630754a8cf1f5bbc380d386fa3df7349839fdc04a30d265934a69ecce0a37f77d2 SHA512 4af9d07e394a6e243c88718f73747282d69e60b6d40045d5364d9fda02d860709572ab252b3954f285dc0f0c4d9df417dbaefd9d8290d81e28239e8c02564374
EBUILD vdradmin-am-3.6.10.ebuild 4768 BLAKE2B cbddb51256653c55a36ffbfab055bf6deb93eba83b1ccafa01c98bd4d8e0237a6b0cf441894281e90d05839098384193666ee9b5a650b87d928cbf420d1f0308 SHA512 cbfe87316898d2cafd01dfb8f3bd681310a80383061c9966d0fc0a246a19cbd1894f7904a2ff94280e17dc148ec1b48c74e71a5475aaa758dacc46f00330b828
EBUILD vdradmin-am-3.6.9-r3.ebuild 4730 BLAKE2B bdc97dd0b5be9bbf0977c9fd687c9260c14831278e43dbb2ea26a00cb4f494b48ba5571a03b3e049340d381df6beb2891b5c62c9752e0e6dacdda5cf5df72e0a SHA512 69a1ce6c895f45b2b738375bcf14501fb1771f72fbf794b99019398599ed9d553402abb17e7488822cf847440939afa644ab7ce81fdd9d21a2971a91c01d849a
EBUILD vdradmin-am-3.6.9.ebuild 4315 BLAKE2B b69fc3e119c2ed3eaf70898515b9612012ab3fbd68395eb9c50b59dc8904293f3fd83988db6f0f6d97f47641f0b85787a01547d566dd26ad9b60f7024481c407 SHA512 1ab55053c9eefd90ca28a5cd7659e6da9cb56c1178a1fffff7e7b9a111ec8b1b0ad3631d29c0206c6ddf1996b2ccd7265b62ef5621269056d566930f063499c3
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 2495866a60b9..216939c5b565 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-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
-EBUILD chrome-binary-plugins-80.0.3987.116.ebuild 1209 BLAKE2B c1fd7fa6547b199790a9f7cb2a4cd1dbb27256d1dafa67e3ee1c978ee8008be5bc3686f3e4b1089d9104dacaf6f30a79857d215e9999053587bae0fd83de3575 SHA512 69aec07518575798600d34cd9a039b7e395eb892aff08cd1aeb4f09e84491b56bc27dcdc8c1c85e894e4598b20ffd177c99bcc9c9c0d440c6bc17479e5b52c20
-EBUILD chrome-binary-plugins-81.0.4044.26_beta.ebuild 1210 BLAKE2B 294b7d0ce29369806476a67ff97d82f6f7dc0d78c30a65d78654edcfbf053e225f0f2285e858219a35a4cd28fe64b85321135335930f4a19fc0a1b4679959bf9 SHA512 cd4ba174b5ab634be57ef87afbf2e92cfce9c4e054144f5a2c1a9984eb0b8046c1b4a28d4ca959b682b34a6e135623eccd63d4752d8f861bb14fd397fe1f1e28
-EBUILD chrome-binary-plugins-82.0.4062.3_alpha.ebuild 1210 BLAKE2B 294b7d0ce29369806476a67ff97d82f6f7dc0d78c30a65d78654edcfbf053e225f0f2285e858219a35a4cd28fe64b85321135335930f4a19fc0a1b4679959bf9 SHA512 cd4ba174b5ab634be57ef87afbf2e92cfce9c4e054144f5a2c1a9984eb0b8046c1b4a28d4ca959b682b34a6e135623eccd63d4752d8f861bb14fd397fe1f1e28
+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
+EBUILD chrome-binary-plugins-80.0.3987.122.ebuild 1209 BLAKE2B c1fd7fa6547b199790a9f7cb2a4cd1dbb27256d1dafa67e3ee1c978ee8008be5bc3686f3e4b1089d9104dacaf6f30a79857d215e9999053587bae0fd83de3575 SHA512 69aec07518575798600d34cd9a039b7e395eb892aff08cd1aeb4f09e84491b56bc27dcdc8c1c85e894e4598b20ffd177c99bcc9c9c0d440c6bc17479e5b52c20
+EBUILD chrome-binary-plugins-81.0.4044.34_beta.ebuild 1210 BLAKE2B 294b7d0ce29369806476a67ff97d82f6f7dc0d78c30a65d78654edcfbf053e225f0f2285e858219a35a4cd28fe64b85321135335930f4a19fc0a1b4679959bf9 SHA512 cd4ba174b5ab634be57ef87afbf2e92cfce9c4e054144f5a2c1a9984eb0b8046c1b4a28d4ca959b682b34a6e135623eccd63d4752d8f861bb14fd397fe1f1e28
+EBUILD chrome-binary-plugins-82.0.4068.4_alpha.ebuild 1210 BLAKE2B 294b7d0ce29369806476a67ff97d82f6f7dc0d78c30a65d78654edcfbf053e225f0f2285e858219a35a4cd28fe64b85321135335930f4a19fc0a1b4679959bf9 SHA512 cd4ba174b5ab634be57ef87afbf2e92cfce9c4e054144f5a2c1a9984eb0b8046c1b4a28d4ca959b682b34a6e135623eccd63d4752d8f861bb14fd397fe1f1e28
MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
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 179509da9775..f6db3f66ce26 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,6 +1,10 @@
AUX puma-3.12.1-ruby26-waitpid.patch 1722 BLAKE2B cee9b9e89cf098a387481d754732f54274ce0f9580568e62496513d58d46578f81c13df2aa98d2da218bf9d8ad581e8728ff60be488905493e9acc6b88012a88 SHA512 86f826d7f9ac8a50d62f8cf2b87b0df5f7ce55c1a5e4ac7b928b756ece809e30750bb2a7c3c50dc95f9edcb463e9c453b5d3eb84ffe44952904200b5337351ad
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
EBUILD puma-3.12.2.ebuild 2052 BLAKE2B fbc4e7bd899b4c75f7ec08851c78b46f27ffbb31cabbeb722bce41ddbe89f33bcacb0fb87aa95c226f5717d93808d54783d82c0a72e33fb925f272e308af9c35 SHA512 e3dbe4a9be2bd6c7d3207dc51599b0cac765785645c9d72188d603dc9ceb3d2c7911a36992de4e445728a9569ce07cd5ed71d7dbe8f8f3378077c0c88ef85f0d
+EBUILD puma-3.12.4.ebuild 2053 BLAKE2B a182e82394828314846a4bd5315376eab9b68a84f79877d742cd6a183a4c386eeb43e3194331aae18e7857c29afa472322353feb7139ca41f84e44026ca2729f SHA512 8b859648005a82ff86cd9be58790b5aafb3fcd57d37b5eab92a560dd0a4d70f237e1d41665f62d9906d0e88b78926a13d08cc28e79e8f6d41667205c8f7f4282
EBUILD puma-4.3.1.ebuild 2120 BLAKE2B 56ea8d92332904306249554f4ea8027569a7c7ee847ea4def39c0e0441ccb26b30be9e596df750373774538c8c11b2e280c75329316223f7ea05dca00f0a6d4d SHA512 e4bf235ad96a7394b5ae2efad00781af95ef1726de6178fa120b1ffdb7997d0428060273856de1fb445543db4c5c5660446d841f0af804e284311ad2d0506bff
+EBUILD puma-4.3.3.ebuild 2127 BLAKE2B 8a73ebcb22058b32d090e6e2eb6eb5b4a2b9234b2243458e5ae2ab11f43d47aa19d4399c37414ee726b56837c6e45db5e0b886a0827eedc9d109485738c6b1fa SHA512 b4623a2a576024d05b37ba0580a57cf9c7f09a125bcea57e67b9b373a1d195a51f93c7749d122a9add5e323f1d791280b82e84e33bfbfbc9d10ab0c51cdc5813
MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
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 945a717350ba..8f20dd1bcac4 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,14 +6,12 @@ AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f
AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-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
-EBUILD tomcat-7.0.96.ebuild 4191 BLAKE2B 00d7bd4b1ccf3146d8cb140674626910a5da66f79494ea2f6fe1e9758177adb62edd54deef493c94c8a511203a1c3d6c4ad63067a531db2ad11011279a500363 SHA512 0f940fb8ec7386d0565700d35d7d137de8e5928c6f813d0a82f55d82bf79dbb57565af7c32ad673760802c57cfc776c83c88100cf7adc31dd3a923c352c59381
-EBUILD tomcat-7.0.99.ebuild 4184 BLAKE2B ae1b4ddd54a605743ac85b68e3a73a58be1fb92f84da7521f1042138fae89e0ddd7c12e6083243c01a038a5d94b804f2117407f8826b5d8db9c58b88d6498d22 SHA512 6b5f9f452256e8f4038cef1a76ca3b4b87323fbbd8ff97e1f7e8ebe3d452b4df91fc7cfe943f8fd121f10a623d85b71ef9bb3fe07e776334a25bbc8f706a8fd3
-EBUILD tomcat-8.5.47.ebuild 4543 BLAKE2B 96ea6dca520f6f8796b49383fa14136c76a98f4397078ce400f45a7f7a7142d056a83506fcef659772574351bba812385dc135af3e8c2c06e253284db23adac9 SHA512 9df31dc266d9310ddd812f35e895d8fd7422f5dda883bfb9b2fd39ca0bd64db90e962f7b2000220952defa9dc7ab5140dfe6a9e3b7df69dd831a8cab164532ce
-EBUILD tomcat-9.0.27.ebuild 5464 BLAKE2B eb4a423dd96a63cc7ef60aa0e22baf4bc0f2472548d6a695dbfaf001d30c2a2af56e25359a04763415273c1be92e16da6e8af7dd817d68f0fc2b27efd58e76ba SHA512 7df1e66ed73fdcb6961a4e4d07c85776f74c8617ba5e1ecc83d925e5b4bd66b5ea9d0e27c58f8f4989130c507d043bcf5b1e37a76c75612efff4eb050ea10c34
+EBUILD tomcat-7.0.100.ebuild 4204 BLAKE2B 933c63117433e3c57c394bfedbaf75c808f79d5b811a0d3580281658298d62c81a81b35c20be389d8135391a14cb68942749927f8b3c02063fdd89411a53f70b SHA512 8a5e1571002872eb6bd972c50ebfb721ad05a78a9176c7215f0ad9d4422109a2206d24d68ff7b82f62745c67d2416b5771af14f24e809a8c097aaaa44e7fd8e5
+EBUILD tomcat-8.5.51.ebuild 4556 BLAKE2B 6a67a362e8fd98f7b233857abbcc2e85e3ce6911c795db4ba899932e62848c060f607b9bff66426dd0fbec9df91dcae959258ad813d4629ddede5c4986204ffb SHA512 de5dfd04a260674bab8c6d6dfbedc9684ad26a98994796472e694a1fa6105f55f721f97eb5ff3331a5c71182aa6874aa9be4bb0ee1fba427a6d7a0e2bdb25154
+EBUILD tomcat-9.0.31.ebuild 5479 BLAKE2B f9ca5f12da777e5a7c4022324f5dbd5e7c62607e1afd2888b9903307ae3af7a6b17fdc8ee7e82011291b4ca39fa59334754189e9abee646453bacbd497a92a03 SHA512 ce012dea0e52c29533191fc08436779309c6ce053d620c018c82d31fe26a8e5da9f39ebc64902ccd642577351c4093e23055306b3790ef107a512c01b0cdc639
MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
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 e606e480e2c4..922c794cf6e2 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,6 +1,8 @@
AUX 0.10.43-unittest-build-failure.patch 545 BLAKE2B 9157ee511bbc09a7cf9d091a4fc57250a533b8028e69dc3ace6d4b10ce6809b7f7d9fa1941505c12cba943657636bd69ad94a52f8c0bfbc5fa1e17ebced5b6c2 SHA512 2f0a4485a458efc7ad0c77ab8ada1cb1833834b1eb3fe3f0d623f963ba65555c5af53b9dbbcf9b1b75d54f19c3873820c839468b361ffca28e6734adab7c3ecb
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
EBUILD goffice-0.10.41.ebuild 1244 BLAKE2B 4d077c53840c1be6be76cd262fa4c1b9798861a429d5c1d4f9441e6f38e83162e24b478721b1dc14e9445582dddd2402a6fcc1d95da991f1da6f5f4d3c84535b SHA512 22a5e59c0b30d031841849c89dbc8258fd9bdd55b62aed930727fc4c33482672b8b464fc0d57f35ee9b0b2ed68f0dc1372d3093da81f3fb2747abc2845372f6f
EBUILD goffice-0.10.43.ebuild 1370 BLAKE2B 7a40e2ca6b0cff35e67066879d46353979ad0549888672a5afcac8629fb892b037a4b8f12d6a4b7092bbeda9b9e70727b3486b72a4f34689ecd26c9e45757635 SHA512 e068b527f8b5438101310b27b7bccda66ce68dac8c82b8cd1c39ee6b8f99f6c84e349acf15615f67f62cd2c0a09366239501c5732981ac8337565ca2e0c82af0
+EBUILD goffice-0.10.46.ebuild 1435 BLAKE2B 21b3248acb696e0110696071828797afe67d49952a4a3a43acef2c016eea09020309837cb8ce418c19a0a345721614b57f56da5ccf971a4fcdcfef7b806412d3 SHA512 992c2f665ee577dd8b459f7e2b7a83c720c4150ce9e5ee9b7f5639fbcb7feeb14c0549bc9040995c0f9f0e21c558273872de9d62c015597a5befb791d411ea2d
MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
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 43bd76eca836..f81346bf2420 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.25.tar.gz 405276 BLAKE2B 9ff163f8ff037eedda29e7479bc637c9e3ddee1edb0848bdb61b32702ad8855745340beca7f5895612209d05bae838ce71a17521ded50cb61f2516669b740009 SHA512 114c510fc3126256af49f9fd7a141ebc86fe8306cf10094c1c9e9980757bf8f23e0ddb131d54aaa8acdcb5b98f0a230e9c2f0584ea09a68b779be5b66bc865b2
-EBUILD py3status-3.25.ebuild 719 BLAKE2B 56da3c804b99364042d91fbd5bf4c028452e27b1d65042529fe283fe9e6e43e54ad8f8595e64695d217c7cd21bc6bf1ea88debacc1b3e26d4d035f8dc974ec26 SHA512 1086f878fd00553f9a82f0358d8298b425526c9d37cb62a95c794d62fa7b243ea7e7c09b5d1824bdb3cc35f54b26a1ba8aea335d4e4c0622484b9515fbed8316
+DIST py3status-3.27.tar.gz 405154 BLAKE2B 9ee094145623520a63412f90dfaac1a2bd017d1785c0e987b9c7c527afa37d2604755fa646c2506c4950079a4b5f956e67a776fa71e4ba21a07caa918780d58f SHA512 4b7c64cd3ec1f9e255e94dd144e1b83a25dce5a661727c3664148f0c6e25cef14ed10237653dcb70706f29be549acb9ed8c1c1d7734b7bd44d02ff957b4bf664
+EBUILD py3status-3.27.ebuild 723 BLAKE2B b62005954af6e13387b48634c04e8cb52ad6d57281cf3e03032f8841d7735db691d228a2a5e81def59e5c6d3eeb6f1d2958e9f78de81c6a965ed383e067c286b SHA512 a96d6985c55f73fae78a542620c6d2f6914f71d1584580a4f9ebc932d2640d6276ec376d463a9abdbbd94847bb6549750603123b9b6fc30f19dbbb7358d05249
MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
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 2912ff460e79..7a29143ab347 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,4 +1,6 @@
DIST xwallpaper-0.6.2.tar.xz 82600 BLAKE2B 2e2b1121fcc2481c4a1e3c78e357534b9609b4435c4364f22dbed78ee0de7c671d2044403c22d22b494a9c89efd17d843f32b296c863df3c0f5d7b3673ae361f SHA512 3713038ffe8fe1da117dc64db6e3c8642fe663473d1e9078963890fa08f21af6ace60e08773e23e6025fcf2116563e24c76d07a66ba02537b38aafa9ac99f395
+DIST xwallpaper-0.6.3.tar.xz 82780 BLAKE2B 485a8d65ae48ee33e22ee199e693268b94f88a38e4f9d56445eab68b2563422824a1dcf4ac4b73d37ae1e51820e1619dcc654f7b50ce889ca13f28d0273d03ae SHA512 8ec6159a44ad08e57c634b0fb6dcc5945fc855796cb4507126248dc1d6c7c406eec1412335828d358eb47d5b9085a2028508d3fd4af75e0767369a8cf40f36f8
EBUILD xwallpaper-0.6.2-r1.ebuild 1023 BLAKE2B e285ddbab7b2fec704a7eff51e7b3a26eebd6c5e2c4721fcc8aa61ded8cfe20c54891930d4d53e36280c2a2e911cd9511bcae7b6d4f2430a4b0547f63bb1c7dd SHA512 810271ad0ce334df6adf60d69949f8a0e16b66753d872dd82190c66c97b7b37a98643b90ede10949a86086cf72e28ce36756cbcda5af9c90471b97056884a619
-EBUILD xwallpaper-9999.ebuild 1018 BLAKE2B e812a3fe52e010dbd3ac6b950a45a8e02a93f6cfa36f2f2f2016588465af6a25a2be264c748bcda18cc6010e4b10866c85a00f81bd95a46725a959c68018c418 SHA512 894e039552b341c29c207864e0c41fb3eb6d6fd93a819320e56350a1981c60c168231c6f65ad4373b1e708fb78b7cb47e5510990da0eae8061b5356eefe0b150
+EBUILD xwallpaper-0.6.3.ebuild 957 BLAKE2B 4b98ca3eeeb452114cac1659db79ce06013706d2640eafbe9232a6850f9b5782ccc0ffc96d9e014d8ae01e0583bb8370601d24ba93b57df8611ed3b30395d821 SHA512 20d58283aea3edc79637a5715db014d9002b5acce8351688bfb0cfe00612795498589c6aa09e1849a38abd9e581ace669e861a1d4f8e1da1d93b91050e6efcec
+EBUILD xwallpaper-9999.ebuild 957 BLAKE2B 4b98ca3eeeb452114cac1659db79ce06013706d2640eafbe9232a6850f9b5782ccc0ffc96d9e014d8ae01e0583bb8370601d24ba93b57df8611ed3b30395d821 SHA512 20d58283aea3edc79637a5715db014d9002b5acce8351688bfb0cfe00612795498589c6aa09e1849a38abd9e581ace669e861a1d4f8e1da1d93b91050e6efcec
MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
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/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index 710a5317d18c..7f536a22d9ee 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -1,6 +1,7 @@
+AUX wmSpaceWeather-1.04_p19-gcc-10.patch 962 BLAKE2B 935948a401c6e5a1bf8bd3bf74721f3c0b099d072401051ab17eef2b95406f4e6b46a661944e003c8ddb3beb3c8ed90089f8a64e49c6372de2e3a9900baaa68b SHA512 46a1a069f6fff39e4771582576540693405759d9033ba3961b23eaa9f7d04f81bf91a8177c7fb75cc7fea78faed28fa561b849a425187a5a2a19783afa0babbd
AUX wmSpaceWeather-1.04_p19-gentoo.patch 2034 BLAKE2B b81b73f9fb8c64c8ba9560f999f72b75a4c12aadb222a84903461adb3756ee991467f74a5b59ea96c3eb46e9ca479cbdd78a2cfa6f8dd2e929dc158201eb1c2c SHA512 7e8d76b6db7e6fd6b498712d0d06cee4a3550914f9c48844c6b3dfc77c1086ac119a097365fd5424e1c251f0e9088feec3c2a1e9ab53e146f3a5427786872982
AUX wmSpaceWeather-1.04_p19-getkp.patch 1290 BLAKE2B dd350e57e2c0d40716ead4fb6bdc215f263bf5340c242550668ba252d78873a5ceab7cbf789209214daec41e33abea3a128b6cd5a5a83ee4e22b9de694ccecec SHA512 54f1ee8d2152bafc7895b2a626f27a4c5bf7b3702a2d14e2523952fcffb8e636f6f3ceb30d95b12b80470a58cb16dd50e04435ccae91e81c83097d41e2949b59
DIST wmspaceweather_1.04-19.diff.gz 9429 BLAKE2B c32b02d123783789962ef56f54b79b7afacc69573526cd5254b7083673a5ae0d70abaa82d84421c86d95139f9033a35de6511d131f73ff1360d43d1d0e320979 SHA512 f8228c15642b88b355f977a8ce73b474bf8874b4b64bce3f519e6ec6c5de1db7bbd1e5f40e57e367dc0a1dec47e5c32b87d4ce61e35043d71cee0005b06a5a78
DIST wmspaceweather_1.04.orig.tar.gz 36295 BLAKE2B 8f12a4ba7dc55d06ab1b3c86f387c0f4dc930d89b8ccf151096d736adb80deaf647e47bb4592f309042e2273936996b215cb2fffe83dbbe20bd10d94b1b7c109 SHA512 d422806d44a2929cfdb3e36c7075a4e02b64416db7c528d08411944f574dc34bb5e5ee48c55a3b9e796b15529857bcb480dc650ebdfe23cf1079ba09e2749154
-EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1615 BLAKE2B 14fe0fcfbd5c1f97d41544d5da48a40c38c017c097c925dd164166bb7c20bf6538f814d2d87eb1a9f87f7393b15f4c7af4859f37e36a72052abf2506e6d5f6d6 SHA512 22994e3a83bb5b196e2815d42991dc2231e3cbe998125a32078e886d3c48b24e6121061a67daafd13a222416d42e637a18ac94dcf3e340abb20abd24b9ce638c
+EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1655 BLAKE2B f0fec1016e233b4a14cf8d1a3be96d8537e0f3d31548ff6ff1f8b8fdb0d62b33af56aa1cdbf03c5e6361574a664ebab641976efc9d6878c40acc09316767bd91 SHA512 33c67461d55fdfe6b8c9c57df9e2599340dc45c8fd92bb8bd2eeb60a834d106a1e2794fda90f47a02b14da83fa8f4ffaa64448ae3b18162e411a91add92dafc3
MISC metadata.xml 349 BLAKE2B 1b79557d30af25f4419b0824e2f99a529447ad80c9c398d22b023eada927a3c840f8787aca77fff8f9073873f01a6be766595bd073cf8b11d335fea81f3e01ab SHA512 f39cf6f8c99788992a57ed0598fcd5d13b25fdf80dc5cf133091f5babae34e269b55e3464bec7b660e3ebb295edc4d46e76dda1978e4fde30e70620cefa21264
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/Manifest b/x11-plugins/wmbinclock/Manifest
index f09db24b2fd9..5440269161b0 100644
--- a/x11-plugins/wmbinclock/Manifest
+++ b/x11-plugins/wmbinclock/Manifest
@@ -1,3 +1,4 @@
+AUX wmbinclock-0.5-gcc-10.patch 1092 BLAKE2B 3955dcc6ac5e123bbab3e390278a88ce1038519d2d6437e67fc5784495faeb1def9658d93ba8825e46130c7e99fd362f51661b01156aeeea6f1aaf2118b91535 SHA512 86d93d7a68a8ac41eb446e3836aac5c6477814869e6b4795df521b442eabc344344dc1a5c51211ef5a74eed334bc4ca2ba443339221b81ca1e7e219acf63be66
DIST wmbinclock-0.5.tar.bz2 15909 BLAKE2B 71a5e53fea8f042bd8e01c0a8dde9057b22e398a4d483b556221d8344b5542f097e835f0d4eafd7cf24964b4b08f04f844c476cddc443ebc8f469e8fbb5142ec SHA512 f0f1f46b19e9c34f9168e03df2d4be2f9c7a73b09dd8247a7bc977309a3354069adf34032f3c0106aa763fe259993176edd84b029941191d05a11505e27de695
-EBUILD wmbinclock-0.5-r1.ebuild 674 BLAKE2B 3f550c8ecbf613ea93442af640fcdb20cc5d3c21ef68b4d0606f15df78822cd0b82172782c88b05fa7bd7ef8c62b6401ad45989b87834752e2d0338eff9b3469 SHA512 570c64f54a7942f5a08feaa0b9d0b59f808bd058a943efa848825bf8fe879eda1b0cedf7754b680aff042a5a637c777067cb126924e8ee03202ce8603ebfdeed
+EBUILD wmbinclock-0.5-r1.ebuild 719 BLAKE2B abf06054bc8dfc3dc072b1b46bbf03d82b6e485af0147d4fe8010901be18d1026ca58f3cabe7a75eb11af8f8c0ee0ddc6e17905f3996bb29760e01c7a224f7b1 SHA512 a31c1dc08910f024f54bdfee328d37c3659a84b0026f0c188c8cd03c8a69fd388a70d7e6b5bdad4e86586bda6be844229efbcf7be7ae3521446949c793938fcf
MISC metadata.xml 531 BLAKE2B 03abe401a3acf82a4a19b432b2f82f8cd8b8aa411618b7f54181cb32e999426c53f141a1c754cbc942abafc8d161aed8565e7e3b34036f489dda2f4b782707bd SHA512 b2a68bb29e867c54506f6b2594d3567353c86ba050127c07fa44f8abd4414aee251c297dfa569ec413e86699c088c61965104f5cafe326da0a376a6d0252098b
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/Manifest b/x11-plugins/wmdots/Manifest
index c60a6ecd4643..cec608f9fbe8 100644
--- a/x11-plugins/wmdots/Manifest
+++ b/x11-plugins/wmdots/Manifest
@@ -1,4 +1,5 @@
+AUX wmdots-0.2_beta-gcc-10.patch 876 BLAKE2B bd8419a77c301d04934b72113e5294f3dac1e1adcc29ba3aa97de20b41e43bf4d195f6e6e3db8dc6d5dfc8c8c7b56bbef200a9061db9cfd468c0485610c00256 SHA512 43c43fc6a4f3364a8ce7800f8f998b02ef237c2a64b75d04d39de88f2548b813ba9a6bc29ad04ebf7516b11c8d4c879e4301cd4e669397cab40165331fc0d577
AUX wmdots-0.2_beta-stringh.patch 325 BLAKE2B fdd3cc86c6eab458926bdb1a33f6050c36716e9840e2d20b60e4835a4895cd3083760c0f01953ab9470691b23fda40e7001f135dfa994d16aee3253205d6e741 SHA512 b2da0950f0b74f6a25bb57d5fd27e315e5e4a1cca41c5cf413bbcf5a7d50ff5312a8d2903a646b2ba7c79007b8804e6518fb9a14b25fdd1028104d7800726f60
DIST wmdots-0.2beta.tar.gz 94933 BLAKE2B 76a722b60989855b47dcf08539299c7bdf57485595d0f452d8ec10ef57f350810396bda396757c266dda8cb1db9bb3f1823b0f9759b1cb85c7e1ff469f5d2a60 SHA512 2e9d42c4086f240ece0a29cb6131bad2d499bb7f08e8a444cf72ce1a9813f9919f9d47c4dd5ae015e6c2e76601f1e7ab421a67daed1cefed45dcb06e4cbd8488
-EBUILD wmdots-0.2_beta-r1.ebuild 863 BLAKE2B 703416d7b326cf66592fe4152b8db30447c27e2b6f35fc421a57565bbb433b0a20f8f0882b84a95dfb0e639be47850c82da61e88c531f81f2ab8a181b63c1a6f SHA512 f4ada3e178c26e6dd7613fa9f36fcad624aad93be43652ac2c557da462f727a06afec22069f002637fc0f601bdb28533e937772398eace91a800ada913779da3
+EBUILD wmdots-0.2_beta-r1.ebuild 944 BLAKE2B 62ff638289d87e340bf3cf4bd8c867d81cb8b7fe36fae16e3562ce5c00145041176e08b5c4a34419ba29afd23d99b909baffc336c5e477073f78bd9bb7df6956 SHA512 2ac87d025e1255712ca70bae87e62143962af1b524184dbc8fac0ff7c79f9c3a42baf18e9547093d12d57d7f516f9adae9e515063b68d50ec83ab72f2c76d893
MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
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/Manifest b/x11-plugins/wmfrog/Manifest
index 52d598fa01a6..d6b073c9054f 100644
--- a/x11-plugins/wmfrog/Manifest
+++ b/x11-plugins/wmfrog/Manifest
@@ -1,3 +1,4 @@
+AUX wmfrog-0.3.1-gcc-10.patch 871 BLAKE2B c9aa926d5657ecadff21413f164a07c6e9ac40fb142bee2a669ac62a11cd0f765642bede1e5732e2702b3d04fa68bb9e8af54089634a652d73da0cbf5cd9d6dd SHA512 7fb0217ac69f552ab3d58a6c8d3ac7d6252fd2e9a1186d2ffd99e9d4d29072156d09b932f1353df64bc0fe18ae4a17eee4349c6ed7254afd623ff8d033efcf1e
DIST wmfrog-0.3.1.tgz 128499 BLAKE2B 5bde4ccf41fda8e1a7e4fe9d40727e0d86d65830cc749955f5b1c97949c543f8f7253ddc6fffa48fc606e23c2ff6b4c66e07c66807a43e02f68961dfbb20d683 SHA512 35cd7da8ec0173f4799119191cd28befaed0fd5ea09c0dd2e9789ce37e9a1a4a83a9fb4562051a8da9c1449eafc8299c86914cb6f0e5bc35bd051560442af7ee
-EBUILD wmfrog-0.3.1-r1.ebuild 667 BLAKE2B a8681e90de83acdf40bbe8297aed249ad0c19c6a352bcd68c496a651c09ee399ed872bd2704486ca995cfc3c80efe12e4962e7eb6ce3bd0ca2db60d49299c3ca SHA512 ba65b0d12577829123c55f97830d9ab554e097f305b5b38ba5526b1c06b786eb517ded7be86decb908877172b8269a5458d68d6320bff49f215929c99646884f
+EBUILD wmfrog-0.3.1-r1.ebuild 711 BLAKE2B 93155549a667423a9c56b636626f1548e0b133b40388d28bfb786416735195cbe08bc324ffbc967925f85d0e0817c3bae76666d92d28e0c0dba1d5aad1a50d1f SHA512 411031fedff47abe6f991f3eab14afede4312fdb65aae5ed3ba33744f259fd7da375cfb8c59bbd919239c27e17639ee7ede881bf27c32f7c97432664127ebfc6
MISC metadata.xml 328 BLAKE2B 4d9379b73162de003a92fc6b9aa8bdce8969c815e2181b62a1be2331e422deb78ae7283a29f28a85a20ff7664378ee88e41f3db4cc302a2351f08e8a349e0fab SHA512 279b5bfe4731afe774f94c0588cb4939e33a8680d07fd1c0504f18f23e47dd4b11bea2237c5422896a5b204926dd6fc39237a62dc70d751891f2cd1bacfa48e7
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/Manifest b/x11-plugins/wmsysmon/Manifest
index 40dc19b313e5..0516c311be25 100644
--- a/x11-plugins/wmsysmon/Manifest
+++ b/x11-plugins/wmsysmon/Manifest
@@ -1,3 +1,4 @@
+AUX wmsysmon-0.7.8-gcc-10.patch 640 BLAKE2B eff20ea6d531a7fa488382aefcf7c5224c835eb42c1aeb31a76c3e9598f757898b0807f2128d47972d9d512650deab4ac68882987916d773716c0fa4cb456918 SHA512 aa18b787921a23fb5de840e7ed006bd56b35891faaa79f4f6b73014adcf0333d5198f7d8480c0f50124dcc6d67774462a3abc87d3b417b0bbc74b7f34127b5ae
DIST wmsysmon-0.7.8.tar.gz 23533 BLAKE2B 830edc78222e8997c6ee23bdd9fcb28729e9b80d92b07f70a53d841065b7377f5c450024c511b4faa92043bd45aa0cc92e89ff900d7d4a53d3c9f4b57b4e6e7e SHA512 b1afd176851e8f89896e39b55d24d6efeb97eb5fdbb9c181cb030320445f1d8b22d31073edc615e6b47b91fd133b381f00b612901c8b312e7da404a4746bb97c
-EBUILD wmsysmon-0.7.8.ebuild 665 BLAKE2B 42d8108c260d8b6850b36998456ecedf58032c16e78c91127782c913520b2b939c066a70e760e7ce623875085fbbd16d4c69166ec6e0899262b649696d9b4ccf SHA512 743002031e8e80cd8f22a6d30edced9afa3dcb0b5d739c3fac8e7885b76cac1ab78a4f01e3fbd0f5c615daf7f68f50d4757109ccdf5c48f1173a497ec414e130
+EBUILD wmsysmon-0.7.8.ebuild 709 BLAKE2B c0e8ca47a722843d018ba95a4da3fcdb8c073b3447cccb4b3a753ced37b31d9774ca67fb7602d3fb54ce4ba9a17851bbc3d206ea639c9582fa0af1f12b1aa5ea SHA512 1f688c2032afbd95c324d692029228c79c551a5737421a271950873a59621b9bcec45cc7df56b6b1edf4b3c84dd853275b61f62ce84dbef41c537d05282ddc05
MISC metadata.xml 327 BLAKE2B 4e0749c3eaf7a3ed5650d48d9f9a80b4ad41a9e0093bc4a8eec9e7348dfdfe03448f5b289f723771f8a3d431275da00dadd6223438fd25e4127658d63027e775 SHA512 0824ce065280643b8763048643991328a88ed82d876a5b7216b506fd156eb575b182edc0335083f011d90d1b3749a0ca746bd2e9fff201c62657906133ad3a8b
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 ecb64f1c9dbe..84ad4f836459 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,3 +1,5 @@
DIST metacity-3.32.0.tar.xz 2055388 BLAKE2B c8ed41e44b0a4890129fe7e79e2dcd486c986541c6b19b8873264f2c179b98c17095f19fbd93290ad253571d0c9ae5f5367df1fe1ba2ac68685139680a2e3afd SHA512 2260411b9ab07fcd1aee8152d700f1e2aa7f1f0753cae6dab82a55cac2cac186a5c9f42377a311a6f90a53ba8ba200d9f5d73a770abc76b558896cd58c30abde
+DIST metacity-3.34.1.tar.xz 2055708 BLAKE2B c1bac27f83d26718fa3d02f777a627324efc3e3eaffbf385a84dd97960adc30e84090f511500fe96a4fbbb373da80a38eaba4c5e14910fbcf8783857c0767ef2 SHA512 e9234ad0aee9fe27cf1c2030e31d8f2c292ae2ee2e9b8546ed86e396152faa9dc4cc67fa8321a0c3d3bf577a83bc143111c6ac225f423db243347a6a760695ee
EBUILD metacity-3.32.0.ebuild 1233 BLAKE2B 4bcaab355a10be79e9a5a2865463fadc773ec40308ca98774a828dda0dcf0a92b8cb1c0de36bd065f42b21ff9d6c07c0082b6526685cf77d596cdeffe310bfec SHA512 e28076ddbfd40149522a83f8cc16cb022554a592aedd29d8de6e62dec874315e676447867be428d6abe5a5ff9d136c279e83e17a2cf7fb1a9a20cbd0045b5cb9
+EBUILD metacity-3.34.1.ebuild 1233 BLAKE2B 6849286bfcc9997d335d7e842a6b03a6150707adae71c0f224b7d4dbe2fe41d3fbf0c89d18780b4f3b36dee20c01026171caa98cae840751b30ef8fe18550a96 SHA512 3519262f4f14a86750a3f833adcb8ef88282ef797c2c2a8c47531ff507d6f81713f336e8a04eb2573b9e485db427de10d7a4469a2b4a832994b48cbcc8c4c621
MISC metadata.xml 477 BLAKE2B 592b2957c7bff2b55505a056a2eef8d8cec25eecb400b5046bfbbd84eadfc6baa1f1475fd772a568538360c6867f0b5c0934d85bc5c6fd6ad362d80bad31ea33 SHA512 e475ae41ee3fa97f037acca5634bcb8ded17e783183459aeb83b3566df36fe7d09832991e9252f59e900982bcd0c80e8987bccc2c3e042080405d5448af9423a
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 122d27ff58e1..7680e72b7b54 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -5,6 +5,9 @@ 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
EBUILD mutter-3.26.2-r1.ebuild 4109 BLAKE2B a4073e48c06b2185bf37a22c509c1959c0855cb838151d91d9b697e4679bc7ec9438b92eaa6499ecfa0f6e389415254b64621d24efa6df9c0abc1a8711ec7c14 SHA512 05266bd54e4bc87fc0bab475354dae4670da1c1d64a6db7cfae3dace6069b78515c5a904d6542cfc471f5cc056b2204dbf95cdabbdf5d49e7854b0c98d8e3592
EBUILD mutter-3.32.2.ebuild 4619 BLAKE2B 09a4dca8c10a02d8aa1b211ba2c453b60f75c2e307c5d261bd9ab9ad028ef7337ea83c66f6425eaf9d64415732498f781cef066b888ede050a3b42801b523fd3 SHA512 fc14e72a1e2ae68997c0c9f55265d1ebef27f4b016830e5d3902e004270eace97229f09657406e29475544d98471364485f365b5bd5abada0f12bbef388dbe04
-MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
+EBUILD mutter-3.34.4.ebuild 4808 BLAKE2B 94f2e2aaf18bf001ca356b177dc732184584a696e791645ff316d0ce88123b52adc7fe63eae668cbce114f224411b47498fa3673aaee9959806619c1f362dbeb SHA512 b16883ed220092cad6c58ace2d55123059f0162cc31688b0a639e31c5975f6b45ba50e3e83ab5b93a4fb7ac6aef820467f44d12b535ca15a6804602dab7b272c
+MISC metadata.xml 662 BLAKE2B 500aef5ca1856da7a8027c1f69c30639791430cf7e94302de37edca6b8c85aa10f244bb85dcd193c1bab65854652b1999219c35fbe8eab49c33647a3b6a0b486 SHA512 b36d65b3f0bd8bf904cc3270b963d997eebe188ee98425a2cffe9df2e15dc28106baea2d0437972c8c211045200b979cd9fb6a902527efe2f6640380bed15801
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 becccfd2e7e6..f930998aa26c 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,3 +1,5 @@
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
EBUILD xfce4-clipman-plugin-1.4.3.ebuild 1084 BLAKE2B f8a4e2f86f7ba9cf3fec923f99b65a2c729c39d4e8163701aaf388e0fdc475f4ed8fb1238e436f96b625baa265896a3b97679d5a72589564c9d738d369b41a2b SHA512 beac46d153686f0099d5bd50c40d880bd4f1c0aa3a80e1eb7d29eae367269acf90d65fdecdaf85a9dcd885824dae0f5a4f8ddd979c35313ab5e31714896e49c7
+EBUILD xfce4-clipman-plugin-1.4.4.ebuild 1089 BLAKE2B 7df5c2140f9d281bacf349345556303975ff7dc09f3bc82afbb62bd45a5f1cd81388930bb67fd272c60d9d7fbaa646d429ca80556310ad0efe34d5d825a0f0d7 SHA512 e6fe757b4f57f890ddc6a0779a6ae4ff7a46f2fd7112fa73ebe1056f9c54d228fcdf9c4f76f61100c815bef0adfe60afbd12637fab7887c3d19302703727d679
MISC metadata.xml 344 BLAKE2B 2e5b2202a94c14c0b873c18bdbb7f02250049dbf45f23b82d44b2cb9fce79e7519a3fbc5f324b3c34f700ecf2314d051551283a5941ce16ff113b28f28852c3f SHA512 13ca7f9858f2eae8eaa1a4a43e371ab5b29433e1ac99ebe33d9678b7c3133d8e1639e146a93b6b4b1039278814d413d29e575a1a2784bbce0fcb50525e106065
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
+}