15 files changed, 173 insertions, 60 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2901f23db6cd..99bd91ebe903 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
index a3d45b22c94d..6609b13ed983 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,4 +1,6 @@
 AUX amc.init.4 401 BLAKE2B a649832bdbc6dc33de0f87ac0037b1c38212b97abdec16d25d714db6c183fcaed0eb8374d7fecccaf8c8cdeff2c125007b4a924e208721e9d6a8e83befb93dc6 SHA512 00cca21719821efff950d272bfe1c35bbedaf5597507d2b19ecdf6f6c2e7ac7c1c1bdd42474177551e55b9751060ec396add7f4cc94f693537c105f5cbe1bac6
 DIST aerospike-amc-community-4.0.19.tar.gz 7868527 BLAKE2B 69835bdf3d7f1a4b23cd63bb7344c50b6bbbdc04fd55b2d6ec5783a429a442fa6cdf985c77cb4ac73f8ac0663ed2524c8d7a853e970cc086335cf810fd9eaecf SHA512 821de8569bf020b9a2b829e71aab5d48d25639620468aa0b3ed28dc24e0d57bc61be60939425c0a69c418602fa2fbf5ef60f1870edb3f04fa40a2a2aca281218
-EBUILD aerospike-amc-community-4.0.19-r1.ebuild 531 BLAKE2B 06276378bd549d7af9f14bd8b51b817f76dc57e55b37ed1a33c98af5df5d536c0466a697f379564e21c6a5fffb2660e15dc9bbdd3006494feda0c74086d3836a SHA512 ad750be87d306784209c62da8aed1829bb8c59e945750773d44b630d279ec201392ab9a797f3ba0b2c8e4cf1c6a5c56fcde04a00df5121fd6c7593fe32471cf7
+DIST aerospike-amc-community-5.0.0.tar.gz 11741635 BLAKE2B cfcbbeb3148a03d4b5381306b42c12886a05a64c3dccd203caa3a1ce411a62908260bc5f9835b8b54f1e1edc2e4c3ba8b9ad19226a87af6da52a49f6d10119b8 SHA512 6db8c5cb79f57d44cbfbc904851b4bef36415d1402ac06f47900c66e59731de78fddc2956e89499c42366ab10ec3662f694b5e1a651f785e5644d014d7165402
+EBUILD aerospike-amc-community-4.0.19-r2.ebuild 550 BLAKE2B bd82c0ffcc60b28c4d266d6c4caada3d1ffd083defb9e11d5f9ed5eb195d8e82448a55b66d61e0fc766d71ea15f07bf9896bf0a10a7ab681f7bb427dbe0232bb SHA512 683032f5aa5d32b19c008dd8f004b36689b78d10e14801ffee081e835147afba2253e29fcc24327b901e81ef34fe1c2179fe5a9a5a760c292540744c1fba7d57
+EBUILD aerospike-amc-community-5.0.0.ebuild 663 BLAKE2B 76cb731678fd91ae7e665e78f16e84b18f4f9b4e78e744133a1668de359c396ad335e7e5037375dae767bc577031888f078c43c7adde61becbb03f3d13afe8f4 SHA512 9b86983bd25176dad2c9b945ef6bed98b702c4a467032f8cb49045303105f486ecff9f56b002e2a4dbec548166820e35ae7ed50bbfff8cf5cbd199cfbf755af2
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r2.ebuild
index 7806c7c930ee..3f3727b13907 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r2.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit user
+EAPI=7
 
 DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
 HOMEPAGE="http://www.aerospike.com"
 SRC_URI="http://www.aerospike.com/download/amc/${PV}/artifact/linux -> ${P}.tar.gz"
+S="${WORKDIR}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
-S=${WORKDIR}
+RDEPEND="
+	acct-group/aerospike-amc
+	acct-user/aerospike-amc
+"
 
 src_install() {
-	cp -r "$S/"* "$D"
-	rm "${D}/etc/init.d/*"
+	cp -r "${S}/"* "${ED}"
+	rm "${ED}/etc/init.d/*"
 	newinitd "${FILESDIR}/amc.init.4" amc
 }
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-5.0.0.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-5.0.0.ebuild
new file mode 100644
index 000000000000..07fdde3f4da5
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-5.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="aerospike-amc-enterprise-${PV}-linux"
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="https://www.aerospike.com"
+SRC_URI="https://github.com/aerospike-community/amc/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/aerospike-amc
+	acct-user/aerospike-amc
+"
+
+QA_PREBUILT="/opt/amc/amc"
+
+src_install() {
+	cp -r "${S}"/* "${ED}" || die
+	rm "${ED}"/etc/init.d/amc || die
+	newinitd "${FILESDIR}/amc.init.4" amc
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 0371e5e94549..2d045e6a76d4 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,10 +3,14 @@ DIST awscli-1.19.104.tar.gz 2024567 BLAKE2B 82662ffe6a05dd329210ff84962e1ad37ece
 DIST awscli-1.19.105.tar.gz 2024530 BLAKE2B 8d05c41aa76338f30edf8640923250fa3d3954e942243552338837ec163f987c583573269d94a63f47f48fbb0beab4c6265e9197b465563374e4afb45ae20843 SHA512 73207ca67d490df705022844e6d025d051a276698204fcf82171e0075f5db2c347de0634cffc48fbd210314d66fd79c61d4129003ddbd6db698adc710fbb2068
 DIST awscli-1.19.106.tar.gz 2025184 BLAKE2B ee1006df7feef7ca3dcae3625a5e318dd1d5ed70a3c0c30fffd431fa41713f1932d2750edd2fd251513eaa631f93c6c9d4ab2e0bb052f246b5b13e48c355646a SHA512 404b7d14622f1250f3cc5ea290dd796fb99aeb141101ca55bb672375d09fb4fccb67c2d926f0a3f7e5efc4c48022197a0de20e59590d4758e5fe0975c63f2bb5
 DIST awscli-1.19.107.tar.gz 2025880 BLAKE2B bbb307072a63a9722496aaae52c2f9fbc2743b8a4fdc2fffdb2b4e9b6be9013868a2130211ef9ab427bc2180ad1d19209fd6411d8cde26a5f02db7f3c643297b SHA512 69ebd9f3397230a7c49ef551258b38e8c66b370f70a8e050fa9c721dd5ebca3a9e0da70c2804417eba4e68bd7620fa2d2802d007369e5cd0bee49bfc512b7853
+DIST awscli-1.19.108.tar.gz 2026311 BLAKE2B 7404fb3010fa122bf210133667696df0e83c0c5d5adc717b75995cd95077f4ebcdd53375e687dce7d52eb1ef264110302f049897c18b7856be9d5e5a24f50ff3 SHA512 f061de7c7cc926f3fc5dc41a33068c8d575e1027f50099c148e80b5be55497508b44b11821e7f675e73bbcbfef12539e4d73afcd6a849d6ad7fc4f72b857b4d7
+DIST awscli-1.19.109.tar.gz 2026658 BLAKE2B 3ec642d44057795519e9e94ce73a6b26b42976018355f029ad7ec5fd6515497c725aad5872b3e061ff15cb7263823577bb3dfd1f43c3f1617ee996c982e722b0 SHA512 71c419359a12b159b06a7f769dbaaea8d5be0de4b71fb002bf3dd4c26810354038fc1057155235b26ad43b3af258e141c139cc84654e11650aa33d013381a192
 DIST awscli-1.19.97.tar.gz 2020143 BLAKE2B 2dac6f59a04a958b09e0f8b7d056583015762df78ed1349b55c6301d3189e1100bd8ab98445ded3ccc0ddbf1148ddf0475086704f123b0db1ccfd1cacb6b4680 SHA512 4e4e0f34ba02819232427f7571a4b10d22b167788d758c9ac43749607ea7a4c498259fcc5c69fb32d66faffc535a5b3045006168b64506f2b0f9fbbaa804e387
 EBUILD awscli-1.19.104.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.19.105.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.19.106.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.19.107.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.19.108.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.19.109.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.19.97.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.19.108.ebuild b/app-admin/awscli/awscli-1.19.108.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.19.108.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.19.109.ebuild b/app-admin/awscli/awscli-1.19.109.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.19.109.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/cancd/Manifest b/app-admin/cancd/Manifest
index 7b0327de086b..a300bb03f081 100644
--- a/app-admin/cancd/Manifest
+++ b/app-admin/cancd/Manifest
@@ -5,5 +5,5 @@ AUX cancd-init.d-r1 596 BLAKE2B 5c439792ef8680238aa59e3f441b1b69ac1889e9a9ea4e57
 AUX netconsole-conf.d 751 BLAKE2B a81cdd8aa5be18e55065e1ca27698a2106bea320da98ea149e4da3f8a0817765b593fe816a9dda8adc9f1cde853f4debaf769e551ff97fe9ac24976c6045ab1e SHA512 7095ec6b8595865fc084b39f027efa0818c1348b8bfc8bfbea8d7d05c767f57a8357ae2eb07f13f073143911451e0fa005e1623ec9865076e4350f442cb8648b
 AUX netconsole-init.d 1503 BLAKE2B e03ee0010c92e011070950bdbb538add60a3eb2291b6b7ff9df60baa28d6fce2ce8e80b5750f730d56d6767743cf6daed358feb524359a0410cf678cf33b140f SHA512 33005e692fce59d567e399fca58b81b740cb381ce897f689af7e33785ccd1991506be1af2c09de8f96b6eb3996c5be16c212daee03d304b1fff7095b2ae1491d
 DIST cancd-0.1.0.tar.gz 7634 BLAKE2B 3ff488caf54764df053237d6ae4c39e7db44c5a5ecd1bcb18f3006e31030232ade4d7a93286dce8f58fb2ae7743700fd14939f219b7f5059cd2fb84bbc107b19 SHA512 9b01ed3ea1e27276799d657572645a7b40da9cf80910a73e2de9d733e8f3cfa374e29764b1e5853d7fb5a6835edda3103a1a6d31fd699010f98318631e62c5fb
-EBUILD cancd-0.1.0-r4.ebuild 1162 BLAKE2B 5060bcf92d4c5495a7a3160ab67e3050eff26889ee005f55fad3e330899bcd3f3333b64468cd1e767f248b0c5f51e21081546f9e8bbf2826055c6b1d12bf4a3c SHA512 e135297de6f711870435a688d5b1fff4b3bffed77c3136cf52de41566c019e01f28d5dc120ae0a4f94a286614c9344330debf5728748013a7459b5377f87a647
+EBUILD cancd-0.1.0-r6.ebuild 1151 BLAKE2B 9ed6ad5cad203374ff6bd69c18556babb6b0ec40bd469e13d59207a226a2443476bafd104206d71b243c68709739624eaf6d60394a2e55880cbb596ee43ed323 SHA512 64bbbe3a2aaeaa99c2b7682c5e3c20945de66a62f6a57e7b1c646417c11e4071bd94f5ef18d01fe11cf7da6953bff559f37418e79c944cc938734d69cdfa55cd
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-admin/cancd/cancd-0.1.0-r4.ebuild b/app-admin/cancd/cancd-0.1.0-r6.ebuild
index d66212991751..c8f64e59008a 100644
--- a/app-admin/cancd/cancd-0.1.0-r4.ebuild
+++ b/app-admin/cancd/cancd-0.1.0-r6.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit user
+EAPI=7
 
 DESCRIPTION="CA NetConsole Daemon receives output from the Linux netconsole driver"
 HOMEPAGE="http://oss.oracle.com/projects/cancd/"
@@ -12,32 +10,33 @@ SRC_URI="http://oss.oracle.com/projects/cancd/dist/files/source/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}/${P}-build-r1.patch"
 	"${FILESDIR}/${P}-c-cleanup.patch"
 )
 
+RDEPEND="
+	acct-group/cancd
+	acct-user/cancd
+"
+
 src_prepare() {
 	default
 
 	# slight makefile cleanup
-	sed -i \
+	sed \
 		-e '/^CFLAGS/s,-g,,' \
 		-e '/^CFLAGS/s,-O2,-Wall -W -Wextra -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wunreachable-code -Wlong-long,' \
 		-e '/rm cancd cancd.o/s,rm,rm -f,' \
-		Makefile || die
+		-i Makefile || die
 }
 
 src_install() {
 	dosbin cancd
+
 	newinitd "${FILESDIR}"/cancd-init.d-r1 cancd
 	newconfd "${FILESDIR}"/cancd-conf.d-r1 cancd
 	newinitd "${FILESDIR}"/netconsole-init.d netconsole
 	newconfd "${FILESDIR}"/netconsole-conf.d netconsole
 }
-
-pkg_preinst() {
-	enewuser cancd
-}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 9e9759f58a1e..4a8c390b195d 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.33.0.tar.gz 5227893 BLAKE2B 17272d6a614aa7b4441d3de73ffebda3244c0ce98e3d74e85c013c3410cf0d414cfcac958ba67eadebfbc84d6c3969bb8563f62a8a9531e6cdd09ac3dfa2526f SHA512 4c17cd8752862de70885a65d43d2ee69a6bed6e96d858423e308188a868b1732137c4bf811b1baae0e9b8a8425f8755d57a3711b333c50dd291fe1e22c19d91c
-EBUILD exo-1.33.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.36.0.tar.gz 5233021 BLAKE2B b1d2fc014773c0a4939e114ea611e067ae9e646126f5ca4c37c78fb06e84df8c3c535570994808fb5aab2545ff3a40a2bbba12642bb5dc02abf6e6f88ba388af SHA512 9d5cb8bef91d78223b625a6b81721d172a9e613199c3f7a0bb225302a498b9625f6dc029b03ca6bbdae0afc59317f2f00637206507724c3852fe09b4095eb807
+EBUILD exo-1.36.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.33.0.ebuild b/app-admin/exo/exo-1.36.0.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.33.0.ebuild
+++ b/app-admin/exo/exo-1.36.0.ebuild
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index ac84a93fae0b..8bda448a1477 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -1,5 +1,4 @@
 AUX fluent.conf 2728 BLAKE2B 1986af0d4062e7d85590e044d47ec77e3a46d9d4e8e79e42a30db05f0c5b730ebdef3f5f233bf929ec05311e644ade0fa89144323fe5ed8a8089dea8e3c5b103 SHA512 b400910c76fe2286e7887643471a55dfbad4aceb8dce07fba33d34923dcc13a609b909394bab50d509719d76a231a77441431e2d6dad75dd62b69ad05a5a804e
-AUX fluentd-1.2.6.initd 421 BLAKE2B c245bfe6fb30a699616f503cd5e2f09f1d84c2a6b605fe244ccf25d2ba3500dd497f950103c99816950541b10e7f0885470510531ad361b76ae882e466423d0f SHA512 fa636af8e7129129887b981bd5e5af68414ceaf32f3de8bbd754e37e29a2bc0a6c44e300000034b8e99fb0df7976ddd331d91001eb11d4b6bfb29886d3a7fa19
 AUX fluentd.confd 85 BLAKE2B 742ae368e0a8dd99f2f697c9438fc0ae4814693ee547be39b3bd8c9956fcb9acd5b6cffcf2a033e987b9a6eb7557a628f360fdd3f0053d055faeb62cad3f1d6a SHA512 9774f8fb0c9db7a501011558ac0c6222bed42501be90ac1c70ae0333cb3dd5ee5bc38417cd5ec3d1e0d8769d7f90bcc230746aed3fd30f28ea643c97d54d1f09
 AUX fluentd.initd 420 BLAKE2B 4498ab59ed5cd542d4a760fdb324c27849680a41df9a8b696381f796a6712fe89caedfd1c038119640621093d4dcad3b67b70092101bbf36370d9824cb9ff199 SHA512 d039c1a7854b7f5f3088b8d4ff38d3357fb13eb4d00cb5e80bf1c8999637a750ffd9299957c64657ce9f62a2ef28ff8bf8f5e95fc493dd5d7934f7b8e3ed328f
 AUX fluentd.logrotate 191 BLAKE2B da3f35ab90d627f35aba5a1b5e51ec54d649c725bb50ca2e5cc66561c94bedb2eaa83e6489051dbf2c1ea209fe35f0b77be1228f1b8e46d61aa00775e65abfbd SHA512 f74c0ef04f479adb7c11074ddd803c2574fadb7ce90022f3efc28c1d44d0b77b1483c7bb217652decf22f879a69c7ba1ee7bdc78e5b153762a4f535ea5faa404
diff --git a/app-admin/fluentd/files/fluentd-1.2.6.initd b/app-admin/fluentd/files/fluentd-1.2.6.initd
deleted file mode 100644
index f2019e3e116a..000000000000
--- a/app-admin/fluentd/files/fluentd-1.2.6.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2018 Sony Interactive Entertainment
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/bin/fluentd
-logfile=/var/log/fluentd/fluent.log
-pidfile=/var/run/fluentd.pid
-command_args="--daemon ${pidfile} --no-supervisor -o ${logfile} ${fluentd_opts}"
-command_background=yes
-command_user=fluentd:fluentd
-retry="TERM/10/KILL/30"
-
-start_pre() {
-	fluentd -q --dry-run
-}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 6622b07f75af..a2c4756ee3d6 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,4 +1,3 @@
-AUX puppet-fix-tests-6.10.1.patch 1163 BLAKE2B c2b0dd51aca250b06bdcefcf59fe0e33244aaaca90ead498fc7254a148ee4f4a5b89e8fd99259fce380517827f75720728610ffb79b90c3416f86de2988126db SHA512 2c97b9929c8a66ffb1ae4a16600e1ffea40b04e13f8cfc320a1d681317b3b348918d8e6c66c9be746db19cfb65b615afe94a4e30a8f6a350cb64cf437415e4ae
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init-4.x 764 BLAKE2B 997fef3e95718f3e0f46fa2ab5994ac994a585bcfe728a9dcdfb3ccd5b76e6fd879a4160dce1402803713344fc2082b43e3116b468e9b49fd1b17a043040f860 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8
 AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76655a4897fdf128fb38950ff8e62abfa806785906fdae648c544310b75f9a33694ce1fbc0c31fe4f04a8 SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
deleted file mode 100644
index daa065dabb5c..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
-@@ -158,16 +158,6 @@
-       handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
--      expect(handler).to receive(:check_authorization).with(anything,
--                                                            anything,
--                                                            excluding(:environment))
--      expect { handler.uri2indirection("GET",
--                                       "#{master_url_prefix}/node/bar",
--                                       {:environment => 'bogus'})
--      }.to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
-