From c915adf64c1415679bfe6b55c95348db2f89202e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Jul 2022 08:41:03 +0100 Subject: gentoo auto-resync : 20:07:2022 - 08:41:03 --- app-admin/Manifest.gz | Bin 32847 -> 32829 bytes app-admin/awscli/Manifest | 2 + app-admin/awscli/awscli-1.25.33.ebuild | 72 +++++++++++++++++++++++++++++++++ app-admin/r10k/Manifest | 2 - app-admin/r10k/r10k-3.7.0-r2.ebuild | 49 ---------------------- 5 files changed, 74 insertions(+), 51 deletions(-) create mode 100644 app-admin/awscli/awscli-1.25.33.ebuild delete mode 100644 app-admin/r10k/r10k-3.7.0-r2.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 5619ce6d3e4e..80a8519f20a2 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 8decfdedec08..c86a917d8012 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -2,8 +2,10 @@ DIST aws-cli-1.25.22.gh.tar.gz 2228459 BLAKE2B e9ca58f6be9d5836b2b4d8ce51154ecd9 DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92d93d831301b0a46ec7dab1ac4b1bdeda9d43f9f6cf20de153f9df3d6b66b0d9ed9754ee4c27b79aacf9d9b8d7e11c2f SHA512 56f9d02d54d20624944c8749860d3e92e7c0887b1c6f524545394ad590ad5ab63752abf25ecba400cfcb9273bdecbae110e4811804e287f15bdfde0d8638adff DIST aws-cli-1.25.31.gh.tar.gz 2233721 BLAKE2B 791bd78851c5643ee72faddc8e4d4e39c94a91e4879d749bcf2cadbe4797cdd448a95dd2b3c626b76e648303ec93fc0338d08f79227f05ff467754810166731b SHA512 586f0fa0f81ec8acc0b79fba5372a37ebcf162981c8fbab31633f63736337cae0b4788bb7a4cdabf6e04800fb63ed6804a6a73a7d5552a9b4c85b4eb273ee6d8 DIST aws-cli-1.25.32.gh.tar.gz 2234199 BLAKE2B 01298ae8efd9f33c71856a3e866b6df86af1ad83e6085015bd76caa6ba4c48847a66348cfbde19ef47bdb1b8f61ded2565d319cbef1f7e2c3472e6dace89193b SHA512 d55eeb201209cfc6c4e1ba443ca049dc1b4ebabfa6abf3327ea0c8967d0d77c9963c2727f29482b475b3b66fc711130c1b40dc29e28c037c912115c24890810f +DIST aws-cli-1.25.33.gh.tar.gz 2234361 BLAKE2B fd4d91cf4ed0ae3715f629754c664802f2fb402c7cec6349ba8faab9e09901a306eeb9f69a15984526177c1ecc75c09965b430607a5d7606b070bd1c7cb4d6dc SHA512 f0fe3b8f31318303bbe4fc16f3ba02cebb27349364351c152ba508dd0a70bf7ba2a82983cfc21da6532b80be7417719d889e620fb5666e70b3f74091bb252dfc EBUILD awscli-1.25.22.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906 EBUILD awscli-1.25.26.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2 EBUILD awscli-1.25.31.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2 EBUILD awscli-1.25.32.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2 +EBUILD awscli-1.25.33.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160 diff --git a/app-admin/awscli/awscli-1.25.33.ebuild b/app-admin/awscli/awscli-1.25.33.ebuild new file mode 100644 index 000000000000..9f176fa05cc8 --- /dev/null +++ b/app-admin/awscli/awscli-1.25.33.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 distutils-r1 multiprocessing + +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 ~arm64 ~x86" + +# botocore is x.(y+2).z +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/pytest-forked[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +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() { + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked +} + +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/r10k/Manifest b/app-admin/r10k/Manifest index c55fcfac157b..fb023544021e 100644 --- a/app-admin/r10k/Manifest +++ b/app-admin/r10k/Manifest @@ -1,5 +1,3 @@ DIST r10k-3.15.0.gem 257536 BLAKE2B 50ddb734bef782d9b061f17338d05c8fd824d0cc1e6005c538c4ef91c584bfe9ecbfb5bc5dc033317344bad7b14825cea6a56e136efec5081778582b8c714b18 SHA512 97cbb0a3e6f23591370de339e3320d9cbff726968b3b73d2bb00ebca7637406a371d1464d3ac955b7aacc4f5cfa898b828095aebaebe24bffd7d90be462457a9 -DIST r10k-3.7.0.gem 217600 BLAKE2B 03af5829d027cf4e84c6a04a3977a4fe97c030c1668f6b77792553fbb23265684232215b4fad1b48282bf55fcc14afe65906ca745722bf14436d27a294b47cc6 SHA512 31d96b69db34e79439a25b83bae73011b81b0e2eb412f944fc68ef4d087f4715ba30e3821c2a12b79fadf01b95a6922bc7cb5c0ed1c3f6ae8e29785d180925ad EBUILD r10k-3.15.0.ebuild 1280 BLAKE2B b483ff6f05ed67b73a00fb3d07498ab5c2b80bc5fbb2e629cf6d34639a30193d11e73901dc46f0de0f670df80916dcdfe87f250ebba4d0875fa272cfc35c82e5 SHA512 109992515ff70be171656c91ff135c33afad7c14d696e66e67e3e0ea5afa1cebf4a2b7f8ac0032e325775bb0f95ac9379ee32b4fbbe00594b020a3d6b270175c -EBUILD r10k-3.7.0-r2.ebuild 1089 BLAKE2B 901a5b11a1fbe624686de01eb2378425c62c298792fa79c66526c63be22f45171e1e3953a3059bbd69a386688202b913f554e036740b22a1bbf81fd2420abdf6 SHA512 c509c0c1fc108f4a702e4386917389c4d0f6b8e82d5911e8bbf1a927681f312f1caec1acaaffbc631b7e1fbafce337c2930d4ce26c9f37c2417f9c4962b89c7e MISC metadata.xml 583 BLAKE2B ba9d1aa2afa56933206aac7d21a4d68eba309714a20ceebdd93d3e2ec96a08af0b6ca67a0badc24065cf3422e0cf3ec8538fe4574e099715cfb0c923ad4b318c SHA512 609f9a84804a73f28fcebe1081296735b34cd54927b770fd10ef82113ffeceb2f04c3e8dd100d5c018659f11227d6807d138de318e65c8e5f6fe1dd800a2c207 diff --git a/app-admin/r10k/r10k-3.7.0-r2.ebuild b/app-admin/r10k/r10k-3.7.0-r2.ebuild deleted file mode 100644 index 0d4f8948a754..000000000000 --- a/app-admin/r10k/r10k-3.7.0-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby24 ruby25 ruby26" - -RUBY_FAKEGEM_RECIPE_DOC="none" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" -RUBY_FAKEGEM_EXTRAINSTALL=locales - -inherit ruby-fakegem - -DESCRIPTION="Puppet environment and module deployment" -HOMEPAGE="https://github.com/puppetlabs/r10k" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+git" - -ruby_add_rdepend " - ~dev-ruby/colored2-3.1.2 - >=dev-ruby/cri-2.15.10:0 - >=dev-ruby/gettext-setup-0.24:0 - >=dev-ruby/fast_gettext-1.1:0 - >=dev-ruby/ruby-gettext-3.0.2:0 - ~dev-ruby/log4r-1.1.10 - >=dev-ruby/multi_json-1.10:0 - =dev-ruby/puppet_forge-2.3* -" - -ruby_add_bdepend "test? ( - >=dev-ruby/minitar-0.9 -)" - -RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" - -all_ruby_prepare() { - sed -e '/s.files/d' \ - -e '/fast_gettext/ s/1.1.0/1.1/' \ - -e "/gettext/ s/'< 3.3.0'//" \ - -i ${RUBY_FAKEGEM_GEMSPEC} || die - - # Avoid specs for unpackaged rugget git provider - rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die -} -- cgit v1.2.3