gentoo auto-resync : 28:08:2024 - 12:00:19

9 files changed, 159 insertions, 3 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0e9cde86d5c7..5ffc52a6e343 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 5620bb5671eb..1b3b076dce1d 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.33.40.gh.tar.gz 2769444 BLAKE2B a26e26cb4694460e36fe2d9730092db33
 DIST aws-cli-1.34.0.gh.tar.gz 2773056 BLAKE2B c6c9d89fe719116faad47417dd1aa9a98125b65efaf61476582cf7fec16e7ab5bd9823b6973bde51891a8bdad8ec9bfade305abfcee2eb70f6cf2679ef815d1b SHA512 914efb62ec94825529e981c934f617b0c1ae3c367b7215bff7160b8bef7c3ea73d0400d3e04ff237546731e3586077c83ed918c0747f75ff4079e8b5e1159809
 DIST aws-cli-1.34.5.gh.tar.gz 2774000 BLAKE2B 34368cc257a99a9c7212972bcff91c46352db8659c5fe98101c9192cb674663b9090b3608d88875875d24488869fcb571e8602532219cf0a25bc3159f3bf285c SHA512 4dc305e4e659fbbd17a265b6c9589e20c63eec671114a67687c225081f8095a8627499441f78d76e6fa0da59b03ae078833227db0434c97572a7f5f7c4a43e5a
 DIST aws-cli-1.34.6.gh.tar.gz 2774042 BLAKE2B 7ba1692ad62128f01f3d082897098f75f010f1eedb0f4f76b434368d64e470900391d94e4f1c857dcbf971c3de65f36adea8c9279f323c4a120c762183942208 SHA512 3e32fa61fb6b1a139b9f89c4b36172b2cf4e31828c66f6e33d93be2debf7c55331780e373a6597fda0e33683554cbeb53bddd6ae9fef90b8a55193bbecb8c3ea
+DIST aws-cli-1.34.7.gh.tar.gz 2785707 BLAKE2B d70383edd80aae01315faaaef9676f7a56fec0f10f04745cc5bed731a2d3b88657af782f7b3f966d0d003eb99d55fa559530c4327541c342ab76b56e710ac5b8 SHA512 4b53cd5963eeec51038f3e04b0d2dd87acb08032925a15245674b23444f5f9801a48992e60f75e143b88c794df8d142f26108ad2fde775172f397164901cd3cf
 EBUILD awscli-1.33.40.ebuild 3048 BLAKE2B 4002d52c91dbcd135f95485348470378b344c96349c05b8cf1424900a18cbe82683c050253b47d845dcf0d4373ed97946287f1e403e5d2a7e0b2646449257a4b SHA512 ec71ff0fdf28ff024763abb7e7f603521b109f027cb56c2806ab6bf50c71a02947cbf067d112451093df8ae6c786585effe20c5c980138d7a8149219d59edfff
 EBUILD awscli-1.34.0.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.5.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.6.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
+EBUILD awscli-1.34.7.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.34.7.ebuild b/app-admin/awscli/awscli-1.34.7.ebuild
new file mode 100644
index 000000000000..599b9bd389b9
--- /dev/null
+++ b/app-admin/awscli/awscli-1.34.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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/pwman3/Manifest b/app-admin/pwman3/Manifest
index 18a5e2209175..aae8528828c8 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,3 +1,5 @@
 DIST pwman3-0.12.2.tar.gz 76744 BLAKE2B 5223169a267f0c35bcb26499138c9b768c6e29c4ce39d4fb89c56eb72d24a9729159bed93af24e12f1e0e6c1569586772eb36954afd51afc7c97c9de898346e5 SHA512 587839e7d532ef3c53e2c429b086eb6bd59290ce43687034400f8e0772cc4e97c9296694ad83c5fa3fdde37b8d8fef5bc150e9f81fcb9fe8712ffafb4be8b400
+DIST pwman3-0.13.1.tar.gz 81775 BLAKE2B d470735a8d514b335f2cf0c0ca84db2f362324262fd22617a98084d2e34b3b37447c2519204525a582a2bb5365f82452819270ad26195537fb776dedcf432bd2 SHA512 8b729968b7817a82692a8f9424f81882e4568cf8ecf5de52037a176ca028aaa58cf238f1d92dab02fbbe547fb872f74440d6eb0bc7a4b0a30649b6d9e3008ee4
 EBUILD pwman3-0.12.2.ebuild 966 BLAKE2B 8bfc598ec4d12420b52b43d5a881d34e5bf00e29d2f4af5b1dcd2b3a0b991479d4a25010f96cbfa2dd164394f18487df52fd565bef14e972e355812a2d4457f8 SHA512 13be127f7da2720dd9132e94e4771bae341a6da0798adab09eff311ec26b66d13c57f64d48a972797c7e664849d5421249160b062415e989b72e4218cff18149
+EBUILD pwman3-0.13.1.ebuild 1120 BLAKE2B 5322d9070b518c693ab116dc076adb0642f0fb636f32e05f31501342f8a10be39ea7e45ddf83179589da9affd3aef0587b7a4149b0ce134a5e59096980eb0205 SHA512 270c7b58f4eb34b5b62bcb8257e41eacba71319981c6bbd36e4ebaab3475bd23b5b9861f1ae6995e13fa8dd046313d124e8ffb55b8c1655075d33821cf979a8f
 MISC metadata.xml 944 BLAKE2B 24c67369c51110a1b5af7460665b6f55a129e86a5e61c4b9cafdf262862cbd21eff1a535dd5bf41c13ddbb3e13913ad06a5ec4bf63d5c8d5d13ee2764685cc2c SHA512 58aceafd3d884f3652682796932e9d6edf8ffecff9f61ee0b7c76f11897f5da20b18a603a8b7246da38ba507b25d5122b2f957349db94c0186abf94fc65c5602
diff --git a/app-admin/pwman3/pwman3-0.13.1.ebuild b/app-admin/pwman3/pwman3-0.13.1.ebuild
new file mode 100644
index 000000000000..678acd2e3e0b
--- /dev/null
+++ b/app-admin/pwman3/pwman3-0.13.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="A lightweight password-manager with multiple database backends"
+HOMEPAGE="https://pwman3.github.io/pwman3/"
+SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m tests.test_pwman || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Support for mongodb" dev-python/pymongo
+	optfeature "Support for postgresql" dev-python/psycopg:2
+	optfeature "Support for mysql" dev-python/pymysql
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 6f78b9dd92bd..b7a99b21154c 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -13,6 +13,7 @@ AUX salt-3005.1-modules-file-python-3.11-host.patch 4206 BLAKE2B 9cd3cb68b5c1a95
 AUX salt-3005.1-no-entry-points.patch 428 BLAKE2B 1bcf3b070afd01c56985290051a3cb031d5ca83b42631eba5f05d7648eabf13bca44573811b767d739dc9bc6d0a5da6f99de87b57c678df79cc172fa6dd5495f SHA512 ed5712689a6d39da9c6a67f28a48d35bbd271a6a3b898cbb0e0493e1813cc99e64388fb60707e6fee95691e339336c2656278780115b39d285c380ded92fe3cb
 AUX salt-3005.1-tests.patch 2367 BLAKE2B 467af423de22b4ddeb80fef3d4682976283116698b7c2551c4710e049d8ad7749a4eb07c541a427ed540fdea6a0e4f4e63d96988bafd92974cc3b1026e27fd03 SHA512 4ba3c36be9de377848880819fc4bacf72978a12e483bea90a4e5e7524d7212b5d554302000f6c628156ec5aafbf48d662dec2764d96253be74fa202c73e7fc67
 AUX salt-3006.2-tests.patch 3598 BLAKE2B 5e8f8df73e905aa1807b6bdeed2f95bd5b12623beb368123091e5f9733dc81d7564b00b308232baa0603feb047ad693581648341e72ab2d263b438d12cc6c916 SHA512 c4dde9a456adfe70ebaf0ebdc8c1dd532e41c603a148ee15720f520f8366738d4fb4e0b6b27a6164ddf4d34d1e9d398c3299aaf3945fbba97c250b38e2dcacec
+AUX salt-3006.9-pam-module.patch 715 BLAKE2B df603eb8a623c813849844a34baffcd41e41df416eee630c426b0ce68ed611db1a5f9394f475eecfb135cf3bca00e1491f8866ac216b0ba33a698029fc188699 SHA512 8adc8d8028811697e36119a2ced87371991c1b25adeb9a122097bf625294ce43ca8235830ff574004c3eaa6c058c3d5c122d49bb1bb6ab136e907c4cd0957905
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@@ -28,7 +29,7 @@ DIST salt-3007.1.tar.gz 19401831 BLAKE2B ea8c89a24991467367dc0c50e3d2f864e2f6211
 EBUILD salt-3005.5-r1.ebuild 12562 BLAKE2B 353e88ebd0c8992826ed030f2cd89bba882e1ea74239276d7f81d904ba27b91e1c4e5b5586bfbc1b16c6446de5f22610e14992b72fa7c5a6d56d3a002e4455c4 SHA512 86392b47a9e0d52a4186416550b75f7ea701355e970efcd1af4cbf27d0cf6f4025de0b6364998e712daca357761e8cd5e65a604ad605d29395231b6193943ea4
 EBUILD salt-3006.5-r1.ebuild 15196 BLAKE2B beb3924f91cf050c2a57414e0121d08c54991c2aa1b5c89a1c67afa644c1ef030415dc588b36e6aa11adf651d851f82365b4d5ccfa27e043c707756ddfe4c6c8 SHA512 c4b1d4a50546196f75c9d1327aa13bb649a61349b52f60b91cc958ad5bfcb1c438042c29d513a94aebb9f92d4d5acc47438d4e34468701e840ca0a0e52f7805e
 EBUILD salt-3006.7-r1.ebuild 15501 BLAKE2B 0de15bea8e2c92b5fe242137604e7bf09555cd054b4a0ef04026b388830ac2b797a51e3c541f43dc40723c0790c9f414f165d6ec950cc247e01c07d594a835e8 SHA512 85bb4881135999701972f2105ed185475c50a62ffe50361bd9842f2603582d9cb0eb2c2b6044ae2227b2f8430662b6e84a7b5a1890cb3c1427e709fedd428b63
-EBUILD salt-3006.9.ebuild 19210 BLAKE2B 3547b1e65be906860d0518d692a4329b91948aacf003530a2def960c7fe5c32f1a6d382203ea7891c38c01dc7d62bb916840b6f8878df73a0ec8dbfe85b07f7e SHA512 35ca63b6bb9ade6395c7eac746234b077ff20ed018e0e022def8e50e036feedadb33c88709f95b6c9e13f06d4db667222a00d8d3575b46937eae6e9704ba85ec
+EBUILD salt-3006.9-r2.ebuild 19255 BLAKE2B 303a0b3de340db2efca419618f23989201706ef4e7b1d551d47f759adbb3a1fbedf24918073bcaefbd22f7404cda82ffe13d0eac75c8231646d0d2ab5e4601d3 SHA512 3f147a05d1f43f67b89314558794fd33d5a704128aa8a76357af45cb7611caee0272ac622f6f85ad3f608655cd46c664a0de560bc51ad0edbe1014c032fb0412
 EBUILD salt-3007.0-r1.ebuild 30876 BLAKE2B 2816e84e757e2076c2c81aa9de3b6984e3567de44a1219dae131c110b5b9b54b9f3c41ac54f0a99e0813bc8347c412948affba56b8e38917b393b81878247034 SHA512 0fdb640a921418059800c9f86d29d4495ef489e607dfcb54baffc7071e22898b9ed5ffbd823641fd0459b1c355bf87aff64f0f65635047a8b1d90c5b5f4e0ae2
-EBUILD salt-3007.1.ebuild 30929 BLAKE2B 07fd76ca5eff01bf95ec9c071ba0470af80fdb9ff5457eed2490ec2750d02881df85738e6bc6266f7431bf979408d3272e6493d3b9cfe75286df53b2c10c4ced SHA512 e0dcb1413b967bfe9b85d39333baf86075763a931b5b0c0e680967f83920cd4d7029dc31ea94b880b3e04f42548f9ee74112bf15de825bf3d5e5b8954cd8d215
+EBUILD salt-3007.1-r1.ebuild 30973 BLAKE2B dd6ffb0a671b10da0f5303f8e23be6ce33731370ea3ab29d1210268a92d18774b38a0669c8a3765a35966fb4e6f19d96e45579e1c44210a735d789966669a2af SHA512 a038b37f7f8f46ffa6138ac143605d1825832143fc827a639c8d10d0c18052d528cab16dab5fb52b400b0296d7b00279bd71fa9f60ec78cb51be016b033da700
 MISC metadata.xml 2244 BLAKE2B 2c67e0828b71051c1c542b1e2142d93d623c28f30e36b59442dda3966f18ef2ae1111a263f1faf56c288c927c7db13736cfa68111248e84378fab23043d49e02 SHA512 89e46a1379b2cf95aff0af082f989cb50a1a769240407fbe6a43de1a3f312be5b690f30d1349aa659268fcf3818a2d829fcff18fd11988b161038cb19e13bde5
diff --git a/app-admin/salt/files/salt-3006.9-pam-module.patch b/app-admin/salt/files/salt-3006.9-pam-module.patch
new file mode 100644
index 000000000000..c0af2ee5210f
--- /dev/null
+++ b/app-admin/salt/files/salt-3006.9-pam-module.patch
@@ -0,0 +1,13 @@
+diff --git a/salt/auth/pam.py b/salt/auth/pam.py
+index 6e179deb7c..935c523606 100644
+--- a/salt/auth/pam.py
++++ b/salt/auth/pam.py
+@@ -228,7 +228,7 @@ def authenticate(username, password):
+     env["SALT_PAM_PASSWORD"] = password
+     env["SALT_PAM_SERVICE"] = __opts__.get("auth.pam.service", "login")
+     env["SALT_PAM_ENCODING"] = __salt_system_encoding__
+-    pyexe = pathlib.Path(__opts__.get("auth.pam.python", "/usr/bin/python3")).resolve()
++    pyexe = pathlib.Path(__opts__.get("auth.pam.python", f"/usr/bin/{os.environ['EPYTHON']}")).resolve()
+     pyfile = pathlib.Path(__file__).resolve()
+     if not pyexe.exists():
+         log.error("Error 'auth.pam.python' config value does not exist: %s", pyexe)
diff --git a/app-admin/salt/salt-3006.9.ebuild b/app-admin/salt/salt-3006.9-r2.ebuild
index 4278c54ee0f5..f81dd7ade71d 100644
--- a/app-admin/salt/salt-3006.9.ebuild
+++ b/app-admin/salt/salt-3006.9-r2.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
 		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
 	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cherrypy? ( >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}] )
 	cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
 	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
@@ -138,6 +138,7 @@ RESTRICT="!test? ( test ) x86? ( test )"
 PATCHES=(
 	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
 	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
+	"${FILESDIR}/salt-3006.9-pam-module.patch"
 )
 
 python_prepare_all() {
diff --git a/app-admin/salt/salt-3007.1.ebuild b/app-admin/salt/salt-3007.1-r1.ebuild
index d8b9533aac5e..8ff966a32715 100644
--- a/app-admin/salt/salt-3007.1.ebuild
+++ b/app-admin/salt/salt-3007.1-r1.ebuild
@@ -142,6 +142,7 @@ RESTRICT="
 
 PATCHES=(
 	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3006.9-pam-module.patch"
 )
 
 python_prepare_all() {