From 92ebda186167f9887d5f43803ced730b499dcf57 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Jul 2023 10:19:19 +0100 Subject: gentoo auto-resync : 08:07:2023 - 10:19:19 --- app-admin/Manifest.gz | Bin 31533 -> 31542 bytes app-admin/awscli/Manifest | 2 + app-admin/awscli/awscli-1.29.1.ebuild | 80 +++++++++++++++++++ app-admin/webapp-config/Manifest | 3 +- .../webapp-config/webapp-config-1.55-r3.ebuild | 87 +++++++++++++++++++++ app-admin/webapp-config/webapp-config-9999.ebuild | 27 +++++-- 6 files changed, 192 insertions(+), 7 deletions(-) create mode 100644 app-admin/awscli/awscli-1.29.1.ebuild create mode 100644 app-admin/webapp-config/webapp-config-1.55-r3.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 908ba8eb1b49..3e8606ac8546 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 0c86f0a247f1..2ec51ba6842f 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -7,6 +7,7 @@ DIST aws-cli-1.27.165.gh.tar.gz 2445911 BLAKE2B 72496a0b5695c78631349b7b6efb4aee DIST aws-cli-1.28.0.gh.tar.gz 2445988 BLAKE2B 5c56f908d72cdc10c3e256dd1cc279a202d302cfee0ce860dbefec33ec78aea7afcae37aa699bab6a8644503c9ff0648d0efd60a168f180847f4392e3440658f SHA512 cc3239b7609de0dfa0bb15fea044a9f51151e6c1873c07dc1f0893b0418721eef9b28d1757bc59f7d9e603b865eec406fbe3865e0f31de2f58142ca6768bd1a3 DIST aws-cli-1.28.1.gh.tar.gz 2446244 BLAKE2B b3642736467a629e810bab4998f797e12845427344689ca8bbe8e2e5e362debc71d2496dfb9ad9e0de1d0e018744e9e13268b6f203040475ef97b77fb99fbf1b SHA512 ab668d09979e5bb1ddec9862227d08c607ddfcac417fe298ac214caf492bcee678291132117925e0e229d10bf4b820c2acc3c335e5b0b9474151ad3233117668 DIST aws-cli-1.29.0.gh.tar.gz 2449423 BLAKE2B 52948b35f391266c38a197d4fa20926c428def190a5821a64b33fe9939b5a30a252fd546a3f1f54056901ed9fe75e7d030d65ca40508658581a4246ad6ec1635 SHA512 5c1b31d2b5c9721b2b27ef21fbd58c74c70fce35122e1de4b1483b8bd6766f2b2b27c288aa1a3d91f1d37decdaa937823b4149f9b1d49acd4404477ee8f9dfd6 +DIST aws-cli-1.29.1.gh.tar.gz 2449948 BLAKE2B 5765a91501be6d789610be4d46373c909f4335159fd0063acc95e5082825684f0e1a83db3ef228ee67342844e81c2ccd2de2651763304a14c0166775839d8f08 SHA512 00a500497ffc0ff22a0f83878aef3a00b6873ad949db2fe9d6a339a7aa8e8465f5aaf996a422a9810731930b0548e1fe771d964001d10657b69398fd0fe9aef1 EBUILD awscli-1.27.155.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b EBUILD awscli-1.27.160.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 EBUILD awscli-1.27.162.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 @@ -16,4 +17,5 @@ EBUILD awscli-1.27.165.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb2 EBUILD awscli-1.28.0.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 EBUILD awscli-1.28.1.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 EBUILD awscli-1.29.0.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 +EBUILD awscli-1.29.1.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab diff --git a/app-admin/awscli/awscli-1.29.1.ebuild b/app-admin/awscli/awscli-1.29.1.ebuild new file mode 100644 index 000000000000..62c19f3a63fb --- /dev/null +++ b/app-admin/awscli/awscli-1.29.1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) + +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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() { + local EPYTEST_DESELECT=( + # TODO + tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple + tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only + tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing + tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid + ) + + # 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/webapp-config/Manifest b/app-admin/webapp-config/Manifest index a94f39bbc4ab..1598074d7ff7 100644 --- a/app-admin/webapp-config/Manifest +++ b/app-admin/webapp-config/Manifest @@ -1,4 +1,5 @@ DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438 EBUILD webapp-config-1.55-r2.ebuild 1787 BLAKE2B 1b17975c92e0fbc0160e1e413dfb812ec5dd6966357408abc7f2db2478a83182e833650e416e288b74a4923ab3397c198f7d55d0b70e7ff4f524c40973bba959 SHA512 c910db16d538246dba10e62f22ef896752dbbf0d4a9fe5cdc5e78604447eb132d4783f525ff87337bbf876bcc23aef2e41e8f3ccedd7b962fb95a4ebc10027fb -EBUILD webapp-config-9999.ebuild 1780 BLAKE2B c3c028949ecda5556b24430d4000b0f1f5f7f7c1ad17de4f90d9cf052e39846bf0d64721d92e3f5e9a4e764c85a311748b885b0d7c598d0d1f8717f038979a56 SHA512 298f6473a69b57353720c14034861382178006173a8e850159922dc20d10a823c9e31407046d4bb64d371967448d0c41d73ea127bf9dcc8f88ac39f44ad38236 +EBUILD webapp-config-1.55-r3.ebuild 2461 BLAKE2B 190826599765147db3d87c3af1b753946baebc1c6d2ede348341188e4586fda6662a3f11cb37e5ed1a5d2f93fe995fd265c7da07ea3f295b4c4502520f872b63 SHA512 a6a166671465821d6fb6ccbd27e0e70e2efccb61a7117b166e063e9afa91f2c1140e380b02fd88fa1cdf8611525c0679b9d6d0ea61b41b44e3733bda43fc5b88 +EBUILD webapp-config-9999.ebuild 2461 BLAKE2B 190826599765147db3d87c3af1b753946baebc1c6d2ede348341188e4586fda6662a3f11cb37e5ed1a5d2f93fe995fd265c7da07ea3f295b4c4502520f872b63 SHA512 a6a166671465821d6fb6ccbd27e0e70e2efccb61a7117b166e063e9afa91f2c1140e380b02fd88fa1cdf8611525c0679b9d6d0ea61b41b44e3733bda43fc5b88 MISC metadata.xml 448 BLAKE2B 14bff33f87640b065d72b7bd98742c602e1cd30be80cde6bbc5bd923cb8529f55e4296e83e630e55a9c8342da063dc3762f515bccd2614fc50d68770260fd727 SHA512 20db75371335720225afe0111925fe6ba3979448987a27459786a4490b862073ac23374ba29c218e523ea465fb811c7686d5a36e073a35a2a2b2c4521b6961f2 diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild new file mode 100644 index 000000000000..76caefb23e6d --- /dev/null +++ b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 prefix + +if [[ ${PV} = 9999* ]] +then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Gentoo's installer for web-based applications" +HOMEPAGE="https://sourceforge.net/projects/webapp-config/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+portage" + +DEPEND="app-text/xmlto + sys-apps/gentoo-functions" +RDEPEND=" + portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +python_prepare_all() { + # make the source from svn mirror the one in the tarball + if [[ ${PV} == 9999* ]]; then + mkdir ../webapp-config || die "Cannot create temp directory." + cp -r * ../webapp-config || die "Cannot copy all into the temp directory." + mv ../webapp-config . || die "Cannot move temp directory to its final position." + + # Installation fails if version is 1.55-git + sed -e 's/-git//' \ + -i webapp-config/WebappConfig/version.py \ + -i WebappConfig/version.py || die "Cannot fix version." + fi + + distutils-r1_python_prepare_all + eprefixify WebappConfig/eprefix.py config/webapp-config +} + +python_compile_all() { + emake -C doc/ +} + +python_test() { + PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v || + die "Testing failed with ${EPYTHON}" +} + +python_install() { + # According to this discussion: + # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html + # distutils does not provide for specifying two different script install + # locations. Since we only install one script here the following should + # be ok + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" +} + +python_install_all() { + distutils-r1_python_install_all + + # distutils-r1 installs the scripts in /usr/bin in PEP517 mode + mv "${ED}"/usr/bin "${ED}"/usr/sbin || die "Cannot rename scripts directory to /usr/sbin" + + insinto /etc/vhosts + doins config/webapp-config + + keepdir /usr/share/webapps + keepdir /var/db/webapps + + dodoc AUTHORS + doman doc/*.[58] +} + +pkg_postinst() { + elog "Now that you have upgraded webapp-config, you **must** update your" + elog "config files in /etc/vhosts/webapp-config before you emerge any" + elog "packages that use webapp-config." +} diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild index 9aad95348cfe..76caefb23e6d 100644 --- a/app-admin/webapp-config/webapp-config-9999.ebuild +++ b/app-admin/webapp-config/webapp-config-9999.ebuild @@ -1,20 +1,20 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 prefix if [[ ${PV} = 9999* ]] then - EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" inherit git-r3 else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Gentoo's installer for web-based applications" @@ -30,6 +30,18 @@ RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" python_prepare_all() { + # make the source from svn mirror the one in the tarball + if [[ ${PV} == 9999* ]]; then + mkdir ../webapp-config || die "Cannot create temp directory." + cp -r * ../webapp-config || die "Cannot copy all into the temp directory." + mv ../webapp-config . || die "Cannot move temp directory to its final position." + + # Installation fails if version is 1.55-git + sed -e 's/-git//' \ + -i webapp-config/WebappConfig/version.py \ + -i WebappConfig/version.py || die "Cannot fix version." + fi + distutils-r1_python_prepare_all eprefixify WebappConfig/eprefix.py config/webapp-config } @@ -55,6 +67,9 @@ python_install() { python_install_all() { distutils-r1_python_install_all + # distutils-r1 installs the scripts in /usr/bin in PEP517 mode + mv "${ED}"/usr/bin "${ED}"/usr/sbin || die "Cannot rename scripts directory to /usr/sbin" + insinto /etc/vhosts doins config/webapp-config -- cgit v1.2.3