summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2020-11-18 00:26:38 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2020-11-18 00:26:38 +0000
commitb5898d3db0cd38c54bc48aaa7ecf6604fcbeeb34 (patch)
tree38460d16d1ed2ad1c82cc3d03f1447e88aa5b0c8
parentf3d958f484a4e2c2632c1ac65fe5d1bec3c19ebe (diff)
downloadbaldeagleos-repo-b5898d3db0cd38c54bc48aaa7ecf6604fcbeeb34.tar.gz
baldeagleos-repo-b5898d3db0cd38c54bc48aaa7ecf6604fcbeeb34.tar.xz
baldeagleos-repo-b5898d3db0cd38c54bc48aaa7ecf6604fcbeeb34.zip
Updating liguros repo
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.18.2-r2.ebuild2
-rw-r--r--app-office/libreoffice/Manifest3
-rw-r--r--app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch31
-rw-r--r--app-office/libreoffice/libreoffice-7.0.3.1.ebuild592
-rw-r--r--app-portage/pfl/pfl-3.1-r1.ebuild2
-rw-r--r--app-portage/portage-utils/Manifest1
-rw-r--r--app-portage/portage-utils/portage-utils-0.90.1.ebuild71
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild2
-rw-r--r--dev-go/go-bindata/Manifest2
-rw-r--r--dev-go/go-bindata/go-bindata-3.1.3.ebuild19
-rw-r--r--dev-go/go-bindata/go-bindata-3.21.0.ebuild20
-rw-r--r--dev-go/go-bindata/metadata.xml20
-rw-r--r--dev-lang/duktape/duktape-2.5.0-r1.ebuild2
-rw-r--r--dev-lang/mujs/mujs-1.0.9.ebuild2
-rw-r--r--dev-libs/botan/botan-2.16.0.ebuild2
-rw-r--r--dev-libs/hiredis/hiredis-1.0.0.ebuild2
-rw-r--r--dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild2
-rw-r--r--dev-libs/libclangformat-ide/metadata.xml4
-rw-r--r--dev-libs/libusb/libusb-1.0.23-r1.ebuild2
-rw-r--r--dev-libs/nspr/nspr-4.29.ebuild2
-rw-r--r--dev-libs/nss/nss-3.58-r2.ebuild2
-rw-r--r--dev-libs/popt/popt-1.18.ebuild2
-rw-r--r--dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild2
-rw-r--r--dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild2
-rw-r--r--dev-python/coverage/coverage-5.3.ebuild2
-rw-r--r--dev-python/distlib/distlib-0.3.1-r1.ebuild2
-rw-r--r--dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild2
-rw-r--r--dev-python/greenlet/greenlet-0.4.17.ebuild2
-rw-r--r--dev-python/lit/lit-11.0.0.ebuild2
-rw-r--r--dev-python/lmdb/lmdb-1.0.0.ebuild2
-rw-r--r--dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild2
-rw-r--r--dev-python/multidict/multidict-5.0.0.ebuild2
-rw-r--r--dev-python/nbformat/nbformat-5.0.8.ebuild2
-rw-r--r--dev-python/odfpy/odfpy-1.3.6.ebuild14
-rw-r--r--dev-python/openstacksdk/openstacksdk-0.50.0.ebuild2
-rw-r--r--dev-python/os-client-config/os-client-config-2.1.0.ebuild2
-rw-r--r--dev-python/os-ken/os-ken-1.2.0.ebuild2
-rw-r--r--dev-python/os-testr/os-testr-2.0.0.ebuild2
-rw-r--r--dev-python/osc-lib/osc-lib-2.2.1.ebuild2
-rw-r--r--dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild2
-rw-r--r--dev-python/oslo-config/oslo-config-8.3.2.ebuild2
-rw-r--r--dev-python/oslo-context/oslo-context-3.1.1.ebuild2
-rw-r--r--dev-python/oslo-log/oslo-log-4.4.0.ebuild2
-rw-r--r--dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild2
-rw-r--r--dev-python/oslo-utils/oslo-utils-4.6.0.ebuild2
-rw-r--r--dev-python/owslib/owslib-0.20.0.ebuild2
-rw-r--r--dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild1
-rw-r--r--dev-python/passlib/passlib-1.7.4.ebuild2
-rw-r--r--dev-python/pycairo/pycairo-1.20.0.ebuild2
-rw-r--r--dev-python/pyproj/pyproj-2.6.1_p1.ebuild2
-rw-r--r--dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild2
-rw-r--r--dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild2
-rw-r--r--dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild2
-rw-r--r--dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild2
-rw-r--r--dev-python/python-ldap/python-ldap-3.3.1.ebuild2
-rw-r--r--dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild1
-rw-r--r--dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild2
-rw-r--r--dev-python/testfixtures/testfixtures-6.15.0.ebuild2
-rw-r--r--dev-python/virtualenv/virtualenv-20.0.35.ebuild2
-rw-r--r--dev-python/yarl/yarl-1.6.2.ebuild2
-rw-r--r--dev-python/zope-interface/zope-interface-5.1.2.ebuild2
-rw-r--r--dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild2
-rw-r--r--dev-ruby/sdoc/sdoc-1.1.0.ebuild2
-rw-r--r--dev-scheme/guile/guile-2.2.7.ebuild2
-rw-r--r--dev-tcltk/tcllib/tcllib-1.20.ebuild2
-rw-r--r--dev-util/debugedit/debugedit-4.16.0.ebuild2
-rw-r--r--dev-util/lldb/lldb-11.0.0.ebuild2
-rw-r--r--dev-util/ninja/ninja-1.10.1.ebuild2
-rw-r--r--games-board/mah-jong/Manifest2
-rw-r--r--games-board/mah-jong/mah-jong-1.14-r1.ebuild47
-rw-r--r--games-board/mah-jong/mah-jong-1.16.ebuild55
-rw-r--r--mail-client/claws-mail/claws-mail-3.17.7.ebuild2
-rw-r--r--mail-mta/courier/courier-1.0.14.ebuild2
-rw-r--r--media-gfx/fbida/fbida-2.14-r2.ebuild2
-rw-r--r--media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild2
-rw-r--r--media-libs/freetype/freetype-2.10.4.ebuild2
-rw-r--r--media-libs/libjpeg-turbo/Manifest1
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild118
-rw-r--r--media-libs/libpng/libpng-1.6.37-r2.ebuild2
-rw-r--r--media-libs/mutagen/mutagen-1.45.1.ebuild2
-rw-r--r--media-libs/opencolorio/opencolorio-1.1.1.ebuild2
-rw-r--r--media-sound/musescore/musescore-3.5.2.ebuild2
-rw-r--r--net-dns/libidn/libidn-1.36.ebuild2
-rw-r--r--net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch11
-rw-r--r--net-ftp/lftp/files/lftp-4.9.0-ipv6.patch18
-rw-r--r--net-im/zoom/Manifest1
-rw-r--r--net-im/zoom/zoom-5.4.54779.1115.ebuild106
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.71.0.ebuild2
-rw-r--r--net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild2
-rw-r--r--net-libs/http-parser/http-parser-2.9.4-r1.ebuild2
-rw-r--r--net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild2
-rw-r--r--net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild2
-rw-r--r--net-libs/nodejs/nodejs-12.19.1.ebuild2
-rw-r--r--net-libs/nodejs/nodejs-14.15.1.ebuild2
-rw-r--r--net-misc/electrum/electrum-4.0.4.ebuild2
-rw-r--r--net-misc/openntpd/openntpd-6.2_p3-r2.ebuild2
-rw-r--r--net-print/hplip/hplip-3.20.9-r3.ebuild2
-rw-r--r--profiles/package.mask/00-gentoo16
-rw-r--r--sci-geosciences/qgis/qgis-3.16.0-r1.ebuild2
-rw-r--r--sci-libs/cln/cln-1.3.6.ebuild2
-rw-r--r--sci-libs/indilib/indilib-1.8.3.ebuild2
-rw-r--r--sci-libs/indilib/indilib-1.8.6.ebuild2
-rw-r--r--sci-libs/shapely/shapely-1.7.1.ebuild2
-rw-r--r--sys-apps/acl/acl-2.2.53-r1.ebuild2
-rw-r--r--sys-apps/attr/attr-2.4.48-r4.ebuild2
-rw-r--r--sys-apps/less/less-563-r1.ebuild2
-rw-r--r--sys-apps/policycoreutils/policycoreutils-3.1.ebuild5
-rw-r--r--sys-apps/policycoreutils/policycoreutils-9999.ebuild5
-rw-r--r--sys-auth/fingerprint-gui/Manifest1
-rw-r--r--sys-auth/fingerprint-gui/fingerprint-gui-1.09-r1.ebuild113
-rw-r--r--sys-auth/fingerprint-gui/metadata.xml9
-rw-r--r--sys-auth/rtkit/rtkit-0.13-r1.ebuild2
-rw-r--r--sys-cluster/pacemaker/Manifest2
-rw-r--r--sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild (renamed from sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild)0
-rw-r--r--sys-devel/clang-common/clang-common-11.0.0.ebuild2
-rw-r--r--sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild2
-rw-r--r--sys-devel/clang/clang-11.0.0.ebuild2
-rw-r--r--sys-devel/lld/lld-11.0.0.ebuild2
-rw-r--r--sys-devel/llvm-common/llvm-common-11.0.0.ebuild2
-rw-r--r--sys-devel/llvm/llvm-11.0.0.ebuild2
-rw-r--r--sys-devel/llvmgold/llvmgold-11.ebuild2
-rw-r--r--sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild2
-rw-r--r--sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild2
-rw-r--r--sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild2
-rw-r--r--sys-libs/gdbm/gdbm-1.18.1-r1.ebuild2
-rw-r--r--sys-libs/libcxx/libcxx-11.0.0.ebuild2
-rw-r--r--sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild2
-rw-r--r--sys-libs/libomp/libomp-11.0.0.ebuild2
-rw-r--r--sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild2
-rw-r--r--sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild2
-rw-r--r--virtual/udev/udev-217-r2.ebuild2
-rw-r--r--www-apache/libapreq2/Manifest1
-rw-r--r--www-apache/libapreq2/libapreq2-2.15.ebuild72
-rw-r--r--www-apps/chromedriver-bin/Manifest2
-rw-r--r--www-apps/chromedriver-bin/chromedriver-bin-87.0.4280.20.ebuild (renamed from www-apps/chromedriver-bin/chromedriver-bin-86.0.4240.22.ebuild)0
-rw-r--r--www-client/firefox/firefox-78.5.0.ebuild2
-rw-r--r--www-client/google-chrome/Manifest2
-rw-r--r--www-client/google-chrome/google-chrome-87.0.4280.66.ebuild (renamed from www-client/google-chrome/google-chrome-86.0.4240.198.ebuild)5
-rw-r--r--www-plugins/chrome-binary-plugins/Manifest2
-rw-r--r--www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.66.ebuild (renamed from www-plugins/chrome-binary-plugins/chrome-binary-plugins-86.0.4240.198.ebuild)0
-rw-r--r--www-servers/pshs/pshs-0.4.1.ebuild2
-rw-r--r--x11-wm/icewm/icewm-1.8.3.ebuild2
-rw-r--r--xfce-base/thunar/thunar-1.8.16.ebuild2
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild2
-rw-r--r--xfce-base/xfwm4/xfwm4-4.14.6.ebuild2
-rw-r--r--xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild2
146 files changed, 485 insertions, 1104 deletions
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r2.ebuild
index fbb61e84e48f..1edf1c1527f4 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
# Test suite requires network access
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 20a3ec8e5f19..77502cb3e9f8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,10 +19,7 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
DIST libreoffice-6.4.6.2.tar.xz 232180876 BLAKE2B b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654 SHA512 377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
-DIST libreoffice-7.0.3.1.tar.xz 240706432 BLAKE2B 4bf075fedb445a60a971adfb029fb7843afab1ee2009d32b149c91970d8eae990e4ac3ea7075d58815288f1f174846e0e9de7ce00655840ad97622a3790b43a2 SHA512 1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
-DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 3b0e845087fe0bd25ad3c06b8a8eac548f05568cf279efc10f7190ee51e8a9922c64749ad57c21b150aaac9b3249a6e184583f389a191fc6b86128153ff363be SHA512 1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78
-DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
diff --git a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch
deleted file mode 100644
index da085ace08f2..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5f3f17a9c64e33fb787a79dc94d902147da77d71 Mon Sep 17 00:00:00 2001
-From: Noel Grandin <noelgrandin@gmail.com>
-Date: Sat, 19 Sep 2020 20:38:29 +0200
-Subject: fix non-pdfium build
-
-Change-Id: Ic1e30a412927748ba58a21cf2ee922cd1a490aa4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103040
-Tested-by: Jenkins
-Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
----
- vcl/source/filter/ipdf/pdfread.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'vcl/source/filter/ipdf/pdfread.cxx')
-
-diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
-index 39c2933be8d5..a9b079a75bc3 100644
---- a/vcl/source/filter/ipdf/pdfread.cxx
-+++ b/vcl/source/filter/ipdf/pdfread.cxx
-@@ -220,7 +220,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector<Bitmap>& rBi
- (void)rBitmaps;
- (void)nFirstPage;
- (void)nPages;
-- (void)fResolutionDPI;
-+ (void)pSizeHint;
- return 0;
- #endif // HAVE_FEATURE_PDFIUM
- }
---
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
deleted file mode 100644
index df70d6f9ea08..000000000000
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ /dev/null
@@ -1,592 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
- # not packaged in Gentoo, QR code generating library for >=libreoffice-6.4, https://bugs.gentoo.org/691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.9
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.9 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- "${FILESDIR}/${PN}-7.0.3.1-fix-non-pdfium-build.patch"
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://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_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --without-system-qrcodegen: see https://bugs.gentoo.org/691740
- # --disable-pdfium: not yet packaged
- # --without-system-qrencode: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-portage/pfl/pfl-3.1-r1.ebuild b/app-portage/pfl/pfl-3.1-r1.ebuild
index 44afdbf92863..2c76296bb266 100644
--- a/app-portage/pfl/pfl-3.1-r1.ebuild
+++ b/app-portage/pfl/pfl-3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="+network-cron"
DEPEND=""
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 9b4dc1f0425c..8ca3a26ec03f 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,3 +1,4 @@
DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0 SHA512 a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
DIST portage-utils-0.89.tar.xz 1775088 BLAKE2B 6218cd3a5a435622366550857753529b38a8c2c9dbc2c9d72d3ce8517679fb782caded843807cebd606294a5ecb6dd110311e8da95d54626126b091ee902ab1d SHA512 c285901f1200f0ee81a4cd12840f5b4938fa525ce3611458287d6f5439c78b9ecf5ec0dc40d759fe5e6a848d4fd13b6d9ac38222ebf2c4453a60f9fdb842a55c
+DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
diff --git a/app-portage/portage-utils/portage-utils-0.90.1.ebuild b/app-portage/portage-utils/portage-utils-0.90.1.ebuild
new file mode 100644
index 000000000000..f859bc27df3e
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.90.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest +qtegrity libressl"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+RDEPEND="
+ qmanifest? (
+ openmp? (
+ || (
+ >=sys-devel/gcc-4.2:*[openmp]
+ sys-devel/clang-runtime:*[openmp]
+ )
+ )
+ static? (
+ app-crypt/libb2:=[static-libs]
+ !libressl? ( dev-libs/openssl:0=[static-libs] )
+ libressl? ( dev-libs/libressl:0=[static-libs] )
+ sys-libs/zlib:=[static-libs]
+ app-crypt/gpgme:=[static-libs]
+ )
+ !static? (
+ app-crypt/libb2:=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sys-libs/zlib:=
+ app-crypt/gpgme:=
+ )
+ )
+ qtegrity? (
+ openmp? (
+ || (
+ >=sys-devel/gcc-4.2:*[openmp]
+ sys-devel/clang-runtime:*[openmp]
+ )
+ )
+ static? (
+ !libressl? ( dev-libs/openssl:0=[static-libs] )
+ libressl? ( dev-libs/libressl:0=[static-libs] )
+ )
+ !static? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf \
+ --disable-maintainer-mode \
+ --with-eprefix="${EPREFIX}" \
+ $(use_enable qmanifest) \
+ $(use_enable qtegrity) \
+ $(use_enable openmp) \
+ $(use_enable static)
+}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild
index d4e7b9b6798b..7bfdc2708637 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index bab3f4c9d656..e89354dd767c 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1 +1 @@
-DIST go-bindata-3.21.0.tar.gz 15615959 BLAKE2B b635869202025992a7f92645de7aa96fadd18f5c99d5e312a1e645712940d05342e192401eb5aec04aac72c50b17d1fe370ef317356d47a40141cec3dc8f01a7 SHA512 004b9f0389d26f82d1419e8e8ad249d33583e85c4b4aaa4e36215bd5289a24146a237bcb55b9d51ff29c1b01ebd822ff60dcf205cb73d34f810e6838df172265
+DIST go-bindata-3.1.3.tar.gz 21280 BLAKE2B cf54b50113006f02eeab47312fcf1eaa1e4b820847ee9c579318a5aac0b720648f73cbf3d2d41e120ea79b65dc3dcfa32accaff16ed4610bcf9a9dd317e9d819 SHA512 870f939cfb07b43c54000d39fa37e8151ca5c20d13eac9bde59e7ec3e2693d8386a1ea4b5372171dac42f8a4f69a754445cb9a4fa51a7a7ba9ec54f3e8a2a2f6
diff --git a/dev-go/go-bindata/go-bindata-3.1.3.ebuild b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
new file mode 100644
index 000000000000..10d5d8179d7e
--- /dev/null
+++ b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/go-bindata/go-bindata/..."
+KEYWORDS="amd64 ~arm ~arm64"
+
+DESCRIPTION="A small utility which generates Go code from any file"
+HOMEPAGE="https://github.com/go-bindata/go-bindata"
+SRC_URI="https://github.com/go-bindata/go-bindata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="CC-PD"
+SLOT="0/${PVR}"
+
+src_install() {
+ GOBIN=${S}/bin \
+ golang-build_src_install
+ dobin bin/*
+}
diff --git a/dev-go/go-bindata/go-bindata-3.21.0.ebuild b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
deleted file mode 100644
index 02d914964278..000000000000
--- a/dev-go/go-bindata/go-bindata-3.21.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Go Overlay Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NOTE: The original github.com/jteeuwen/go-bindata is no more maintained.
-# Instead, we use a fork which is API compatible.
-# For more details, see https://github.com/Dr-Terrible/go-overlay/issues/76
-GOLANG_PKG_IMPORTPATH="github.com/kevinburke"
-GOLANG_PKG_ARCHIVEPREFIX="v"
-GOLANG_PKG_IS_MULTIPLE=1
-GOLANG_PKG_HAVE_TEST=1
-
-inherit golang-single
-
-DESCRIPTION="A small utility for embedding binary data in a GoLang program."
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
index 0afda6620771..8c1d74d431e9 100644
--- a/dev-go/go-bindata/metadata.xml
+++ b/dev-go/go-bindata/metadata.xml
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>toffanin.mauro@gmail.com</email>
- <name>Mauro Toffanin</name>
- <description>Maintainer. Assign bugs to him</description>
- </maintainer>
+ <maintainer type="project">
+ <email>dev@liguros.net</email>
+ <name>Development</name>
+ </maintainer>
<upstream>
- <bugs-to>https://github.com/jteeuwen/go-bindata/issues</bugs-to>
+ <remote-id type="github">jteeuwen/go-bindata</remote-id>
</upstream>
- <longdescription lang="en">
- This package converts any file into managable Go source code. Useful for
- embedding binary data into a go program. The file data is optionally
- gzip compressed before being converted to a raw byte slice.
- </longdescription>
- <origin>go-overlay</origin>
+ <origin>ports</origin>
</pkgmetadata>
diff --git a/dev-lang/duktape/duktape-2.5.0-r1.ebuild b/dev-lang/duktape/duktape-2.5.0-r1.ebuild
index 392ef9302b37..3f817f751d2b 100644
--- a/dev-lang/duktape/duktape-2.5.0-r1.ebuild
+++ b/dev-lang/duktape/duktape-2.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://duktape.org/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
IUSE=""
DEPEND=""
diff --git a/dev-lang/mujs/mujs-1.0.9.ebuild b/dev-lang/mujs/mujs-1.0.9.ebuild
index d987ee84cc74..5e989016cc43 100644
--- a/dev-lang/mujs/mujs-1.0.9.ebuild
+++ b/dev-lang/mujs/mujs-1.0.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC"
# subslot matches SONAME
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs"
RDEPEND="sys-libs/readline:0="
diff --git a/dev-libs/botan/botan-2.16.0.ebuild b/dev-libs/botan/botan-2.16.0.ebuild
index 2f18e70b7b76..cf885b04f897 100644
--- a/dev-libs/botan/botan-2.16.0.ebuild
+++ b/dev-libs/botan/botan-2.16.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD-2"
SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
index 33ae5c527a85..5ca5e35b261c 100644
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris"
IUSE="examples ssl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index 5d57bab77681..4a119c079871 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="|| ( public-domain MIT )"
SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libclangformat-ide/metadata.xml b/dev-libs/libclangformat-ide/metadata.xml
index 4c59ffa5ce30..b295d2b34c2d 100644
--- a/dev-libs/libclangformat-ide/metadata.xml
+++ b/dev-libs/libclangformat-ide/metadata.xml
@@ -5,9 +5,5 @@
<email>zx2c4@gentoo.org</email>
<name>Jason A. Donenfeld</name>
</maintainer>
- <maintainer type="person">
- <email>pesa@gentoo.org</email>
- <name>Davide Pesavento</name>
- </maintainer>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-libs/libusb/libusb-1.0.23-r1.ebuild b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
index de58b15aa4ef..32e1df38e1a6 100644
--- a/dev-libs/libusb/libusb-1.0.23-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc examples static-libs test udev"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/nspr/nspr-4.29.ebuild b/dev-libs/nspr/nspr-4.29.ebuild
index eec38b819881..d16b52ec47cb 100644
--- a/dev-libs/nspr/nspr-4.29.ebuild
+++ b/dev-libs/nspr/nspr-4.29.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/nss-3.58-r2.ebuild b/dev-libs/nss/nss-3.58-r2.ebuild
index a90ad4c67ec5..38528576dc70 100644
--- a/dev-libs/nss/nss-3.58-r2.ebuild
+++ b/dev-libs/nss/nss-3.58-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cacert utils"
# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
RDEPEND="
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index 51c8d3587b92..713c1120f69a 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
IUSE="nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
index 6e7920922763..b47188055827 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
LICENSE="BSD-2"
# Subslot == SONAME version
SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
index 3dd40d5d76c4..5db99dbbfb29 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Self Contained RDBMS in a DBI Driver"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="test system-sqlite"
RESTRICT="!test? ( test )"
diff --git a/dev-python/coverage/coverage-5.3.ebuild b/dev-python/coverage/coverage-5.3.ebuild
index 3f0d6ca363f3..44b7c17141ba 100644
--- a/dev-python/coverage/coverage-5.3.ebuild
+++ b/dev-python/coverage/coverage-5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
#IUSE="test"
# The tests are impossible to appease. Please run them externally
# via tox. Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
index 3d363048e2e7..5bdc90240bb0 100644
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.3.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
IUSE="test"
# This package's tests are extremely fragile and tend to break or hang
# when it doesn't like metadata of packages installed on the system.
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
index 1154927e4703..f1c37a2f5b41 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="~amd64 arm64 x86"
distutils_enable_tests pytest
diff --git a/dev-python/greenlet/greenlet-0.4.17.ebuild b/dev-python/greenlet/greenlet-0.4.17.ebuild
index b8a3574636a2..8a1c0289d6a9 100644
--- a/dev-python/greenlet/greenlet-0.4.17.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/lit/lit-11.0.0.ebuild b/dev-python/lit/lit-11.0.0.ebuild
index 46922973db5c..14fff54955a0 100644
--- a/dev-python/lit/lit-11.0.0.ebuild
+++ b/dev-python/lit/lit-11.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lmdb/lmdb-1.0.0.ebuild b/dev-python/lmdb/lmdb-1.0.0.ebuild
index 6f1c63fa791c..86e1ab79d5df 100644
--- a/dev-python/lmdb/lmdb-1.0.0.ebuild
+++ b/dev-python/lmdb/lmdb-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="OPENLDAP"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-db/lmdb:="
DEPEND="${RDEPEND}"
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
index e95aef0f0c56..22602b7991b9 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
IUSE=""
RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/multidict/multidict-5.0.0.ebuild b/dev-python/multidict/multidict-5.0.0.ebuild
index bce0c324c147..fd7511510858 100644
--- a/dev-python/multidict/multidict-5.0.0.ebuild
+++ b/dev-python/multidict/multidict-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
BDEPEND="
>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbformat/nbformat-5.0.8.ebuild b/dev-python/nbformat/nbformat-5.0.8.ebuild
index ef53ed01d26f..30464adb0eb4 100644
--- a/dev-python/nbformat/nbformat-5.0.8.ebuild
+++ b/dev-python/nbformat/nbformat-5.0.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="~amd64 arm64 x86"
RDEPEND="
>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/odfpy/odfpy-1.3.6.ebuild b/dev-python/odfpy/odfpy-1.3.6.ebuild
index 9b7fe5b1c10b..caa39b8d69e3 100644
--- a/dev-python/odfpy/odfpy-1.3.6.ebuild
+++ b/dev-python/odfpy/odfpy-1.3.6.ebuild
@@ -3,9 +3,6 @@
EAPI=7
-# Classifier: Programming Language :: Python :: 2 :: Only
-# py3 fails one test, pypy anpother.
-# Notes on page of home repo reports support of python3.
PYTHON_COMPAT=( python3_{5,6,7,8,9} )
inherit distutils-r1
@@ -17,16 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
- pytest -v || die "Tests failed with ${EPYTHON}"
-}
+distutils_enable_tests pytest
python_install_all() {
if use examples; then
diff --git a/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
index f3c4d9fa36de..1e0dd7f1cde9 100644
--- a/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/os-client-config-2.1.0.ebuild b/dev-python/os-client-config/os-client-config-2.1.0.ebuild
index ac9549537864..ecf52caede58 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
IUSE=""
CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-ken/os-ken-1.2.0.ebuild b/dev-python/os-ken/os-ken-1.2.0.ebuild
index 80033011b582..cb12672b6799 100644
--- a/dev-python/os-ken/os-ken-1.2.0.ebuild
+++ b/dev-python/os-ken/os-ken-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os-ken-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
IUSE=""
DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-testr/os-testr-2.0.0.ebuild b/dev-python/os-testr/os-testr-2.0.0.ebuild
index dad3302204ea..9ede5a66be67 100644
--- a/dev-python/os-testr/os-testr-2.0.0.ebuild
+++ b/dev-python/os-testr/os-testr-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/osc-lib/osc-lib-2.2.1.ebuild b/dev-python/osc-lib/osc-lib-2.2.1.ebuild
index ba5401336d27..117b88e64015 100644
--- a/dev-python/osc-lib/osc-lib-2.2.1.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
index 3387817524cb..40759847899b 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
IUSE=""
RESTRICT=""
diff --git a/dev-python/oslo-config/oslo-config-8.3.2.ebuild b/dev-python/oslo-config/oslo-config-8.3.2.ebuild
index a0600d0731ae..6b775a8a2a73 100644
--- a/dev-python/oslo-config/oslo-config-8.3.2.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.3.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-context/oslo-context-3.1.1.ebuild b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
index 08eec7c58bad..a98eb33aa488 100644
--- a/dev-python/oslo-context/oslo-context-3.1.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.context-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-log/oslo-log-4.4.0.ebuild b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
index 589127d40339..c50d8ce3121a 100644
--- a/dev-python/oslo-log/oslo-log-4.4.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.log-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild
index fc907a4df19c..f6b99599ff2a 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
index 99f87f4b39c7..1bb98a5750d9 100644
--- a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/owslib/owslib-0.20.0.ebuild b/dev-python/owslib/owslib-0.20.0.ebuild
index a901ed6ac69c..6bac5de44044 100644
--- a/dev-python/owslib/owslib-0.20.0.ebuild
+++ b/dev-python/owslib/owslib-0.20.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/OWSLib-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 01316a2fbe99..c0a3b72b1f68 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -14,7 +14,6 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/passlib/passlib-1.7.4.ebuild b/dev-python/passlib/passlib-1.7.4.ebuild
index 33717c3390b3..4d3a5983a8c4 100644
--- a/dev-python/passlib/passlib-1.7.4.ebuild
+++ b/dev-python/passlib/passlib-1.7.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
SLOT="0"
IUSE="+bcrypt doc +scrypt +totp"
diff --git a/dev-python/pycairo/pycairo-1.20.0.ebuild b/dev-python/pycairo/pycairo-1.20.0.ebuild
index 8dc0b84f4aff..f96efea72c53 100644
--- a/dev-python/pycairo/pycairo-1.20.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="examples"
BDEPEND="
diff --git a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild b/dev-python/pyproj/pyproj-2.6.1_p1.ebuild
index 457c8d466c4f..c1ce0936e020 100644
--- a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild
+++ b/dev-python/pyproj/pyproj-2.6.1_p1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_p/.post}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux"
IUSE="doc"
RDEPEND=">=sci-libs/proj-6.2.0:="
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
index d0346efb33b0..73d0f3d5a884 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
RDEPEND="
dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
index f7bc66c54f92..b574e38882a3 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MPL-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
"
diff --git a/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
index f9693844ac8e..e4a933f3e615 100644
--- a/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild b/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild
index 62ceb4e0a8cf..da5674cfba94 100644
--- a/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ldap/python-ldap-3.3.1.ebuild b/dev-python/python-ldap/python-ldap-3.3.1.ebuild
index a570002bb365..775436269d38 100644
--- a/dev-python/python-ldap/python-ldap-3.3.1.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
fi
LICENSE="PSF-2"
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index 1e6c09641a93..7119af9cb70a 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -15,6 +15,5 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
index eeb6567ce9fa..bb2dff87d590 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="examples +sqlite test"
REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/testfixtures/testfixtures-6.15.0.ebuild b/dev-python/testfixtures/testfixtures-6.15.0.ebuild
index 31817303684f..3a9b162be1c6 100644
--- a/dev-python/testfixtures/testfixtures-6.15.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
test? (
diff --git a/dev-python/virtualenv/virtualenv-20.0.35.ebuild b/dev-python/virtualenv/virtualenv-20.0.35.ebuild
index 470272aef1b9..39d0f5104be2 100644
--- a/dev-python/virtualenv/virtualenv-20.0.35.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.35.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/yarl/yarl-1.6.2.ebuild b/dev-python/yarl/yarl-1.6.2.ebuild
index b2083f19f565..3a1ea7f2a570 100644
--- a/dev-python/yarl/yarl-1.6.2.ebuild
+++ b/dev-python/yarl/yarl-1.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/zope-interface-5.1.2.ebuild b/dev-python/zope-interface/zope-interface-5.1.2.ebuild
index c0fe271fbb35..389a06a33cab 100644
--- a/dev-python/zope-interface/zope-interface-5.1.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
index b0074af8ecdc..cb4afb5e8307 100644
--- a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
+++ b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ppc"
COMMON_DEPEND="dev-lang/duktape"
DEPEND+="${COMMON_DEPEND}"
diff --git a/dev-ruby/sdoc/sdoc-1.1.0.ebuild b/dev-ruby/sdoc/sdoc-1.1.0.ebuild
index a250697e85d7..2eba8de69eea 100644
--- a/dev-ruby/sdoc/sdoc-1.1.0.ebuild
+++ b/dev-ruby/sdoc/sdoc-1.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://rubygems.org/gems/sdoc"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ppc ~x86"
IUSE="test"
ruby_add_rdepend ">=dev-ruby/rdoc-5.0"
diff --git a/dev-scheme/guile/guile-2.2.7.ebuild b/dev-scheme/guile/guile-2.2.7.ebuild
index ca0da03540fc..4ec74c9beba6 100644
--- a/dev-scheme/guile/guile-2.2.7.ebuild
+++ b/dev-scheme/guile/guile-2.2.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
REQUIRED_USE="regex" # workaround for bug 596322
RESTRICT="strip"
diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
index e1a5aba66b4d..9ab05694f9a5 100644
--- a/dev-tcltk/tcllib/tcllib-1.20.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
IUSE="examples"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RESTRICT="!test? ( test )"
RDEPEND="
diff --git a/dev-util/debugedit/debugedit-4.16.0.ebuild b/dev-util/debugedit/debugedit-4.16.0.ebuild
index 73711976ffde..dc3a711d8087 100644
--- a/dev-util/debugedit/debugedit-4.16.0.ebuild
+++ b/dev-util/debugedit/debugedit-4.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-util/lldb/lldb-11.0.0.ebuild b/dev-util/lldb/lldb-11.0.0.ebuild
index e925512a93ea..481e4d19c45a 100644
--- a/dev-util/lldb/lldb-11.0.0.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
IUSE="libedit lzma ncurses +python test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RESTRICT="test"
diff --git a/dev-util/ninja/ninja-1.10.1.ebuild b/dev-util/ninja/ninja-1.10.1.ebuild
index 4fa91eecab51..b824db5838cb 100644
--- a/dev-util/ninja/ninja-1.10.1.ebuild
+++ b/dev-util/ninja/ninja-1.10.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/games-board/mah-jong/Manifest b/games-board/mah-jong/Manifest
index c6b27f6a6784..c96def872312 100644
--- a/games-board/mah-jong/Manifest
+++ b/games-board/mah-jong/Manifest
@@ -1 +1 @@
-DIST mj-1.14-src.tar.gz 414414 BLAKE2B 88aa315e629dd6c1155de38897925c99a742054778721f23c4e95b0b82667ad737246a92a1e9e18aa72e8e5b118d7c5bc5e8eb7ac9d0aab51b946a154627a584 SHA512 b4c631ce388041475b877cd4b413fda200932aea19212c00cb606d2ef0bb6a498fe12b7b52b04ef744b296c37c531bc44d9e35f9aed44edf89651580acde91e5
+DIST mj-1.16-src.tar.gz 403981 BLAKE2B fe04caa61c6b2b16be1799903ba222fe4ea6b177fa68c76c66a24fbf3ac8c02420f32a253fc1f7bc7fdb9bd371b294c2debd0492ae1071570f28dc69f22ba5f4 SHA512 9a4a4947670facaea6230aa9b143dab4bc7546b6e8b9c85726ac0b5e4d1f1760736072a27075cf2cce82cd8fdf2eb031f81e604fa0da6c05c7ac68c7da4b497e
diff --git a/games-board/mah-jong/mah-jong-1.14-r1.ebuild b/games-board/mah-jong/mah-jong-1.14-r1.ebuild
deleted file mode 100644
index 81dce8f21b66..000000000000
--- a/games-board/mah-jong/mah-jong-1.14-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-MY_P="mj-${PV}-src"
-DESCRIPTION="A networked Mah Jong program, together with a computer player"
-HOMEPAGE="https://www.stevens-bradfield.com/MahJong/"
-SRC_URI="http://mahjong.julianbradfield.org/Source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- sed -i -e '/^.TH/ s/1/6/' xmj.man || die
- sed -i \
- -e "/^DESTDIR =/ s:=.*:= ${D}:" \
- -e "/^BINDIR =/ s:=.*:= /usr/bin:" \
- -e '/^MANDIR =/ s:man/man1:/usr/share/man/man6:' \
- -e '/^MANSUFFIX =/ s:1:6:' \
- -e "/^CC =/ s:gcc:$(tc-getCC):" \
- -e "/^CFLAGS =/ s:=:= ${CFLAGS}:" \
- -e "/^LDLIBS =/ s:$:${LDFLAGS}:" \
- -e '/^INSTPGMFLAGS =/ s:-s::' \
- -e '/^CDEBUGFLAGS =/d' \
- -e "/^TILESETPATH=/ s:NULL:\"/usr/share/${PN}/\":" Makefile || die
-}
-
-src_install() {
- emake install install.man
- insinto /usr/share/${PN}
- doins -r fallbacktiles/ tiles-numbered/ tiles-small/
- newicon tiles-v1/tongE.xpm ${PN}.xpm
- make_desktop_entry xmj Mah-Jong ${PN}
- dodoc CHANGES ChangeLog *.txt
-}
diff --git a/games-board/mah-jong/mah-jong-1.16.ebuild b/games-board/mah-jong/mah-jong-1.16.ebuild
new file mode 100644
index 000000000000..0d457c6c2d37
--- /dev/null
+++ b/games-board/mah-jong/mah-jong-1.16.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg
+
+MY_P="mj-${PV}-src"
+DESCRIPTION="A networked Mah Jong program, together with a computer player"
+HOMEPAGE="https://mahjong.julianbradfield.org/"
+SRC_URI="https://mahjong.julianbradfield.org/Source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+ sed -i -e '/^.TH/ s/1/6/' xmj.man || die
+}
+
+src_compile() {
+ # TILESETPATH value is passed as "char*" into "gui.c"
+ emake \
+ CC="$(tc-getCC)" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ EXTRA_LDOPTIONS="${LDFLAGS}" \
+ CDEBUGFLAGS= \
+ TILESETPATH="\"${EPREFIX}/usr/share/${PN}/\""
+}
+
+src_install() {
+ emake \
+ DESTDIR="${ED}" \
+ BINDIR="/usr/bin" \
+ MANDIR="/usr/share/man/man6" \
+ MANSUFFIX=6 \
+ INSTPGMFLAGS= \
+ install install.man
+
+ insinto "/usr/share/${PN}"
+ doins -r fallbacktiles/ tiles-numbered/ tiles-small/
+ newicon tiles-v1/tongE.xpm "${PN}.xpm"
+ make_desktop_entry xmj Mah-Jong "${PN}"
+ dodoc CHANGES ChangeLog *.txt
+}
diff --git a/mail-client/claws-mail/claws-mail-3.17.7.ebuild b/mail-client/claws-mail/claws-mail-3.17.7.ebuild
index 92d042602969..81c3de08b2e5 100644
--- a/mail-client/claws-mail/claws-mail-3.17.7.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.7.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
else
SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
fi
SLOT="0"
diff --git a/mail-mta/courier/courier-1.0.14.ebuild b/mail-mta/courier/courier-1.0.14.ebuild
index ab91466b5664..6f5990c95e80 100644
--- a/mail-mta/courier/courier-1.0.14.ebuild
+++ b/mail-mta/courier/courier-1.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 s390 sparc x86"
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
diff --git a/media-gfx/fbida/fbida-2.14-r2.ebuild b/media-gfx/fbida/fbida-2.14-r2.ebuild
index 8ab68490c7d7..46e671b8cc49 100644
--- a/media-gfx/fbida/fbida-2.14-r2.ebuild
+++ b/media-gfx/fbida/fbida-2.14-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
"
LICENSE="GPL-2 IJG"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ppc ppc64 sparc x86"
IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
REQUIRED_USE="
ghostscript? ( tiff )
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index d9f8fcff7f5b..67e8256b5fc7 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
LICENSE="MIT"
SLOT="1.0"
[[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc static-libs"
# Test test-bz106632 is known to be broken, see bug #751232
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
index a5d54c643b3a..1402927ebaa8 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE+=" doc"
else
inherit autotools git-r3
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index e62be3c5192b..0fea845bd3b3 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,3 +1,4 @@
DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
DIST libjpeg-turbo-2.0.5.tar.gz 2162983 BLAKE2B d9204e06f075173a420931457c3738aba57a820719fb878765114b169ebb8212df18165a5f86f22126dd7eb8f8aab03caa2ba7f55e87d19196dba094e4a959fa SHA512 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555
+DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f SHA512 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
new file mode 100644
index 000000000000..47751e0823a7
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG ZLIB"
+SLOT="0/0.2"
+[[ "$(ver_cut 3)" -ge 90 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+
+COMMON_DEPEND="!media-libs/jpeg:0
+ !media-libs/jpeg:62"
+
+BDEPEND=">=dev-util/cmake-3.16.5
+ amd64? ( ${ASM_DEPEND} )
+ x86? ( ${ASM_DEPEND} )
+ amd64-fbsd? ( ${ASM_DEPEND} )
+ x86-fbsd? ( ${ASM_DEPEND} )
+ amd64-linux? ( ${ASM_DEPEND} )
+ x86-linux? ( ${ASM_DEPEND} )
+ x64-macos? ( ${ASM_DEPEND} )
+ x64-cygwin? ( ${ASM_DEPEND} )"
+
+DEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+ local FILE
+ ln -snf ../debian/extra/*.c . || die
+
+ for FILE in ../debian/extra/*.c; do
+ FILE=${FILE##*/}
+ cat >> CMakeLists.txt <<EOF || die
+add_executable(${FILE%.c} ${FILE})
+install(TARGETS ${FILE%.c})
+EOF
+ done
+
+ for FILE in ../debian/extra/exifautotran; do
+ cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
+EOF
+ done
+
+ for FILE in ../debian/extra/*.[0-9]*; do
+ cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
+EOF
+ done
+
+ #default
+
+ cmake_src_prepare
+ java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+ if multilib_is_native_abi && use java ; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+ fi
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DENABLE_STATIC="$(usex static-libs)"
+ -DWITH_JAVA="$(multilib_native_usex java)"
+ -DWITH_MEM_SRCDST=ON
+ )
+
+ [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
+
+ if use ppc ; then
+ # Workaround recommended by upstream:
+ # https://bugs.gentoo.org/715406#c9
+ # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
+ mycmakeargs+=( -DFLOATTEST="64bit" )
+ fi
+
+ cmake_src_configure
+}
+
+multilib_src_install() {
+ cmake_src_install
+
+ if multilib_is_native_abi && use java ; then
+ rm -rf "${ED}"/usr/classes || die
+ java-pkg_dojar java/turbojpeg.jar
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ docinto html
+ dodoc -r "${S}"/doc/html/*
+ newdoc "${WORKDIR}"/debian/changelog changelog.debian
+ if use java; then
+ docinto html/java
+ dodoc -r "${S}"/java/doc/*
+ newdoc "${S}"/java/README README.java
+ fi
+}
diff --git a/media-libs/libpng/libpng-1.6.37-r2.ebuild b/media-libs/libpng/libpng-1.6.37-r2.ebuild
index 0bb1132f707e..66399db83dd9 100644
--- a/media-libs/libpng/libpng-1.6.37-r2.ebuild
+++ b/media-libs/libpng/libpng-1.6.37-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng2"
SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/mutagen/mutagen-1.45.1.ebuild b/media-libs/mutagen/mutagen-1.45.1.ebuild
index 18cfbb3a9059..852684da21f4 100644
--- a/media-libs/mutagen/mutagen-1.45.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.45.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
# TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index f0fbbdd17436..15c4d47edd44 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/OpenColorIO-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
REQUIRED_USE="
doc? ( python )
diff --git a/media-sound/musescore/musescore-3.5.2.ebuild b/media-sound/musescore/musescore-3.5.2.ebuild
index 59c8b43c79bd..a1d345341b93 100644
--- a/media-sound/musescore/musescore-3.5.2.ebuild
+++ b/media-sound/musescore/musescore-3.5.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
fi
diff --git a/net-dns/libidn/libidn-1.36.ebuild b/net-dns/libidn/libidn-1.36.ebuild
index 8449c79d05ce..8e8470641b95 100644
--- a/net-dns/libidn/libidn-1.36.ebuild
+++ b/net-dns/libidn/libidn-1.36.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs java mono nls"
DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
deleted file mode 100644
index 01c9371870c0..000000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/lftp_lib_readline.m4
-+++ b/m4/lftp_lib_readline.m4
-@@ -107,7 +107,7 @@
- if test -f "$readline_include_dir/readline/readline.h"; then
- readline_include_dir="$readline_include_dir/readline"
- fi
-- readline_ld_flags="-L$readline_prefix/lib"
-+ readline_ld_flags="-L$libdir"
- readline_lib_flags="-lreadline"
- run_readline_test="yes"
- elif test "$readline_requested" = "yes"; then
diff --git a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch b/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
deleted file mode 100644
index 2c02ce5e787b..000000000000
--- a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/ftpclass.cc
-+++ b/src/ftpclass.cc
-@@ -848,6 +848,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
- conn->data_sa.in.sin_port=htons(port);
- conn->data_sa.sa.sa_family=AF_INET;
- }
-+#if INET6
- // V6 / AF_INET6
- else if (proto == 2)
- {
-@@ -855,6 +856,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
- conn->data_sa.in6.sin6_port=htons(port);
- conn->data_sa.sa.sa_family=AF_INET6;
- }
-+#endif
- else
- {
- Disconnect("unsupported address family");
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index d0331044e4d7..ad6dd32074ec 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -2,4 +2,3 @@ DIST zoom-5.3.472687.1012_i686.tar.xz 39774708 BLAKE2B 3cd80244168bfee3b92ffc5be
DIST zoom-5.3.472687.1012_x86_64.tar.xz 40046644 BLAKE2B a05255bcefcf0a0f44055ef5f89797ef8c62082732fc7e1a68c9601b34ece01989216a8b68fb6d42ec51976159d9f2766de50f25db4dd53120a303c1b6bd26d0 SHA512 c355073ce73ae047bc4aad952432e85ab0464bc3bb68dc20c121243bc719b3bd3337382bd3a283a44724d68b28a6e64c7bd8eb0f6598c2ecb6d4ddcb7193eab0
DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.4.54779.1115_x86_64.tar.xz 45216096 BLAKE2B a65c7db96ac0ea5a99b6edba0145d766395ebd67402f28ee276e1a2ed87ca9c9c01bedef12eb4d99a6525f0ec0698de1471c3ca620e32ec29ada5b8edd55416c SHA512 e859060592dc110ccb42760fff54f632b079124ff2b8988e55dfd27d70b132b035d6b0ef8eec83b7d90ddf56a6e675dac4d04c29bec9faab377db4926fb2462d
diff --git a/net-im/zoom/zoom-5.4.54779.1115.ebuild b/net-im/zoom/zoom-5.4.54779.1115.ebuild
deleted file mode 100644
index 0f1d682e7236..000000000000
--- a/net-im/zoom/zoom-5.4.54779.1115.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )"
-# "x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo pulseaudio"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
- dev-libs/glib:2
- dev-libs/icu
- dev-libs/quazip
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5[widgets]
- dev-qt/qtdiag:5
- dev-qt/qtgraphicaleffects:5
- dev-qt/qtgui:5
- dev-qt/qtlocation:5
- dev-qt/qtnetwork:5
- dev-qt/qtquickcontrols:5[widgets]
- dev-qt/qtscript:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-sound/mpg123
- sys-apps/dbus
- sys-apps/util-linux
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- !bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
- pulseaudio? ( media-sound/pulseaudio )
- !pulseaudio? ( media-libs/alsa-lib )"
-
-BDEPEND="!pulseaudio? ( dev-util/bbe )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
- default
- if ! use pulseaudio; then
- # For some strange reason, zoom cannot use any ALSA sound devices if
- # it finds libpulse. This causes breakage if media-sound/apulse[sdk]
- # is installed. So, force zoom to ignore libpulse.
- bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
- mv zoom.tmp zoom || die
- fi
-}
-
-src_install() {
- insinto /opt/zoom
- exeinto /opt/zoom
- doins -r json ringtone sip timezones translations
- doins *.pcm *.sh Embedded.properties version.txt
- doexe zoom zoom.sh zopen ZoomLauncher
- dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
- dosym {"../../usr/$(get_libdir)",/opt/zoom}/libquazip.so
-
- if use bundled-libjpeg-turbo; then
- doexe libturbojpeg.so
- else
- dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
- fi
-
- make_wrapper zoom ./zoom /opt/zoom
- make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
- "MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
- # The tarball doesn't contain an icon, so take a generic camera icon
- # from https://github.com/google/material-design-icons, modified to be
- # white on a blue background
- doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
- doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-
- local FORCE_PRINT_ELOG v
- for v in ${REPLACING_VERSIONS}; do
- ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
- done
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
index f5ae82112e00..0ce94a3ca9a2 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
inherit flag-o-matic
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86"
DESCRIPTION="Courier authentication library"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
index caf08c721135..9685cf9df338 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86"
IUSE=""
src_configure() {
diff --git a/net-libs/http-parser/http-parser-2.9.4-r1.ebuild b/net-libs/http-parser/http-parser-2.9.4-r1.ebuild
index edebd695e24e..34d63a7745e6 100644
--- a/net-libs/http-parser/http-parser-2.9.4-r1.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.4-r1.ebuild
@@ -12,7 +12,7 @@ LICENSE="MIT"
# 2.9.4 restored ABI compatibility with 2.9.0 but since we failed
# to set subslot in 2.9.3, we want to provoke another rebuild
SLOT="0/2.9.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
PATCHES=(
"${FILESDIR}"/${P}-non-x86-test.patch
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index df58b9f388d1..c36244c8e4d0 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="gcrypt libressl mbedtls zlib"
REQUIRED_USE="?? ( gcrypt mbedtls )"
RESTRICT="test"
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
index 44facfc4a335..1edb0099052b 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
LICENSE="BSD"
SLOT="0/17"
-KEYWORDS="~amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~mips ppc ppc64 s390 sparc x86"
IUSE="ipv6 kernel_linux static-libs"
RDEPEND=""
diff --git a/net-libs/nodejs/nodejs-12.19.1.ebuild b/net-libs/nodejs/nodejs-12.19.1.ebuild
index 45bbdec247e1..92e0f30f1e5b 100644
--- a/net-libs/nodejs/nodejs-12.19.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.19.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
REQUIRED_USE="
inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-14.15.1.ebuild b/net-libs/nodejs/nodejs-14.15.1.ebuild
index 31af5c975e80..b39361f37032 100644
--- a/net-libs/nodejs/nodejs-14.15.1.ebuild
+++ b/net-libs/nodejs/nodejs-14.15.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl system-icu +system-ssl systemtap test"
REQUIRED_USE="inspector? ( icu ssl )
diff --git a/net-misc/electrum/electrum-4.0.4.ebuild b/net-misc/electrum/electrum-4.0.4.ebuild
index 4882d7633002..de76710f0b33 100644
--- a/net-misc/electrum/electrum-4.0.4.ebuild
+++ b/net-misc/electrum/electrum-4.0.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cli ncurses qrcode +qt5"
REQUIRED_USE="|| ( cli ncurses qt5 )"
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
index 37fc1cdea986..2c290b002df5 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="libressl selinux"
DEPEND="
diff --git a/net-print/hplip/hplip-3.20.9-r3.ebuild b/net-print/hplip/hplip-3.20.9-r3.ebuild
index 5e6daa07be22..2d55e17fc045 100644
--- a/net-print/hplip/hplip-3.20.9-r3.ebuild
+++ b/net-print/hplip/hplip-3.20.9-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo
index 63a5675d587d..50831940845c 100644
--- a/profiles/package.mask/00-gentoo
+++ b/profiles/package.mask/00-gentoo
@@ -33,6 +33,17 @@
#--- END OF EXAMPLES ---
# Michał Górny <mgorny@gentoo.org> (2020-11-17)
+# Discontinued upstream. No revdeps. Use dev-python/toml instead.
+# Removal in 30 days. Bug #755125.
+dev-python/pytoml
+
+# Michał Górny <mgorny@gentoo.org> (2020-11-17)
+# A drive-by package with one release in 2015, no revdeps and no tests.
+# The same purpose is served e.g. by dev-python/parameterized.
+# Removal in 30 days. Bug #755122.
+dev-python/parametrized
+
+# Michał Górny <mgorny@gentoo.org> (2020-11-17)
# Old dependencies of dev-python/GitPython. The current versions (3)
# have been renamed back to dev-python/{gitdb,smmap}.
# Removal in 30 days. Bug #755080.
@@ -381,11 +392,6 @@ games-strategy/megaglest
# Bug #708700, Removal in 30 days.
dev-python/PythonQt
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-10-18)
-# Dead upstream, fails to build against libfprint-2, multiple longstanding bugs
-# #490234, #678232, #705496, #718642 and no maintainer. Removal in 30 days.
-sys-auth/fingerprint-gui
-
# Marek Szuba <marecki@gentoo.org> (2020-10-13)
# Not compatible with >=dev-libs/openssl-1.1.0, no maintainer in Gentoo,
# no new commits to the upstream Git repository since September 2013.
diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index cbedc2d578df..4e9d9ce86743 100644
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
else
SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 x86"
fi
inherit cmake desktop python-single-r1 qmake-utils xdg
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
index 31c8d582f4b1..88ac5650e971 100644
--- a/sci-libs/cln/cln-1.3.6.ebuild
+++ b/sci-libs/cln/cln-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/indilib/indilib-1.8.3.ebuild b/sci-libs/indilib/indilib-1.8.3.ebuild
index 883a84595b95..8111266706f8 100644
--- a/sci-libs/indilib/indilib-1.8.3.ebuild
+++ b/sci-libs/indilib/indilib-1.8.3.ebuild
@@ -43,7 +43,7 @@ src_configure() {
local mycmakeargs=(
-DINDI_BUILD_QT5_CLIENT=OFF
-DINDI_BUILD_UNITTESTS=$(usex test)
- -DUDEVRULES_INSTALL_DIR="$(get_udevdir)"/rules.d
+ -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
$(cmake_use_find_package ogg OggTheora)
-DINDI_BUILD_WEBSOCKET=$(usex websocket)
)
diff --git a/sci-libs/indilib/indilib-1.8.6.ebuild b/sci-libs/indilib/indilib-1.8.6.ebuild
index c0ffca05006a..dc1c02bc3d9b 100644
--- a/sci-libs/indilib/indilib-1.8.6.ebuild
+++ b/sci-libs/indilib/indilib-1.8.6.ebuild
@@ -43,7 +43,7 @@ src_configure() {
local mycmakeargs=(
-DINDI_BUILD_QT5_CLIENT=OFF
-DINDI_BUILD_UNITTESTS=$(usex test)
- -DUDEVRULES_INSTALL_DIR="$(get_udevdir)"/rules.d
+ -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
$(cmake_use_find_package ogg OggTheora)
-DINDI_BUILD_WEBSOCKET=$(usex websocket)
)
diff --git a/sci-libs/shapely/shapely-1.7.1.ebuild b/sci-libs/shapely/shapely-1.7.1.ebuild
index de023bb6de0b..b50ce87d12d0 100644
--- a/sci-libs/shapely/shapely-1.7.1.ebuild
+++ b/sci-libs/shapely/shapely-1.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
index 9b2846af8dd4..739c38023023 100644
--- a/sys-apps/acl/acl-2.2.53-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.53-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="nls static-libs"
RDEPEND="
diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
index 25e4f4a9ccfb..45f3412feefc 100644
--- a/sys-apps/attr/attr-2.4.48-r4.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug nls static-libs"
BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/less/less-563-r1.ebuild b/sys-apps/less/less-563-r1.ebuild
index 19cae5984c68..50d5350e8d91 100644
--- a/sys-apps/less/less-563-r1.ebuild
+++ b/sys-apps/less/less-563-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
LICENSE="|| ( GPL-3 BSD-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pcre unicode"
DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1.ebuild
index 329f610079d3..572000329fed 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.1.ebuild
@@ -46,7 +46,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
sys-libs/libcap-ng:=
>=sys-libs/libsepol-${SEPOL_VER}:=
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
- sys-devel/gettext
dev-python/ipy[${PYTHON_USEDEP}]
dbus? (
sys-apps/dbus
@@ -56,6 +55,10 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
pam? ( sys-libs/pam:= )
${PYTHON_DEPS}"
+# Avoid dependency loop in the cross-compile case, bug #755173
+# (Still exists in native)
+BDEPEND="sys-devel/gettext"
+
### libcgroup -> seunshare
### dbus -> restorecond
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 329f610079d3..572000329fed 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -46,7 +46,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
sys-libs/libcap-ng:=
>=sys-libs/libsepol-${SEPOL_VER}:=
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
- sys-devel/gettext
dev-python/ipy[${PYTHON_USEDEP}]
dbus? (
sys-apps/dbus
@@ -56,6 +55,10 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
pam? ( sys-libs/pam:= )
${PYTHON_DEPS}"
+# Avoid dependency loop in the cross-compile case, bug #755173
+# (Still exists in native)
+BDEPEND="sys-devel/gettext"
+
### libcgroup -> seunshare
### dbus -> restorecond
diff --git a/sys-auth/fingerprint-gui/Manifest b/sys-auth/fingerprint-gui/Manifest
deleted file mode 100644
index 4df985412c79..000000000000
--- a/sys-auth/fingerprint-gui/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fingerprint-gui-1.09.tar.gz 7037943 BLAKE2B b35b8a1c5f53752709da44903961527c01db20773298e4636d8c316946cd7d23022c9407081c55ba5f6ec55d9ed53b7f8ef858c44a623873834fa1cbd6aa941f SHA512 c4fb22368d82d72586f80009b5adb9db0a8e8777c3d1c1f23cf58a21f718a3e3d05bbc90fff295be969cf7f744f037fb886e975e626cf6d599f8f6b5f8323724
diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.09-r1.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.09-r1.ebuild
deleted file mode 100644
index 2495880d7692..000000000000
--- a/sys-auth/fingerprint-gui/fingerprint-gui-1.09-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils readme.gentoo-r1 udev user gnome2-utils
-
-DESCRIPTION="Use Fingerprint Devices with Linux"
-HOMEPAGE="https://www.ullrich-online.cc/fingerprint/ https://github.com/maksbotan/fingerprint-gui"
-SRC_URI="https://github.com/maksbotan/fingerprint-gui/archive/v${PV}-qt5.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+upekbsapi"
-
-DEPEND="
- app-crypt/qca[qt5(+)]
- dev-qt/qtcore:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtx11extras:5
- sys-auth/libfprint
- sys-auth/polkit-qt[qt5(+)]
- sys-libs/pam
- x11-libs/libX11
- x11-libs/libfakekey
- dev-libs/libusb
- !sys-auth/thinkfinger
-"
-RDEPEND="${DEPEND}"
-
-QA_SONAME="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
-QA_PRESTRIPPED="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
-QA_FLAGS_IGNORED="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
-
-S="${WORKDIR}/${P}-qt5"
-
-HTML_DOCS=( doc/Hacking.html doc/Step-by-step-manual.html )
-
-src_prepare() {
- eapply_user
-
- sed -e '/Icon=/s:=.*:=Fingerprint:' \
- -i bin/${PN}/${PN}.desktop || die
- sed -e "s:/etc/udev/rules.d:\"$(get_udevdir)\"/rules.d:g" \
- -i bin/${PN%-gui}-helper/${PN%-gui}-helper.pro || die
- sed -e 's:GROUP="plugdev":GROUP="fingerprint":' \
- -i bin/fingerprint-helper/92-fingerprint-gui-uinput.rules \
- -i upek/91-fingerprint-gui-upek.rules || die
- sed -e '/DOCDIR\s\+=/s:'${PN}':'${PF}/html':' \
- -i bin/fingerprint-gui/fingerprint-gui.pro || die
- sed -e '/#define DOCDIR/s:'${PN}':'${PF}/html':' \
- -i include/Globals.h || die
-}
-
-src_configure() {
- eqmake5 \
- PREFIX="${EROOT}"usr \
- LIB="$(get_libdir)" \
- LIBEXEC=libexec \
- LIBPOLKIT_QT=LIBPOLKIT_QT_1_1
-}
-
-src_install() {
- export INSTALL_ROOT="${D}" #submakes need it as well, re-install fails otherwise.
- emake -j1 install
- if use upekbsapi ; then
- use amd64 && dolib.so upek/lib64/libbsapi.so*
- use x86 && dolib.so upek/lib/libbsapi.so*
- udev_dorules upek/91-fingerprint-gui-upek.rules
- insinto /etc
- doins upek/upek.cfg
- #dodir /var/upek_data
- #fowners root:plugdev /var/upek_data
- #fperms 0775 /var/upek_data
- fi
- doicon src/res/Fingerprint.png
-
- einstalldocs
-
- keepdir /var/lib/fingerprint-gui
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- enewgroup fingerprint
-
- gnome2_icon_cache_update
-}
-
-pkg_postinst() {
- einfo "Fixing permisisons of fingerprints..."
- find "${EROOT}"/var/lib/fingerprint-gui -exec chown root:root {} + || die "chown root:root failed"
- find "${EROOR}"/var/lib/fingerprint-gui -type d -exec chmod 755 {} + || die "chmod 755 failed"
- find "${EROOT}"/var/lib/fingerprint-gui -type f -exec chmod 600 {} + || die "chmod 600 failed"
-
- readme.gentoo_print_elog
-
- gnome2_icon_cache_update
-}
-
-FORCE_PRINT_ELOG=1
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please take a thorough look a the Step-by-step-manual.html
-in /usr/share/doc/${PF}/html for integration with pam/polkit/...
-Hint: You may want
-auth sufficient pam_fingerprint-gui.so
-in /etc/pam.d/system-auth
-
-There are udev rules to enforce group fingerprint on the reader device
-Please put yourself in that group and re-trigger the udev rules."
diff --git a/sys-auth/fingerprint-gui/metadata.xml b/sys-auth/fingerprint-gui/metadata.xml
deleted file mode 100644
index c2b2fda08667..000000000000
--- a/sys-auth/fingerprint-gui/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
- <flag name="upekbsapi">Add UPEK BSAPI drivers for identify functions on some readers</flag>
-</use>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/sys-auth/rtkit/rtkit-0.13-r1.ebuild b/sys-auth/rtkit/rtkit-0.13-r1.ebuild
index b0238d9f3261..09fccb721a9c 100644
--- a/sys-auth/rtkit/rtkit-0.13-r1.ebuild
+++ b/sys-auth/rtkit/rtkit-0.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/heftig/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-3 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="systemd"
BDEPEND="virtual/pkgconfig"
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 5c63c1e1a451..3a92272a676a 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -2,4 +2,4 @@ DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5b
DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2 SHA512 c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
DIST Pacemaker-1.1.24-rc1.tar.gz 5766749 BLAKE2B 7928fc40ba6c88983f394edb19116f8843c0e51c5dbbde503b10962fc178ab712470f3de91d93f69de4e18395aa9af04edf79c0c35372a3d3cc3d4d1ef6aa262 SHA512 188e3960408b9529f502e3bff28de39b7d7393140af3b14fe9220b52f59b3bcca85d9f00d07f9d210b3a5dd8a618d2aea23f65c6f484a8e31510da9d759ceeb8
DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d SHA512 fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d
-DIST Pacemaker-2.0.5-rc1.tar.gz 5432484 BLAKE2B 34474ce29ed7822839676a4044129954e5b13038857aff156e3bf37090c000b421bcb2760b28b2c83531d92e32abbeb439a67b76154b8b7c10322d1e3467348d SHA512 90e2994df8ee60f525dd919a5edad2c48bbe60fabd42318527c02bc47900bff24901f73eb6498d3fdf75996539e647460b540375008d263baf7890f271fae76c
+DIST Pacemaker-2.0.5-rc3.tar.gz 5433648 BLAKE2B f564ff0d7c33897bb58886194e169d2071823c43b27bb5e359a3a3a9a471cb8a9c22f86e93ed99d7eedcebfc530494a35fbd0b523287d3111dea0f507cf5b76b SHA512 adf558d80d93ee7944b8e9eb5d07304e374ee61a4d81159daa9c6a9108ee77294e109766c21ed6f6eef2847ebc67d98925b8c63ff49bba958058bb7ef68d0f07
diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild b/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild
index 2a8c518b44c4..2a8c518b44c4 100644
--- a/sys-cluster/pacemaker/pacemaker-2.0.5_rc1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild
diff --git a/sys-devel/clang-common/clang-common-11.0.0.ebuild b/sys-devel/clang-common/clang-common-11.0.0.ebuild
index 635512f56c82..636965492422 100644
--- a/sys-devel/clang-common/clang-common-11.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-11.0.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild
index 91859516ce23..04d3897324e8 100644
--- a/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="+compiler-rt libcxx openmp +sanitize"
REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang/clang-11.0.0.ebuild b/sys-devel/clang/clang-11.0.0.ebuild
index c8ee243da892..61ed7ce3d0df 100644
--- a/sys-devel/clang/clang-11.0.0.ebuild
+++ b/sys-devel/clang/clang-11.0.0.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux"
IUSE="debug default-compiler-rt default-libcxx default-lld
doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-devel/lld/lld-11.0.0.ebuild b/sys-devel/lld/lld-11.0.0.ebuild
index 58d111f61299..f37de4122530 100644
--- a/sys-devel/lld/lld-11.0.0.ebuild
+++ b/sys-devel/lld/lld-11.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/llvm-common/llvm-common-11.0.0.ebuild b/sys-devel/llvm-common/llvm-common-11.0.0.ebuild
index e6af4bcc987f..d12935e080d2 100644
--- a/sys-devel/llvm-common/llvm-common-11.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-11.0.0.ebuild
@@ -12,7 +12,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/llvm-11.0.0.ebuild b/sys-devel/llvm/llvm-11.0.0.ebuild
index 0160161cb864..fd2aa60e5a18 100644
--- a/sys-devel/llvm/llvm-11.0.0.ebuild
+++ b/sys-devel/llvm/llvm-11.0.0.ebuild
@@ -29,7 +29,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
diff --git a/sys-devel/llvmgold/llvmgold-11.ebuild b/sys-devel/llvmgold/llvmgold-11.ebuild
index bed405a9b6ee..065dea585bc2 100644
--- a/sys-devel/llvmgold/llvmgold-11.ebuild
+++ b/sys-devel/llvmgold/llvmgold-11.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux"
IUSE=""
RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
index 2f090dae45e8..3af20e38759a 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips sparc x86"
IUSE="doc"
DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild
index 7acafffbd3fe..5d7962ba57dc 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
# FIXME: libfuzzer does not enable all its necessary dependencies
REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
index 777ccf208bac..8b7b65978ce1 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="+clang test"
RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
index 44d10fd4a4bb..0ee72c596756 100644
--- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+berkdb nls +readline static-libs"
DEPEND="
diff --git a/sys-libs/libcxx/libcxx-11.0.0.ebuild b/sys-libs/libcxx/libcxx-11.0.0.ebuild
index 8cdcac19003a..dbc2c28d8bc2 100644
--- a/sys-libs/libcxx/libcxx-11.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( libcxxabi )"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
index b97c46c5c00d..a3785c668257 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
@@ -16,7 +16,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
IUSE="+libunwind +static-libs test elibc_musl"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/libomp/libomp-11.0.0.ebuild b/sys-libs/libomp/libomp-11.0.0.ebuild
index d33816ba6c58..5f4e4cde518c 100644
--- a/sys-libs/libomp/libomp-11.0.0.ebuild
+++ b/sys-libs/libomp/libomp-11.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
IUSE="cuda hwloc kernel_linux offload ompt test"
# CUDA works only with the x86_64 ABI
REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild
index ac95bbdb109a..ca194485264e 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
IUSE="debug +static-libs test"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
index 10592dbc9936..e37be8a71353 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="MIT"
# The subslot reflects the SONAME.
SLOT="5/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86"
IUSE="gpm tinfo unicode"
DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/virtual/udev/udev-217-r2.ebuild b/virtual/udev/udev-217-r2.ebuild
index 09ca546be87e..a4d4a51402b5 100644
--- a/virtual/udev/udev-217-r2.ebuild
+++ b/virtual/udev/udev-217-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual to select between different udev daemon providers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
RDEPEND="
|| (
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index 00cb7fd82958..d72320403b1e 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -1 +1,2 @@
DIST libapreq2-2.13.tar.gz 891320 BLAKE2B 6e896b95a17d7e4eede651bd74f21280d77b38c1c96be790c34993307a0435ea6d4626825dc215680e1fa2cd6a3ec635fcbeb9fda3b34e687ed8f7641b4fee7e SHA512 54553cb90c0d3f6fb34ff19364c5804976c4aff1bae551ae051fdd06f41695770f1e285c40e03dbd93ae738adc332f38f1a1994167598364071feaec833fdf05
+DIST libapreq2-2.15.tar.gz 839618 BLAKE2B 875aa8091512cf6b43c8654579b3d4779ea50835784380dcf69ca048f9b8d4ef6e573fef5ee03c0e47a929dcd8c4643d5dc861d875122095024bca6e8fbbf38c SHA512 abdc34f4867ba891966e7296c8110cffaa723f9b966522a1de352bc459e89e5cfc60de25dcd20cf0fa9b7cdf9282719b0276b621af8aa7bb770c89a7fbae4701
diff --git a/www-apache/libapreq2/libapreq2-2.15.ebuild b/www-apache/libapreq2/libapreq2-2.15.ebuild
new file mode 100644
index 000000000000..03aadcb290e7
--- /dev/null
+++ b/www-apache/libapreq2/libapreq2-2.15.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit apache-module perl-module
+
+DESCRIPTION="A library for manipulating client request data via the Apache API"
+SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
+HOMEPAGE="https://httpd.apache.org/apreq/"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="perl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ perl? (
+ >=dev-perl/ExtUtils-XSBuilder-0.23
+ virtual/perl-version
+ >=www-apache/mod_perl-2
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-perl/Apache-Test )
+"
+
+PATCHES=(
+ "${FILESDIR}"/libapreq2-2.08-doc.patch
+)
+
+APACHE2_MOD_FILE="module/apache2/.libs/mod_apreq2.so"
+APACHE2_MOD_CONF="76_mod_apreq"
+APACHE2_MOD_DEFINE="APREQ"
+DOCFILES="docs/html/*.html CHANGES README INSTALL MANIFEST"
+
+need_apache2
+
+pkg_setup() {
+ perl_set_version
+}
+
+src_prepare() {
+ default
+
+ sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/acinclude.m4 || die
+ sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/aclocal.m4 || die
+ sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/configure || die
+}
+
+src_configure() {
+ econf \
+ --with-apache2-apxs=${APXS} \
+ $(use_enable perl perl-glue)
+}
+
+src_install() {
+ APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+ apache-module_src_install
+
+ make DESTDIR="${D}" INSTALLDIRS=vendor install || die "make install failed"
+ doman docs/man/man3/*.3
+
+ perl_delete_localpod
+
+ for i in $(find "${D}" -type f -not -name '*.so'); do
+ if file ${i} | grep -i " text"; then
+ sed -i -e "s:${D}:/:g" ${i} || die
+ fi
+ done
+}
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 067eda40e137..bf68019694bb 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1 +1 @@
-DIST chromedriver-bin-86.0.4240.22.linux64.zip 5456932 BLAKE2B 9a54a5b45e04069c326aafd0d5dd60663556b793dd756e28e82b7cbbe9c232d56c3722017fc2c792e79e2ba7705e4590dc6435ca090e756f87d3dd8e28ca3b5e SHA512 f61bc8a3f48eb3c6dbb51d8fdef93000150307cc0824dc5ffaa155aaa598ba7bd1aab723e41c1aa0eb317603c93f2c661e8fc14403179fe5bd18b317935f5a1e
+DIST chromedriver-bin-87.0.4280.20.linux64.zip 5564194 BLAKE2B ec11817045f9ab60a34eaacf701a609b7ccbf4548e82df8348cac86ca0faaeb51a66f2873ca444fcd8c67bea3ff885caaf749008307f8dbbf1b37ffa24b9e7bf SHA512 b46518fa756b19e83d2c491470f6528d3eefa7ad6d7f59ca6c05e8ddc655c92ca641f2264678571731eb9f8a3809d0dffa137cfbfbfce39358b39045d712879d
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-86.0.4240.22.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-87.0.4280.20.ebuild
index c96967a171b8..c96967a171b8 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-86.0.4240.22.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-87.0.4280.20.ebuild
diff --git a/www-client/firefox/firefox-78.5.0.ebuild b/www-client/firefox/firefox-78.5.0.ebuild
index 2b4bf05edce2..7bc04601846f 100644
--- a/www-client/firefox/firefox-78.5.0.ebuild
+++ b/www-client/firefox/firefox-78.5.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
DESCRIPTION="Firefox Web Browser"
HOMEPAGE="https://www.mozilla.com/firefox"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
SLOT="0/esr$(ver_cut 1)"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 813c66afb442..dec149d7def0 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1 +1 @@
-DIST google-chrome-stable_86.0.4240.198-1_amd64.deb 71160936 BLAKE2B 248532d525dee6c25a4e050f1cad6ee6a29f02b46897059e6930c12657284a2352e7881e12dd34ec8ca33f4639f90162ec7cd1652b8c93c791590c40e467736f SHA512 dcbb3e93915524504fae65cffb21f29b527e5019e2926f884d6ec1da3dc4ee293957ce37fcfe71b087f2fa9ade16c0530c9c3d47c97748e85e27f7b62409d730
+DIST google-chrome-stable_87.0.4280.66-1_amd64.deb 72726412 BLAKE2B 81902234ab4c7df0994eb98aad31f526b05b281f46920e64af492a5f885e1dc6619979006b3c34c2954f952f1327b57e0013edd2bfc634167be94d660aa5402a SHA512 c4c173a69d59c05f5b3b159fb3ed3a6b09e880083adfe07cea45b9f7a592dc3eefca70676b5bae66e679f1030c7459523f99dd61c9a28f676bc7a91d5f72662d
diff --git a/www-client/google-chrome/google-chrome-86.0.4240.198.ebuild b/www-client/google-chrome/google-chrome-87.0.4280.66.ebuild
index 33358d2b47aa..5a9c327ca88b 100644
--- a/www-client/google-chrome/google-chrome-86.0.4240.198.ebuild
+++ b/www-client/google-chrome/google-chrome-87.0.4280.66.ebuild
@@ -32,6 +32,7 @@ RESTRICT="bindist mirror strip"
DEPEND=""
RDEPEND="
app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2
app-arch/bzip2
app-misc/ca-certificates
dev-libs/atk
@@ -39,15 +40,18 @@ RDEPEND="
dev-libs/glib:2
dev-libs/nspr
>=dev-libs/nss-3.26
+ dev-libs/wayland
media-libs/alsa-lib
media-libs/fontconfig
media-libs/freetype:2
+ media-libs/mesa[gbm]
net-print/cups
sys-apps/dbus
sys-libs/libcap
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3[X]
+ x11-libs/libdrm
>=x11-libs/libX11-1.5.0
x11-libs/libXcomposite
x11-libs/libXcursor
@@ -60,6 +64,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
x11-libs/libxcb
+ x11-libs/libxkbcommon
x11-libs/pango
x11-misc/xdg-utils
selinux? ( sec-policy/selinux-chromium )
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index e1a3cf14693d..9bdd90a87db9 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
DIST google-chrome-beta_87.0.4280.66-1_amd64.deb 72746672 BLAKE2B 730d100753aaeaac9254794e4bddfd9871bc5499c02faa75965089d935bc69f7f39a7d9db5ea278a0600c3a062d30ad96edaf3b15ee254b300e8dcfa44fb6d13 SHA512 23158dc27fac73b093663dae01568eafe898d3c9335206d8814c747a30df564930152c2139013d393b71f477868f5206c2642ef4ac481ec9ba89a10cf4b74260
-DIST google-chrome-stable_86.0.4240.198-1_amd64.deb 71160936 BLAKE2B 248532d525dee6c25a4e050f1cad6ee6a29f02b46897059e6930c12657284a2352e7881e12dd34ec8ca33f4639f90162ec7cd1652b8c93c791590c40e467736f SHA512 dcbb3e93915524504fae65cffb21f29b527e5019e2926f884d6ec1da3dc4ee293957ce37fcfe71b087f2fa9ade16c0530c9c3d47c97748e85e27f7b62409d730
+DIST google-chrome-stable_87.0.4280.66-1_amd64.deb 72726412 BLAKE2B 81902234ab4c7df0994eb98aad31f526b05b281f46920e64af492a5f885e1dc6619979006b3c34c2954f952f1327b57e0013edd2bfc634167be94d660aa5402a SHA512 c4c173a69d59c05f5b3b159fb3ed3a6b09e880083adfe07cea45b9f7a592dc3eefca70676b5bae66e679f1030c7459523f99dd61c9a28f676bc7a91d5f72662d
DIST google-chrome-unstable_88.0.4315.5-1_amd64.deb 73652632 BLAKE2B ffb039327d26c465a21a35d26abeb1cac04eeb3f8f66f9c114b07591af3a344f3f1e01d190f839227898c94fdd72e2ff0d92b52a43a081b1f96f3038dbfd8ae1 SHA512 d582a9c93602b34789152c38ac5f7cbd33b06d66e1f36cd505c5e8b6d90a746da539738f7aa06874fdb62b2a15dd5f6e90d635f7d4f11aa3d1bba42a9dc8623f
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-86.0.4240.198.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.66.ebuild
index 645ebaaf6be2..645ebaaf6be2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-86.0.4240.198.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.66.ebuild
diff --git a/www-servers/pshs/pshs-0.4.1.ebuild b/www-servers/pshs/pshs-0.4.1.ebuild
index d7fda003a4b4..1d7ddf7a5956 100644
--- a/www-servers/pshs/pshs-0.4.1.ebuild
+++ b/www-servers/pshs/pshs-0.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="libressl +magic qrcode ssl upnp"
RDEPEND=">=dev-libs/libevent-2:0=
diff --git a/x11-wm/icewm/icewm-1.8.3.ebuild b/x11-wm/icewm/icewm-1.8.3.ebuild
index 310d2f45e737..a9502b12ad78 100644
--- a/x11-wm/icewm/icewm-1.8.3.ebuild
+++ b/x11-wm/icewm/icewm-1.8.3.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
# Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/xfce-base/thunar/thunar-1.8.16.ebuild b/xfce-base/thunar/thunar-1.8.16.ebuild
index f0a0028c1bde..d56945bf657d 100644
--- a/xfce-base/thunar/thunar-1.8.16.ebuild
+++ b/xfce-base/thunar/thunar-1.8.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild
index 39d9d2939762..64d22d2e74d8 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug libnotify +thunar"
RDEPEND=">=x11-libs/cairo-1.12
diff --git a/xfce-base/xfwm4/xfwm4-4.14.6.ebuild b/xfce-base/xfwm4/xfwm4-4.14.6.ebuild
index 7fdbffb1e359..58a16b960ecc 100644
--- a/xfce-base/xfwm4/xfwm4-4.14.6.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.14.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="opengl startup-notification +xcomposite +xpresent"
RDEPEND=">=dev-libs/glib-2.20
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild
index c0fc97d0f6c7..c341080b2a87 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-libs/glib-2.24