summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-04-19 16:09:04 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-04-19 16:09:04 +0000
commit4f5969b0c4d4454178c32527baa29a4e97a2bfde (patch)
tree1bb00aeb3671eec8cf8d677cfc2b050f8debb748
parent2022-04-19 11:54:56 UTC (diff)
parentapp-text/enchant: Correct the blocker's slot (diff)
downloadgentoo-4f5969b0c4d4454178c32527baa29a4e97a2bfde.tar.gz
gentoo-4f5969b0c4d4454178c32527baa29a4e97a2bfde.tar.bz2
gentoo-4f5969b0c4d4454178c32527baa29a4e97a2bfde.zip
Merge updates from master
-rw-r--r--app-admin/hcloud/Manifest2
-rw-r--r--app-admin/hcloud/hcloud-1.29.5.ebuild (renamed from app-admin/hcloud/hcloud-1.29.4.ebuild)0
-rw-r--r--app-admin/mcelog/Manifest1
-rw-r--r--app-admin/mcelog/mcelog-181.ebuild51
-rw-r--r--app-text/enchant/enchant-2.3.3-r1.ebuild (renamed from app-text/enchant/enchant-2.3.3.ebuild)2
-rw-r--r--dev-db/postgresql/postgresql-14.2-r1.ebuild2
-rw-r--r--dev-db/sqlite/sqlite-3.38.1.ebuild2
-rw-r--r--dev-lang/erlang/erlang-23.3.4.12.ebuild2
-rw-r--r--dev-lang/erlang/erlang-24.3.3.ebuild2
-rw-r--r--dev-libs/libical/libical-3.0.14-r1.ebuild117
-rw-r--r--dev-libs/libuv/libuv-1.44.1.ebuild2
-rw-r--r--dev-python/fonttools/fonttools-4.31.2.ebuild2
-rw-r--r--dev-python/google-auth/google-auth-2.6.3-r1.ebuild2
-rw-r--r--dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild2
-rw-r--r--dev-python/identify/identify-2.4.12.ebuild2
-rw-r--r--dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild2
-rw-r--r--dev-python/ini2toml/ini2toml-0.10.ebuild2
-rw-r--r--dev-python/lz4/lz4-4.0.0.ebuild2
-rw-r--r--dev-python/nspektr/nspektr-0.3.0.ebuild2
-rw-r--r--dev-python/paramiko/Manifest1
-rw-r--r--dev-python/paramiko/paramiko-2.10.2.ebuild55
-rw-r--r--dev-python/paramiko/paramiko-2.10.3.ebuild2
-rw-r--r--dev-python/paste/paste-3.5.0.ebuild42
-rw-r--r--dev-python/pyfakefs/Manifest1
-rw-r--r--dev-python/pyfakefs/pyfakefs-4.5.5.ebuild24
-rw-r--r--dev-python/pyfakefs/pyfakefs-4.5.6.ebuild2
-rw-r--r--dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild2
-rw-r--r--dev-python/pyscard/pyscard-2.0.3.ebuild2
-rw-r--r--dev-python/pytest-console-scripts/Manifest1
-rw-r--r--dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild40
-rw-r--r--dev-python/pytools/pytools-2022.1.3-r1.ebuild2
-rw-r--r--dev-python/pytz/Manifest1
-rw-r--r--dev-python/pytz/pytz-2021.3.ebuild31
-rw-r--r--dev-python/pytz/pytz-2022.1.ebuild2
-rw-r--r--dev-python/reportlab/reportlab-3.6.9.ebuild2
-rw-r--r--dev-python/repoze-lru/repoze-lru-0.7-r2.ebuild2
-rw-r--r--dev-python/sentry-sdk/Manifest1
-rw-r--r--dev-python/sentry-sdk/sentry-sdk-1.5.7.ebuild80
-rw-r--r--dev-python/sentry-sdk/sentry-sdk-1.5.8.ebuild2
-rw-r--r--dev-python/setuptools/setuptools-60.10.0.ebuild2
-rw-r--r--dev-python/setuptools/setuptools-62.1.0.ebuild2
-rw-r--r--dev-python/sphinx-tabs/Manifest1
-rw-r--r--dev-python/sphinx-tabs/sphinx-tabs-3.3.0.ebuild39
-rw-r--r--dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild2
-rw-r--r--dev-python/trimesh/trimesh-3.10.8.ebuild2
-rw-r--r--dev-python/urllib3/Manifest1
-rw-r--r--dev-python/urllib3/urllib3-1.26.8.ebuild60
-rw-r--r--dev-python/urllib3/urllib3-1.26.9.ebuild2
-rw-r--r--dev-python/virtualenv/Manifest3
-rw-r--r--dev-python/virtualenv/virtualenv-20.13.3.ebuild97
-rw-r--r--dev-python/virtualenv/virtualenv-20.13.4.ebuild97
-rw-r--r--dev-python/virtualenv/virtualenv-20.14.0.ebuild99
-rw-r--r--dev-python/virtualenv/virtualenv-20.14.1.ebuild2
-rw-r--r--dev-python/wsproto/wsproto-1.0.0-r1.ebuild2
-rw-r--r--dev-python/xarray/xarray-2022.3.0.ebuild2
-rw-r--r--dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild2
-rw-r--r--dev-ruby/mime-types/mime-types-3.4.1.ebuild4
-rw-r--r--dev-util/colm/colm-0.14.7-r1.ebuild2
-rw-r--r--dev-util/ragel/ragel-7.0.4-r1.ebuild2
-rw-r--r--eclass/toolchain.eclass9
-rw-r--r--mail-client/mutt/mutt-2.2.3.ebuild2
-rw-r--r--mail-mta/postfix/Manifest2
-rw-r--r--mail-mta/postfix/postfix-3.6.6.ebuild286
-rw-r--r--mail-mta/postfix/postfix-3.7.1.ebuild289
-rw-r--r--media-libs/lcms/lcms-2.13.1.ebuild2
-rw-r--r--net-im/teams/Manifest1
-rw-r--r--net-im/teams/teams-1.5.00.10453.ebuild106
-rw-r--r--net-mail/mailbase/files/mailcap-r119
-rw-r--r--net-mail/mailbase/files/mailcap-r236
-rw-r--r--net-mail/mailbase/mailbase-1.6-r1.ebuild46
-rw-r--r--net-mail/mailbase/mailbase-1.7.ebuild45
-rw-r--r--net-misc/dropbox/Manifest2
-rw-r--r--net-misc/dropbox/dropbox-146.4.4836.ebuild110
-rw-r--r--sys-apps/man-db/Manifest2
-rw-r--r--sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch30
-rw-r--r--sys-apps/man-db/man-db-2.10.1.ebuild202
-rw-r--r--sys-apps/man-db/man-db-2.9.4-r1.ebuild201
-rw-r--r--sys-devel/gcc/Manifest2
-rw-r--r--sys-devel/gcc/gcc-12.0.1_pre20220417.ebuild31
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild (renamed from sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild)68
80 files changed, 1075 insertions, 1333 deletions
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 879bcb509a07..abe9876eff92 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,2 +1,2 @@
DIST hcloud-1.29.0.tar.xz 1499276 BLAKE2B 3ec9973fc3ecaf5ec476b2d165fc1663f4d6cd2c00c4c87efc72f3946d1d6028f9a2d20f80020203b1f8f2aa94512a1d02e05b54e9422f5b84826eb8bb552490 SHA512 b5b1e20785fc8a06954a753dbd6c5d91b2b557d0e64cb044ab55cbfb11f0fd7d0a2eb625a51e1216af86cad6f772a206d3b0ef443f256649dba38d199614d41d
-DIST hcloud-1.29.4.tar.xz 1417068 BLAKE2B 88a26d771cd0b7b603bce7de8e8e299dceecf931b8fd7bfa1e734134200cb4f2c6d0598f8253024179ba3a4df87d182418f2ceb8b230af48f82cc6be9720ef6b SHA512 409de5fc334fa725c9b314cf9a327976da043af675b704c8ee4d1bb7e42d70607722891deb9ff2b5b1298b7a38d8ce4b0063a10d64c5d1fe2be03f4c8c794c25
+DIST hcloud-1.29.5.tar.xz 1416952 BLAKE2B 4b1c9e1df9bb3fdb63c28890e7f9cfb8c4c628fd22b765d8265e63415b8feee0466f32fd6a87a5cd981d231f93a60c28c140c1efa7ea33c327b234f1a4d6b0cf SHA512 fbe395c47cf1bef800c162b8c44359dab173c636ec4d7e8e4629fa95b323731c7c3d8a9045dd77692b7beb8a3554cdce567f2285640a5b410262be69442fe99e
diff --git a/app-admin/hcloud/hcloud-1.29.4.ebuild b/app-admin/hcloud/hcloud-1.29.5.ebuild
index 82ba00ab5dca..82ba00ab5dca 100644
--- a/app-admin/hcloud/hcloud-1.29.4.ebuild
+++ b/app-admin/hcloud/hcloud-1.29.5.ebuild
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 28c0348e1f9f..b80b5ead5fff 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1 +1,2 @@
DIST mcelog-180.tar.gz 314605 BLAKE2B 0cf4f25dc26901bee56ddd437ad3d56874ba70f2323d9d6821432bf744b78392e871c9632e44a7bef7a1954eb6605cf72f6d9268397741cecd5066b6bcafe54a SHA512 89b2b1c2f7ab03bb358926f10fa2c3e8f048bb5cf2d6f4453de63ecfd44daebe771087522c69ade5638248ab79c80122448efef798e4ea8d1a5f88308e8bfd32
+DIST mcelog-181.tar.gz 314690 BLAKE2B 4e182c84ae15abf3673e0210940830c66377b275e05c0bf88ff2199ef1b87bf1e9bcff12ebd9c07e5af00d763369c96aae37c274174563fb3ae0db7bbd7306de SHA512 70f0a923bfc0a941b2a70501dd89b8634be52f51c98ab482b212e337684620165f71420205bd779039fe7704e230eb35e47c77802109242dc401803613393bb9
diff --git a/app-admin/mcelog/mcelog-181.ebuild b/app-admin/mcelog/mcelog-181.ebuild
new file mode 100644
index 000000000000..b95ec9cf6b31
--- /dev/null
+++ b/app-admin/mcelog/mcelog-181.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+DEPEND="${PYTHON_DEPS}"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~X86_MCE"
+ kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+ python_fix_shebang genconfig.py
+}
+
+src_install() {
+ default
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit ${PN}.service
+
+ dodoc *.pdf
+}
diff --git a/app-text/enchant/enchant-2.3.3.ebuild b/app-text/enchant/enchant-2.3.3-r1.ebuild
index 237874a845fd..01202d5bee1a 100644
--- a/app-text/enchant/enchant-2.3.3.ebuild
+++ b/app-text/enchant/enchant-2.3.3-r1.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND="
voikko? ( dev-libs/libvoikko )
"
RDEPEND="${COMMON_DEPEND}
- !<app-text/enchant-1.6.1-r2:1
+ !<app-text/enchant-1.6.1-r2:0
"
DEPEND="${COMMON_DEPEND}
test? ( >=dev-libs/unittest++-2.0.0-r2 )
diff --git a/dev-db/postgresql/postgresql-14.2-r1.ebuild b/dev-db/postgresql/postgresql-14.2-r1.ebuild
index 669ad0e26b8a..4c8c23c190eb 100644
--- a/dev-db/postgresql/postgresql-14.2-r1.ebuild
+++ b/dev-db/postgresql/postgresql-14.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8,9,10} )
inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/sqlite/sqlite-3.38.1.ebuild b/dev-db/sqlite/sqlite-3.38.1.ebuild
index eeebdb0c3fdb..698ad75aed18 100644
--- a/dev-db/sqlite/sqlite-3.38.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.38.1.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-lang/erlang/erlang-23.3.4.12.ebuild b/dev-lang/erlang/erlang-23.3.4.12.ebuild
index e68adcea8ab9..d87e1a997ebf 100644
--- a/dev-lang/erlang/erlang-23.3.4.12.ebuild
+++ b/dev-lang/erlang/erlang-23.3.4.12.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
# same build of ERTS that was used when compiling the code. See
# http://erlang.org/doc/system_principles/misc.html for more information.
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets"
RDEPEND="
diff --git a/dev-lang/erlang/erlang-24.3.3.ebuild b/dev-lang/erlang/erlang-24.3.3.ebuild
index 870060fa5a8f..5de42e1e60bf 100644
--- a/dev-lang/erlang/erlang-24.3.3.ebuild
+++ b/dev-lang/erlang/erlang-24.3.3.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
# same build of ERTS that was used when compiling the code. See
# http://erlang.org/doc/system_principles/misc.html for more information.
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
RDEPEND="
diff --git a/dev-libs/libical/libical-3.0.14-r1.ebuild b/dev-libs/libical/libical-3.0.14-r1.ebuild
new file mode 100644
index 000000000000..727ee343e87a
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.14-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="Implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/icu:=
+ glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+ glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-libs/timezone-data
+"
+BDEPEND="
+ dev-lang/perl
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ glib? ( dev-util/gtk-doc )
+ )
+ introspection? ( dev-libs/gobject-introspection )
+ test? (
+ ${PYTHON_DEPS}
+ glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
+ )
+ vala? ( $(vala_depend) )
+"
+
+DOCS=(
+ AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO
+ doc/{AddingOrModifyingComponents.txt,UsingLibical.md}
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.4-tests.patch"
+ "${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch"
+)
+
+python_check_deps() {
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ use examples || cmake_comment_add_subdirectory examples
+ use vala && vala_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON
+ -DICAL_BUILD_DOCS=$(usex doc)
+ -DICAL_GLIB=$(usex glib)
+ -DGOBJECT_INTROSPECTION=$(usex introspection)
+ -DSHARED_ONLY=$(usex !static-libs)
+ -DLIBICAL_BUILD_TESTING=$(usex test)
+ -DICAL_GLIB_VAPI=$(usex vala)
+ )
+ if use vala; then
+ mycmakeargs+=(
+ -DVALAC="${VALAC}"
+ -DVAPIGEN="${VAPIGEN}"
+ )
+ fi
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ cmake_src_compile docs
+
+ HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+ fi
+}
+
+src_test() {
+ local myctestargs=(
+ -E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+ )
+
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ if use examples; then
+ rm examples/CMakeLists.txt || die
+ dodoc -r examples
+ fi
+}
diff --git a/dev-libs/libuv/libuv-1.44.1.ebuild b/dev-libs/libuv/libuv-1.44.1.ebuild
index 8930dc48b8e0..bb8f07143154 100644
--- a/dev-libs/libuv/libuv-1.44.1.ebuild
+++ b/dev-libs/libuv/libuv-1.44.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-python/fonttools/fonttools-4.31.2.ebuild b/dev-python/fonttools/fonttools-4.31.2.ebuild
index f0532d0a8742..d3fea10889ed 100644
--- a/dev-python/fonttools/fonttools-4.31.2.ebuild
+++ b/dev-python/fonttools/fonttools-4.31.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}
diff --git a/dev-python/google-auth/google-auth-2.6.3-r1.ebuild b/dev-python/google-auth/google-auth-2.6.3-r1.ebuild
index 35f8032960a3..23a3aa238ec0 100644
--- a/dev-python/google-auth/google-auth-2.6.3-r1.ebuild
+++ b/dev-python/google-auth/google-auth-2.6.3-r1.ebuild
@@ -17,7 +17,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"
RDEPEND="
<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild
index 66b5f36534ac..18947ee0a45c 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild
@@ -14,7 +14,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"
RDEPEND="
>=dev-python/protobuf-python-3.12.0[${PYTHON_USEDEP}]
diff --git a/dev-python/identify/identify-2.4.12.ebuild b/dev-python/identify/identify-2.4.12.ebuild
index ca074bc25eff..0ca6024f920e 100644
--- a/dev-python/identify/identify-2.4.12.ebuild
+++ b/dev-python/identify/identify-2.4.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
RDEPEND="dev-python/ukkonen[${PYTHON_USEDEP}]"
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
index 8d86215cd48f..a456b96184e4 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
@@ -17,7 +17,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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/ini2toml/ini2toml-0.10.ebuild b/dev-python/ini2toml/ini2toml-0.10.ebuild
index 8b6d5d0eb8e2..1f1300e95026 100644
--- a/dev-python/ini2toml/ini2toml-0.10.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.10.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~riscv ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
RDEPEND="
>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/lz4/lz4-4.0.0.ebuild b/dev-python/lz4/lz4-4.0.0.ebuild
index 4b35a580cf55..fae106f3f435 100644
--- a/dev-python/lz4/lz4-4.0.0.ebuild
+++ b/dev-python/lz4/lz4-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
RDEPEND="app-arch/lz4:="
DEPEND=${RDEPEND}
diff --git a/dev-python/nspektr/nspektr-0.3.0.ebuild b/dev-python/nspektr/nspektr-0.3.0.ebuild
index f7b39a54bef1..15dda4b5a87f 100644
--- a/dev-python/nspektr/nspektr-0.3.0.ebuild
+++ b/dev-python/nspektr/nspektr-0.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-python/jaraco-context-4.1.1-r2[${PYTHON_USEDEP}]
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index c38ba035e69f..bb3ad3811586 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,2 +1 @@
-DIST paramiko-2.10.2.tar.gz 347527 BLAKE2B 0c9ad4a696020eaef3402e1243f3f8ebfbe0cdd8c363d0ec04170678906ed67fe3d233d2feba6be4c48e98ee68589d8cebcf56bc0d818af8d827461634ef03fa SHA512 213fb65ac23133d82edf39c07b85a1e3785c25b4e44a31525595e389da4dda83ddf6fd01e637f66a0524b7f5b95e41615b6e0f578e4709c63a7a25ffd1509288
DIST paramiko-2.10.3.tar.gz 347738 BLAKE2B ccc66a7e0fe3f777e74b94374ed59435eda440fe0aeab3871e68a132610193d2fadca1fd200db3d194566b8a2a8d6ff889d71594fed69a01fb97ca43b967e957 SHA512 e1fce2ad33ee2942b519458d53497671e66d4777c23877954b135cf9bb8ec43357156147c7e012956ccf6198de800835a617b541a4b0faf54df00f936128514b
diff --git a/dev-python/paramiko/paramiko-2.10.2.ebuild b/dev-python/paramiko/paramiko-2.10.2.ebuild
deleted file mode 100644
index 01fc4e263788..000000000000
--- a/dev-python/paramiko/paramiko-2.10.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples server"
-
-RDEPEND="
- >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
- >=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
- >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx sites/docs
-distutils_enable_tests pytest
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-2.7.1-tests.patch"
- )
-
- if ! use server; then
- PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
- fi
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- if use examples; then
- docinto examples
- dodoc -r demos/*
- fi
-}
diff --git a/dev-python/paramiko/paramiko-2.10.3.ebuild b/dev-python/paramiko/paramiko-2.10.3.ebuild
index 6f8a297919b6..01fc4e263788 100644
--- a/dev-python/paramiko/paramiko-2.10.3.ebuild
+++ b/dev-python/paramiko/paramiko-2.10.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
IUSE="examples server"
RDEPEND="
diff --git a/dev-python/paste/paste-3.5.0.ebuild b/dev-python/paste/paste-3.5.0.ebuild
deleted file mode 100644
index ca4614a321c6..000000000000
--- a/dev-python/paste/paste-3.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P="Paste-${PV}"
-DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.org/project/Paste/"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
- >=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
- # TODO: 'Address already in use'
- sed -e 's:test_address_family_v4:_&:' \
- -i tests/test_httpserver.py || die
-
- # Remove a test that runs against the paste website.
- rm tests/test_proxy.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 858047756a1a..55f8be701e88 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,2 +1 @@
-DIST pyfakefs-4.5.5.tar.gz 206012 BLAKE2B f23c612493d7817784cd823bc984b0fce264882bc75787fb985b33bd91875fac83073e17cfe988718413209d95a34838ffd02840c7900740e119fed162b1f0bf SHA512 338813ac1b64c95376c890d8655e70f4c9b6f6361608f868f8569c2151fed66fa30a680c000912e3821c271c6ccebd3407257ea03dfa6d58461d0d25ea6bee86
DIST pyfakefs-4.5.6.tar.gz 206310 BLAKE2B c37cb4709a285bfba411cd76da4f158cfe682d210411290ed3e06456ceb5b6de99ecc320da748c8d9b0e230b6384290638d3fd22f0e1388c1965b2b2806d2d30 SHA512 c7a31cc94eaa2b1830d4da355bf4d3de5cbdc8851561ec82fd2de9fe845457f13bcc25aa58a50afb862f396cb0e83c8bf71bb8be51cc3b628ff01b25db62eca6
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.5.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.5.ebuild
deleted file mode 100644
index 297faf254177..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.5.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
- "${EPYTHON}" -m pyfakefs.tests.all_tests -v ||
- die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
index bc616b332663..297faf254177 100644
--- a/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
distutils_enable_tests pytest
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild
index 2f25204f92f9..99f31b5e2689 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
RDEPEND="
>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyscard/pyscard-2.0.3.ebuild b/dev-python/pyscard/pyscard-2.0.3.ebuild
index 2eefa09fd4bc..9396b82e059b 100644
--- a/dev-python/pyscard/pyscard-2.0.3.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
RDEPEND="sys-apps/pcsc-lite"
DEPEND="${RDEPEND}"
diff --git a/dev-python/pytest-console-scripts/Manifest b/dev-python/pytest-console-scripts/Manifest
index 91978245551d..90c710e59c7f 100644
--- a/dev-python/pytest-console-scripts/Manifest
+++ b/dev-python/pytest-console-scripts/Manifest
@@ -1,2 +1 @@
DIST pytest-console-scripts-1.3.1.tar.gz 14238 BLAKE2B 2c00af468d19500078f48ca38d20430ed426e66b2277b7ad233356969d2a72d51cf60e90a46ae7808e6d33172fa053cc34d45b1f618d866dd14e917e6b225935 SHA512 344e9379976d9a7541f9683f7646b47f7fc25d2ab8d941351811ada7fddd77497cc24f4bc6a6d5ab9388dd5b289ed125bcbfad869009fb3b80aaaa1b951d656d
-DIST pytest-console-scripts-1.3.tar.gz 14365 BLAKE2B 7a9b83f53ef9911e5f336375389e6c6311e64e7b4880ea2cb1f996221d4dbf119bf6fc487f7bb7bfda4355df8f797981e99ac9db2fff3e4871173a878a4fbd64 SHA512 8b66df3a8ff700817f8ec34aa95385ff82c4df47fd67974e91cf4d2fdae578d4683032b0a8162723adfcd461e5da7f1c5bb99339d62ed9cbdca4fd1be001b0f6
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild
deleted file mode 100644
index 8ba921cb08bb..000000000000
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin for testing console scripts"
-HOMEPAGE="https://github.com/kvas-it/pytest-console-scripts"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
- >=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- local script="${BUILD_DIR}/install${EPREFIX}/usr/bin/pytest"
- cat > "${script}" <<-EOF
- #!/usr/bin/env python
- import pytest
- import sys
- sys.exit(pytest.console_main())
- EOF
- chmod +x "${script}" || die
- epytest -x
- rm "${script}" || die
-}
diff --git a/dev-python/pytools/pytools-2022.1.3-r1.ebuild b/dev-python/pytools/pytools-2022.1.3-r1.ebuild
index c12bd0efdfc5..58f62d1e8b8f 100644
--- a/dev-python/pytools/pytools-2022.1.3-r1.ebuild
+++ b/dev-python/pytools/pytools-2022.1.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND="
>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 693ff7905153..a693901d112f 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,2 +1 @@
-DIST pytz-2021.3.tar.gz 320512 BLAKE2B a5f67650cc4eeaa8030fc7d5b7a66bcc397b95e41b492367981580678e1d535cdb425066d4821d9c5f94e4fd813c669987560030c046fc63ecffa2f46e0c3f89 SHA512 c45099f319592976b7715d9973496a2c7438a1b958ef8b90a1ad1fb97e7035624fe6191796727d4b7edf3236271bea4d864e25d1d92431e8cf767ac798448882
DIST pytz-2022.1.tar.gz 320473 BLAKE2B 9a745629a9e4547f8c8765353e58baa6d63e3e6b357e9ca88f69928fb9350cebb6bb3371eee419b4b92b29e6253f8c24af8c781f10d72211d78cb699043496fe SHA512 7737aa28626743026b7de932b27bf44d7b209f495d9dd7f90c6448ec271e007f23004fcd04982e2ca6d0a4075206e1dae7b8836319c299b5559c514366d518a6
diff --git a/dev-python/pytz/pytz-2021.3.ebuild b/dev-python/pytz/pytz-2021.3.ebuild
deleted file mode 100644
index f074e31cd235..000000000000
--- a/dev-python/pytz/pytz-2021.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-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 ~x64-solaris"
-IUSE=""
-
-DEPEND="
- || ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-RDEPEND="${DEPEND}"
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
- # Use timezone-data zoneinfo.
- "${FILESDIR}"/pytz-2020.5-system-zoneinfo.patch
-)
-
-python_test() {
- "${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2022.1.ebuild b/dev-python/pytz/pytz-2022.1.ebuild
index 9b90370f8669..f5343912016d 100644
--- a/dev-python/pytz/pytz-2022.1.ebuild
+++ b/dev-python/pytz/pytz-2022.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE=""
DEPEND="
diff --git a/dev-python/reportlab/reportlab-3.6.9.ebuild b/dev-python/reportlab/reportlab-3.6.9.ebuild
index a78215c6e3bf..f267aca4c1f9 100644
--- a/dev-python/reportlab/reportlab-3.6.9.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
DEPEND="
media-libs/freetype
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r2.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r2.ebuild
index 56c9542c3f1b..ef5d908f13d2 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r2.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="repoze"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~riscv x86"
distutils_enable_tests unittest
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index c41fd11fe043..635c94622100 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,2 +1 @@
-DIST sentry-sdk-1.5.7.gh.tar.gz 244753 BLAKE2B 343c9439525f7609eb3c3962213c8c4b5493d2ace8143d3bb36cd4b13463f4548597f80ac49288d925e0f03a9675b1ed24744eb4cfa3dbe2700a19f2e03585d3 SHA512 8d5e41967387463ed50b4cd582ac0492905bb9cd8740054690f176b8ba07a095836141f4f23791a83909bdb18d4b006aeb0ff963c1663f97305bbdd819a2889a
DIST sentry-sdk-1.5.8.gh.tar.gz 245374 BLAKE2B 0a94db069786813ce38346d50c51173cef5a47099232d56ecc561ebaf7e9ff3ef1063f964370aaf0f184ec02af7652db59153fa1bf3425e6c75c0a4c73c4ede2 SHA512 992cebceb9b3b2a861b6f084a1ae88f93a8cf740b8f0407550c31af9a9332afdeeb6e64d0dd29b2f80ac1cdade942ada90756c6fbc3373f3ee1948b9d037b59b
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.7.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.7.ebuild
deleted file mode 100644
index 10c2be51e86a..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
-SRC_URI="
- https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
- dev-python/urllib3[${PYTHON_USEDEP}]
- dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/asttokens[${PYTHON_USEDEP}]
- dev-python/django[${PYTHON_USEDEP}]
- dev-python/executing[${PYTHON_USEDEP}]
- dev-python/fakeredis[${PYTHON_USEDEP}]
- dev-python/flask-login[${PYTHON_USEDEP}]
- dev-python/gevent[${PYTHON_USEDEP}]
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pyrsistent[${PYTHON_USEDEP}]
- dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
- dev-python/pytest-django[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-localserver[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- dev-python/zope-event[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/eventlet[${PYTHON_USEDEP}]
- ' python3_{8..9})
- )
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
- # tests require Internet access
- tests/integrations/httpx/test_httpx.py
- tests/integrations/requests/test_requests.py
- tests/integrations/stdlib/test_httplib.py
- # wtf is it supposed to do?!
- tests/integrations/gcp/test_gcp.py
- # broken by rq-1.10.1 (optional dep)
- tests/integrations/rq/test_rq.py
-)
-
-EPYTEST_DESELECT=(
- # hangs
- 'tests/test_transport.py::test_transport_works'
- # TODO
- 'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
- tests/test_client.py::test_databag_depth_stripping
- tests/test_client.py::test_databag_string_stripping
- tests/test_client.py::test_databag_breadth_stripping
- tests/integrations/asgi/test_asgi.py::test_websocket
- # incompatible version?
- tests/integrations/falcon/test_falcon.py
- tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
- # test_circular_references: apparently fragile
- 'tests/integrations/threading/test_threading.py::test_circular_references'
- # test for new feature, fails with IndexError
- tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
- # TODO
- tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.8.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.8.ebuild
index 6890de3314ce..dc9d2ef62a99 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.8.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.5.8.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/sentry-python-${PV}"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
RDEPEND="
dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/setuptools-60.10.0.ebuild b/dev-python/setuptools/setuptools-60.10.0.ebuild
index cf905613fe22..b6a443125649 100644
--- a/dev-python/setuptools/setuptools-60.10.0.ebuild
+++ b/dev-python/setuptools/setuptools-60.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools/setuptools-62.1.0.ebuild b/dev-python/setuptools/setuptools-62.1.0.ebuild
index e56325c324b1..6b7d4e64e2c0 100644
--- a/dev-python/setuptools/setuptools-62.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-62.1.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~riscv ~s390 ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index 6f7cb8f0940d..15aa9ccb183e 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,2 +1 @@
-DIST sphinx-tabs-3.3.0.tar.gz 523885 BLAKE2B a02426197dad8d68f57d94804f9c8488236943719e26c3b65f0bea0f539c9be2ef11d9df9b69810081f354cfdbdf8bf5e52806b79b902a3c6bdc0bb36df9e61a SHA512 95b601ac08bf69c96b97834878b2794d0fc0e3aed860c5bbb174e039207b6dc07369f8a5108353a1823e76ac42d0068d4d5185992b1124e9b71ee7cd9c8dc778
DIST sphinx-tabs-3.3.1.tar.gz 523932 BLAKE2B 8b941eb549ea8a10fcd329e880b8fa15742ba7903f4f9d6422335cf889c344a1fec8f16798c286b0c0f7561c128ea297153c31d0445b867e5e23f7960698d31a SHA512 d93ba1149a20711b52f8a76f22d212fdbb97349561f3e13b53873cdb4dba8f18f645e2d73ef378c2dde3d1c0c585c1402d73f4102da0e973be0c90a5912e7036
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.3.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.3.0.ebuild
deleted file mode 100644
index 552657909b41..000000000000
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="https://github.com/executablebooks/sphinx-tabs"
-SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
- =dev-python/docutils-0.17*[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/pytest-regressions[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sphinx-testing[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
- # Unpackaged rinohtype
- tests/test_build.py::test_rinohtype_pdf
-)
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild
index c92f3639cf1d..552657909b41 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz ->
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
=dev-python/docutils-0.17*[${PYTHON_USEDEP}]
diff --git a/dev-python/trimesh/trimesh-3.10.8.ebuild b/dev-python/trimesh/trimesh-3.10.8.ebuild
index 45da22f2c5ec..cef3a3a7573d 100644
--- a/dev-python/trimesh/trimesh-3.10.8.ebuild
+++ b/dev-python/trimesh/trimesh-3.10.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
RDEPEND="
dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index e5829cd73eb0..252dbfc04fdd 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,2 +1 @@
-DIST urllib3-1.26.8.tar.gz 294280 BLAKE2B 401801b16c0c5152cabdfe3317cc53bc79a5aec103cc53a22189dcefcf0d022a05f6afac0bd99274a2fe48b6e86da8eb544b78e4c3a1534f000a9756ff15ccd9 SHA512 bcb56faa5dbe6019f70b63c076e118ec5f89e2d0c25f0e415d9db079532c98ced7e636cec5bf26210d4b0a08bb7b5b7a33a5c8648ccdaad129eea3a212a53bc5
DIST urllib3-1.26.9.tar.gz 295258 BLAKE2B 1c6b51e4243c18c25bcb53158e645ea71fe33e0d09ca029256bcbe05bf178ba600dd8911c71730bdefc3cf9f65cdfd5740f579d17d293f9ac7c5d3cbff478b6f SHA512 ac384291b02516dee781c98182625356ac7bc03972612577de5286e159cf161b541cc610b103e0eec1c9f40503049b41e972a9e0998fcd834efe2f40af0e7394
diff --git a/dev-python/urllib3/urllib3-1.26.8.ebuild b/dev-python/urllib3/urllib3-1.26.8.ebuild
deleted file mode 100644
index dd2f981a1bf1..000000000000
--- a/dev-python/urllib3/urllib3-1.26.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
- >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
- <dev-python/PySocks-2.0[${PYTHON_USEDEP}]
- brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- test? (
- $(python_gen_cond_dep "
- ${RDEPEND}
- dev-python/brotlicffi[\${PYTHON_USEDEP}]
- dev-python/mock[\${PYTHON_USEDEP}]
- dev-python/pytest[\${PYTHON_USEDEP}]
- dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
- >=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
- >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
- " python3_{8..10})
- )
-"
-
-python_test() {
- local -x CI=1
- # FIXME: get tornado ported
- # please keep in sync with BDEPEND!
- if ! has "${EPYTHON}" python3.{8..10}; then
- einfo "Skipping tests on ${EPYTHON}"
- return
- fi
-
- local EPYTEST_DESELECT=(
- # TODO?
- test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_3::test_verified
- test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
- )
-
- epytest
-}
diff --git a/dev-python/urllib3/urllib3-1.26.9.ebuild b/dev-python/urllib3/urllib3-1.26.9.ebuild
index d1b0d817f2ef..767e94c13881 100644
--- a/dev-python/urllib3/urllib3-1.26.9.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="brotli test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 16f61fec3287..3abc3d0a1a17 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,4 +1 @@
-DIST virtualenv-20.13.3.tar.gz 12152717 BLAKE2B 791eff66e02d0e7b563d68136cf9652ca0e7422cde94ddf558053778e7677937f7f3ddd9e2d6d0a5fd56c79d9061474685b39aa8519471cea230f4dc5ea71c83 SHA512 e9e05e6e6aba10bb6c0813484f508aede9fe2a78401272bb12ea68b80e8f4059f4292de51e37c2487efb92d27f6eeda6e108dd12f45623984966d8fe821352c0
-DIST virtualenv-20.13.4.tar.gz 12153741 BLAKE2B 050553253f2576917b71eccb94b9a4f370d8c131c61fd84e1d4e6445181c793435ca7ce988ff62cffedb406d357c52337ba5ad921f1837ac29d81896958b58e0 SHA512 d2800ce3830ac154e9c0f03fe96535286a4322b89ef94c01638065ec353ee1dc439f7dbdbd9647836e514e828781c5a48fce3723f80c32bfa9ce96243610a396
-DIST virtualenv-20.14.0.tar.gz 12209889 BLAKE2B d6b89f71009109ec688045b92fa2907baa2a174a8736b66e3635b125d05f9cedf2b0cf26497e47193d3c99d44b94b899205e8b94d20beeeacab0b22b47e3eb41 SHA512 c4f1b40187d847602cb2ccef1be9ecce6acd234d08abf5967219d8cf900e641337ce027018c2cca566409a5ab3dda1f363d7381a0d2f676000c04e10677bfada
DIST virtualenv-20.14.1.tar.gz 12216889 BLAKE2B 7d06b47629dcf4a60299b9b0a192478b20ef820b8a7516569e50b57b2df383781e7e14fd4beda14a3425164997e69c8ed922edb593f86eb3bd85e4ee3a9f2ac1 SHA512 149e78787db23eabd4238baa172bf023ddcf87d59284fdd090269acfa15991aab182f9e168851f88ef810d5c50dd7cdce69d132c46ebedb10080d65a308e63a1
diff --git a/dev-python/virtualenv/virtualenv-20.13.3.ebuild b/dev-python/virtualenv/virtualenv-20.13.3.ebuild
deleted file mode 100644
index 21703e46e846..000000000000
--- a/dev-python/virtualenv/virtualenv-20.13.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/platformdirs-2[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- )"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-# dev-python/sphinx-argparse \
-# dev-python/sphinx_rtd_theme \
-# dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- tests/unit/activation/test_xonsh.py
- tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
- tests/unit/create/test_creator.py::test_cross_major
- )
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
- )
-
- epytest
-}
-
-pkg_postinst() {
- elog "Please note that while virtualenv package no longer supports"
- elog "Python 2.7, you can still create py2.7 virtualenvs via:"
- elog " $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.13.4.ebuild b/dev-python/virtualenv/virtualenv-20.13.4.ebuild
deleted file mode 100644
index f40a630e4ff5..000000000000
--- a/dev-python/virtualenv/virtualenv-20.13.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/platformdirs-2[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- )"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-# dev-python/sphinx-argparse \
-# dev-python/sphinx_rtd_theme \
-# dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- tests/unit/activation/test_xonsh.py
- tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
- tests/unit/create/test_creator.py::test_cross_major
- )
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
- )
-
- epytest
-}
-
-pkg_postinst() {
- elog "Please note that while virtualenv package no longer supports"
- elog "Python 2.7, you can still create py2.7 virtualenvs via:"
- elog " $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.14.0.ebuild b/dev-python/virtualenv/virtualenv-20.14.0.ebuild
deleted file mode 100644
index 049e901dc93d..000000000000
--- a/dev-python/virtualenv/virtualenv-20.14.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/platformdirs-2[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- )
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-# dev-python/sphinx-argparse \
-# dev-python/sphinx_rtd_theme \
-# dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- tests/unit/activation/test_xonsh.py
- tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
- tests/unit/create/test_creator.py::test_cross_major
- )
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
- 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
- )
-
- epytest
-}
-
-pkg_postinst() {
- elog "Please note that while virtualenv package no longer supports"
- elog "Python 2.7, you can still create py2.7 virtualenvs via:"
- elog " $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.14.1.ebuild b/dev-python/virtualenv/virtualenv-20.14.1.ebuild
index 049e901dc93d..53ea173f1027 100644
--- a/dev-python/virtualenv/virtualenv-20.14.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.14.1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
RDEPEND="
diff --git a/dev-python/wsproto/wsproto-1.0.0-r1.ebuild b/dev-python/wsproto/wsproto-1.0.0-r1.ebuild
index 0c959077a0a6..680e60ecf13c 100644
--- a/dev-python/wsproto/wsproto-1.0.0-r1.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86"
RDEPEND="
>=dev-python/h11-0.9[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/xarray-2022.3.0.ebuild b/dev-python/xarray/xarray-2022.3.0.ebuild
index ab14769c7814..95d669980ab1 100644
--- a/dev-python/xarray/xarray-2022.3.0.ebuild
+++ b/dev-python/xarray/xarray-2022.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
index aff04f9ef317..8f246b00ff9a 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-ruby/mime-types/mime-types-3.4.1.ebuild b/dev-ruby/mime-types/mime-types-3.4.1.ebuild
index 1fe0d52a87de..bb89a8724c19 100644
--- a/dev-ruby/mime-types/mime-types-3.4.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
diff --git a/dev-util/colm/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild
index 1904f500b44d..939cb961af14 100644
--- a/dev-util/colm/colm-0.14.7-r1.ebuild
+++ b/dev-util/colm/colm-0.14.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
BDEPEND="
diff --git a/dev-util/ragel/ragel-7.0.4-r1.ebuild b/dev-util/ragel/ragel-7.0.4-r1.ebuild
index 349189368c90..db6ed6d7f4f3 100644
--- a/dev-util/ragel/ragel-7.0.4-r1.ebuild
+++ b/dev-util/ragel/ragel-7.0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-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"
# Notes from bug #766090
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 8788e72efebb..3bd4b84f494a 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -83,15 +83,18 @@ GCCMICRO=$(ver_cut 3 ${GCC_PV})
# Ideally this variable should allow for custom gentoo versioning
# of binary and gcc-config names not directly tied to upstream
-# versioning. In practive it's hard to untangle from gcc/BASE-VER
+# versioning. In practice it's hard to untangle from gcc/BASE-VER
# (GCC_RELEASE_VER) value.
GCC_CONFIG_VER=${GCC_RELEASE_VER}
# Pre-release support. Versioning schema:
# 1.0.0_pre9999: live ebuild
-# 1.2.3_pYYYYMMDD: weekly snapshots
+# 1.2.3_pYYYYMMDD (or 1.2.3_preYYYYMMDD for unreleased major versions): weekly snapshots
# 1.2.3_rcYYYYMMDD: release candidates
-if [[ ${GCC_PV} == *_p* ]] ; then
+if [[ ${GCC_PV} == *_pre* ]] ; then
+ # weekly snapshots
+ SNAPSHOT=${GCCMAJOR}-${GCC_PV##*_pre}
+elif [[ ${GCC_PV} == *_p* ]] ; then
# weekly snapshots
SNAPSHOT=${GCCMAJOR}-${GCC_PV##*_p}
elif [[ ${GCC_PV} == *_rc* ]] ; then
diff --git a/mail-client/mutt/mutt-2.2.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
index 75b326418878..b88f46543037 100644
--- a/mail-client/mutt/mutt-2.2.3.ebuild
+++ b/mail-client/mutt/mutt-2.2.3.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# yes, we overdepend on the backend impls here, hopefully one day we can
# have REQUIRED_USE do what it is made for again. bug #607360
CDEPEND="
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index a1cf56e82b2f..14fc77a8a35c 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,3 +1,5 @@
DIST postfix-3.6.5.tar.gz 4751485 BLAKE2B 7d53ccf76d978db269fe0ab8641abcb3ba91a72c97fa739a2c8ea80c45bb3ecdaca51d08f7db03582887a0cdcdf96be423e3e35b4f2ab2fbb0fbe4e98dd60758 SHA512 510c7b387b38c8683bda33371468c1c1209285baca7d8f237fdb668b313fa4b4d6727f7e4eb79fc81c4155f0839b4e95995dff186e62621b26e5b8b31cff15d5
+DIST postfix-3.6.6.tar.gz 4752461 BLAKE2B f2508233bfe72706450af0f61d58ef1b5781cebef28dbf42a3f9772f7033ead65542e6b906b35e9ec2adfe05db3f992a7f39287a6439cc60672d7313c52fe3e6 SHA512 ee2e1a59c99b9869c401f8a42afdc094c4b2ba804ed8f9f366c33b36b8d2c66d8362d5a32fbe72f4b2c9a431c232b60ada9fce29dec60ac4610220e0f5c6fb77
DIST postfix-3.7.0.tar.gz 4823087 BLAKE2B 7388ad49862c97e20179a2d3ed26069f21e8a578790fcb8adc9f5b648202269bd4c07905931237dab905d991002bcfd9f03d11e6a85b46fcf0e3b72412d852eb SHA512 f2fb5c0399100c19e428b68728a8ce62b1fb74d365038373f22ed698c1d0fece506b3f1335c322b949875a4a9fa96fa0a7680b12641d596d09615e8fef061da4
+DIST postfix-3.7.1.tar.gz 4824081 BLAKE2B d0bfdbc5105407e5143823e8e14b49e60d5c248eac435279a5fe803b370b46a56de9aff39fdf94398758863f753e43e889e2dffbb393ab63cf486d4fd3f5cf99 SHA512 2a8916eae4b0a4f4e055e1dbae1b9655b1eabcb22d911599a63fb9a1900174c9eab24280bee2ddab42db6674c6b4362964a2a41f67fcb18f0c8c41ad0100b044
DIST postfix-3.8-20220417.tar.gz 4808516 BLAKE2B 738b98be1ccbf7401971da7b46839ebe98f45dfa8605f3644b104fd7c7c347dc4dd818e4fdfa4a3b49dd8c1978cc7e70de38c9a54601832694fba3467a93baa7 SHA512 496f5de690728acae0b42709b3acfd053a0630b7821d788075d61fc8d5eaaf49869aa9268fe44605925206631be08ab67977548074f55a68cc1e6feff4f04e9a
diff --git a/mail-mta/postfix/postfix-3.6.6.ebuild b/mail-mta/postfix/postfix-3.6.6.ebuild
new file mode 100644
index 000000000000..e928304a3b20
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.6.6.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+ acct-group/postfix
+ acct-group/postdrop
+ acct-user/postfix
+ >=dev-libs/libpcre-3.4
+ dev-lang/perl
+ berkdb? ( >=sys-libs/db-3.2:* )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+ eai? ( dev-libs/icu:= )
+ ldap? ( net-nds/openldap:= )
+ ldap-bind? ( net-nds/openldap:=[sasl] )
+ lmdb? ( >=dev-db/lmdb-0.9.11:= )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ nis? ( net-libs/libnsl:= )
+ pam? ( sys-libs/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( >=dev-libs/openssl-1.1.1:0= )
+ "
+
+RDEPEND="${DEPEND}
+ memcached? ( net-misc/memcached )
+ net-mail/mailbase
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !mail-mta/ssmtp[mta]
+ selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+src_prepare() {
+ default
+ sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+ src/util/sys_defs.h || die "sed failed"
+ # change default paths to better comply with portage standard paths
+ sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+ for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+ do
+ local AUXLIBS_${name}=""
+ done
+
+ # Make sure LDFLAGS get passed down to the executables.
+ local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+ AUXLIBS_PCRE="$(pcre-config --libs)"
+
+ use pam && mylibs="${mylibs} -lpam"
+
+ if use ldap; then
+ mycc="${mycc} -DHAS_LDAP"
+ AUXLIBS_LDAP="-lldap -llber"
+ fi
+
+ if use mysql; then
+ mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+ AUXLIBS_MYSQL="$(mysql_config --libs)"
+ fi
+
+ if use postgres; then
+ mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+ AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+ fi
+
+ if use sqlite; then
+ mycc="${mycc} -DHAS_SQLITE"
+ AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+ fi
+
+ if use ssl; then
+ mycc="${mycc} -DUSE_TLS"
+ mylibs="${mylibs} -lssl -lcrypto"
+ fi
+
+ if use lmdb; then
+ mycc="${mycc} -DHAS_LMDB"
+ AUXLIBS_LMDB="-llmdb -lpthread"
+ fi
+
+ if ! use eai; then
+ mycc="${mycc} -DNO_EAI"
+ fi
+
+ # broken. and "in other words, not supported" by upstream.
+ # Use inet_protocols setting in main.cf
+ #if ! use ipv6; then
+ # mycc="${mycc} -DNO_IPV6"
+ #fi
+
+ if use sasl; then
+ if use dovecot-sasl; then
+ # Set dovecot as default.
+ mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+ fi
+ if use ldap-bind; then
+ mycc="${mycc} -DUSE_LDAP_SASL"
+ fi
+ mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+ mylibs="${mylibs} -lsasl2"
+ elif use dovecot-sasl; then
+ mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+ fi
+
+ if ! use nis; then
+ mycc="${mycc} -DNO_NIS"
+ fi
+
+ if ! use berkdb; then
+ mycc="${mycc} -DNO_DB"
+ if use cdb; then
+ # change default hash format from Berkeley DB to cdb
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+ fi
+ fi
+
+ if use cdb; then
+ mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+ # Tinycdb is preferred.
+ if has_version dev-db/tinycdb ; then
+ einfo "Building with dev-db/tinycdb"
+ AUXLIBS_CDB="-lcdb"
+ else
+ einfo "Building with dev-db/cdb"
+ CDB_PATH="/usr/$(get_libdir)"
+ for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+ AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+ done
+ fi
+ fi
+
+ sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+ sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+ emake makefiles shared=yes dynamicmaps=no pie=yes \
+ shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+ DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+ AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+ AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+ AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+ AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+ LD_LIBRARY_PATH="${S}/lib" \
+ /bin/sh postfix-install \
+ -non-interactive \
+ install_root="${D}" \
+ config_directory="/etc/postfix" \
+ manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" \
+ mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ || die "postfix-install failed"
+
+ # Fix spool removal on upgrade
+ rm -Rf "${D}"/var
+ keepdir /var/spool/postfix
+
+ # Install rmail for UUCP, closes bug #19127
+ dobin auxiliary/rmail/rmail
+
+ # Provide another link for legacy FSH
+ dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+ # Install qshape, posttls-finger and collate and tlstype
+ dobin auxiliary/qshape/qshape.pl
+ doman man/man1/qshape.1
+ dobin bin/posttls-finger
+ doman man/man1/posttls-finger.1
+ dobin auxiliary/collate/collate.pl
+ newdoc auxiliary/collate/README README.collate
+ dobin auxiliary/collate/tlstype.pl
+ dodoc auxiliary/collate/README.tlstype
+
+ # Performance tuning tools and their manuals
+ dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+ doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+ # Set proper permissions on required files/directories
+ keepdir /var/lib/postfix
+ fowners -R postfix:postfix /var/lib/postfix
+ fperms 0750 /var/lib/postfix
+ fowners root:postdrop /usr/sbin/post{drop,queue}
+ fperms 02755 /usr/sbin/post{drop,queue}
+
+ keepdir /etc/postfix
+ keepdir /etc/postfix/postfix-files.d
+ if use mbox; then
+ mypostconf="mail_spool_directory=/var/spool/mail"
+ else
+ mypostconf="home_mailbox=.maildir/"
+ fi
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+ -e ${mypostconf} || die "postconf failed"
+
+ insinto /etc/postfix
+ newins "${FILESDIR}"/smtp.pass saslpass
+ fperms 600 /etc/postfix/saslpass
+
+ newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+ # do not start mysql/postgres unnecessarily - bug #359913
+ use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+ use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+ dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+ mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+ # postfix set-permissions expects uncompressed man files
+ docompress -x /usr/share/man
+
+ if use pam; then
+ pamd_mimic_system smtp auth account
+ fi
+
+ if use sasl; then
+ insinto /etc/sasl2
+ newins "${FILESDIR}"/smtp.sasl smtpd.conf
+ fi
+
+ # header files
+ insinto /usr/include/postfix
+ doins include/*.h
+
+ if has_version mail-mta/postfix; then
+ # let the sysadmin decide when to change the compatibility_level
+ sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+ fi
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ if [[ ! -e /etc/mail/aliases.db ]] ; then
+ ewarn
+ ewarn "You must edit /etc/mail/aliases to suit your needs"
+ ewarn "and then run /usr/bin/newaliases. Postfix will not"
+ ewarn "work correctly without it."
+ ewarn
+ fi
+
+ # check and fix file permissions
+ "${EROOT}"/usr/sbin/postfix set-permissions
+
+ # configure tls
+ if use ssl ; then
+ if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+ elog "To configure client side TLS settings:"
+ elog "${EROOT}"/usr/sbin/postfix tls enable-client
+ fi
+ if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+ elog "To configure server side TLS settings:"
+ elog "${EROOT}"/usr/sbin/postfix tls enable-server
+ fi
+ fi
+}
diff --git a/mail-mta/postfix/postfix-3.7.1.ebuild b/mail-mta/postfix/postfix-3.7.1.ebuild
new file mode 100644
index 000000000000..fb6f54abaadd
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.7.1.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+ acct-group/postfix
+ acct-group/postdrop
+ acct-user/postfix
+ dev-libs/libpcre2:0
+ dev-lang/perl
+ berkdb? ( >=sys-libs/db-3.2:* )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+ eai? ( dev-libs/icu:= )
+ ldap? ( net-nds/openldap:= )
+ ldap-bind? ( net-nds/openldap:=[sasl] )
+ lmdb? ( >=dev-db/lmdb-0.9.11:= )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ nis? ( net-libs/libnsl:= )
+ pam? ( sys-libs/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( >=dev-libs/openssl-1.1.1:0= )
+ "
+
+RDEPEND="${DEPEND}
+ memcached? ( net-misc/memcached )
+ net-mail/mailbase
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !mail-mta/ssmtp[mta]
+ selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+src_prepare() {
+ default
+ sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+ src/util/sys_defs.h || die "sed failed"
+ # change default paths to better comply with portage standard paths
+ sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+ for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+ do
+ local AUXLIBS_${name}=""
+ done
+
+ # Make sure LDFLAGS get passed down to the executables.
+ local mycc="" mylibs="${LDFLAGS} -ldl"
+
+ # libpcre is EOL. prefer libpcre2
+ mycc=" -DHAS_PCRE=2"
+ AUXLIBS_PCRE="$(pcre2-config --libs8)"
+
+ use pam && mylibs="${mylibs} -lpam"
+
+ if use ldap; then
+ mycc="${mycc} -DHAS_LDAP"
+ AUXLIBS_LDAP="-lldap -llber"
+ fi
+
+ if use mysql; then
+ mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+ AUXLIBS_MYSQL="$(mysql_config --libs)"
+ fi
+
+ if use postgres; then
+ mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+ AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+ fi
+
+ if use sqlite; then
+ mycc="${mycc} -DHAS_SQLITE"
+ AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+ fi
+
+ if use ssl; then
+ mycc="${mycc} -DUSE_TLS"
+ mylibs="${mylibs} -lssl -lcrypto"
+ fi
+
+ if use lmdb; then
+ mycc="${mycc} -DHAS_LMDB"
+ AUXLIBS_LMDB="-llmdb -lpthread"
+ fi
+
+ if ! use eai; then
+ mycc="${mycc} -DNO_EAI"
+ fi
+
+ # broken. and "in other words, not supported" by upstream.
+ # Use inet_protocols setting in main.cf
+ #if ! use ipv6; then
+ # mycc="${mycc} -DNO_IPV6"
+ #fi
+
+ if use sasl; then
+ if use dovecot-sasl; then
+ # Set dovecot as default.
+ mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+ fi
+ if use ldap-bind; then
+ mycc="${mycc} -DUSE_LDAP_SASL"
+ fi
+ mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+ mylibs="${mylibs} -lsasl2"
+ elif use dovecot-sasl; then
+ mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+ fi
+
+ if ! use nis; then
+ mycc="${mycc} -DNO_NIS"
+ fi
+
+ if ! use berkdb; then
+ mycc="${mycc} -DNO_DB"
+ # change default database type
+ if use cdb; then
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+ elif use lmdb; then
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"lmdb\\\""
+ fi
+ fi
+
+ if use cdb; then
+ mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+ # Tinycdb is preferred.
+ if has_version dev-db/tinycdb ; then
+ AUXLIBS_CDB="-lcdb"
+ else
+ CDB_PATH="/usr/$(get_libdir)"
+ for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+ AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+ done
+ fi
+ fi
+
+ sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+ sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+ emake makefiles shared=yes dynamicmaps=no pie=yes \
+ shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+ DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+ AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+ AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+ AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+ AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+ LD_LIBRARY_PATH="${S}/lib" \
+ /bin/sh postfix-install \
+ -non-interactive \
+ install_root="${D}" \
+ config_directory="/etc/postfix" \
+ manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" \
+ mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ || die "postfix-install failed"
+
+ # Fix spool removal on upgrade
+ rm -Rf "${D}"/var
+ keepdir /var/spool/postfix
+
+ # Install rmail for UUCP, closes bug #19127
+ dobin auxiliary/rmail/rmail
+
+ # Provide another link for legacy FSH
+ dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+ # Install qshape, posttls-finger, collate and tlstype
+ dobin auxiliary/qshape/qshape.pl
+ doman man/man1/qshape.1
+ dobin bin/posttls-finger
+ doman man/man1/posttls-finger.1
+ dobin auxiliary/collate/collate.pl
+ newdoc auxiliary/collate/README README.collate
+ dobin auxiliary/collate/tlstype.pl
+ dodoc auxiliary/collate/README.tlstype
+
+ # Performance tuning tools and their manuals
+ dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+ doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+ # Set proper permissions on required files/directories
+ keepdir /var/lib/postfix
+ fowners -R postfix:postfix /var/lib/postfix
+ fperms 0750 /var/lib/postfix
+ fowners root:postdrop /usr/sbin/post{drop,queue,log}
+ fperms 02755 /usr/sbin/post{drop,queue,log}
+
+ keepdir /etc/postfix
+ keepdir /etc/postfix/postfix-files.d
+ if use mbox; then
+ mypostconf="mail_spool_directory=/var/spool/mail"
+ else
+ mypostconf="home_mailbox=.maildir/"
+ fi
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+ -e ${mypostconf} || die "postconf failed"
+
+ insinto /etc/postfix
+ newins "${FILESDIR}"/smtp.pass saslpass
+ fperms 600 /etc/postfix/saslpass
+
+ newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+ # do not start mysql/postgres unnecessarily - bug #359913
+ use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+ use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+ dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+ dodoc -r README_FILES/ examples/
+ # postfix set-permissions expects uncompressed man files
+ docompress -x /usr/share/man
+
+ if use pam; then
+ pamd_mimic_system smtp auth account
+ fi
+
+ if use sasl; then
+ insinto /etc/sasl2
+ newins "${FILESDIR}"/smtp.sasl smtpd.conf
+ fi
+
+ # header files
+ insinto /usr/include/postfix
+ doins include/*.h
+
+ if has_version mail-mta/postfix; then
+ # let the sysadmin decide when to change the compatibility_level
+ sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+ fi
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ if [[ ! -e /etc/mail/aliases.db ]] ; then
+ ewarn
+ ewarn "You must edit /etc/mail/aliases to suit your needs"
+ ewarn "and then run /usr/bin/newaliases. Postfix will not"
+ ewarn "work correctly without it."
+ ewarn
+ fi
+
+ # check and fix file permissions
+ "${EROOT}"/usr/sbin/postfix set-permissions
+
+ # configure tls
+ if use ssl ; then
+ if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+ elog "To configure client side TLS settings:"
+ elog "${EROOT}"/usr/sbin/postfix tls enable-client
+ fi
+ if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+ elog "To configure server side TLS settings:"
+ elog "${EROOT}"/usr/sbin/postfix tls enable-server
+ fi
+ fi
+}
diff --git a/media-libs/lcms/lcms-2.13.1.ebuild b/media-libs/lcms/lcms-2.13.1.ebuild
index f33993e0517f..915f7d934e27 100644
--- a/media-libs/lcms/lcms-2.13.1.ebuild
+++ b/media-libs/lcms/lcms-2.13.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lcms2-${PV}"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc jpeg static-libs test +threads tiff zlib"
REQUIRED_USE="tiff? ( zlib )"
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index fd916d991d3e..7d1ad8f51ca9 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,3 +1,4 @@
DIST teams_1.4.00.13653_amd64.deb 83232268 BLAKE2B bc59aa1f4b9d5f1740fedc7bfc3c2cec6f8b4c1979a55e5a68742c36ea4399ba0e8c276de2d9e5b8de39363a9359136a5d1be59a6019af8bd5ac9922a5aab2c9 SHA512 d15b6cca0321e5e569e6a1f4ad0801f7a2de1e9312e8f584f07a4bc8bcac8a55626eb060a41baf31b9f4cfcd1cf2757e2f2b946f671f0e4c95c81f9eea0f8e2c
DIST teams_1.4.00.26453_amd64.deb 84503304 BLAKE2B a9d9fb27d42c53b12747fd229214d4d5db8197c870effd201dc7ba9feea143b18138c7bed15d18e70326781577e8bda8640ea463125abc8f0bef08292ad850d5 SHA512 bdc050e813f1237d7774270a8a5229a975e5bb28706b957f5cb03eb481870ca8e81562096e5041f060414d1c727f5b7d6aff7ef66bce96f2fac86f535aade058
DIST teams_1.4.00.7556_amd64.deb 77232550 BLAKE2B f663a79a9edb29aecb240722f46cb29aa6f4e2cca6dbe1a29801aee2e9c408b1ad00ab0d2b8fac3c7c4c227429b0382a06b46114921d2f435fbe1c80415ea9d4 SHA512 0afe2714e290e8b2d30039e27a2af4d22cbd03bc4bfe90d6979714ae1cc75bc5226af8932dc38528a5dc5bd6b4820c4b9d9444abcb558a76438c62cff285ffac
+DIST teams_1.5.00.10453_amd64.deb 84485626 BLAKE2B f9570bedd12dc9113c956d0b9c34c4124939b0a855f73a7611ce640b00fd4a7d8288af94aa3f087482040619c11f79a144e2292dd853254fe4f55fe694165a26 SHA512 69d95e06c67265358f1d995ad9faa21a1af753241031569e7ac88d0cc9c4781985a0839b4fa7e58d176472c7ab15bc8d0876733a2eb710d5d087d2662bc04c30
diff --git a/net-im/teams/teams-1.5.00.10453.ebuild b/net-im/teams/teams-1.5.00.10453.ebuild
new file mode 100644
index 000000000000..3fd38c8df204
--- /dev/null
+++ b/net-im/teams/teams-1.5.00.10453.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+ sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 desktop unpacker xdg
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror splitdebug test"
+IUSE="swiftshader system-ffmpeg"
+
+QA_PREBUILT="*"
+# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 2.2.0), libatspi2.0-0 (>= 2.9.90), libc6 (>= 2.17), libcairo2 (>= 1.10.0)
+# libcups2 (>= 1.7.0), libdrm2 (>= 2.4.38), libexpat1 (>= 2.0.1), libgbm1 (>= 17.1.0~rc2), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0),
+# libglib2.0-0 (>= 2.39.4), libgtk-3-0 (>= 3.19.12), libnspr4 (>= 2:4.9-2~), libnss3 (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0),
+# libx11-6 (>= 2:1.4.99.1), libx11-xcb1, libxcb-dri3-0, libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1),
+# libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18),
+# libstdc++6 (>= 4.8.1)
+RDEPEND="
+ app-accessibility/at-spi2-core:2
+ app-accessibility/at-spi2-atk:2
+ app-crypt/libsecret
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/mesa[gbm(+)]
+ net-print/cups
+ sys-apps/dbus
+ sys-apps/util-linux
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/libdrm
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libxcb
+ x11-libs/libxkbfile
+ x11-libs/pango
+ system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ default
+ sed -i '/OnlyShowIn=/d' usr/share/applications/${PN}.desktop || die
+ sed -e "s@^TEAMS_PATH=.*@TEAMS_PATH=${EPREFIX}/opt/${PN}/${PN}@" \
+ -i usr/bin/${PN} || die
+}
+
+src_install() {
+ rm _gpgorigin || die
+ rm -r "usr/share/${PN}/resources/assets/"{.gitignore,macos,tlb,windows,x86,x64,arm64} || die
+ rm -r "usr/share/${PN}/resources/tmp" || die
+ rm "usr/share/${PN}/chrome-sandbox" || die
+
+ insinto /opt
+ doins -r usr/share/${PN}
+
+ dobin usr/bin/${PN}
+ domenu usr/share/applications/${PN}.desktop
+ doicon usr/share/pixmaps/${PN}.png
+
+ pushd "${ED}/opt/${PN}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ if use system-ffmpeg; then
+ rm "${ED}/opt/${PN}/libffmpeg.so" || die
+ dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so" "opt/${PN}/libffmpeg.so" || die
+ elog "Using system ffmpeg. This is experimental and may lead to crashes."
+ fi
+
+ if ! use swiftshader; then
+ rm -r "${ED}/opt/${PN}/swiftshader" || die
+ elog "Running without SwiftShader OpenGL implementation. If Teams doesn't start "
+ elog "or you experience graphic issues, then try with USE=swiftshader enabled."
+ fi
+
+ fperms +x /usr/bin/${PN}
+ fperms +x /opt/${PN}/${PN}
+}
diff --git a/net-mail/mailbase/files/mailcap-r1 b/net-mail/mailbase/files/mailcap-r1
deleted file mode 100644
index 0ffdcca3783f..000000000000
--- a/net-mail/mailbase/files/mailcap-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-application/pdf; xdg-open '%s'; needsterminal
-application/postscript; xdg-open '%s'; needsterminal
-application/x-info; info --subnodes -o /dev/stdout -f '%s' 2>/dev/null; copiousoutput; description=GNU Info document
-application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
-application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
-application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
-
-audio/*; xdg-open '%s'; needsterminal
-image/*; xdg-open '%s'; needsterminal
-
-text/html; lynx -dump '%s'; copiousoutput; description=HTML Text; nametemplate=%s.html
-text/troff; man -l '%s'; needsterminal; description=Man page
-text/*; less '%s'; needsterminal
-text/*; gview '%s'; edit=gvim -f '%s'; compose=gvim -f '%s'; test=test "$DISPLAY" != ""
-text/*; view '%s'; edit=vim '%s'; compose=vim '%s'; needsterminal
-text/*; more '%s'; needsterminal
-
-*/*; less '%s'; needsterminal
-*/*; false; print=lpr '%s'
diff --git a/net-mail/mailbase/files/mailcap-r2 b/net-mail/mailbase/files/mailcap-r2
deleted file mode 100644
index 5ecd40a4201a..000000000000
--- a/net-mail/mailbase/files/mailcap-r2
+++ /dev/null
@@ -1,36 +0,0 @@
-# Database binding MIME types to programs that can process them.
-# This file is generally used by mail clients to view attachments.
-#
-# Users should add their own rules to their ~/.mailcap file. That file will be
-# processed first before falling back to this one.
-#
-# For more information, see the mailcap(5) man page.
-
-# NB: Do not quote %s. Clients will handle expanding it with proper quoting,
-# so adding quotes ourselves just confuses things.
-
-application/pdf; xdg-open %s; needsterminal
-application/postscript; xdg-open %s; needsterminal
-application/x-info; info --subnodes -o /dev/stdout -f %s 2>/dev/null; copiousoutput; description=GNU Info document
-application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
-application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
-application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
-# It'd be nice to limit this to compressed formats (e.g. x-*), but the file
-# format doesn't support that, and less has good fallbacks already.
-application/*; less %s; copiousoutput; needsterminal
-
-audio/*; xdg-open %s; needsterminal
-image/*; xdg-open %s; needsterminal
-
-text/html; lynx -dump -assume_charset=%{charset} %s; copiousoutput; description=HTML Text; nametemplate=%s.html
-text/troff; man -l %s; needsterminal; description=Man page
-text/*; less %s; needsterminal
-text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
-text/*; view %s; edit=vim %s; compose=vim %s; needsterminal
-text/*; more %s; needsterminal
-
-# NB: This is an extension in the hope that it might be useful to some programs.
-# RFC1524 does not support * for the type (the string before the /), only for
-# the subtype (the string after the /).
-*/*; less %s; needsterminal
-*/*; false; print=lpr %s
diff --git a/net-mail/mailbase/mailbase-1.6-r1.ebuild b/net-mail/mailbase/mailbase-1.6-r1.ebuild
deleted file mode 100644
index c8ddcc3a5694..000000000000
--- a/net-mail/mailbase/mailbase-1.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit pam
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pam"
-
-RDEPEND="
- acct-group/mail
- acct-user/mail
- acct-user/postmaster
- pam? ( sys-libs/pam )
- !<net-mail/metamail-2.7.53.3-r2
-"
-
-src_install() {
- insinto /etc/mail
- doins "${FILESDIR}"/aliases
- insinto /etc
- newins "${FILESDIR}"/mailcap-r1 mailcap
- doman "${FILESDIR}"/mailcap.5
-
- dosym spool/mail /var/mail
-
- if use pam ; then
- newpamd "${FILESDIR}"/common-pamd-include pop
- newpamd "${FILESDIR}"/common-pamd-include imap
- local p
- for p in pop3 pop3s pops ; do
- dosym pop /etc/pam.d/${p}
- done
- for p in imap4 imap4s imaps ; do
- dosym imap /etc/pam.d/${p}
- done
- fi
-}
diff --git a/net-mail/mailbase/mailbase-1.7.ebuild b/net-mail/mailbase/mailbase-1.7.ebuild
deleted file mode 100644
index 242efe827056..000000000000
--- a/net-mail/mailbase/mailbase-1.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit pam
-
-DESCRIPTION="MTA layout package"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pam"
-
-RDEPEND="
- acct-group/mail
- acct-user/mail
- acct-user/postmaster
- pam? ( sys-libs/pam )
- !<net-mail/metamail-2.7.53.3-r2
-"
-
-src_install() {
- insinto /etc/mail
- doins "${FILESDIR}"/aliases
- insinto /etc
- newins "${FILESDIR}"/mailcap-r2 mailcap
- doman "${FILESDIR}"/mailcap.5
-
- dosym spool/mail /var/mail
-
- if use pam ; then
- newpamd "${FILESDIR}"/common-pamd-include pop
- newpamd "${FILESDIR}"/common-pamd-include imap
- local p
- for p in pop3 pop3s pops ; do
- dosym pop /etc/pam.d/${p}
- done
- for p in imap4 imap4s imaps ; do
- dosym imap /etc/pam.d/${p}
- done
- fi
-}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 0cd38f6fe7bb..05d1ee722e42 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,5 +1,7 @@
DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
DIST dropbox-lnx.x86-144.4.4491.tar.gz 102606173 BLAKE2B e662ffac51126b1541a448a32aa4885e4a9a300a48cda79b2cd26e9edcdc53c2cf76dd1e03be4bc7d44d2a7c11e2b7f32d2b89af6ded4c650af8f05ddd865753 SHA512 ed040ddc8883877dd28966691ac068e26cc57a89d9cd9c364b005afb6057c025ec7182f341e1d8c7c2edb1d65ad7ab71a8f39c17e2dcbf73a5af6eba1275986b
DIST dropbox-lnx.x86-145.4.4921.tar.gz 102627045 BLAKE2B a048bce81530d3874f4139e6e98e787f4e2242da830b5a5a43e6ec5f5502ad91bd90bfd25d2068895d18487b516cbd1e35c2fc2cfee9a50f15aca20ea48f8f6b SHA512 3bc7059e5387862c9ccc720f620d7aa47b594c78360f7644b5312659056cbca7cd345c0ee784b4de20c2bcd5f47958a64cc0e0eb63200bdfa8b73e6c06156f0a
+DIST dropbox-lnx.x86-146.4.4836.tar.gz 102846504 BLAKE2B 4f15e811b24a9f4dc64344c68ef8d474afa9d0a0d75aaf17429dec80d6f72e5e77523bb169e01148ee28ee352e68cb497cdcee9381198e299df225cf6bf2d388 SHA512 1f183026fec89d69a739c97aad7c8c94fd4b51fd0db639d883a2ab6866a5b06ed7ec84ff84394bcc03fee44c37409cbbea46e3382c181c3f311d565a94797fb3
DIST dropbox-lnx.x86_64-144.4.4491.tar.gz 104875474 BLAKE2B 42dd986edcf1ae6b709f0a52872219618d771636dccd6f4d0ff0abd7302c8d9358ed0cc6f6f26fb007633a9696f6119c7aac80f631f6687203cd8ed85760f8e4 SHA512 4bef381d4ab177325cd089a854942814b8a7efd553b4f71980c17ea1312d8e9c9a64662ab6a99626254e50a195c2c66f5fc92f465f12881cbd4e89618e120d89
DIST dropbox-lnx.x86_64-145.4.4921.tar.gz 104888508 BLAKE2B 11a91e4c0da4066e4d18daaf5e066c141bb480811a54e3aab8b7c6ef3a96faaee40d5d7007c871de7cc1bd5f402a03c2586de49a13ff2ce75d5bf1dbf120d1bd SHA512 f3f8805c7f98f5bc0010545be2daa9d8713253a5391494537b5c2a8e010b605f50a32ebf1dff473ce6e8768e5350a8b62310541197de24b44a4c5c2295d43c30
+DIST dropbox-lnx.x86_64-146.4.4836.tar.gz 105115149 BLAKE2B dc55f0068d8e98aa806c94fbe3cd21f03a70a4a6bd842ac15acdb4fc9bc6136a663adb1c790bb0ef14724f80076355a9306fac6856fa01e6bc8c165887956d4e SHA512 4e55564295d6770d3bdd731157cede187dcbd54b42436616a024b22b067210f16d2eb280e9b2afd73e00ff13d2b0b2bfd5ad26b6eabf83062d85135107893fd4
diff --git a/net-misc/dropbox/dropbox-146.4.4836.ebuild b/net-misc/dropbox/dropbox-146.4.4836.ebuild
new file mode 100644
index 000000000000..0c3e0f739306
--- /dev/null
+++ b/net-misc/dropbox/dropbox-146.4.4836.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+ amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+ x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+ https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+ X? (
+ x11-themes/hicolor-icon-theme
+ )
+ selinux? ( sec-policy/selinux-dropbox )
+ app-arch/bzip2
+ dev-libs/glib:2
+ dev-libs/libffi-compat:6
+ media-libs/fontconfig
+ media-libs/freetype
+ net-misc/wget
+ sys-libs/zlib
+ sys-libs/ncurses-compat:5
+ virtual/opengl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libxcb
+"
+
+src_unpack() {
+ unpack ${A}
+ mkdir -p "${S}" || die
+ mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+ mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+ rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+ rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+ default
+ # we supply all of these in RDEPEND
+ rm -vf libGL.so.1 libX11* libffi.so.6 || die
+ # some of these do not appear to be used
+ rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+ PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \
+ wmctrl libdrm.so.2 libpopt.so.0 || die
+ if use X ; then
+ mv images/hicolor/16x16/status "${T}" || die
+ else
+ rm -vrf images || die
+ fi
+ patchelf --set-rpath '$ORIGIN' \
+ apex._apex.*.so \
+ nucleus_python.*.so \
+ tprt.*.so \
+ || die
+ pax-mark cm dropbox
+ mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+ local targetdir="/opt/dropbox"
+
+ insinto "${targetdir}"
+ doins -r *
+ fperms a+x "${targetdir}"/{dropbox,dropboxd}
+ dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+ if use X; then
+ doicon -s 16 -c status "${T}"/status
+ newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+ fi
+
+ make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+ newinitd "${FILESDIR}"/dropbox.initd dropbox
+ newconfd "${FILESDIR}"/dropbox.conf dropbox
+ systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+ dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+ einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+ einfo " your user's home directory. To prevent this, run the following as"
+ einfo " each user who will run dropbox:"
+ einfo ""
+ einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 47fcf4b1a730..ac1a6f7a5112 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,3 +1 @@
-DIST man-db-2.10.1.tar.xz 1890536 BLAKE2B b052a7006e1d47dfe7b82f82b6e6e47500ca1c8fa20716af7d3d4193ebde0b109f13f4ed3148c5e4bbc76f34d457ec71bf93ed88f9ab0f5da5b5e1c9066e6d70 SHA512 25a3c4e3d7b171faf0771885a7a7d502c4af801881777231c79d7ee9768c2e48e44afbf5603af13f5ac63e6981cfdb8e36ba8a33d5f926d8122635cf45fcff7a
DIST man-db-2.10.2.tar.xz 1902840 BLAKE2B 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599 SHA512 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf
-DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c
diff --git a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch
deleted file mode 100644
index 71cbb1c20df6..000000000000
--- a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://gitlab.com/cjwatson/man-db/-/merge_requests/3
-
-libdb: link against libintl
-
-necessary since gettext is used for translations
-
-Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-
---- a/libdb/Makefile.am
-+++ b/libdb/Makefile.am
-@@ -43,7 +43,7 @@
- db_xdbm.h \
- mydbm.h
-
--libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS)
-+libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL)
-
- libmandb_la_LDFLAGS = \
- -avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined
---- a/libdb/Makefile.in
-+++ b/libdb/Makefile.in
-@@ -1541,7 +1541,7 @@
- db_xdbm.h \
- mydbm.h
-
--libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS)
-+libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL)
- libmandb_la_LDFLAGS = \
- -avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined
-
diff --git a/sys-apps/man-db/man-db-2.10.1.ebuild b/sys-apps/man-db/man-db-2.10.1.ebuild
deleted file mode 100644
index 10986291516d..000000000000
--- a/sys-apps/man-db/man-db-2.10.1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd prefix tmpfiles
-
-DESCRIPTION="A man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="https://gitlab.com/cjwatson/man-db https://www.nongnu.org/man-db/"
-if [[ ${PV} == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://gitlab.com/cjwatson/man-db.git"
-else
- # TODO: Change tarballs to gitlab too...?
- SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="!sys-apps/man
- >=dev-libs/libpipeline-1.5.0
- sys-apps/groff
- !berkdb? ( sys-libs/gdbm:= )
- berkdb? ( sys-libs/db:= )
- seccomp? ( sys-libs/libseccomp )
- zlib? ( sys-libs/zlib )"
-DEPEND="${CDEPEND}"
-BDEPEND="app-arch/xz-utils
- virtual/pkgconfig
- nls? (
- >=app-text/po4a-0.45
- sys-devel/gettext
- virtual/libiconv
- virtual/libintl
- )"
-RDEPEND="${CDEPEND}
- acct-group/man
- acct-user/man
- selinux? ( sec-policy/selinux-mandb )"
-PDEPEND="manpager? ( app-text/manpager )"
-
-PATCHES=(
- "${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
-)
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- git-r3_src_unpack
-
- # We need to mess with gnulib
- EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
- EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- default
-
- if [[ "${PV}" == *9999 ]] ; then
- local bootstrap_opts=(
- --gnulib-srcdir=../gnulib
- --no-bootstrap-sync
- --copy
- --no-git
- )
- AUTORECONF="/bin/true" \
- LIBTOOLIZE="/bin/true" \
- sh ./bootstrap "${bootstrap_opts[@]}" || die
-
- eautoreconf
- fi
-
- hprefixify src/man_db.conf.in
- if use prefix ; then
- {
- echo "#"
- echo "# Added settings for Gentoo Prefix"
- [[ ${CHOST} == *-darwin* ]] && \
- echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
- echo "MANDATORY_MANPATH /usr/share/man"
- } >> src/man_db.conf.in
- fi
-}
-
-src_configure() {
- # Set sections we want to search by default
- local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
- sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
- case ${CHOST} in
- *-solaris*)
- # Solaris tends to use sections named after the pkgs that
- # owns them, in particular for libc functions we want those
- # sections
- local s
- for s in $(cd /usr/share/man/ && echo man*) ; do
- s=${s#man}
- [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
- done
- ;;
- esac
-
- export ac_cv_lib_z_gzopen=$(usex zlib)
- local myeconfargs=(
- --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --disable-setuid # bug #662438
- --enable-cache-owner=man
- --with-sections="${sections}"
-
- $(use_enable nls)
- $(use_enable static-libs static)
- $(use_with seccomp libseccomp)
-
- --with-db=$(usex berkdb db gdbm)
- )
-
- case ${CHOST} in
- *-solaris*|*-darwin*)
- myeconfargs+=(
- $(use_with nls libiconv-prefix "${EPREFIX}"/usr)
- $(use_with nls libintl-prefix "${EPREFIX}"/usr)
- )
- ;;
- esac
-
- econf "${myeconfargs[@]}"
-
- # Disable color output from groff so that the manpager can add it. bug #184604
- sed -i \
- -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
- src/man_db.conf || die
-
- cat > 15man-db <<-EOF || die
- SANDBOX_PREDICT="/var/cache/man"
- EOF
-}
-
-src_install() {
- default
- dodoc docs/{HACKING.md,TODO}
- find "${ED}" -type f -name "*.la" -delete || die
-
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #289884
-
- insinto /etc/sandbox.d
- doins 15man-db
-}
-
-pkg_preinst() {
- local cachedir="${EROOT}/var/cache/man"
- # If the system was already exploited, and the attacker is hiding in the
- # cachedir of the old man-db, let's wipe them out.
- # see bug #602588 comment 18
- local _replacing_version=
- local _setgid_vuln=0
- for _replacing_version in ${REPLACING_VERSIONS} ; do
- if ver_test '2.7.6.1-r2' -le "${_replacing_version}" ; then
- debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
- else
- _setgid_vuln=1
- debug-print "Applying cleanup for security bug #602588"
- fi
- done
- [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
- # Fall back to recreating the cachedir
- if [[ ! -d ${cachedir} ]] ; then
- mkdir -p "${cachedir}" || die
- chown man:man "${cachedir}" || die
- fi
-
- # Update the whatis cache
- if [[ -f ${cachedir}/whatis ]] ; then
- einfo "Cleaning ${cachedir} from sys-apps/man"
- find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process man-db.conf
-
- if [[ -n "${REPLACING_VERSIONS}" ]] ; then
- local _replacing_version=
-
- for _replacing_version in ${REPLACING_VERSIONS} ; do
- if [[ $(ver_cut 2 ${_replacing_version}) -lt 7 ]] ; then
- einfo "Rebuilding man-db from scratch with new database format!"
- su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-
- # No need to run it again if we hit one
- break
- fi
- done
- fi
-}
diff --git a/sys-apps/man-db/man-db-2.9.4-r1.ebuild b/sys-apps/man-db/man-db-2.9.4-r1.ebuild
deleted file mode 100644
index 4dd59206d9d6..000000000000
--- a/sys-apps/man-db/man-db-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd prefix tmpfiles
-
-DESCRIPTION="A man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
- SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="
- !sys-apps/man
- >=dev-libs/libpipeline-1.5.0
- sys-apps/groff
- gdbm? ( sys-libs/gdbm:= )
- !gdbm? ( berkdb? ( sys-libs/db:= ) )
- !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
- seccomp? ( sys-libs/libseccomp )
- zlib? ( sys-libs/zlib )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
- app-arch/xz-utils
- virtual/pkgconfig
- nls? (
- >=app-text/po4a-0.45
- sys-devel/gettext
- virtual/libiconv
- virtual/libintl
- )
-"
-RDEPEND="
- ${CDEPEND}
- acct-group/man
- acct-user/man
- selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-PATCHES=(
- "${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
- "${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch
-)
-
-pkg_setup() {
- if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
- ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
- fi
-}
-
-src_unpack() {
- if [[ "${PV}" == *9999 ]] ; then
- git-r3_src_unpack
-
- # We need to mess with gnulib :-/
- EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
- EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- default
- if [[ "${PV}" == *9999 ]] ; then
- local bootstrap_opts=(
- --gnulib-srcdir=../gnulib
- --no-bootstrap-sync
- --copy
- --no-git
- )
- AUTORECONF="/bin/true" \
- LIBTOOLIZE="/bin/true" \
- sh ./bootstrap "${bootstrap_opts[@]}" || die
-
- eautoreconf
- fi
-
- hprefixify src/man_db.conf.in
- if use prefix ; then
- {
- echo "#"
- echo "# Added settings for Gentoo Prefix"
- [[ ${CHOST} == *-darwin* ]] && \
- echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
- echo "MANDATORY_MANPATH /usr/share/man"
- } >> src/man_db.conf.in
- fi
-}
-
-src_configure() {
- # set sections we want to search by default
- local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
- sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
- case ${CHOST} in
- *-solaris*)
- # Solaris tends to use sections named after the pkgs that
- # owns them, in particular for libc functions we want those
- # sections
- local s
- for s in $(cd /usr/share/man/ && echo man*) ; do
- s=${s#man}
- [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
- done
- ;;
- esac
-
- export ac_cv_lib_z_gzopen=$(usex zlib)
- local myeconfargs=(
- --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --disable-setuid #662438
- --enable-cache-owner=man
- --with-sections="${sections}"
- $(use_enable nls)
- $(use_enable static-libs static)
- $(use_with seccomp libseccomp)
- --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
- )
- case ${CHOST} in
- *-solaris*|*-darwin*)
- myeconfargs+=(
- $(use_with nls libiconv-prefix ${EPREFIX}/usr)
- $(use_with nls libintl-prefix ${EPREFIX}/usr)
- )
- ;;
- esac
- econf "${myeconfargs[@]}"
-
- # Disable color output from groff so that the manpager can add it. #184604
- sed -i \
- -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
- src/man_db.conf || die
-
- cat > 15man-db <<-EOF || die
- SANDBOX_PREDICT="/var/cache/man"
- EOF
-}
-
-src_install() {
- default
- dodoc docs/{HACKING,TODO}
- find "${ED}" -type f -name "*.la" -delete || die
-
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
-
- insinto /etc/sandbox.d
- doins 15man-db
-}
-
-pkg_preinst() {
- local cachedir="${EROOT}/var/cache/man"
- # If the system was already exploited, and the attacker is hiding in the
- # cachedir of the old man-db, let's wipe them out.
- # see bug #602588 comment 18
- local _replacing_version=
- local _setgid_vuln=0
- for _replacing_version in ${REPLACING_VERSIONS}; do
- if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
- debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
- else
- _setgid_vuln=1
- debug-print "Applying cleanup for security bug #602588"
- fi
- done
- [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
- # Fall back to recreating the cachedir
- if [[ ! -d ${cachedir} ]] ; then
- mkdir -p "${cachedir}" || die
- chown man:man "${cachedir}" || die
- fi
-
- # Update the whatis cache
- if [[ -f ${cachedir}/whatis ]] ; then
- einfo "Cleaning ${cachedir} from sys-apps/man"
- find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process man-db.conf
-
- if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
- einfo "Rebuilding man-db from scratch with new database format!"
- su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
- fi
-}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7f79d51acfb1..b224864ac5c3 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -12,6 +12,8 @@ DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa445
DIST gcc-11.3.0-musl-patches-1.tar.bz2 3997 BLAKE2B 5ca064cc78b067f4a7822fa0341c37ae03c8024f871d2e274e481a583afa96c36e291be93fbdd633f203260ae2ea9ac1d45f666d134bac75bc9a715a369d7374 SHA512 0ab239c66cf62a737266377c19b8dda6af6df56380f6731c2c17f3e82778e7e023a68d31728490eea3ad946f4b71d4cab363a75548f74b4b7f653972469d9e91
DIST gcc-11.3.0-patches-3.tar.bz2 13567 BLAKE2B dba270d74b7a598e0108be0be7ff8cf01899d044ca4be9938cd5324465dc00c9e5cac4ffb4b6c1bdcdb824d75a7577eed63ae724c7e2887a19708992aca10f26 SHA512 7919b37900bbc2493564bc70f7911cf03efb857ff09c2b13280018fb54c48d8be42e35b649e69594a3ce61d51de847a8d4f75f794ce1dc50db3a700831b6a1e7
DIST gcc-11.3.0-patches-4.tar.bz2 14030 BLAKE2B cdd555f329c7c0b993cd3527489681bfcc2162db0997611b66337e6b287356761c7deccd3b9f9bb8980a32df0574017a52c5e445e24db746757d87ffccb1ea89 SHA512 cb227599d01734ae9f9fc7ae2c8dd4cae1da80d6ab398ec6f112535239ac76ce8e91fbac88e19c2f75cb08ab75f966c1d1ad4af80ede67e953fbbafc7baefa58
+DIST gcc-12-20220417.tar.xz 79042676 BLAKE2B 389cacda0c01734341d9faa1d196685b7e584fce1dea6bc5c7b23588194390511d0b47ebfd8e6ef847dc9c6e49163c97298ab1e68b4caa00d3e307292b25ad50 SHA512 fbf24f0dc5ccba2586d0ed52e305417d891e1afc09cb1e4e843849940efe169cc43e0a7d6fb0748c1236f63ccd3c41a6c4e6307d1eb6de388fd6a37e90c2aca7
+DIST gcc-12.0.0-musl-patches-1.tar.bz2 1221 BLAKE2B d647eea69bbc4635b9dc404375f6cac617b3beccc792f400bc47d680a9e78e85ed54be6c5475d4e53494ce7c1a23f813d56f1ed88597039147ead7db01963f1f SHA512 1ea72da6e530b3484e4be10df2864f8e1fce1d2c151533e611ee020b3388d9670b2081b3e0b21e6a4ffabdb93f85bdc0411cc0229186a25b53638011a3a66b06
DIST gcc-12.0.0-patches-4.tar.bz2 10109 BLAKE2B 8169b76a32d39abb53c0f1259067e084fdcea836c7b7d8801149e6845435f277459d6c26c71af23a5a091a50669834d69daae831221caeb7c305e3ecf565dd9b SHA512 58ec31b740f07d0a7ed85b27d00c3b1afbc4991921526325d9ad99325fc18247ebc24234a44d46ff924156198f3047c027662983e311eb74d4404a58646afa3c
DIST gcc-6.5.0-patches-6.tar.bz2 15320 BLAKE2B fe6b60cd45d00187e4e41e607af6a1137481a6d8f4421a0ead7da9fd86d0cd19bf428e5d150e1de4e0616606f8d6c31738da24be8151c58f7760aa92432ea3d0 SHA512 87c2a6726373999472cbd6211e486864266c833d5a07f8fb02dd3054b7dd3f86aa86ea47b17928045ef6e46d82f429f879d6f69d8adf3b6f2956f4ac6b3f80f1
DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
diff --git a/sys-devel/gcc/gcc-12.0.1_pre20220417.ebuild b/sys-devel/gcc/gcc-12.0.1_pre20220417.ebuild
new file mode 100644
index 000000000000..24bc3cc5bbcf
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.0.1_pre20220417.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER="4"
+PATCH_GCC_VER="12.0.0"
+MUSL_VER="1"
+MUSL_GCC_VER="12.0.0"
+
+inherit toolchain
+
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+
+src_prepare() {
+ toolchain_src_prepare
+
+ if tc-is-cross-compiler ; then
+ # bug #803371
+ eapply "${FILESDIR}"/gcc-11.2.0-cross-compile-include.patch
+ fi
+
+ eapply_user
+}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
index 275b94d17ffd..2949d25768a2 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
@@ -12,16 +12,22 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse lto nls static-libs +threads +tools"
+IUSE="cron fuse lto nls static-libs test +threads +tools"
+RESTRICT="!test? ( test )"
RDEPEND="
!sys-libs/${PN}-libs
cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
fuse? ( sys-fs/fuse:0 )
nls? ( virtual/libintl )
- tools? ( >=sys-apps/util-linux-2.16 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+ tools? ( sys-apps/util-linux )"
+# For testing lib/ext2fs, lib/support/libsupport.a is required, which
+# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
+DEPEND="
+ ${RDEPEND}
+ test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )"
+BDEPEND="
+ virtual/pkgconfig
sys-apps/texinfo
nls? ( sys-devel/gettext )"
@@ -32,13 +38,9 @@ PATCHES=(
"${FILESDIR}"/${P}-parallel-make.patch
)
-pkg_setup() {
- if use tools ; then
- MULTILIB_WRAPPED_HEADERS=(
- /usr/include/ext2fs/ext2_types.h
- )
- fi
-}
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/ext2fs/ext2_types.h
+)
src_prepare() {
default
@@ -101,50 +103,44 @@ multilib_src_configure() {
}
multilib_src_compile() {
- if ! multilib_is_native_abi || ! use tools ; then
+ if multilib_is_native_abi && use tools ; then
+ emake V=1
+ else
emake -C lib/et V=1
emake -C lib/ss V=1
- if use tools ; then
- emake -C lib/ext2fs V=1
- emake -C lib/e2p V=1
- fi
- return 0
+ emake -C lib/ext2fs V=1
+ emake -C lib/e2p V=1
fi
-
- emake V=1
}
multilib_src_test() {
- if multilib_is_native_abi ; then
+ if multilib_is_native_abi && use tools ; then
emake V=1 check
else
+ # required by lib/ext2fs's check target
+ emake -C lib/support V=1
+
# For non-native, there's no binaries to test. Just libraries.
emake -C lib/et V=1 check
emake -C lib/ss V=1 check
+ emake -C lib/ext2fs V=1 check
+ emake -C lib/e2p V=1 check
fi
}
multilib_src_install() {
- if ! multilib_is_native_abi || ! use tools ; then
+ if multilib_is_native_abi && use tools ; then
+ emake STRIP=':' V=1 DESTDIR="${D}" install
+ else
emake -C lib/et V=1 DESTDIR="${D}" install
emake -C lib/ss V=1 DESTDIR="${D}" install
-
- if use tools ; then
- emake -C lib/ext2fs V=1 DESTDIR="${D}" install
- emake -C lib/e2p V=1 DESTDIR="${D}" install
- fi
- else
- emake \
- STRIP=: \
- DESTDIR="${D}" \
- install
-
- # Move shared libraries to /lib/, install static libraries to
- # /usr/lib/, and install linker scripts to /usr/lib/.
- gen_usr_ldscript -a e2p ext2fs
+ emake -C lib/ext2fs V=1 DESTDIR="${D}" install
+ emake -C lib/e2p V=1 DESTDIR="${D}" install
fi
- gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+ # Move shared libraries to /lib/, install static libraries to
+ # /usr/lib/, and install linker scripts to /usr/lib/.
+ gen_usr_ldscript -a com_err ss ext2fs e2p
# configure doesn't have an option to disable static libs :/
if ! use static-libs ; then