gentoo resync : 24.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
commit: b49088575eb777ced2551f484da86317332d6087 (patch)
tree: bf9a151cf2d61956340d555659ffc098ee1da466 /app-admin
parent: 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)
45 files changed, 517 insertions, 287 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 174a25f5ecbf..1ce7aff3eebf 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 05db82fbd9c6..a65464af398d 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -2,6 +2,6 @@ AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f
 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
 DIST abrt-2.14.2.tar.gz 6113632 BLAKE2B 904ec2ca4c3aa70b62573ca2730742689f4446c1e5f04bfb6dc4267a4a9a6d44ef8c2b6e82c1e0aba04876b400c3a965a879da65bbff7ec729846f1b5c28cdf9 SHA512 82ba10cb151b4585024e3dfc626f46a7d967797e0375158cd76355c4f6a66c59578cc7b41bc5d5aaa3e694b3653b8658650df458676225660cfe95ec318c6886
 DIST abrt-2.14.5.tar.gz 6056105 BLAKE2B 22e797a431237bd3d4ef6f2467842c5f08e2ef3ca51e7857e3c55e45ed93a9499843fe40b081c70affb5def8f2cfe78d61e865c51c969fb2c9936225bdfe4996 SHA512 a8672735c6d3263ddff006e6e186d9b71e6d9375a8c909c2a85bbbf736a6687b6fe4aa74640a07664f14fd886895a86babf41218a8c2365d6fccd347630ccc9e
-EBUILD abrt-2.14.2.ebuild 3153 BLAKE2B 90814321779be2e6e624d3eaac8e0a910e11e8379c04c0d408a70b5561c4f2ce560b126887e24d72884eb9553f0c8ba00c860b775286ae5279853770cf9e6d53 SHA512 0fe5f288ebc6a9937f9cbc9634801b4c92d0e84fb3bd4b679974f8f0759d2d2bb9710bdc70462dbaf73904d9f57c332746fe93fb7dfba5ed3a9863ecbd9e8d32
-EBUILD abrt-2.14.5.ebuild 3153 BLAKE2B 90814321779be2e6e624d3eaac8e0a910e11e8379c04c0d408a70b5561c4f2ce560b126887e24d72884eb9553f0c8ba00c860b775286ae5279853770cf9e6d53 SHA512 0fe5f288ebc6a9937f9cbc9634801b4c92d0e84fb3bd4b679974f8f0759d2d2bb9710bdc70462dbaf73904d9f57c332746fe93fb7dfba5ed3a9863ecbd9e8d32
+EBUILD abrt-2.14.2.ebuild 3123 BLAKE2B bc1b6fd277f756dd59fcd34a045f0768c5ac418636e576ce2b1b43ef73a2e994c857635e9cbd311382868930c94032ffdef0b0dc716371e2e7e2f4a59604fa3c SHA512 b9585478516532464b1c966ce04e60d1a32b9148960b03a15e0107248bfa00a56e3d3bc350973c11c0c659a0da485563f6dece86aed1af4f33fb39195411247e
+EBUILD abrt-2.14.5.ebuild 3123 BLAKE2B bc1b6fd277f756dd59fcd34a045f0768c5ac418636e576ce2b1b43ef73a2e994c857635e9cbd311382868930c94032ffdef0b0dc716371e2e7e2f4a59604fa3c SHA512 b9585478516532464b1c966ce04e60d1a32b9148960b03a15e0107248bfa00a56e3d3bc350973c11c0c659a0da485563f6dece86aed1af4f33fb39195411247e
 MISC metadata.xml 327 BLAKE2B 856e3ab03170c985b08a7c11282af63794b0447b04d221803badcb19a9145adaa91d7637a6fe864618c469d2dfa7796bb39a3ef5ab2116eb7861f2793961dd0b SHA512 4ab7758c443c8c34f579d9b89e9b2c8aeeaf2b83f8bef397d1d56e24779708e761324eea26c0ef69283c9a018b7e7f82492a534683509040facefa382d9a3acb
diff --git a/app-admin/abrt/abrt-2.14.2.ebuild b/app-admin/abrt/abrt-2.14.2.ebuild
index 16a5250da01e..6756dd1e66a6 100644
--- a/app-admin/abrt/abrt-2.14.2.ebuild
+++ b/app-admin/abrt/abrt-2.14.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1 xdg-utils
 
@@ -41,15 +41,15 @@ RDEPEND="${DEPEND}
 	sys-apps/util-linux
 	>=sys-devel/gdb-7
 	$(python_gen_cond_dep '
-			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
-			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-			dev-python/argh[${PYTHON_MULTI_USEDEP}]
-			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+			dev-libs/satyr[${PYTHON_USEDEP}]
+			dev-python/argcomplete[${PYTHON_USEDEP}]
+			dev-python/argh[${PYTHON_USEDEP}]
+			dev-python/humanize[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)
 	app-text/asciidoc
 	app-text/xmlto
diff --git a/app-admin/abrt/abrt-2.14.5.ebuild b/app-admin/abrt/abrt-2.14.5.ebuild
index 16a5250da01e..6756dd1e66a6 100644
--- a/app-admin/abrt/abrt-2.14.5.ebuild
+++ b/app-admin/abrt/abrt-2.14.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1 xdg-utils
 
@@ -41,15 +41,15 @@ RDEPEND="${DEPEND}
 	sys-apps/util-linux
 	>=sys-devel/gdb-7
 	$(python_gen_cond_dep '
-			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
-			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-			dev-python/argh[${PYTHON_MULTI_USEDEP}]
-			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+			dev-libs/satyr[${PYTHON_USEDEP}]
+			dev-python/argcomplete[${PYTHON_USEDEP}]
+			dev-python/argh[${PYTHON_USEDEP}]
+			dev-python/humanize[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)
 	app-text/asciidoc
 	app-text/xmlto
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 37fa90bdb337..ec6d029f7a23 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -2,9 +2,11 @@ DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cb
 DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16572d4a4e79c5f3e4151ec8b913a3be0cfbcb42e5743fe627b7aba9b0e6b004189960cd5a17ff46166cd033a952d3c560 SHA512 093514230a3f6680ddeda07c24e77c2e793475895f44da6e5dd68335341d6fefe10091a124cf84e18475257a099b39fd2c16e6fc0dae0bbaf2d26e70b09c277a
 DIST ansible-core-2.11.1.tar.gz 6148111 BLAKE2B 46b1553542adbebfb0b0756be99a81d20cce2978a59766c65632b40413a851ad3c9de12df67959c0557584c5209ecd4f3c94381ae0a1e6987bd3cfb237de5a85 SHA512 1362754dde0a88ca8f6323d87cc6f4bf5f93b189b8d45fcb435d3fb289c359da128e7688a92107ade2c54828d4c4deb3ded9e01e18d19c503306924aa189a381
 DIST ansible-core-2.11.2.tar.gz 7081783 BLAKE2B 64a2e02c4e44e72383bfb291efcde07a85ae553418e27687fbc12acdc45608e9b89e9f64943ad7f98a6de094f61765ac3e89fa84e66ed634e764a5f9581c6bd5 SHA512 8b4a8e329be9375d3226f8b992223198913226527278c14ccec01d8e7c546cca847cf7d2415440be995d236bdd88640c0dd6f740e91ca748de2d1c5b7b52c921
+DIST ansible-core-2.11.3.tar.gz 6841255 BLAKE2B fde1143515d04121de79ddb2c14bf326f9efa596c39418b9def1679539dd144551b64dff83c66795e44f48e776dbc60bc456125904bbb64970f8c44e072b5abf SHA512 93a28200dd0ab289cc05add5fbe46a1cfbbd4ba91fc7d7e95ee4060dc4f126bf4bd4affce5e44dac9cf2c12792b2a2a10b97d96b795f5bed579959391b7c4a65
 EBUILD ansible-base-2.10.10.ebuild 1633 BLAKE2B 425db4ea1e64c960b86d56cccddeb59edd838f389bb685c145babd0e885677de76b364383b801f7ffbdc61fd6a46f8baa24c26e45f00e984aa162bbcac4ae24b SHA512 2b67326ac2653e03b37829db0952232183b2f79d7e66c3d5a78847f17b2f5f93f27bccf39e164af56f80c1ee8acb69c3379bb6107c0e987aeeabb6caf3547c52
 EBUILD ansible-base-2.10.9.ebuild 1630 BLAKE2B 1893c43eb9482e3899c4695a6378f85f945fb71ae968845672a6f806be576d5746ef505b0ef63c87b49e4e7a406d772353846ae923c363844d2fe2dc66b5a33b SHA512 66db0cdc15878cc5378a8b63644b7e143fad646342d763c83b8a58de3cc117093495f8a5945daffb93b3219beaa47a0c1564c8fba14611c5a1054789ac8dc99b
 EBUILD ansible-base-2.11.1.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
 EBUILD ansible-base-2.11.2.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
+EBUILD ansible-base-2.11.3.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
 EBUILD ansible-base-9999.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
 MISC metadata.xml 1039 BLAKE2B f5dae1c1a1b61e63b24a07d2de97caa4e50b7ef0d5d19b094e917d31e24fe7eb187505fd2841cd6e5a3ad20461a0f645b30732d7ac909503f35cdfb1f2bd3316 SHA512 6431f60bcde845ad153894cb4149418918a2250f7011ca73794635334ca12a1e550c40d002eaf45ae725d0ff510b8fb3b0815e94df69b744f027ffa797534a32
diff --git a/app-admin/ansible-base/ansible-base-2.11.3.ebuild b/app-admin/ansible-base/ansible-base-2.11.3.ebuild
new file mode 100644
index 000000000000..459607c5a037
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.11.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 8d25cd743e4f..da36483eada2 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,7 @@
 DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191
 DIST ansible-4.1.0.tar.gz 33999079 BLAKE2B b7c512ed01f220dbfdd5c90cd67c88cc3b50dce5a83a783b798afafe88d75d96ae7abd9a512a1d4fc4e1ad0305c72e6d2b4ebe3811addf78faf2d14dab7dd188 SHA512 603a5aa6b63d447efcb6e2f04f40c1bf5d7cc888f344bdc00ca3f9bca92c406554328a0e77cf3d5f2633addc9d6459d7b9d9176d14ecc506c67013fc8180b0c0
+DIST ansible-4.3.0.tar.gz 35135987 BLAKE2B 6f4bf55f07275b7264a7fba693816bf925d574d4da3d4d13af9b85c44d4b5adf9e823b9bd936408a0e424273f8f2aa529e960105842444d26eb3f45973109ec5 SHA512 035a236d0762e425c4ce4ffd709386075aee438bb8085a25920543bb2378feb07fb8f0a50ce9fb6b0d1f5dde1f27a408b828c286bfc1173d38da5f8c7b572c3a
 EBUILD ansible-2.10.7.ebuild 1480 BLAKE2B b69ca1d077f02df2047cc868fbf47a1d7b5fb254e5d3b1df1b338185817d62e754d9a7ec1dbd7142a70693b05e39cdb521e8857602ff1cf8687ed42047ba0a0f SHA512 b7c2c77bfed222420589930162c334b2ddc5ee5db2cf5476886bc6197025d25b57459b01e7988b74a11b7fafb11e1f1f9914d306ea3dba7eeccc176aa464c14f
 EBUILD ansible-4.1.0.ebuild 607 BLAKE2B 36fcaac434ab8c234eb47fae029ce81d50424677d39e3efadd3b8b44af7831ccf0fee49c748881fee8c26655eb0431710eb65620e8284c0a3369160e46957d77 SHA512 fa3b300013afc4409b08c815e12842497abfd5a3745a4da7cd1e70d55f7aefbefdabe0203e5647b161a587c2e5066e86aace9fd1b10c584b774c35c719985d7f
+EBUILD ansible-4.3.0.ebuild 697 BLAKE2B ea53fc76991ee7470e5fbf667e49d0dd58a476ea06fd39aed5af1e26e4b5fba44e18d14d0e753668b12149fbf82123eabb1ab754e0adb5c80b449732fd5eb4d1 SHA512 2492cb5fcc3ab10e275ece25748b4c90ae5587fbfb3f3055b26d24b94753839fe33a21107fed237f3ffff0611e97970405397228b5249fb41d6107c0a6d89a14
 MISC metadata.xml 725 BLAKE2B 3d7a1655261b538ceb1511d626df23c93d0c30a0ab3b1ba38e560b4b43ffe7a82c6e207d991680bc321f6698596b1a61ec2182ae1c42c296a91b9f98896cff70 SHA512 bb3b5e0d20f530c1961bf19060ce1e5d087384008c116c4bc0af3e86368e9e9fdbce84d22b6f7b4f6760f039b180805364478e8e3d98b9b4d4d2600f9de62e6f
diff --git a/app-admin/ansible/ansible-4.3.0.ebuild b/app-admin/ansible/ansible-4.3.0.ebuild
new file mode 100644
index 000000000000..45a02aba0ec9
--- /dev/null
+++ b/app-admin/ansible/ansible-4.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-base-2.11.1
+	<app-admin/ansible-base-2.12"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 66feb79c0f1f..365fbe278fb9 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,8 +3,16 @@ DIST awscli-1.19.104.tar.gz 2024567 BLAKE2B 82662ffe6a05dd329210ff84962e1ad37ece
 DIST awscli-1.19.112.tar.gz 2028010 BLAKE2B c5f973a2a0cf002038cdc46d0760f5e5fad942b1383f21819459d51fd3e3a17617e23d45d284345fac1760a812ffc81842068e8517bb500559a330ea8183968e SHA512 4ad9e960826baa057a2e72ddc2afce1012b766b5f691236435347c3e4ce210ee0b14003c16615262ec707d0c65b7f7f71a15fcf80a0fdfefb21ab6a28cfb1d55
 DIST awscli-1.20.0.tar.gz 2028152 BLAKE2B d746335fc3414e773fbf3cb60b68ea1242162c7fb6f9e8222bec1bff992ec08e7239b9279de70551d05a99b2bd2743e8e2b8f65e01655574a542660fbb4a6ad7 SHA512 0aa478e9c28afa922958881f2f7795c6925e342964fb171176c81bce1fc4a0529dc9eb2fefaa05b670376781671e1531bbfe5114d0f0a748c964c5ace2c79ee4
 DIST awscli-1.20.1.tar.gz 2028927 BLAKE2B bd535f1eba64987c8389c8003b90a1361e95db00a62f13138b35d0f4b6a5130b2e52e38663f4560bf58fe6b86e668ee142a0228001d8cde583d096ce81612264 SHA512 b704ff3f482dd2ccfdf78d01ccff214c9cb9f7b12b1af0a7c615b9567a931a8bc47a444dd8f136a958346750a60fb03a084993a7deb0c234448a9889918c97e6
+DIST awscli-1.20.2.tar.gz 2029411 BLAKE2B dad47f749af3c1e7bbeb291eb92889c7dc9bdc9e81ddb1fd3769897f94ba549123589a2ef8a34b88d8370cc6bb5ad45cc7b9fa06ec474620303a78ec3d64100e SHA512 6384a02a7bd3a8ea38cf46725daa25e7656e12c1f3f6465043efc223a82c605dbc916a26debc214ff6d364e81013e729acac424ccccc535785e8a3b68cfce2f6
+DIST awscli-1.20.3.tar.gz 2029411 BLAKE2B 6d8573709072ea3955696de0c65a32610446737a216f6c5dd4ecae4cffcb48ecac531cfc598517c037066d066cf0de01510c0740949450ad3a5925af79bd8c16 SHA512 2324800964de8b1af4ae39dcee15e8fc2bd5e11a239c245590a86fac6574d80b290fb9d967df82d6fdd412cd8b783fd209780e5e58846a16302fa13c6f3b93fb
+DIST awscli-1.20.4.tar.gz 2043470 BLAKE2B 58722fe4277a7950665913e8b9ae99de8017cfe8c4974a3524f917533499e830d2eea2ac0994022796b979869468b5f3a767727b4384f78e325e423ed003b1b3 SHA512 3066438ac58eb2afb83ae6fef516e09965ceea1e97897e4f5b5760046f28a2f822b16b90c0a9ee6a58c6cdabbfb2f0ce044caf41396093188290e2a7c1e8c4f3
+DIST awscli-1.20.5.tar.gz 2043880 BLAKE2B f4b833baf883479ed63e09de998b41e0e0e88006d4779b0be86396bafdb559cd8b158f30f012045f699b7c374a2e6584534534fd778ac7669016d23b06534080 SHA512 598163c27dce2ee166fd1d27cbca62c14c807118df99951963665a064fb71ba795726ef3ea46cc51bd2a51f256364c66edb88d1cdd8f319b2025c0cecfe9f6ca
 EBUILD awscli-1.19.104.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
 EBUILD awscli-1.19.112.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.0.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.1.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.2.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.3.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.4.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.5.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.20.2.ebuild b/app-admin/awscli/awscli-1.20.2.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.3.ebuild b/app-admin/awscli/awscli-1.20.3.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.4.ebuild b/app-admin/awscli/awscli-1.20.4.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.5.ebuild b/app-admin/awscli/awscli-1.20.5.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index a475a6df5996..14adee7e846d 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,5 +1,5 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
-EBUILD calamares-3.2.32.1.ebuild 2181 BLAKE2B b371e28a165c6c80dee19e5b8e4076bcd70e399d76b43b8210dfe69aa6d6c1f29d48f858594482dbb1ea28c0d19571da907f22a082966d3fd9e0333431daa19f SHA512 484a41c3789eceac69e3aeaa1882a6585ce060411522f7a8d6f2604301d7b4c37636eb015bc6ca1e3383c044a9bcc9f77ffa12c64551f5af39978b96b44d0ca6
+EBUILD calamares-3.2.32.1.ebuild 2169 BLAKE2B 81cee92fa9be1c9d11916a4fe06a0cd60c0faa1e7aecdbd37169d749e042e4500cc3dab28b1527ba7ee6938039322ce4823dc29cb1827971b02c3466ebde65d1 SHA512 52063da86aafca435a91754127e122f541279efb70b6bedc0c99f79366d424a8cea8fc2219600231610f134c62c921dc420c689e7eebf70fea96d654db7de8f6
 EBUILD files/calamares-3.2.32.1-remove-broken-tests.ebuild 1682 BLAKE2B 1d41c22b99797d41066e55b21bd5b9957411c210be3d1a8c01470694211387aa7e8b931d5499143d7d2747657625ac1c3db17d67bac9f741aada25fde93f517a SHA512 1c4a5a2d8b6c96299f45d3ef7581dfdca81c0854c9c746e6636a07101fb4e0d05809a4d64d826180599969c6fe398175dc7f5322ab52ff6c61dac4925919f275
 MISC metadata.xml 858 BLAKE2B b66d7a5fa62cc1a83bba80a4d166e3985fb0bae043b5fbf03328e2c838543ae072322aa376751da8ee3912e8c8cdfb9e5aec8ee4700346543464a117d57933f9 SHA512 b333853647f132719762811ecf38e8a9dd3794dee3b944d3771204849f8ebe60f179759c5c9bfed4ed358174921c16b45c175a7598074814342225134f0bb700
diff --git a/app-admin/calamares/calamares-3.2.32.1.ebuild b/app-admin/calamares/calamares-3.2.32.1.ebuild
index b6050726915a..2f6bd1c64399 100644
--- a/app-admin/calamares/calamares-3.2.32.1.ebuild
+++ b/app-admin/calamares/calamares-3.2.32.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit ecm python-single-r1
 
@@ -24,8 +24,8 @@ BDEPEND="
 COMMON_DEPEND="${PYTHON_DEPS}
 	dev-cpp/yaml-cpp:=
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
-		dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
+		dev-libs/libpwquality[${PYTHON_USEDEP}]
 	')
 	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index e8468c1c41b8..b9f727832202 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1,3 +1,3 @@
 DIST haskell-updater-1.3.2.tar.gz 26133 BLAKE2B ea72850e5ca35ec18fa00136c654435a852b072aea0402003c962abbb0e0f09e8a84568f78c9186324b0b0ee9658de1b413670e268cfe1c0056810b8c61b479c SHA512 a4d80ecb65efa9ae21008e04b1363ff2196df4ba431fc5ec899bb9904c598c7a109a38f7dd86dd2dc86faca8ed5083d036d700e7f7796840ee5470401c24f3d9
-EBUILD haskell-updater-1.3.2.ebuild 1022 BLAKE2B a6bf02a0947a549edfd287df0777761c0a79bc8e383abb2cd092cb6d5593c779302f20dc1f3f165de409893a7d0b3f3c4025a6fd5fcacd569f9100f127a67151 SHA512 43b6dc6ced38bcfa3746b174a2c8bb71df7c70e34ed6a3c266a202c37453eaddca0a8c07bbd4a51d960a4362b967b740506bdc1d33017222755aa0a4926eba81
+EBUILD haskell-updater-1.3.2.ebuild 1018 BLAKE2B 02f9034fd1cc3fbc6046093cfb621fe6d757c176b28115355ae443374b72596ceff0adeccad70384ef68b69045c49d3cb30920e278d7b98a2f6c8218438f2515 SHA512 ce6d9d60a4ca56ef0602e6b791f7b861dfbd422ad050f400e3cf811b18c1457776fa4f30af4d8945d3f462892959bd1bd941746da51ce6a6b05e2f02d8c0bce3
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
index 544312532d31..52affb69bb08 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-CABAL_FEATURES="bin nocabaldep"
+CABAL_FEATURES="nocabaldep"
 inherit haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index bf150a9aa683..abb3babf45d2 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -6,7 +6,7 @@ AUX lnav-0.9.0-bug786456.patch 12401 BLAKE2B 698644b7b573dd15e3c91125ad80f6794be
 AUX lnav-0.9.0-bug792582.patch 3615 BLAKE2B 3e1c71ea871aa909067f3d6a1fa75dc314e4000dc4c8875fa806fcd92bdfd74c2fff4f248742691aa0c1797b7343700f9ab03450ec4504f993750b6e2f020a8f SHA512 2704893f2ae634cf4f15d61a40b3276fc27d40b08373d928b05123e16bc364f0f874dd09c34eeb493604e5f92676d69a7e552c3f9f7362c27998214060bc79ee
 DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe
 DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
-EBUILD lnav-0.8.5.ebuild 769 BLAKE2B b08fe37937578081017b9431dc1aa9d191f6f79e09c1c8b3d3f6ec704688bbba9808a72e9df73f77c88f0bd42bf392a252a07ca723363a35a0d5e1c912fe8aeb SHA512 8361c2a5730cbcbdaae957ab04401685e332b4ff67fcf03441d72bdd6a8d54b95c9caa9378096d32b691c14ab0e135310b7c7c15cf7c1ba2aa4c6eb66a4601da
-EBUILD lnav-0.9.0-r1.ebuild 1127 BLAKE2B 3db56f6846bedb38d6605cebd74c21d210bd1293c71e707a05f00b1ee6bd5fdd330fc137de8090f15a20394ba31374e288bf28e9b7d8b13284fa550cc1da4cfa SHA512 0b536153247f3ab9e6d017ad3a21cfef41f8cee76efa7da19293162984b7ec8b8ad6e2bd9c49a6e729f6cb6e42b0df2c195d844290d7d38bd678d156be0a356d
-EBUILD lnav-0.9.0.ebuild 944 BLAKE2B dc46210b028568171b31b40b3531a24ae7ca2e2aa9f80e1c9538a10ae80e77973b628c5389cf644feb1358152ff2b4f38e0e2fe5c3d898fa8c8f4b4139697e82 SHA512 8d243ec4fafae0bc1c1558b0a9c980874d47bdeeaf3451e0e8647d5825f09647254d76d02e29d71f323f45d63df1b45d42864f2e41cbdc45124bc988c615ad42
+EBUILD lnav-0.8.5-r1.ebuild 771 BLAKE2B 609d5809483dfc348a4979ed7760e804bf3b12f7391c4ef54e3df7062a33deccbaa538f72d1ba743cff7d1ffa7c582b5415bd6b7d0e4829348ef959a44f7d19b SHA512 9e17a7aa378d23baeb26c55c74e947b868f60fbcbacda28795add54ed6f83d5f6e12f5562b5bb01e45e9be62d82e7071d6d8f944296c863ae90de893404e2ef4
+EBUILD lnav-0.9.0-r2.ebuild 946 BLAKE2B 2588e27c8d698fc0f225327433a9a740d46f5137399586bf66466d99ec3d710e04b57c46e6da12fb1478ca962633456cdf5d46d3b8452190dd8e7580dd652e48 SHA512 b38de5ff9bf039a45ef8ab9e2444a9395650b99a684b8c80cce8eea58f5686fae55d19bca9c595541d0801c7706d0a8028bbdbeae075ffed5c2288d2096347eb
+EBUILD lnav-0.9.0-r3.ebuild 1129 BLAKE2B 28295e39ddfdb4fb151132c61e0928dd9ab53853206d6f1cd4bd378d45ca07826eb8fa7c64efeb44d6cd1c8af252d050e36eabffff3bd9232b6825ba977b627c SHA512 2801635eebd830873063750792af5b4d441166432bb064cecb562f9f5cd27ef2249574dade33e53c066e3b044f0cf00831d9246e2dab350ed9c0a57d8e298e6b
 MISC metadata.xml 780 BLAKE2B 2cef44f3fda69ccc20f16a7f75cac035bfec429767dc12966c6729fa1b0b72ac66333d3f3ab7341f7b1b2a0fdd8f533577a04fcf15df7f268ca0a99f8c0acb07 SHA512 b9a91a8dfb2f0f528fb89fc6ea20867792baccdb12386dd8e92f4462b16869b51a796ed44f3f44faa41f8745db18d2c1fe5dd0df82aad6f40486b47b37a8a6e2
diff --git a/app-admin/lnav/lnav-0.8.5.ebuild b/app-admin/lnav/lnav-0.8.5-r1.ebuild
index d981f24a9e9f..2e91e591669e 100644
--- a/app-admin/lnav/lnav-0.8.5.ebuild
+++ b/app-admin/lnav/lnav-0.8.5-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/libpcre[cxx]
 	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	sys-libs/readline:0=
 	sys-libs/zlib:0="
 DEPEND="${RDEPEND}"
diff --git a/app-admin/lnav/lnav-0.9.0.ebuild b/app-admin/lnav/lnav-0.9.0-r2.ebuild
index bc2f04f49352..6849f2beec08 100644
--- a/app-admin/lnav/lnav-0.9.0.ebuild
+++ b/app-admin/lnav/lnav-0.9.0-r2.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	>=dev-db/sqlite-3.9.0
 	dev-libs/libpcre[cxx]
 	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	sys-libs/readline:0=
 	sys-libs/zlib:0="
 DEPEND="${RDEPEND}"
diff --git a/app-admin/lnav/lnav-0.9.0-r1.ebuild b/app-admin/lnav/lnav-0.9.0-r3.ebuild
index 1a6b79c93526..46fd2ba10a93 100644
--- a/app-admin/lnav/lnav-0.9.0-r1.ebuild
+++ b/app-admin/lnav/lnav-0.9.0-r3.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	>=dev-db/sqlite-3.9.0
 	dev-libs/libpcre[cxx]
 	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	sys-libs/readline:0=
 	sys-libs/zlib:0="
 DEPEND="${RDEPEND}"
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 0614f598ce56..48d163a86b83 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -4,5 +4,5 @@ AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe
 DIST logrotate-3.18.0.tar.gz 224873 BLAKE2B f73ffa2d58a5125393e6c96e158e39e0b4cadef01e6eebd172220227a7e1363e6731bc2ac511fa028078054b55d42b131cdc30232ac5762ce4c6cbff79c19681 SHA512 d1bca267fbec4acbb83ffba4d3ac4c864f4269d8513e5614e7dbe6f3b1f176685218bffdb5d62f559ee73f84cf9a8a257c9f63e30af058d12d0034240f247586
 DIST logrotate-3.18.1.tar.gz 225226 BLAKE2B 6f40dfe89f9c6202263f16204a9cff07b921abc9a298b58649bb4968c9f498626741be334c47d4092da564ed75642b687ff6ef8781f69f5e25364f8635646d9d SHA512 c40f920686aee014c652f087c64f2a85e9e866a8717d1bd3f32a9dd7959a02962e6174de28ae685428b442e12079d0c8d91485611ca34a873ffae872a54ec9fe
 EBUILD logrotate-3.18.0.ebuild 2485 BLAKE2B def8bc9ca3114392f84c537ad44d06b44503fddce3600464e3e5645251f9f25753458eaa86ed59ad9470be7c3df25df089cd2749933cf8bebf8da6533803cc72 SHA512 7f74ae31c32d858036c998ab0f7eefe0c56dc34d19fb35fd0133a0e618e073b940c4e007b710f76a626890f084492de1de4cfbd988e61ce935a63162a8475766
-EBUILD logrotate-3.18.1.ebuild 2435 BLAKE2B e123c58fc13c28cf2dd1c12a25a60935785021d42cba32eb435d784997d33263a47a07d5530717ab22ceb4b41ec04aefa8c8cf301b8fbdbd88880a804f8d73d5 SHA512 4087f14f7b2676e1f7182efb9189a50b6b14b3fa8871b3e70b533c1c001970c499ca61b18fe1f4a6ea6d31cffacd75cd9973917b7c410b7738692b3ccdec53b3
+EBUILD logrotate-3.18.1.ebuild 2432 BLAKE2B 04125968e369f364b20461a771339c3bea718beb935ba10cfdf0532e66fd55ffd92e132fb9677c48d92b4b4fa6b91e970d69f2e1ad63f1d9c74ea6a1fd6fc3d3 SHA512 ca7a8fcc929b7f48b1d4224bbd016a23eaf1dcacf4aff31adce052f2fb6018603d39c3801866089d8866011715ff114b5113673e812dfb7972f66d9eccd43c8a
 MISC metadata.xml 1206 BLAKE2B c52b227a223e5d7db50f2009b3766d6af0f2c0ca51bdf3f6098d56d16c6586c08826b795f50a6f3f2e50f29ed4f9def8c53268a533eac985e3ab22042c418f7a SHA512 9d184f5b4c025416b7a2f6019f982a12e65e39da3532d7d024759e1e73d2b55d0e949e38c4cd0926e552059b600c114daa5beb135433d71e8f85d0f732d0b791
diff --git a/app-admin/logrotate/logrotate-3.18.1.ebuild b/app-admin/logrotate/logrotate-3.18.1.ebuild
index d49a3017aaba..78f3396cdb33 100644
--- a/app-admin/logrotate/logrotate-3.18.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="acl +cron selinux"
 
 DEPEND="
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index fba530ccb6df..8d043fa5ca45 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -3,7 +3,9 @@ AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de412158
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 DIST mcelog-175.tar.gz 315350 BLAKE2B a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64 SHA512 992789817a3963a3f118121149bf9b217609f54d85a71c2adb671728cf04777ccb062033df68793afff5fb6a0080b50b4e6fa89cbcd0970d92ca4246155ea13a
 DIST mcelog-177.tar.gz 315474 BLAKE2B 8c6920b01ba836460067f322a17e5a69c2a9a447127ae583ddd151f3cd290aca039a63e95601789cd71c4ef75d4213e39918e08b600aeda3e06bb800119209c5 SHA512 b73d103c7b326e6aa2cb22a05b7df29e24f5b8f9e564a9d2d05627e0af80ee581d62b422e35a68cf3e43a3e1aaf905cccb08a65286c9f77c8c8c2ac41e880fbf
+DIST mcelog-178.tar.gz 315460 BLAKE2B 65d424f70c615a694dfb18a0d7049965280141858a2c527fbe1db806d675785a0edba161dd6ac4bf6660e1bb2334d394f98bc85058c17d79b2c25106297ae95e SHA512 f024908c877b489148e23bbb8b34d587d1b88e13e43bb401b4594eafb577a24a4b478fd4aa7e221d2d9e633b509b641123418dc36a52425193083d26d2ca60bb
 EBUILD mcelog-175.ebuild 1353 BLAKE2B d6b73b5c2cba965f04baa24493349a8a9e20b584f36056d68905bf0072f53dc25dbf53096ff2484b501a2e143b7110718c8a97e983270350e72ac3d81523b36f SHA512 50587acc615805ef2b615ced31b64de5a614cd72afb5aa5953a03652fb98bb6d947deb3c86116ebb6c8db4822bbcb0e8a693c9d17cd1e36a25baab4ba9a6d295
 EBUILD mcelog-177-r1.ebuild 1160 BLAKE2B 09d326e4b1e37b94cd1b31d9632a375632e9297315e82ae91c33af8915e93ce8f96ef173afc074632b8fef2d44320307743362d463e62b8c36e91416aa13a1ec SHA512 d11bb734c6474a25246a0e74ad4be087990a34e68bd8a91a894798aa4d379f03c63e8e061d6408a32fb53b473e736e3fef1497f6941cc87e96ec4f36f2dc23e4
 EBUILD mcelog-177.ebuild 1355 BLAKE2B c1c875cfb1efeae3e9818a0c1393cca8e05e2444861c426959f212e3a6ffbe1efc3a6b5ad0bdee4f14e8eb0cbfa06fcccd87a8fa8d0cce112ad79a1474d17a76 SHA512 07f1dee935160cafe5a52ec266744b7911095d012eb91d403863e3a4996768c24ea7cf15cacf6600184ba02fec380d3c8bb7390ca92eb9d4066b34bb3fd16595
+EBUILD mcelog-178.ebuild 1160 BLAKE2B 09d326e4b1e37b94cd1b31d9632a375632e9297315e82ae91c33af8915e93ce8f96ef173afc074632b8fef2d44320307743362d463e62b8c36e91416aa13a1ec SHA512 d11bb734c6474a25246a0e74ad4be087990a34e68bd8a91a894798aa4d379f03c63e8e061d6408a32fb53b473e736e3fef1497f6941cc87e96ec4f36f2dc23e4
 MISC metadata.xml 537 BLAKE2B 565ccc3c3b497c157bad02578153aa33529089d8147f70d1e8efd88531ff3b5e615c7733780e6b991b1e7adc3a15c37d79076185141c0f5942958cdab89d84ca SHA512 e63aa74914714bbc4419369a567180acbcb40e162b3d0fa3998ee36e898982401a59f82bc4a848906b8f12de5e87f48114d7c1c1e0dfffe6e656af491c92af25
diff --git a/app-admin/mcelog/mcelog-178.ebuild b/app-admin/mcelog/mcelog-178.ebuild
new file mode 100644
index 000000000000..2ed1d04cc6aa
--- /dev/null
+++ b/app-admin/mcelog/mcelog-178.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info 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 )"
+
+# 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
+}
+
+src_install() {
+	default
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit ${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+}
diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
index 0babc34cacb2..a71e5ecfcb33 100644
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@@ -1,4 +1,6 @@
 AUX openrc-settingsd-1.0.1-remove-bashisms.patch 2670 BLAKE2B 06b61db1c40ae4a99b5fd46c3f83eecb8428c5bef150be1f7d6b0e25ab4667cae40a4664720586540a7d180218e5b4e23ad4fafeaaadce112a9566e412c4f9a3 SHA512 c4715aa4bdf35011400d02971d2739db347aeed96bbffe42c56a47714a0554c69137fa4b239b0b8ad3eed118d1da2af8c26bd4eaf8e39fa19176c85ed9c289fa
 DIST openrc-settingsd-1.0.1.tar.xz 243552 BLAKE2B 2abf084c59ef310ca72bf2d528c6f8f04b3a502ea421247989e5356e759f2850f1749ffae7592ff30c92a0496db01e9d5e55c2a4ae9dbd3a9954414d4eabd31b SHA512 1f04a4b078a5fb659573daec0962f819af7eaff17a6213c4881726833cf32becd71dd820cd63767e2933465df26b3e4a3475d94f23e203a6977298965c709b21
+DIST openrc-settingsd-v1.1.0.tar.bz2 41781 BLAKE2B 1a508c5751a3b2c734b533ebdf72d4c5fa97b67743caf5e47f06fc505a286e92167715e0ec706528a4e9a74d0aed9d78d6b6b2d542c1df3781d5bd76ff700b91 SHA512 f63aa624097a806094c51a6da8fc6f4962c3302ea0acf02be17744db9d5caf4cfd68294a8e8916e62eeeca722cadc571715b9751730f9d9cf1f9be66e93510f7
 EBUILD openrc-settingsd-1.0.1-r1.ebuild 1459 BLAKE2B c6c15c6f92b560645982b0558585f7cdff35957e8eb7bb7b090fef2d30f7b0582c9dff2a547e1fbdd52eb2c3aff0684c8f8b32d3399a94be7127d5dbd8cc076f SHA512 a0a81314af123503b312cac28b6e2d4394ad1d1ae2f5c35f4f505919c3d278620a907ec111565c8f04021483cbba4bcd5648598f3dd2fb6e5f38f1d1d63e197a
+EBUILD openrc-settingsd-1.1.0.ebuild 1473 BLAKE2B fcbcc46ddaceba2870a1408e908a3f991e348a240fd12ab7352d75fe80ba575638fa359a54de606e2f5f3c42ad9ec8080ebb024f47ce0b10306b9e3a1fb7b004 SHA512 281592aab7ae5f570f469b3903d29f15bcd61192d59734e1f5127a6d6e57ab41e3f0d84d58ac03aed0b2c39e2ab4d5854c868b6b734087949286b1007603587c
 MISC metadata.xml 375 BLAKE2B 2ef1245cabf20154d53ca5b9161f9e5055d38ede47687bc2314cf787c804dbff40a1278769fec061468c95139a8c5f9f573e06e901c580e6923e93b29e3db398 SHA512 489eae3aa828d6aeb43f3b24783777644f7abd7522d842c44918ba6c5fecf0ca9f02f91764f7f2566960283737f4a2c17f307f4f26e9d1c8ff92ee9e2e99e8fc
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild
new file mode 100644
index 000000000000..7a0eee93c891
--- /dev/null
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="System settings D-Bus service for OpenRC"
+HOMEPAGE="https://gitlab.com/postmarketOS/openrc-settingsd/"
+SRC_URI="https://gitlab.com/postmarketOS/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.30:2
+	dev-libs/libdaemon:0=
+	sys-apps/dbus
+	sys-apps/openrc:=
+	sys-auth/polkit
+"
+RDEPEND="
+	${DEPEND}
+	systemd? ( >=sys-apps/systemd-197 )
+	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:g' data/init.d/openrc-settingsd.in || die
+}
+
+src_configure() {
+	econf \
+		--with-pidfile="${EPREFIX}"/run/openrc-settingsd.pid
+}
+
+src_install() {
+	default
+	if use systemd; then
+		# Avoid file collision with systemd
+		rm -vr "${ED}"/usr/share/{dbus-1,polkit-1} "${ED}"/etc/dbus-1 || die "rm failed"
+	fi
+}
+
+pkg_postinst() {
+	if use systemd; then
+		elog "You installed ${PN} with USE=systemd. In this mode,"
+		elog "${PN} will not start via simple dbus activation, so you"
+		elog "will have to manually enable it as an rc service:"
+		elog " # /etc/init.d/openrc-settingsd start"
+		elog " # rc-update add openrc-settingsd default"
+	fi
+}
diff --git a/app-admin/sagan-rules/Manifest b/app-admin/sagan-rules/Manifest
index 1e15dfe5a463..bc819a012013 100644
--- a/app-admin/sagan-rules/Manifest
+++ b/app-admin/sagan-rules/Manifest
@@ -1,6 +1,4 @@
-DIST sagan-rules-06172014.tar.gz 273531 BLAKE2B f78a2203013c3ca4d0f33421b750a6f03f7929193f122df5504b6919ecbc24302bf10a2c65390ebaf6d7f6c4e12a1ef8e2c4d457bd2dd14cd79a7f0313a2c6a5 SHA512 824e3b159fae10876f59e50b1c751e509b04e6ee347e74afb19c1a5f935fe41b8d8874d6379bea477fea5a9c5754b1917f9b78da3009203fe23a0c600e03da23
 DIST sagan-rules-20210208.tar.gz 461258 BLAKE2B bdb9cffa0c3e0a2750c86c32f75cb571cafa7ae51099ca79210a76134e599222b11520d45ea58ecbaebe7b32700d2935f089f69405fa7f3493d7bbb2f5d1abf6 SHA512 d6609c31e262c78b5ef609a602e406b79df80b27b8908b665598bfe18482461e0a5ebcdc4fe26e91be41eacd4e885c1ca28eaf6f4fe2b647726c7db9a09ce277
-EBUILD sagan-rules-20140617.ebuild 550 BLAKE2B 96583666ae4e4c01ed92e0e835ad819a2965b8fd69220abbd61de592b02548ce88c25dfa7c6c15e32094a339b65aa72669490e1d5b889afdd47b60448f69985a SHA512 b560a5422eb9559f85e057f6681b1d9cdda344a07cd07d59c5f2374c51ada996428070accf8144b79cf740f75878f6e23dab56597552c495e151cc64ac942737
-EBUILD sagan-rules-20210208.ebuild 526 BLAKE2B 7b4472e4fc2385ff353d8dbc9ad6a00f8f606d42817ab0b0717bbceee559942c914e3db47af6ef65fdd6885c62bffd2401f1836d754415214dd35bfe7a2250e4 SHA512 d0c902eef86371dfc76615e2ce167cf021160873ef8a1ce63773ae45970ef2e5949fffc5d0333f5fb1705c9b44fcadc6e7c5538828a481704c46606b8bc5de4e
-EBUILD sagan-rules-99999999.ebuild 466 BLAKE2B caa866e1f8082ccd01ef9ed0bae57b8de08730d7b25f5ea80526b1d4d7e4b95b02316bdbc2d64d5a73119a7b79c33daea1b1cf7c1c1bd1787824aba8ae6efda5 SHA512 4f409bc7a7f18fd51fbb65305d6e7bd1c929a0cebb668d3e97eeba64fce4e4e18e832d8c1be320141a9f1a011e13ba2bbdbaadfa44168a9f21d5cc5dd9458275
-MISC metadata.xml 368 BLAKE2B c966c44e4f04e4c75eb880239ea4a6aacdfb924709eca5fb766df68a1b19afc8f4c814865da1d9d852ae837ebbfdc4661e5d29d3b00b9cfea108213daa2cf2cc SHA512 1d910f985e6137f07e6bb906bb105a92cee1643b6a4dfe9b8bf2ad115d124c457912e38df87d625da5591665260ea941c6576229aa2d5e19f09077c1a7c5e743
+EBUILD sagan-rules-20210208.ebuild 480 BLAKE2B fa5b9360b56cb9d69b499ce763ab81c563036d9a896522bbbf8f41eaf2ae158d98e239904189c0492fde628c0fc4719acc09232a507414be2640ce8584ce3d39 SHA512 75a77d96aafbc576245b9861e9d0ad839bde5d6a8d4c1bea62c2e07cc37c5b12e94b2bd68843f60cd643e4e85f0b4fea5d424dbaf5142a41e32de4f1cc40d412
+EBUILD sagan-rules-99999999.ebuild 436 BLAKE2B 063e82561a51b04e562f0e8977b32b07bc2e15b7ba9c9c2d3bd563a8302880d37304e6231c55f20ec9f642716b95e1344d3d12bacd9612febfc517388636ab32 SHA512 7471c2767e1a8e8000a73435a6383270af915ffa7ea1d41e9dbdd11f37d6535b5e4beac679c745ba5fd9241584d9d0338216a573c9f30a1894b8fe42dbda83af
+MISC metadata.xml 255 BLAKE2B f898e4768ff2233e024d15ccbf459bbd853ddd110479645fa1b570e7f46a3c18362971f9c8d42005f16c9355501eefb834fadfb0096477ebf10e0bef26e76158 SHA512 f5d550b10ee9cfa17f07420a6bd1375aa4f114930f734f6c166b8a67fa16beeba3dcb58031b694258eff98c256baa3ba5ff186a0eaa047d16eda5e2f0c5831f4
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
index a138c09bf20a..985506754f84 100644
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="lognorm">Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">quadrantsec/sagan-rules</remote-id>
 	</upstream>
diff --git a/app-admin/sagan-rules/sagan-rules-20140617.ebuild b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
deleted file mode 100644
index f96f36790f2e..000000000000
--- a/app-admin/sagan-rules/sagan-rules-20140617.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Rules for Sagan log analyzer"
-HOMEPAGE="http://sagan.softwink.com/"
-SRC_URI="http://sagan.quadrantsec.com/rules/sagan-rules-06172014.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lognorm"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-PDEPEND="app-admin/sagan"
-
-S=${WORKDIR}/rules
-
-src_install() {
-	insinto /etc/sagan-rules
-	doins *.config
-	doins *rules
-	doins *map
-	if use lognorm ; then
-		doins *normalize.rulebase
-	fi
-}
diff --git a/app-admin/sagan-rules/sagan-rules-20210208.ebuild b/app-admin/sagan-rules/sagan-rules-20210208.ebuild
index 6535027cd0d5..2bfc68a94370 100644
--- a/app-admin/sagan-rules/sagan-rules-20210208.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-20210208.ebuild
@@ -10,8 +10,7 @@ S="${WORKDIR}/rules"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lognorm"
+KEYWORDS="amd64 x86"
 
 PDEPEND="app-admin/sagan"
 
@@ -20,7 +19,5 @@ src_install() {
 	doins *.config
 	doins *rules
 	doins *map
-	if use lognorm ; then
-		doins normalization.rulebase
-	fi
+	doins normalization.rulebase
 }
diff --git a/app-admin/sagan-rules/sagan-rules-99999999.ebuild b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
index 85ac82618c67..6506abadf616 100644
--- a/app-admin/sagan-rules/sagan-rules-99999999.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 inherit git-r3
 
+EGIT_REPO_URI="https://github.com/beave/sagan-rules.git"
+
 DESCRIPTION="Rules for Sagan log analyzer"
 HOMEPAGE="http://sagan.softwink.com/"
-EGIT_REPO_URI="https://github.com/beave/sagan-rules.git"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+lognorm"
 
 PDEPEND="app-admin/sagan"
 
@@ -19,7 +19,6 @@ src_install() {
 	insinto /etc/sagan-rules
 	doins *.config
 	doins *rules
-	if use lognorm; then
-		doins normalization.rulebase
-	fi
+	doins *map
+	doins normalization.rulebase
 }
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index 9b4086b3e747..d73a80f70e15 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -1,12 +1,8 @@
-AUX sagan-1.0.0-liblognorm-json-c.patch 2472 BLAKE2B dc04f9949709523c3516d7b9693bba7aca5ff354c9c40df30fa16d668c3e08bb79f49f97806bc3659022ffb9a499f9ea843022c68045ffc2d43dcf7ac5e7ba42 SHA512 15308ca18901a9f6ca069f2067d83199b7461a6fcdfc54f171796ebf4578c2ccf19ecf2737aae0e03a21927f959aac1688e5c0e319b3dcf30a2dde4643b53ea5
 AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
-AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
 AUX sagan.init-r1 424 BLAKE2B e6fdd676e772d2abfca02215026a95321edecb41fcbeec3aa45afe15abd667e323ec2f21375d41c692b9648017002c0b410d551034dcbd3f060f5bb1e2f95026 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809
 AUX sagan.logrotate 239 BLAKE2B d3feae0843f34cc66ae930b694924a5a79ad580356c338e5f7473530a4fdd3bbadf4a849c749481dd281940b7116f4778bec55436b966df5ffdea0fc26ae9c2f SHA512 20111f2d1131c58fbd2b11e9c0946e53f100a09042d1c2e7a0204647523afe581da5f3777ce215e7da37d9ed9fa99663e31733d7d4df0cff31ebaea37a816b2e
 AUX sagan.service 277 BLAKE2B 524e83a05a0a7e8f83585add01f3365f573dbb0d1dc773ab68b42078267cad1d45f3cf872dfdf2048f8639d1c6edfdf94d5b7c31d7f5760f86430e7b84db6ee4 SHA512 ba8efb9e7f42f15789d63bc7ae0a4c77391ae14c1bb44924634f9fb63c8f2b44d920bce564d60e10816f605c3e6ef572438ca637c9853a350d551462a502a723
 AUX sagan.tmpfiles 32 BLAKE2B c00a177b7ea9df47a878783f3372f6d9709ea50e6c8bdde81f7d84bd01ecae1b084cf26ac4d5eeb891034fad29fc67802c557d495d312deb4fb3425a112bfe2f SHA512 7c65575415eaabdad9864f9af14042def57d9de24b4306037f78eda00b4c4d7de5a3b4849a316ee7519a239db2848cf94fb862a23c4b126575d200903389df22
-DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
 DIST sagan-2.0.1.tar.gz 487936 BLAKE2B 84a137bb0001c6758979d17cf67442262f732f7d49ce397183c0c226d6135e2c3cd8362452ef6b893e75a9cf5e874256d88f740b94df0dfa39587fc771ad4f8d SHA512 0cc288b67f641346bb0dbfcac2682c8c2b09e3e508b94dd5b2d5a81c2a80c7989f1d54725041210511877bd6b2338e8b0fdcae01f7084d39d48abef073d1fe64
-EBUILD sagan-1.0.0_rc3-r1.ebuild 2237 BLAKE2B d911a530d495310f1e98294063d5a181cd391fde4c5385f0f79c206c75caf735d3a1edb7f14c9cee86d8248b601dcadc7c229dce09f010e06e8e15bb55fc892a SHA512 c26f4a6bdb8c8f51b4b98e202f25351e202ad57f350ad7eda2d6982dc109aebfaa06bdd10cd4818fbb1f8ae12b7a1efba5b962cb67de0a130937fbaf2cd4ba6d
-EBUILD sagan-2.0.1-r4.ebuild 3219 BLAKE2B 2fa76b99db74c9b4e74ad01f8b0dcf40d186c55cd8345910045b67723db4d84403e765e28312c0ff2ceb708a2a3713f4ab0dd6e91e20bb8a74a96c18fbde1a02 SHA512 e31b945927f06265217a76c3f597f9e15d841602c3eb1e5bfa53afdeb3ff57e8032f91042a4cd9a9ed5efa020ad0f9b5bf0c35aaee903ae399447127f0024bfe
-MISC metadata.xml 805 BLAKE2B fe11cb2f2a1d73d2c8da9ef9df8abe1974e4e8ac95a0c91e3eca63828a3db2f8872c43961af2b279a942e299c1b2bc7a1ecd781b3051d92775339b2653c27ee0 SHA512 9a85b9166631c8522f4939876af5a9094f1637659d1ffce0c72707415a9433e0075cc240e2222e101640e21e9fc6f514c37d347915831254edf8e08e7239042d
+EBUILD sagan-2.0.1-r5.ebuild 3175 BLAKE2B 468db3eac3ac60b1b8987dbfbf2be71615995d1f5a7e4eebf540f70f2f92b73bed5fa97bf715831ab891c3e2095d1cd110e4a41c5c84c7a87d4c3c9207456643 SHA512 657806dda8e3cc565bc6cdc942e9d0edcc58e5da94a20a14a5b360e37ee9b2c1713039a8547c22ecf376875ce4331052654de6add33197ca31375f444239c677
+MISC metadata.xml 592 BLAKE2B dc7dff5c573af3496c1edadbde487e16db5af058d3b09d9ffd09b5044726e3c65ab6b84b4de2a009a7d04bab7942003e9fb5e093c41ec9ae68286b36ad12be61 SHA512 6f401f45231af2a53173626339d906113e9fc3bbccde3e72ef2ed0bafe35110861e689a3a8c8862fa671013da0e97a0375d2a1b4165e954b8afcb34e6d91cd8f
diff --git a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
deleted file mode 100644
index a1b3fb290f50..000000000000
--- a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -192,29 +192,15 @@ If you're not interested in libesmtp sup
-        fi
- 
- if test "$LOGNORM" = "yes"; then
--       AC_MSG_RESULT([------- liblognorm support is enabled -------])
--       AC_CHECK_HEADER([liblognorm.h])
--       AC_CHECK_HEADERS([json/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag.])]) 
--       AC_CHECK_LIB(estr, main,,AC_MSG_ERROR(The libestr library cannot be found.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag. ))
--       AC_CHECK_LIB(ee, main,,AC_MSG_ERROR(The libee library cannot be found.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag. ))
--       AC_CHECK_LIB(lognorm, main,,AC_MSG_ERROR(The liblognorm library cannot be found.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag. ))
--       AC_CHECK_LIB(json, json_object_put,, [ AC_CHECK_LIB(json-c, json_object_put,,AC_MSG_ERROR(The json library cannot be found.
--This library is important for the correlation aspects of Sagan! Please see
--https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
--use the --disable-lognorm flag.)) ],)
--       fi
-+	AC_MSG_RESULT([------- liblognorm support is enabled -------])
-+
-+	PKG_CHECK_MODULES(LIBEE, libee >= 0.3.2)
-+	PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
-+	PKG_CHECK_MODULES([JSON_C], [json-c],, [
-+		PKG_CHECK_MODULES([JSON_C], [json],,)
-+	])
-+	PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.0.2)
-+fi
- 
- if test "$LIBPCAP" = "yes"; then
-        AC_MSG_RESULT([------- libpcap support is enabled -------])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,6 +2,9 @@ AUTOMAKE_OPIONS=foreign no-dependencies
- 
- bin_PROGRAMS = sagan
- 
-+sagan_CFLAGS = $(JSON_C_CFLAGS) $(LIBESTR_CFLAGS) $(LIBLOGNORM_CFLAGS)
-+sagan_LDFLAGS = $(JSON_C_LIBS) $(LIBESTR_LIBS) $(LIBLOGNORM_LIBS)
-+
- sagan_SOURCES = sagan.c \
- sagan-classifications.c \
- sagan-config.c \
diff --git a/app-admin/sagan/files/sagan.init b/app-admin/sagan/files/sagan.init
deleted file mode 100644
index 99f1f24e3bfa..000000000000
--- a/app-admin/sagan/files/sagan.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/sagan/sagan.pid"
-command="/usr/bin/sagan"
-command_args="-D \"${SAGAN_OPTS}\" -u \"${SAGAN_USER}\""
-
-depend() {
-      use logger mysql postgresql
-      need localmount
-}
-
-start_pre() {
-    checkpath -d -o sagan /var/run/sagan
-    checkpath -p -o sagan -m 0644 /var/run/sagan/sagan.fifo
-}
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
index 4a81536f6250..69fe306ea6a4 100644
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@@ -4,11 +4,9 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="smtp">Build witch SMTP (E-Mail) support</flag>
-		<flag name="lognorm">Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
 		<flag name="redis">Add support for the Redis database via <pkg>dev-libs/hiredis</pkg></flag>
 		<flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
 		<flag name="libdnet">Add support for <pkg>dev-libs/libdnet</pkg></flag>
-		<flag name="snort">Add support to interact with Snort IDE using  <pkg>net-analyzer/snortsam</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">quadrantsec/sagan</remote-id>
diff --git a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
deleted file mode 100644
index 959ab0672dc9..000000000000
--- a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic user
-
-DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
-HOMEPAGE="http://sagan.quadrantsec.com/"
-SRC_URI="http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz"
-S="${WORKDIR}/sagan-1.0.0RC3/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	app-admin/sagan-rules[lognorm?]
-	dev-libs/libpcre
-	geoip? ( dev-libs/geoip )
-	lognorm? (
-		dev-libs/liblognorm
-		dev-libs/json-c:=
-		dev-libs/libee
-		dev-libs/libestr
-	)
-	libdnet? ( dev-libs/libdnet )
-	pcap? ( net-libs/libpcap )
-	smtp? ( net-libs/libesmtp )
-	snort? ( >=net-analyzer/snortsam-2.50 )
-"
-DEPEND="${RDEPEND}"
-
-# Package no longer logs directly to a database
-# and relies on Unified2 format to accomplish it
-RDEPEND="${RDEPEND} mysql? ( net-analyzer/barnyard2[mysql] )"
-
-REQUIRED_USE="mysql? ( libdnet )"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch
-)
-
-pkg_setup() {
-	enewgroup sagan
-	enewuser sagan -1 -1 /dev/null sagan
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fcommon
-
-	local myeconfargs=(
-		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
-		$(use_enable libdnet)
-		$(use_enable pcap libpcap)
-		$(use_enable snort snortsam)
-		$(use_enable geoip)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	diropts -g sagan -o sagan -m 775
-
-	dodir /var/log/sagan
-
-	keepdir /var/log/sagan
-
-	touch "${ED}"/var/log/sagan/sagan.log || die
-	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log || die
-
-	newinitd "${FILESDIR}"/sagan.init-r1 sagan
-	newconfd "${FILESDIR}"/sagan.confd sagan
-
-	docinto examples
-	dodoc -r extra/*
-}
-
-pkg_postinst() {
-	if use smtp; then
-		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
-		ewarn "email, create valid writable home directory for user 'sagan'"
-		ewarn "For security reasons it was created with /dev/null home directory"
-	fi
-
-	einfo "For configuration assistance see"
-	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
-}
diff --git a/app-admin/sagan/sagan-2.0.1-r4.ebuild b/app-admin/sagan/sagan-2.0.1-r5.ebuild
index 6cd0b6adfd46..77ee263296c7 100644
--- a/app-admin/sagan/sagan-2.0.1-r4.ebuild
+++ b/app-admin/sagan/sagan-2.0.1-r5.ebuild
@@ -11,22 +11,20 @@ SRC_URI="https://sagan.quadrantsec.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="geoip +libdnet +lognorm mysql redis +pcap smtp"
+KEYWORDS="amd64 x86"
+IUSE="geoip +libdnet mysql redis +pcap smtp"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
 	acct-group/sagan
 	acct-user/sagan
-	app-admin/sagan-rules[lognorm?]
+	app-admin/sagan-rules
+	dev-libs/libestr
+	dev-libs/libfastjson:=
+	dev-libs/liblognorm
 	dev-libs/libpcre
 	dev-libs/libyaml
 	geoip? ( dev-libs/geoip )
-	lognorm? (
-		dev-libs/liblognorm
-		dev-libs/libfastjson:=
-		dev-libs/libestr
-	)
 	redis? ( dev-libs/hiredis )
 	pcap? ( net-libs/libpcap )
 	smtp? ( net-libs/libesmtp )
@@ -57,8 +55,8 @@ src_configure() {
 	# Note that not all of these are used:
 	# https://github.com/quadrantsec/sagan/blob/main/m4/ax_ext.m4
 	local myeconfargs=(
+		--enable-lognorm
 		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
 		$(use_enable redis)
 		$(use_enable pcap libpcap)
 		$(use_enable geoip)
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index c4cc6ec048be..6c97c0b86ae4 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,6 @@
 DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
 DIST sudo-1.9.7p1.tar.gz 4197591 BLAKE2B fff3eab8b4de6276135229c5fe12e7eced98af988b7686600e6a63b8615f6357ab2c5f95ef6f1872534476c4398a28c4f468ffc316e0cff7d4b32e6068aa97d4 SHA512 bc85d9de1566de24883375edd1c4cd24b1f24437bb16d181bfa3c9c94cead220c69ad00d6727560ca195765ced970e95d69b9ce01dbea448de39afac9a902fb4
 EBUILD sudo-1.9.6_p1-r2.ebuild 6725 BLAKE2B 620c20c144bb7fd723e3e46022dd3e6152084978091e2e3af0a95a961dc027defeb5d20dcee4b0e36959e04124586a2c53d65c8137af9d1f52a6044392c08aea SHA512 fc61898d795187d7ab0876001c725bdb2c5f0c98ab38adc8427f69abc1da8b33be6ef8ebe1353ead193f10f48ed042fe12a13f90c181bc3a0d3cceed352bc262
-EBUILD sudo-1.9.7_p1-r1.ebuild 6679 BLAKE2B 7f549173042dedae316d4b9d0fc76dbb14d659c8633188abc4a0c40d5a8e0a9035184267ba8b3e964729a5e40673b8c7633f97adf5eeab5f9507438fa59c9a57 SHA512 9f92a6dbe26990ecb27c55539d09d875b87373139aa20fe2c39795addacdb852c959416ede36734ca4ce3b0e353558fb6ddeb69840a2c6783e3e339a7c0a448f
-EBUILD sudo-9999.ebuild 6733 BLAKE2B 46f131886f02d8f028f1ef3fb9e832bd1f070dec0796fbd34f21813fe0b0e9b653b3f5e6af50d5fc1d10ca4cd8b638e0408c2a4a796ebf68d9abe8363db041d3 SHA512 6b1db30bc2b57ba72f68c2785de5dc856d5062aa90034b27b3ca3a9b40215e9493ebe46830b796b76968cdeeae774e7fd50dd2997a1ee5dd9274787fe93fb344
+EBUILD sudo-1.9.7_p1-r1.ebuild 6686 BLAKE2B c088c8a2cad0fcc78dc91ca5ec04b1ed36a7eff66349d4abbc2de78074395c9dfa6dfba2662f180e53f86a84f9118d93a0a7da2f52e10131c94caff2721594fe SHA512 ccc8a5c262cd07b3c456ed3e5100f4787b814308a223a7c3c2a9c60db3dd308e60812607c289381230948ee184f71c3503de4dabb4dee388b174b65c502b447e
+EBUILD sudo-9999.ebuild 6740 BLAKE2B 8b9f2a5fa1e912a46f3ce6af924fa9b13c01a917c0d34874992413a9af0873c4db96bdf537fc92e20d6af433bbf0569bcdfa68ecf694e51c4343743d96b60608 SHA512 94d95b089753f5ce476a5d26dddd4e095fa98410c3f1f90048a75206b285544c9c3d1f94fbccbe966cdc98d508a5f4fe236845b19cecbc8ad02c5b26910aa213
 MISC metadata.xml 1049 BLAKE2B 7b4bbe6469dc6e683d73b81d055ca3b7b3ae610e2889edcde54b735cafa91d1a186268d70c96f5e90a4fcf90f4750ecee9eb4823fcbde5b47dfb9ebf27845b2e SHA512 7a9a9c9e0f457ba15355d5f14dbe0fd187485df6f9fad0c32a4e39850947e4bf1329370a52e4eb7396e0ee55c81fc31ea8569895e0d4608983b4b703d0dcc761
diff --git a/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild b/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild
index 7f613e4fb615..82fffc77e5e4 100644
--- a/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 3351bd020d3a..c99d6029f0b1 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index d6a91cbc4d3f..965bfd213671 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,3 +1,3 @@
 DIST system-config-printer-1.5.15.tar.xz 1005764 BLAKE2B 4919c555444829505b09b658ce0fd016ba235260f8c8b4db751e6a511afba5d5975e5f9570f5fe74fc35d158bbf2dd3ece99aa568ec1bb850096e5f12f0fc0b0 SHA512 b992f96f48c54350c11c5c629e77ee4409fe52fb17b386f226a42d532a95e17b6506319dcedeb70c0072555cb9ab464daaae22f295ce3d5181e5f49836f2ae2e
-EBUILD system-config-printer-1.5.15.ebuild 1942 BLAKE2B 466e1c61ee073d76ee62706cb036d9d06ba3a5c5558e7d9146651617406deabe23430302eb2309424234c1a889b96cdd956d13d4a0ebd2aff61d8f9b5364402b SHA512 5157020f628fe7859f370ecf4b6673d7c62501416a0d95b571a0061d42f3f9dae0d151481c1e6da9e3f51289387d60a3f250b2d71a541ac94e254df451412ccb
+EBUILD system-config-printer-1.5.15.ebuild 1904 BLAKE2B 0b0c859a98a981a229e19dd89e961a894f4be78d391aeed5158a1eeb230bfd966e1284060bcf50af0763a9d3b5a36a5ab2ff1456b6a76f810590150fe5dcda59 SHA512 708507b00e3fe96ec85c55a5bd9c2c2475048575684fec7a87f0e46714ca70ba82f8964eee370e7ccd6683883af42b7be93954fb9bfb43d54fa16eca5c03f098
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
index e2494d75ec08..5bc31accd637 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="xml"
 inherit python-single-r1 systemd xdg
 
@@ -44,12 +44,12 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycups[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycups[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
 	')
 	gnome-keyring? ( app-crypt/libsecret[introspection] )
 	policykit? ( net-print/cups-pk-helper )
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 1857424683ef..4a9fdc161eab 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -4,4 +4,4 @@ AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd03
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
 DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
 EBUILD ulogd-2.0.7-r2.ebuild 3178 BLAKE2B 6e0e62cd8ec982001c973a78da705f229d7bca57878c3a96cba2f2ac86ccd53da3fafece16d0993c1bb931e670c50b7106c74778e7d22b669be17804eeb420d2 SHA512 2dfa6f9b8992537f343770c447574beb1eccd23bec5e294711f25f324507f154224ae1ec98494470d1d04c7b231d3460dd199b046855f068277707d46b411c74
-MISC metadata.xml 1135 BLAKE2B 55b1207d68b757368a794f88678a36cac409b00c71e441db520f57435663dd41e75b381310350ed7023d50413a504ebdf81f8af157fbfa318003023f32be4d4e SHA512 00172540261e4f7e06b8afe70a5a4b21bc0833f12a83ecff675fae82f35dcc36f86d84fc744e3ec5d7055a4e97c512ef5fd6a39ca97ab5450c768612df0dee81
+MISC metadata.xml 907 BLAKE2B db3e8f8baa571251c26d3b7c860b5fcd5019d5987f8932e4a65197811f5ca36dc4220e5c9deb3b42ded8b0c26f5cfeac76f85d4bb1ff35d0818021127f699ccb SHA512 0dcb4e1c7261bf298e0c0a89fffbfff2e497f66f9215d2cb0b488e460a224f8128648d907cc1ad09c2a2209a917e1f7ac4b97efce62b53cfc6e71068400aa56e
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 7c43c19ee247..b155d9e37204 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="json">Build JSON output plugin to save packets in JSON file format</flag>
 		<flag name="pcap">Build PCAP output plugin to save packets in libpcap file format</flag>
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
commit	b49088575eb777ced2551f484da86317332d6087 (patch)
tree	bf9a151cf2d61956340d555659ffc098ee1da466 /app-admin
parent	514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)