diff options
Diffstat (limited to 'app-admin')
89 files changed, 1567 insertions, 1313 deletions
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest index 0e97f0c84c5e..6817e3bf783e 100644 --- a/app-admin/ansible-core/Manifest +++ b/app-admin/ansible-core/Manifest @@ -1,6 +1,4 @@ DIST ansible-core-2.14.13.tar.gz 3145413 BLAKE2B 75b11feaaefa9a63c6f83f64c796ceacf7c6b08322ac0b85f6dcf968db7b80cc97262ea6f8f839e5e41e800ad7cae610e96f312c1ae0f58882c8891246a81b8a SHA512 195885815d40448d8497eae9533a4104c4b9f17ab3a812d544a403f41d2e77e7be2c15bae5a6df07563499052beb273580a569d51b667d0a9c5a16e55b35258a DIST ansible-core-2.15.8.tar.gz 3160606 BLAKE2B 439a3f584940e5ab46b43b0b47395e0618a3ea52c67ebcd51667f31220cb038dda35506e7843d177d555b77a55a9d2c6245a916741ab1dcdf222c535afb5f83d SHA512 020191ef4b005abbf799204da68270bd4f13a85c7f23cb9dffe85b1c5c093c0ad86e061211ab9fcc8fd0be9367717fb0baadefb1ebecd3579471120fb2e8647f -DIST ansible-core-2.16.2.tar.gz 3163899 BLAKE2B 6365dd573ae4a2f3ebfc870ae3ea399b268615333de2ddf7e21323189dfdd9bf61ae836b536c86d713f4a934468ed36835084e06e4b6d9b32c4b633f55353ad9 SHA512 6e2389fc6b34645c0f1566eca960da36616619a5ed5e35b46f3d659979fe519db20d89b4f598344a389f4b6ac33bb660ea91a1a6509002bbf4ac791ea3cb4cbd -DIST ansible-core-2.16.4.tar.gz 3170397 BLAKE2B 8226641621ce4b2a8cd564f831cd21e36345b2db6680f8d9f3d3388a05ff66df74f4d286300dbb1b73601a0bf4a781d266e62e9fd0c894a79f89d545930c854a SHA512 d05737eec9a6a0e71891821acd4540576b3a993f59d88c12c2da8e7f075bc11c712e0eba850b3f7a2643e3c970f51938267fed6fa7f99f2c4c205b64f9b13259 DIST ansible-core-2.16.5.tar.gz 3171617 BLAKE2B cb620cf9fc9fd509edb62bf75ab19b5ffe80f4d8520be76bbeb030c74953945295e0f4f30102f51d20247d2ce4a18b15e488e47b4346319f5442979593402821 SHA512 dbe5d68fbc3a0ef611791d6995297bca5bba6aed1f4871964136ea81810458646bc78c2146739f887de3c2e3017cf4e6d4d09652e41c2ca046c4bc88eca6c5d8 DIST ansible_core-2.16.6.tar.gz 3176041 BLAKE2B 37aa15e8d9165eb89db0704f7670f78f3e3a50915e17bb1d56689e65e6cfc0bb15b7e01768d25c5d2a9a00802411a6eefdb9ad70aa38877d7115bc40faafea59 SHA512 cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409 diff --git a/app-admin/ansible-core/ansible-core-2.16.2-r1.ebuild b/app-admin/ansible-core/ansible-core-2.16.2-r1.ebuild deleted file mode 100644 index 45fc573d4107..000000000000 --- a/app-admin/ansible-core/ansible-core-2.16.2-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 - -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 - inherit pypi - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" -fi - -LICENSE="GPL-3" -SLOT="0" -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-1.1.0[${PYTHON_USEDEP}] - net-misc/sshpass - virtual/ssh -" -BDEPEND=" - >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - test? ( - dev-python/botocore[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -python_compile() { - export ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_compile -} diff --git a/app-admin/ansible-core/ansible-core-2.16.4-r1.ebuild b/app-admin/ansible-core/ansible-core-2.16.4-r1.ebuild deleted file mode 100644 index 51f3b5d36db1..000000000000 --- a/app-admin/ansible-core/ansible-core-2.16.4-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 - -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 - inherit pypi - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" -fi - -LICENSE="GPL-3" -SLOT="0" -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-1.1.0[${PYTHON_USEDEP}] - net-misc/sshpass - virtual/ssh -" -BDEPEND=" - >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - test? ( - dev-python/botocore[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -python_compile() { - export ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_compile -} diff --git a/app-admin/ansible-core/ansible-core-2.16.6.ebuild b/app-admin/ansible-core/ansible-core-2.16.6.ebuild index 45a1511c7489..7e0388815e05 100644 --- a/app-admin/ansible-core/ansible-core-2.16.6.ebuild +++ b/app-admin/ansible-core/ansible-core-2.16.6.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_BRANCH="devel" else inherit pypi - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" fi LICENSE="GPL-3" diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index 2b8fc9c59daf..793cf95128c8 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -1,2 +1,3 @@ DIST ansible-lint-24.2.0.tar.gz 513719 BLAKE2B 54e05acf982cf13cb2142a10bf04250171f07936df14933525dfae68b312a0d92ceb30867603dc7ce686206b7de010f6ca4eb9ab532ca000fc3c15c77c354c81 SHA512 3276d28c7b85a6087a0142cc56442efddf9ff3e81155455c74686015a2ab45ece64847b0243373ad01145e67599d8449866c122efe8ae404cd819011e41c5235 DIST ansible-lint-24.2.2.tar.gz 515822 BLAKE2B e9d8e689dfe4e4efbd4dad44ff3567f50412400ed979f2d60150f09f17c5f63f2441f25a33ecdf0112024ced07e62ac16b8a2dbc1c01d62855ec785fc75d1b9a SHA512 3de6b14e4b64ba577abcb67920a45dbf45fedb84e21091cd6a29e3c52a7a91555a152ee3e265624aafbf9dddba96d04241c2598a18f2103ce2cae48706142446 +DIST ansible_lint-24.5.0.tar.gz 525539 BLAKE2B 2681da05c69299f62b9a180ff4a10ea8fa27731d5a9f3d836e67fd211c2def86a6baa38583900e9c8be1a5da0a8658aded6e83cb8f13f129f55bd18a06b2e574 SHA512 b390743bbb09c03c9b402c35644c2b2e29b9a94fce842bf42b8938f7094b145ea75275f643949383bdad694408c606c0bc3038d5ca733a39ac08ef77cc7dc459 diff --git a/app-admin/ansible-lint/ansible-lint-24.5.0.ebuild b/app-admin/ansible-lint/ansible-lint-24.5.0.ebuild new file mode 100644 index 000000000000..fcaeec307b68 --- /dev/null +++ b/app-admin/ansible-lint/ansible-lint-24.5.0.ebuild @@ -0,0 +1,57 @@ +# 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..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved" +HOMEPAGE="https://github.com/ansible/ansible-lint" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" + +# Upstream has stated explicitly that all tests require Internet access +PROPERTIES="test_network" +RESTRICT="test" + +RDEPEND=" + >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-4.1.11[${PYTHON_USEDEP}] + >=dev-python/black-22.8.0[${PYTHON_USEDEP}] + >=dev-python/filelock-3.8.0[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.17.0[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/pathspec-0.10.3[${PYTHON_USEDEP}] + >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}] + >=dev-python/rich-12.0.0[${PYTHON_USEDEP}] + >=dev-python/ruamel-yaml-0.18.5[${PYTHON_USEDEP}] + >=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}] + >=dev-util/yamllint-1.30.0[${PYTHON_USEDEP}] + dev-vcs/git" +BDEPEND=" + >=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}] + test? ( + dev-python/mypy[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + >=dev-python/pytest-plus-0.6[${PYTHON_USEDEP}] + >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}] + )" + +# test_call_from_outside_venv doesn't play nicely with the sandbox +# irrespective of whether Internet access is allowed or not +EPYTEST_DESELECT=( + test/test_main.py::test_call_from_outside_venv +) + +distutils_enable_tests pytest + +# Test suite fails to start without this +python_test() { + epytest test +} diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index 28e77d767d29..c19663989454 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,5 +1,4 @@ DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9 DIST ansible-8.7.0.tar.gz 49317896 BLAKE2B d5923753e368e908a569c5f8f261b1afe7c51d5381db190bf7de1e81f0a6359136581852faa2974f174e816944c66e2c0f625d3d62bdde324758309982c90de9 SHA512 6a67f8553c3fa56559e4a31ec627cfe2c5f42e147d94bea305ec4580af9ba8add136092b209a5a3d7f9022407e9d557484f044d23cb227973fe4e4341fed7983 -DIST ansible-9.1.0.tar.gz 48839908 BLAKE2B caa652b339fb93334bff7246d1bab6bbdd9672a096637aa0695cd94a7f50d0e5ca7a1bfeb559792833c97eb9d16486965776b609354dc05ca63b1474d43e767b SHA512 ec6d86b3d05e66053001720b6b7d7bd1dba8bd50917c913e1f08a63b0c94f76a5d69732c78e793d038622a0b8c652860290a89cee1dfb22491a81763923ef843 DIST ansible-9.3.0.tar.gz 38240168 BLAKE2B 0cd243a21b12163fcb37f014a69f6041f9c48dae84d1aeea342713daf8150246efa14ac94f43890e449896d111f1839ebe2dba7d9c48c2359fb01e4aadfd270b SHA512 71eff05455aee0a013b69790145a73325ac7037fc509545a7cdca358aa54c1731f7dc6fb0169f602d668e9da9e41a0879ff48ba1243d372e02dae9382ac46c5c DIST ansible-9.4.0.tar.gz 38389836 BLAKE2B a2e08088565e6f248c1185ee96ac2365fc1385993d3f3fe68f941e8acb0e567c3defeec3ea376a30213921f02881bce0a0ac737323fc3ec82dc77d2d4a550dbd SHA512 4c75235a866f3f95cda8dd3b6c9d22b916ad117d54a86a30585f71c9015cd98db764afa225af5b2f6fa884af558ee488785e26c9e8b9e8be105062f069f065b2 diff --git a/app-admin/ansible/ansible-9.1.0.ebuild b/app-admin/ansible/ansible-9.1.0.ebuild deleted file mode 100644 index 09a9b1e9bd54..000000000000 --- a/app-admin/ansible/ansible-9.1.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# 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..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://www.ansible.com/" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" -RESTRICT="test" - -RDEPEND=">=app-admin/ansible-core-2.16.0 - <app-admin/ansible-core-2.17" - -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/apache-tools/apache-tools-2.4.59.ebuild b/app-admin/apache-tools/apache-tools-2.4.59.ebuild index ff67bbf7dac4..f3af585656d2 100644 --- a/app-admin/apache-tools/apache-tools-2.4.59.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ssl" RESTRICT="test" diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest index 58d3060a2f18..6009e546afb6 100644 --- a/app-admin/authbind/Manifest +++ b/app-admin/authbind/Manifest @@ -1 +1,2 @@ DIST authbind_2.1.2.tar.gz 15279 BLAKE2B 5f9a31c9f51c307e9ad85bf14b436e1780d0c7dc5655ad3882e9596927862be0684d0a4a43c7d2e98a0d6a0d4c2552aaaf954ce32d3e9202bf5593ce501b5962 SHA512 85020af9703f8f39194a7719c50a51d75344db9ea99ecbc83c3c6bff0852ab1ea1cbd0b9bff6a2345e08a7bef9732e36890f33af08929e36dae8215dd070cc4d +DIST authbind_2.1.3.tar.gz 15215 BLAKE2B c74b7caf27b6a26cf924084fe79dff1ccf429d2a0e9773690407b5f40b07589841b857fe8fda50c1251825fbabf9054c54ab79dea38026bbae770a47a774610b SHA512 357c8f5c5ad446e75a597d5bc5bb5af7db17de771643a39976b5ac1425f03bf44f322c8dd07b0e1b04a0bf78d5000841b4866e0d0945584689e99291156dfac1 diff --git a/app-admin/authbind/authbind-2.1.3.ebuild b/app-admin/authbind/authbind-2.1.3.ebuild new file mode 100644 index 000000000000..7df60af86ca9 --- /dev/null +++ b/app-admin/authbind/authbind-2.1.3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Bind sockets to privileged ports without root" +HOMEPAGE="https://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/" +SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz" +S="${WORKDIR}/work" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="app-alternatives/awk" + +PATCHES=( + "${FILESDIR}/${PN}-2.1.2-respect-flags.patch" +) + +src_configure() { + tc-export CC LD + + sed -i \ + -e "s|^prefix=.*|prefix=/usr|" \ + -e "s|^lib_dir=.*|lib_dir=\$(prefix)/$(get_libdir)|" \ + -e "s|^libexec_dir=.*|libexec_dir=\$(prefix)/libexec/authbind|" \ + -e "s|^SHARED_LDFLAGS=.*|SHARED_LDFLAGS=$(raw-ldflags)|" \ + Makefile || die "sed failed" + + sed -i \ + -e 's|/usr/lib|/usr/libexec|' \ + authbind-helper.8 || die "sed failed" +} + +src_install() { + dobin authbind + doman authbind.1 authbind-helper.8 + + local major=$(awk -F= '/MAJOR=/ { print $2 }' Makefile || die) + ln -s libauthbind.so.* libauthbind.so.${major} || die + dolib.so libauthbind.so* + + exeinto /usr/libexec/authbind + exeopts -m4755 + doexe helper + + keepdir /etc/authbind/by{addr,port,uid} + + dodoc debian/changelog +} diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index aaee59a3df73..63fe2718ef3e 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,5 +1,6 @@ -DIST aws-cli-1.32.84.gh.tar.gz 2691519 BLAKE2B 4cb78f14975d74013803af0f6397d959294cca6046ee19c1a907ca3e60fd224539d39535416ddcc2713b1de653b78ba03965dc78415dd915e80d11fcd6fbe02f SHA512 19d2030201806b336ede2c5e09f761e39959a156057d68316180145232e54013f2e5fa57023146488d407aa7e655fdb2245058e45eb5c4d6778eecd867f6eac1 -DIST aws-cli-1.32.88.gh.tar.gz 2693435 BLAKE2B 043f4eb08711760b7f8e15a5eba879524788cb65823215ed9d1c8ee5337a085ab6975dfc1c90aea29b7137f050a6d4f201eba57e8c8c83c09625401d8075eb6c SHA512 cb0ed179b9549d988e19963607fe28ca6fb02c92280c451c8651a8149d60a929158f9ae04a1c764540648b8b42417e908cb956fe71ce787c4b788f83cc2ef488 -DIST aws-cli-1.32.93.gh.tar.gz 2695489 BLAKE2B d2f81786d4db158a13ec50ed833668db26bde00cc1e4f5254aa127aba82113074abafa996f525b5f7cd215fd51639481a01a49c425bb4c01e990261529f06082 SHA512 e03892ef522fa43442d1b053d0bf8dbd6c892d94398934c4af58e81153c2759f7e55a289457bb3e5b46f2f01697642498fdd6d51cdc18ad8b6c0f6a31d7c606a -DIST aws-cli-1.32.94.gh.tar.gz 2696222 BLAKE2B 275464cb94d3282141209aa1ba90bd5a4a69f128f55cf222f60e8b964126d8bbc63c5313034496b18bb2db7c9ccba2ac199345e3f93e8597feded89a05f59df5 SHA512 a4fb1667d9161ffab2165502bc89a93667f83bcdae778daf42b4675b9345d0a497f5b36c40cf758613e8e4443173d4d358d39e6e30196c9f5a6b8a102d45c366 -DIST aws-cli-1.32.95.gh.tar.gz 2699193 BLAKE2B d50c00be87343f80be4342f6f1ef6ac611c6c7c37d72e369b87aff0d38ed763451a3de54a7d4013632f47cebd688b76b9103e85a20e58e01cd5ee66e7eabeb20 SHA512 0ec08479e9ef3b0eb231438c59379beb2d6a8bdca52a375bc5ba386d2bde3062093bb592bbf843d2be80658d9d88d4ae71ffa372db1261d6f6f16cd17c196ddc +DIST aws-cli-1.32.103.gh.tar.gz 2726436 BLAKE2B 7c08f29df7b0f786a99a7469263cb367ed8024cadb700a56955669abe6fd562cde349fe1e17e7b328b6cc69e6af6db30293f5a13129d700ebfedc1950c26fed3 SHA512 248659ee989df69ffbfbe6dd181632d4a784d4de333b8592c5e0b4a0333d2b201ec652f8ff0f44b51ffe4bc9bea230d047f655016742816cfc52bbb871a707d7 +DIST aws-cli-1.32.108.gh.tar.gz 2728605 BLAKE2B 83606ebe909a4ee3d4f0d2875f56958b02b791d31d2fc770b1dc60072d31a56b6b7b5ef3ad79d8239b5f061f99f0dbfb554cab169bb99e6813f2b55cf8c185e2 SHA512 ce4bde840a4bfcdce91165bcf66139056e479322c80ef3211c98cd12c09d60d95bad8255f616dca4c11db3a26f3dca8149a42b76d163a8f02a88e6f986faff51 +DIST aws-cli-1.32.113.gh.tar.gz 2730091 BLAKE2B d7c88dd962f1be64fc57f19a3ad247725efdd14b611f752200d333297f99993f896855bc307fcab8ec76c6c00b982dca2f507023211f6ce54bcb6380f71f9dd3 SHA512 9dcc017e8b8ab9d9aef26c7bcbaaeb7256e20ba4abf4fe80580561cb46a61fd5e79e5057dc38b05b1af22a7b03610c88a1babb63c9503b16176010d2903661cb +DIST aws-cli-1.32.114.gh.tar.gz 2730585 BLAKE2B f0dd58f095b5955498fd7b498825e38970be3618b8e745bd8b3645e922d134b61ed3fe1d5ae883cc85fa3a019d6c52a1af3b2a7668a6a304b1e738424bf47ec2 SHA512 78fac6d15eda829412ac644d3329ec480985f5c424ed0a1800a519af03adaf2c1ea889c92e29dc12250b58b7c27f80bde8a3d361146f8c91d3d942d73c1ef51d +DIST aws-cli-1.32.115.gh.tar.gz 2730746 BLAKE2B 8fc1812f7ac78043e2405a6b93ec37fe6b17a7d3828bba7c8bccef2c2fcebed9aa408bc754108c754a91a8b2cbd855b2b8a9dea6568fea8b7b148373d6710ff9 SHA512 1ce600a0b3640083d534ca4b7c9b516b594556ae9dbe20e2255d4736c891529021bf351959b3f8f9849739a433e1f716aa93364a14e2a9d16971a9c9f3272808 +DIST aws-cli-1.32.116.gh.tar.gz 2732322 BLAKE2B e2223ff809a3d59866ff8087bd4e9b36f6cbb6cefcac32b89f5ec1563836b5014632c2f550a2a71bbc038ba20e1eb70a7663ed8cb28b32167cd83eddb088ce6e SHA512 6884d63ff05e1bc5442b4ffc566ea926a33f7a270c0f2ecbd7da6615035fbe26a2220aeb4031853460380884ee5dc47dcef586037903dd3516a8c2ad2722280f diff --git a/app-admin/awscli/awscli-1.32.84.ebuild b/app-admin/awscli/awscli-1.32.103.ebuild index b7c9ceb6d88f..b7c9ceb6d88f 100644 --- a/app-admin/awscli/awscli-1.32.84.ebuild +++ b/app-admin/awscli/awscli-1.32.103.ebuild diff --git a/app-admin/awscli/awscli-1.32.88.ebuild b/app-admin/awscli/awscli-1.32.108.ebuild index 4a677affdbc4..4a677affdbc4 100644 --- a/app-admin/awscli/awscli-1.32.88.ebuild +++ b/app-admin/awscli/awscli-1.32.108.ebuild diff --git a/app-admin/awscli/awscli-1.32.93.ebuild b/app-admin/awscli/awscli-1.32.113.ebuild index 4a677affdbc4..4a677affdbc4 100644 --- a/app-admin/awscli/awscli-1.32.93.ebuild +++ b/app-admin/awscli/awscli-1.32.113.ebuild diff --git a/app-admin/awscli/awscli-1.32.94.ebuild b/app-admin/awscli/awscli-1.32.114.ebuild index 4a677affdbc4..4a677affdbc4 100644 --- a/app-admin/awscli/awscli-1.32.94.ebuild +++ b/app-admin/awscli/awscli-1.32.114.ebuild diff --git a/app-admin/awscli/awscli-1.32.95.ebuild b/app-admin/awscli/awscli-1.32.115.ebuild index 4a677affdbc4..4a677affdbc4 100644 --- a/app-admin/awscli/awscli-1.32.95.ebuild +++ b/app-admin/awscli/awscli-1.32.115.ebuild diff --git a/app-admin/awscli/awscli-1.32.116.ebuild b/app-admin/awscli/awscli-1.32.116.ebuild new file mode 100644 index 000000000000..4a677affdbc4 --- /dev/null +++ b/app-admin/awscli/awscli-1.32.116.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..12} ) + +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+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.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/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest index 3567b1970501..766929ac7384 100644 --- a/app-admin/bitwarden-desktop-bin/Manifest +++ b/app-admin/bitwarden-desktop-bin/Manifest @@ -1,3 +1,4 @@ DIST Bitwarden-2024.2.0-amd64.deb 79917282 BLAKE2B 2066dc71bed9cddbcedccfd9129e3e81ac9f8a71217d2c651fb8a067b3e318574e26104b447a7ccd6734efded64ef3620cf4a7e36f0a577ed98f5468839540cb SHA512 c9394914fd6c82096fc5336e73b539e250727c6917af97961df0bd7de241f955b9eb87da154f32972c73ea1ce59bf0d79660658277185c89e099360ec4c3ea26 DIST Bitwarden-2024.3.0-amd64.deb 80463348 BLAKE2B 668fd4c18507b349e5892e7511b4898764a33d9da0a837379c7856caa054782fbf6a3337b03a779a8c8111d2458f560b31c32856850ff931694a8f18d889bdc9 SHA512 9297367e82e76870b7f12becfca6ec3bc0ce8f6515f4e17e9830d4df599891c839a8f5990c97b684528c8a4ad1c24ddd3bc99c1552620aee84b81c1cbf115771 DIST Bitwarden-2024.4.1-amd64.deb 80470012 BLAKE2B 64b451c3fbbac303782c68a366c66c32c49d0ecb52bcbc085451157216cc99fa888941e8c911c14f6a68aa6bb0413463b4296f108386e7b5b3ca8925c6dcc871 SHA512 e6edcd84f44062ccfa4152baf7dab230915d006f7f31de0ffcbe1acb62525777c7d653a7cb7c51509fb9ebcf5ba4219df97e5128853813a54aadbfd92ff2c819 +DIST Bitwarden-2024.5.0-amd64.deb 80326102 BLAKE2B ec8e9ae52bb5dcddc8b0d6e34f18174a304766639300ef2b601c4b5c62b4fa8f2d79e38b7a383e20aee9eb45a3af24ff54d7926ca051d5f1ea3b92861539dff3 SHA512 1f54757c74e438e556c512b5b96f08b758924248aea495ef87e2e408895f05970f2a46627ef421f23d659d50510216dcecca774f4a0fd34ee87cd10bed1e1f98 diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.5.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.5.0.ebuild new file mode 100644 index 000000000000..a98f129ada65 --- /dev/null +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.5.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop unpacker xdg-utils + +MY_PN="Bitwarden" + +DESCRIPTION="Bitwarden password manager desktop client" +HOMEPAGE="https://bitwarden.com/" +SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb" +S="${WORKDIR}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret + dev-libs/expat + dev-libs/glib + dev-libs/nspr + dev-libs/nss + dev-libs/wayland + media-libs/alsa-lib + media-libs/mesa + net-print/cups + sys-apps/dbus + sys-apps/util-linux + sys-libs/glibc + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxkbcommon + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libxshmfence + x11-libs/libXtst + x11-libs/pango +" +IDEPEND=" + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache +" + +QA_PREBUILT=" + opt/Bitwarden/*.so* + opt/Bitwarden/bitwarden + opt/Bitwarden/chrome-sandbox + opt/Bitwarden/chrome_crashpad_handler +" + +src_install() { + insinto /opt + doins -r opt/${MY_PN} + fperms 755 /opt/Bitwarden/bitwarden + fperms 4755 /opt/Bitwarden/chrome-sandbox + + domenu usr/share/applications/bitwarden.desktop + + local x + for x in 16 32 64 128 256 512; do + doicon -s ${x} usr/share/icons/hicolor/${x}*/* + done +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index c13fb1de9f0c..66fea02d53c4 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,3 +1,2 @@ DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f -DIST calamares-3.3.5.tar.gz 4722988 BLAKE2B bc3270fbc2f804c46008f1f0a106719b779a07d7d5d3cc9f1ab17da7597ebb5dfebc8793036e19570b0048afb667df4b9fed55e813374d7465513ea048e00ffc SHA512 6846e13455e4fa38bd4d5061eece1baf5a972700f489dc1e35d988cfb5359650c63f79f9453431f1aff722af696260504c27f0c000490d781ab5fe03a5c46cf2 DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6 diff --git a/app-admin/calamares/calamares-3.3.5.ebuild b/app-admin/calamares/calamares-3.3.5.ebuild deleted file mode 100644 index 18227c7ccfcf..000000000000 --- a/app-admin/calamares/calamares-3.3.5.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PYTHON_COMPAT=( python3_{10..11} ) - -inherit ecm python-single-r1 - -DESCRIPTION="Distribution-independent installer framework" -HOMEPAGE="https://calamares.io" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="5" -KEYWORDS="~amd64" -IUSE="+networkmanager qt6 +upower" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -QT5_MIN="5.15.0" -KF_QT5_MIN="5.78" -QT6_MIN="6.5.0" -KF_QT6_MIN="5.240" - -BDEPEND=" - qt6? ( - >=dev-qt/qttools-${QT6_MIN}:6[linguist] - >=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN} - ) - !qt6? ( - >=dev-qt/linguist-tools-${QT5_MIN}:5 - >=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN} - ) -" -COMMON_DEPEND="${PYTHON_DEPS} - dev-cpp/yaml-cpp:= - $(python_gen_cond_dep ' - >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}] - dev-libs/libpwquality[${PYTHON_USEDEP}] - ') - qt6? ( - >=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml] - >=dev-qt/qtdeclarative-${QT6_MIN}:6 - >=dev-qt/qtsvg-${QT6_MIN}:6 - >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets] - dev-qt/kdsingleapplication[qt6] - >=kde-frameworks/kconfig-${KF_QT6_MIN}:6 - >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6 - >=kde-frameworks/kcrash-${KF_QT6_MIN}:6 - >=kde-frameworks/ki18n-${KF_QT6_MIN}:6 - >=kde-frameworks/kpackage-${KF_QT6_MIN}:6 - >=kde-frameworks/kparts-${KF_QT6_MIN}:6 - >=kde-frameworks/kservice-${KF_QT6_MIN}:6 - >=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6 - sys-auth/polkit-qt[qt6(-)] - >=sys-libs/kpmcore-24.01.75:6= - ) - !qt6? ( - >=dev-qt/qtconcurrent-${QT5_MIN}:5 - >=dev-qt/qtdbus-${QT5_MIN}:5 - >=dev-qt/qtdeclarative-${QT5_MIN}:5 - >=dev-qt/qtgui-${QT5_MIN}:5 - >=dev-qt/qtnetwork-${QT5_MIN}:5 - >=dev-qt/qtsvg-${QT5_MIN}:5 - >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets] - >=dev-qt/qtwidgets-${QT5_MIN}:5 - >=dev-qt/qtxml-${QT5_MIN}:5 - dev-qt/kdsingleapplication[-qt6] - >=kde-frameworks/kconfig-${KF_QT5_MIN}:5 - >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5 - >=kde-frameworks/kcrash-${KF_QT5_MIN}:5 - >=kde-frameworks/ki18n-${KF_QT5_MIN}:5 - >=kde-frameworks/kpackage-${KF_QT5_MIN}:5 - >=kde-frameworks/kparts-${KF_QT5_MIN}:5 - >=kde-frameworks/kservice-${KF_QT5_MIN}:5 - >=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5 - sys-auth/polkit-qt[qt5(+)] - >=sys-libs/kpmcore-20.04.0:5= - ) - sys-apps/dbus - sys-apps/dmidecode - virtual/libcrypt:= -" -DEPEND="${COMMON_DEPEND} - test? ( - !qt6? ( dev-qt/qttest:5 ) - ) -" -RDEPEND="${COMMON_DEPEND} - app-admin/sudo - dev-libs/libatasmart - net-misc/rsync - || ( - sys-boot/grub:2 - sys-apps/systemd[boot(-)] - sys-apps/systemd-utils[boot] - ) - sys-boot/os-prober - sys-fs/squashfs-tools - sys-libs/timezone-data - virtual/udev - networkmanager? ( net-misc/networkmanager ) - upower? ( sys-power/upower ) -" - -src_prepare() { - ecm_src_prepare - export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ - PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ - PYTHON_CFLAGS="$(python_get_CFLAGS)"\ - PYTHON_LIBS="$(python_get_LIBS)" - - sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \ - calamares.desktop || die - sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \ - calamares.desktop || die - - cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file" -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_CONFIG=ON - -DINSTALL_COMPLETION=ON - -DINSTALL_POLKIT=ON - -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON - -DWITH_PYTHON=ON - # Use system instead - -DWITH_PYBIND11=OFF - -DBUILD_APPDATA=ON - -DWITH_QT6="$(usex qt6)" - ) - - ecm_src_configure -} - -src_test() { - local myctestargs=( - # Skipped tests: - # load-dracut: tries and fails to find Dracut config - # libcalamaresnetworktest: needs network - # libcalamaresutilstest: inspects /tmp (expects namespace?) - # - # Need investigation: - # test_libcalamaresuipaste - # validate-netinstall - # validate-services-systemd - # localetest - # machineidtest - # packagechoosertest - # - # Requires removed dev-python/toml - # lint-displaymanager - # - # E1101 - # lint-dummypython - -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)" - ) - - cmake_src_test -} - -src_install() { - ecm_src_install - dobin "${FILESDIR}"/calamares-pkexec -} diff --git a/app-admin/calamares/calamares-3.3.6.ebuild b/app-admin/calamares/calamares-3.3.6-r1.ebuild index add03ed16ed6..2036bb2bfb26 100644 --- a/app-admin/calamares/calamares-3.3.6.ebuild +++ b/app-admin/calamares/calamares-3.3.6-r1.ebuild @@ -44,7 +44,6 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-qt/qtdeclarative-${QT6_MIN}:6 >=dev-qt/qtsvg-${QT6_MIN}:6 >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets] - dev-qt/kdsingleapplication[qt6] >=kde-frameworks/kconfig-${KF_QT6_MIN}:6 >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6 >=kde-frameworks/kcrash-${KF_QT6_MIN}:6 @@ -66,7 +65,6 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets] >=dev-qt/qtwidgets-${QT5_MIN}:5 >=dev-qt/qtxml-${QT5_MIN}:5 - dev-qt/kdsingleapplication[-qt6] >=kde-frameworks/kconfig-${KF_QT5_MIN}:5 >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5 >=kde-frameworks/kcrash-${KF_QT5_MIN}:5 diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest index 7359503f6415..e7be92aa74f9 100644 --- a/app-admin/cdist/Manifest +++ b/app-admin/cdist/Manifest @@ -1,2 +1 @@ -DIST cdist-6.9.8.tar.gz 1385902 BLAKE2B 6190f09d527a562e490669335d604d3173209bb950448855588a78d48428b8522c8f39327d6455d30242d97bb48d810c319f650a1c0c2fba203a348637dc87c1 SHA512 3c78dd5332a5957750948c52c4b27269ada21b07a2fce0d84019b4fcd3b7ddc6221f0179690d1b3af7e685ffafd739e604f50195fbc36a5494a102b2fa1b732b DIST cdist-7.0.0.tar.gz 1395298 BLAKE2B 0dc11302b4a63e24f31d598df63dc5da784cb01d57ade9b67da277b7c27f66b4c31891ce710c3acdc100e92500b0e80e22cf01882b1669fa714d70c44879f7f0 SHA512 bd87b52603443bc9ffd81785a73bc07387e0555da34b04f97619beb39a1bfcf488b84a6a37fac4fe49b9b002080c5f20a50b3f08ac3665c6c2143a4aa4ee47b7 diff --git a/app-admin/cdist/cdist-6.9.8.ebuild b/app-admin/cdist/cdist-6.9.8.ebuild deleted file mode 100644 index 4e75b661c296..000000000000 --- a/app-admin/cdist/cdist-6.9.8.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) - -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -DESCRIPTION="A usable configuration management system" -HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist" -SRC_URI="https://code.ungleich.ch/ungleich-public/cdist/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( "${FILESDIR}"/test.patch ) - -distutils_enable_sphinx docs/src dev-python/sphinx-rtd-theme -distutils_enable_tests unittest - -python_prepare_all() { - echo "VERSION='${PV}'" > cdist/version.py || die "Failed to set version" - distutils-r1_python_prepare_all -} diff --git a/app-admin/cdist/cdist-7.0.0.ebuild b/app-admin/cdist/cdist-7.0.0.ebuild index 074a43f466ea..6a67147f107c 100644 --- a/app-admin/cdist/cdist-7.0.0.ebuild +++ b/app-admin/cdist/cdist-7.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_SETUPTOOLS=no diff --git a/app-admin/cdist/files/test.patch b/app-admin/cdist/files/test.patch deleted file mode 100644 index ebc9d944ba57..000000000000 --- a/app-admin/cdist/files/test.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://code.ungleich.ch/ungleich-public/cdist/commit/3a321469a8ba5aea55220bd70bd4900de732e917 -https://bugs.gentoo.org/831362 -From 3a321469a8ba5aea55220bd70bd4900de732e917 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net> -Date: Tue, 16 Nov 2021 11:11:45 +0100 -Subject: [PATCH] Python 3.10: collections.X -> collections.abc.X - ---- - cdist/integration.py | 2 +- - cdist/util/fsproperty.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cdist/integration.py b/cdist/integration.py -index 17b65f09..04470ea7 100644 ---- a/cdist/integration.py -+++ b/cdist/integration.py -@@ -84,7 +84,7 @@ def _process_hosts_simple(action, host, manifest, verbose, - """ - if isinstance(host, str): - hosts = [host, ] -- elif isinstance(host, collections.Iterable): -+ elif isinstance(host, collections.abc.Iterable): - hosts = host - else: - raise cdist.Error('Invalid host argument: {}'.format(host)) -diff --git a/cdist/util/fsproperty.py b/cdist/util/fsproperty.py -index 09e9cc19..6bf935e8 100644 ---- a/cdist/util/fsproperty.py -+++ b/cdist/util/fsproperty.py -@@ -33,7 +33,7 @@ class AbsolutePathRequiredError(cdist.Error): - return 'Absolute path required, got: {}'.format(self.path) - - --class FileList(collections.MutableSequence): -+class FileList(collections.abc.MutableSequence): - """A list that stores it's state in a file. - - """ -@@ -102,7 +102,7 @@ class FileList(collections.MutableSequence): - self.__write(lines) - - --class DirectoryDict(collections.MutableMapping): -+class DirectoryDict(collections.abc.MutableMapping): - """A dict that stores it's items as files in a directory. - - """ diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 851cef28a4fb..f4447fe432c3 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,2 +1,3 @@ DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4 DIST conky-1.20.2.tar.gz 1837320 BLAKE2B 41aaa384366ee9229ec4e7df97f37a8c62fff4dd864b3f8f8d3d40c57e87646ee8309c3d1fb68c7d7f8ed802c7ce49a57bbe0c01d32eaacfe84fddbd65b81007 SHA512 b516db38af5c20b101520356cd4f50d147869e7ed2bc84287e8a464e32bb306655edbac074da278d4732ee87f02c52d99cb4c117556e0d08f5be911a2a789618 +DIST conky-1.21.1.tar.gz 2146994 BLAKE2B 7c19813dad6a7a701cfedfba6d424d61bd5c960dc836c6aa6668031c7e096e214559177f0a8186fda1a770a956c301274d24d45a21c9d2d8faf62ce2f76610fd SHA512 4b7f243943a7d04942ee86dc6d5cdd75c6999a4ff0616efb5b00c47ad100a5b83dd4ca618764fc1ce97f0fc77118dabc87fa691fb1181fb54ab1b38d862f5229 diff --git a/app-admin/conky/conky-1.20.2.ebuild b/app-admin/conky/conky-1.20.2-r1.ebuild index 1db4f0fdeff5..f134905d992c 100644 --- a/app-admin/conky/conky-1.20.2.ebuild +++ b/app-admin/conky/conky-1.20.2-r1.ebuild @@ -16,9 +16,9 @@ LICENSE="GPL-3 BSD LGPL-2.1 MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib - intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd - mysql ncurses nvidia +portmon pulseaudio rss systemd test thinkpad - truetype wayland webserver wifi X xinerama xmms2" + intel-backlight iostats irc lua-cairo lua-cairo-xlib lua-imlib lua-rsvg + math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd test + thinkpad truetype wayland webserver wifi X xinerama xmms2" RESTRICT="!test? ( test )" # Note: toluapp is bundled in conky since 1.11.2 @@ -32,7 +32,8 @@ COMMON_DEPEND=" iconv? ( virtual/libiconv ) imlib? ( >=media-libs/imlib2-1.11.0[X] ) irc? ( net-libs/libircclient ) - lua-cairo? ( x11-libs/cairo[X] ) + lua-cairo? ( x11-libs/cairo[X?] ) + lua-cairo-xlib? ( x11-libs/cairo[X] ) lua-imlib? ( >=media-libs/imlib2-1.11.0[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) @@ -41,7 +42,6 @@ COMMON_DEPEND=" pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 - net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) @@ -56,10 +56,11 @@ COMMON_DEPEND=" wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd:= ) X? ( - x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext + x11-libs/libXi + x11-libs/libX11 ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) @@ -107,10 +108,12 @@ python_check_deps() { REQUIRED_USE=" ${LUA_REQUIRED_USE} imlib? ( X ) - lua-cairo? ( X bundled-toluapp ) - lua-imlib? ( X bundled-toluapp ) - lua-rsvg? ( X bundled-toluapp ) + lua-cairo? ( || ( X wayland ) bundled-toluapp ) + lua-cairo-xlib? ( X bundled-toluapp ) + lua-imlib? ( X bundled-toluapp ) + lua-rsvg? ( || ( X wayland ) bundled-toluapp ) nvidia? ( X ) + rss? ( curl ) truetype? ( X ) xinerama? ( X ) " @@ -149,15 +152,15 @@ src_configure() { if use X; then mycmakeargs+=( - -DBUILD_ARGB=yes - -DBUILD_X11=yes + -DOWN_WINDOW=yes -DBUILD_XDAMAGE=yes - -DBUILD_XDBE=yes -DBUILD_XFIXES=yes + -DBUILD_ARGB=yes + -DBUILD_XDBE=yes -DBUILD_XSHAPE=yes -DBUILD_XINPUT=yes -DBUILD_MOUSE_EVENTS=yes - -DOWN_WINDOW=yes + -DBUILD_X11=yes ) else mycmakeargs+=( @@ -186,6 +189,7 @@ src_configure() { -DBUILD_IRC=$(usex irc) -DBUILD_JOURNAL=$(usex systemd) -DBUILD_LUA_CAIRO=$(usex lua-cairo) + -DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib) -DBUILD_LUA_IMLIB2=$(usex lua-imlib) -DBUILD_LUA_RSVG=$(usex lua-rsvg) -DBUILD_MATH=$(usex math) diff --git a/app-admin/conky/conky-1.21.1.ebuild b/app-admin/conky/conky-1.21.1.ebuild new file mode 100644 index 000000000000..d76b4731f0d6 --- /dev/null +++ b/app-admin/conky/conky-1.21.1.ebuild @@ -0,0 +1,249 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-4 ) +PYTHON_COMPAT=( python3_{10,11,12} ) + +inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg + +DESCRIPTION="An advanced, highly configurable system monitor for X" +HOMEPAGE="https://github.com/brndnmtthws/conky" +SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3 BSD LGPL-2.1 MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical + iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib + lua-imlib lua-rsvg math moc mpd mysql ncurses nvidia +portmon + pulseaudio rss systemd test thinkpad truetype wayland webserver wifi X + xinerama xmms2" +RESTRICT="!test? ( test )" + +# Note: toluapp is bundled in conky since 1.11.2 +# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug +# which creates debug symbols and enables "-DBUILD_TESTS" which also +# results in conky_core debug library getting installed + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + ical? ( dev-libs/libical:= ) + iconv? ( virtual/libiconv ) + imlib? ( >=media-libs/imlib2-1.11.0[X] ) + irc? ( net-libs/libircclient ) + lua-cairo? ( x11-libs/cairo[X?] ) + lua-cairo-xlib? ( x11-libs/cairo[X] ) + lua-imlib? ( >=media-libs/imlib2-1.11.0[X] ) + lua-rsvg? ( gnome-base/librsvg ) + mysql? ( dev-db/mysql-connector-c ) + ncurses? ( sys-libs/ncurses:= ) + nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) + pulseaudio? ( media-libs/libpulse ) + rss? ( + dev-libs/libxml2 + dev-libs/glib:2 + ) + systemd? ( sys-apps/systemd ) + truetype? ( + x11-libs/libXft + >=media-libs/freetype-2 + ) + wayland? ( + dev-libs/wayland + x11-libs/pango + ) + wifi? ( net-wireless/wireless-tools ) + webserver? ( net-libs/libmicrohttpd:= ) + X? ( + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXext + x11-libs/libXi + x11-libs/libX11 + ) + xinerama? ( x11-libs/libXinerama ) + xmms2? ( media-sound/xmms2 ) + ${LUA_DEPS} +" +RDEPEND=" + ${COMMON_DEPEND} + apcupsd? ( sys-power/apcupsd ) + cmus? ( media-sound/cmus ) + hddtemp? ( app-admin/hddtemp ) + moc? ( media-sound/moc ) +" +DEPEND=" + ${COMMON_DEPEND} + test? ( + dev-cpp/catch + ) + wayland? ( + dev-libs/wayland-protocols + ) +" +BDEPEND=" + colour-name-map? ( + dev-util/gperf + ) + doc? ( + virtual/pandoc + $(python_gen_any_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + ') + ) + extras? ( + $(python_gen_any_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + ') + ) + wayland? ( dev-util/wayland-scanner ) +" + +python_check_deps() { + use doc || use extras || return 0 + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + imlib? ( X ) + lua-cairo? ( || ( X wayland ) bundled-toluapp ) + lua-cairo-xlib? ( X bundled-toluapp ) + lua-imlib? ( X bundled-toluapp ) + lua-rsvg? ( || ( X wayland ) bundled-toluapp ) + nvidia? ( X ) + rss? ( curl ) + truetype? ( X ) + xinerama? ( X ) +" + +CONFIG_CHECK="~IPV6" + +DOCS=( README.md AUTHORS ) + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="You can find sample configurations at /usr/share/doc/${PF}. +To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking. + +There are pretty html docs available at https://conky.cc/. + +Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky" + +pkg_setup() { + linux-info_pkg_setup + lua-single_pkg_setup + if use doc || use extras; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + # pin lua 5.4 + sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \ + cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake" + + cmake_src_prepare + xdg_environment_reset +} + +src_configure() { + local mycmakeargs=() + + if use X; then + mycmakeargs+=( + -DOWN_WINDOW=yes + -DBUILD_XDAMAGE=yes + -DBUILD_XFIXES=yes + -DBUILD_ARGB=yes + -DBUILD_XDBE=yes + -DBUILD_XSHAPE=yes + -DBUILD_XINPUT=yes + -DBUILD_MOUSE_EVENTS=yes + -DBUILD_X11=yes + ) + else + mycmakeargs+=( + -DBUILD_X11=no + ) + fi + + mycmakeargs+=( + -DBUILD_APCUPSD=$(usex apcupsd) + -DBUILD_AUDACIOUS=no + -DBUILD_BUILTIN_CONFIG=yes + -DBUILD_CMUS=$(usex cmus) + -DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map) + -DBUILD_CURL=$(usex curl) + -DBUILD_DOCS=$(usex doc) + -DBUILD_EXTRAS=$(usex extras) + -DBUILD_HDDTEMP=$(usex hddtemp) + -DBUILD_HTTP=$(usex webserver) + -DBUILD_I18N=yes + -DBUILD_IBM=$(usex thinkpad) + -DBUILD_ICAL=$(usex ical) + -DBUILD_ICONV=$(usex iconv) + -DBUILD_IMLIB2=$(usex imlib) + -DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight) + -DBUILD_IOSTATS=$(usex iostats) + -DBUILD_IPV6=yes + -DBUILD_IRC=$(usex irc) + -DBUILD_JOURNAL=$(usex systemd) + -DBUILD_LUA_CAIRO=$(usex lua-cairo) + -DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib) + -DBUILD_LUA_IMLIB2=$(usex lua-imlib) + -DBUILD_LUA_RSVG=$(usex lua-rsvg) + -DBUILD_MATH=$(usex math) + -DBUILD_MOC=$(usex moc) + -DBUILD_MPD=$(usex mpd) + -DBUILD_MYSQL=$(usex mysql) + -DBUILD_NCURSES=$(usex ncurses) + -DBUILD_NVIDIA=$(usex nvidia) + -DBUILD_OLD_CONFIG=yes + -DBUILD_PORT_MONITORS=$(usex portmon) + -DBUILD_PULSEAUDIO=$(usex pulseaudio) + -DBUILD_RSS=$(usex rss) + -DBUILD_TESTS=$(usex test) + -DBUILD_WAYLAND=$(usex wayland) + -DBUILD_WLAN=$(usex wifi) + -DBUILD_XFT=$(usex truetype) + -DBUILD_XINERAMA=$(usex xinerama) + -DBUILD_XMMS2=$(usex xmms2) + -DDOC_PATH=/usr/share/doc/${PF} + -DMAINTAINER_MODE=no + -DRELEASE=yes + ) + + if use doc || use extras; then + mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use extras; then + insinto /usr/share/vim/vimfiles/ftdetect + doins "${S}"/extras/vim/ftdetect/conkyrc.vim + + insinto /usr/share/vim/vimfiles/syntax + doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim + + insinto /usr/share/nano/ + doins "${BUILD_DIR}"/extras/nano/conky.nanorc + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + xdg_pkg_postinst +} diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml index 7a0ba1bcf7e0..0a8b212cb2c9 100644 --- a/app-admin/conky/metadata.xml +++ b/app-admin/conky/metadata.xml @@ -18,12 +18,14 @@ <flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag> <flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</flag> <flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag> + <flag name="colour-name-map">Include mappings of colour name</flag> <flag name="extras">Enable syntax highlighting for <pkg>app-editors/nano</pkg>and app-editors/vim</flag> <flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag> <flag name="intel-backlight">Enable support for Intel backlight</flag> <flag name="iostats">Enable support for per-task I/O statistics</flag> <flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag> <flag name="lua-cairo">Enable if you want Lua Cairo bindings</flag> + <flag name="lua-cairo-xlib">Enable support for Cairo and Xlib interoperability for Lua</flag> <flag name="lua-imlib">Enable if you want Lua Imlib2 bindings</flag> <flag name="lua-rsvg">Enable if you want Lua RSVG bindings</flag> <flag name="math">Enable support for glibc's libm math library</flag> diff --git a/app-admin/consul/consul-1.18.1.ebuild b/app-admin/consul/consul-1.18.1.ebuild index b54c5f6b26e6..08991b0221e7 100644 --- a/app-admin/consul/consul-1.18.1.ebuild +++ b/app-admin/consul/consul-1.18.1.ebuild @@ -14,7 +14,7 @@ LICENSE="BUSL-1.1 MPL-2.0" LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" SLOT="0" RESTRICT="test" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" BDEPEND="dev-go/gox" COMMON_DEPEND=" diff --git a/app-admin/cronolog/cronolog-1.6.2-r7.ebuild b/app-admin/cronolog/cronolog-1.6.2-r7.ebuild index 32788154300e..a2bcdadc827c 100644 --- a/app-admin/cronolog/cronolog-1.6.2-r7.ebuild +++ b/app-admin/cronolog/cronolog-1.6.2-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="http://cronolog.org/download/${P}.tar.gz" LICENSE="GPL-2+ Apache-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc x86" PATCHES=( "${FILESDIR}"/${PV}-patches diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest index 6f1c08679920..fd7c3d41d94f 100644 --- a/app-admin/eclean-kernel/Manifest +++ b/app-admin/eclean-kernel/Manifest @@ -1 +1 @@ -DIST eclean_kernel-2.99.7.tar.gz 25393 BLAKE2B 74f803f1007a1c54d87f087287a34a8380b21b9c66ad75a0ae64463815d5df39de0387f5d0cfd366e33efdaf039fce5dad923f1e55f93a2836830e303c3ca2df SHA512 dd43f65c1beebef59ee7a2e41375797fa5ea77171d8e4cf465b2b6a46e8e4500fb1723f664f2ce59e5b6e79d2dedd4abbaaa303a77e8349b9ee90c56e00e799e +DIST eclean_kernel-2.99.8.tar.gz 25134 BLAKE2B efd29370f0204c8df7a8e955a50ef8ad819fd29f8cbf1d179e61588130ac6d589366f1f76d499cae42c6e99c553d1b0cd68c4f0728315940b5997196bda6b57c SHA512 57956e1f93327db86942c5be815d3df61934f93a65349faca4d2605e7667b9dfe8e42bc6d4f5c5c27fbbdd536a25371b4c4b0b88dca92ba0f5f98058f1c1b679 diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.7.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild index 7829c8eaafb0..d5d222851c21 100644 --- a/app-admin/eclean-kernel/eclean-kernel-2.99.7.ebuild +++ b/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild @@ -14,12 +14,13 @@ HOMEPAGE=" https://pypi.org/project/eclean-kernel/ " -LICENSE="BSD" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~riscv x86" IUSE="lz4 lzo zstd" RDEPEND=" + dev-python/distro[${PYTHON_USEDEP}] kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] ) lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] ) diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild index 993e9658085c..5f9082c69fdb 100644 --- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild +++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,15 +9,18 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 git-r3 DESCRIPTION="Remove outdated built kernels" -HOMEPAGE="https://github.com/projg2/eclean-kernel/" +HOMEPAGE=" + https://github.com/projg2/eclean-kernel/ + https://pypi.org/project/eclean-kernel/ +" EGIT_REPO_URI="https://github.com/projg2/eclean-kernel.git" -LICENSE="BSD" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="" IUSE="lz4 lzo zstd" RDEPEND=" + dev-python/distro[${PYTHON_USEDEP}] kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] ) lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] ) diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest index 64b82fca614e..b5a51c19c204 100644 --- a/app-admin/emacs-updater/Manifest +++ b/app-admin/emacs-updater/Manifest @@ -1 +1,2 @@ DIST emacs-updater-1.17.tar.xz 7236 BLAKE2B f39a19eba794cd57b25fbfc38998775a7818d98c81bbbdf485b33ed273815dfb3a74c26ca410f0e3b8e4bd46f2114b96155485cdcf87d5bec70a96dfe1a3a279 SHA512 461f496075bd7fc057290d40d408e5243ec464d8814abbe0c47c77a223b314ba2bcc35e20bf5e22e6dcee485a024ab93ced7155fa5212bc2d9c3b6362f168c52 +DIST emacs-updater-1.18.tar.xz 7360 BLAKE2B ff890584349d87a9cdcfe4576dd3bb1f8fc73b6cb086a5dd09fef3c8bf500a519f1aab810321680a5f5d4f1093455a6c54db42d900ee50fc39fcc03f0d6db69e SHA512 15c3b6e5ea7d1935a7e472d75409c0cb0dc9658142c1270a4a487eba822dbcd3ac32ffe60cb501859a7ccb7441efa1c7dd5d3a6cf481f69a583c5c8d5001051a diff --git a/app-admin/emacs-updater/emacs-updater-1.18.ebuild b/app-admin/emacs-updater/emacs-updater-1.18.ebuild new file mode 100644 index 000000000000..f9cebdcb57a7 --- /dev/null +++ b/app-admin/emacs-updater/emacs-updater-1.18.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Rebuild Emacs packages" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs" +SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +DEPEND="|| ( sys-apps/util-linux app-misc/getopt )" +RDEPEND="${DEPEND} + >=app-editors/emacs-23.1:* + >=app-portage/portage-utils-0.80" + +src_prepare() { + default + + if ! has_version sys-apps/util-linux; then + # BSD ships a dumb getopt(1), so use getopt-long instead + sed -i -e '/^GETOPT=/s/getopt/&-long/' emacs-updater || die + fi + + if [[ -n ${EPREFIX} ]]; then + sed -i -e "1s:/:${EPREFIX}/:" \ + -e "s:^\([[:upper:]]*=\)/:\1${EPREFIX}/:" \ + emacs-updater || die + fi +} + +src_install() { + dosbin emacs-updater + doman emacs-updater.8 +} diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest index ec87aec67339..8d8ded050f48 100644 --- a/app-admin/exo/Manifest +++ b/app-admin/exo/Manifest @@ -1 +1 @@ -DIST exo-1.77.1.gh.tar.gz 11091028 BLAKE2B 0aa0f82cff7e3807bd5237fc9c8f77583eb98c8b10a6c49a529c19f95017e60a752478e093f072f5e7b52b2f9b7386a60786f40938d43f0cef996d77fa969c38 SHA512 815b82761947eaf39b8336eb7f24b5db16b8fb5904b4234cbf20d1b1cec058182079b04f5eca9020475b60f3c9e93410e58e2bf1eafa30f341b9962c542437e4 +DIST exo-1.78.2.gh.tar.gz 11084100 BLAKE2B 56cf1212040df77d2e39bbc90490276563a45632fe47f1781bba84fe5d99634a6d050c52dd15c9bb837e7ebef2ea21087a5c50cc165b0b606a0f3e9b4f59182a SHA512 1f2b3fedd12a00457e241b0d00eb4235804b60c8c8e6bec1f970617a969761eb9e18c10a6031bffba6c58571ca7049c47d8eb74f3fbaacb095ef72b21bea1c20 diff --git a/app-admin/exo/exo-1.77.1.ebuild b/app-admin/exo/exo-1.78.2.ebuild index 832c2c26b861..43fbacd8aa32 100644 --- a/app-admin/exo/exo-1.77.1.ebuild +++ b/app-admin/exo/exo-1.78.2.ebuild @@ -3,23 +3,22 @@ EAPI=8 +inherit go-module + DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns" HOMEPAGE="https://github.com/exoscale/cli" SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/cli-${PV}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -IUSE="" DEPEND=">=dev-lang/go-1.16:=" RESTRICT="strip" -QA_FLAGS_IGNORED=".*" - -S="${WORKDIR}/cli-${PV}" src_compile() { - go build -mod vendor -o ${PN} -ldflags "-X main.version=${PVR}-gentoo -X main.commit=" || die "build failed" + ego build -mod vendor -o ${PN} -ldflags "-X main.version=${PVR}-gentoo -X main.commit=" } src_test() { diff --git a/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild b/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild index 50939531c011..974e33be5d96 100644 --- a/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild +++ b/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" DEPEND=">=dev-lang/go-1.16" RDEPEND=" diff --git a/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild index dcc9f7b6470b..e30950cff996 100644 --- a/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild +++ b/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" DEPEND=">=dev-lang/go-1.16" RDEPEND=" diff --git a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild index 699540bb5843..828cd8d04aa5 100644 --- a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild +++ b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" DEPEND=">=dev-lang/go-1.16" RDEPEND=" diff --git a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild index 44e42f854afe..3dd1d2e881c7 100644 --- a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild +++ b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" DEPEND=">=dev-lang/go-1.16" RDEPEND=" diff --git a/app-admin/gopass/gopass-1.15.13.ebuild b/app-admin/gopass/gopass-1.15.13.ebuild index bac64dde98cc..ebbaad82b80f 100644 --- a/app-admin/gopass/gopass-1.15.13.ebuild +++ b/app-admin/gopass/gopass-1.15.13.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" DEPEND=">=dev-lang/go-1.18" RDEPEND=" diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest index 65239aedf187..e7bd44ada36e 100644 --- a/app-admin/hcloud/Manifest +++ b/app-admin/hcloud/Manifest @@ -1,2 +1 @@ -DIST hcloud-1.42.0.tar.xz 1876444 BLAKE2B e7ed2e01a7c6bb106a5c46e21e26d8b6bdd7636b64c7b354674364c3db8c1776f09f199ea022e2f311e873490b737490ea22045aa00147c6066ff0a7fb96d563 SHA512 dab916666ec17b9675ba0a559170859779289c36739ac4c3d72445c87fb440df475e55e52ed628fd8d1a52421c6df4d47b0b51713e476753a66da74b3a7bf11c DIST hcloud-1.43.1.tar.xz 1889004 BLAKE2B 563cde962cf1fd180bbef60127b714419c09da198afeb4923f8fc1cd48850131b3b91de243de43e269497f36d14757a1e71941d30dfbee98baebb533f20e6cdd SHA512 c8fa46e9d3e2c73cc2d86e597bebf6e1dbf28b7145dbc272c403607807251ac27eee14b9ad267fdf2aa730da16ce52be4d2b0d94653612b4f375f1779c95d90b diff --git a/app-admin/hcloud/hcloud-1.42.0.ebuild b/app-admin/hcloud/hcloud-1.42.0.ebuild deleted file mode 100644 index c073e3b5e053..000000000000 --- a/app-admin/hcloud/hcloud-1.42.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module - -DESCRIPTION="A command-line interface for Hetzner Cloud" -HOMEPAGE="https://github.com/hetznercloud/cli" -SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" - -src_compile() { - ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} -} - -src_test() { - # For upstream a simple test is run 'hcloud version' - ./hcloud version - if [[ $? -ne 0 ]] - then - die "Test failed" - fi -} - -src_install() { - dobin ${PN} -} diff --git a/app-admin/hcloud/hcloud-1.43.1.ebuild b/app-admin/hcloud/hcloud-1.43.1.ebuild index c4449b25b091..1b73743024ed 100644 --- a/app-admin/hcloud/hcloud-1.43.1.ebuild +++ b/app-admin/hcloud/hcloud-1.43.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" src_compile() { ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.versionPrerelease=gentoo" ./cmd/${PN} diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index d9b76c352e07..40112daa3c5b 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,2 +1,2 @@ -DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe SHA512 58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812 DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477 SHA512 fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926 +DIST keepassxc-2.7.8-src.tar.xz 9764860 BLAKE2B edc5af2b7bd6173f8df4fa20fca54e78c40610d29b02ac9f9920382b8ead3ea293e22e578c353ffc1a374a23f1117a2595570d1de7053a1d36bcb40ed8eceb04 SHA512 c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a diff --git a/app-admin/keepassxc/keepassxc-2.7.6.ebuild b/app-admin/keepassxc/keepassxc-2.7.8.ebuild index 0ca6281dbb85..11cc2ac9b84e 100644 --- a/app-admin/keepassxc/keepassxc-2.7.6.ebuild +++ b/app-admin/keepassxc/keepassxc-2.7.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,18 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" HOMEPAGE="https://keepassxc.org/ https://github.com/keepassxreboot/keepassxc/" -if [[ "${PV}" != *9999 ]] ; then +if [[ "${PV}" = *9999* ]] ; then + inherit git-r3 + + EGIT_BRANCH="develop" + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +else if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz + -> ${P}.tar.gz" S="${WORKDIR}/${P/_/-}" else SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" - [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" + + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi LICENSE="LGPL-2.1 GPL-2 GPL-3" @@ -42,27 +45,33 @@ RDEPEND=" dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= - sys-libs/zlib:= - X? ( dev-qt/qtx11extras:5 ) + sys-libs/zlib:=[minizip] + X? ( + dev-qt/qtx11extras:5 + ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) - keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-qt/qttest:5 " BDEPEND=" dev-qt/linguist-tools:5 - doc? ( dev-ruby/asciidoctor ) + doc? ( + dev-ruby/asciidoctor + ) " -PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch ) +PATCHES=( + "${FILESDIR}/${PN}-2.7.4-tests.patch" +) src_prepare() { if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then @@ -76,7 +85,7 @@ src_configure() { # https://github.com/keepassxreboot/keepassxc/issues/5801 filter-lto - local mycmakeargs=( + local -a mycmakeargs=( # Gentoo users enable ccache via e.g. FEATURES=ccache or # other means. We don't want the build system to enable it for us. -DWITH_CCACHE=OFF @@ -85,6 +94,7 @@ src_configure() { -DWITH_XC_AUTOTYPE="$(usex autotype)" -DWITH_XC_DOCS="$(usex doc)" -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)" -DWITH_XC_BOTAN3=ON -DWITH_XC_FDOSECRETS=ON -DWITH_XC_KEESHARE="$(usex keeshare)" @@ -95,7 +105,9 @@ src_configure() { -DWITH_XC_X11="$(usex X)" ) if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) + mycmakeargs+=( + -DOVERRIDE_VERSION="${PV/_/-}" + ) fi cmake_src_configure } diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 4b24b9ee85b7..11cc2ac9b84e 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -9,20 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" HOMEPAGE="https://keepassxc.org/ https://github.com/keepassxreboot/keepassxc/" -if [[ "${PV}" != *9999 ]] ; then +if [[ "${PV}" = *9999* ]] ; then + inherit git-r3 + + EGIT_BRANCH="develop" + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +else if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz + -> ${P}.tar.gz" S="${WORKDIR}/${P/_/-}" else SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" - - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" - [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi LICENSE="LGPL-2.1 GPL-2 GPL-3" @@ -68,6 +69,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}/${PN}-2.7.4-tests.patch" +) + src_prepare() { if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then printf '%s' "${PV}" > .version || die @@ -89,6 +94,7 @@ src_configure() { -DWITH_XC_AUTOTYPE="$(usex autotype)" -DWITH_XC_DOCS="$(usex doc)" -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)" -DWITH_XC_BOTAN3=ON -DWITH_XC_FDOSECRETS=ON -DWITH_XC_KEESHARE="$(usex keeshare)" @@ -99,7 +105,9 @@ src_configure() { -DWITH_XC_X11="$(usex X)" ) if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) + mycmakeargs+=( + -DOVERRIDE_VERSION="${PV/_/-}" + ) fi cmake_src_configure } diff --git a/app-admin/lib_users/lib_users-0.15-r1.ebuild b/app-admin/lib_users/lib_users-0.15-r1.ebuild index 45ccbc10dde4..5faf526074f6 100644 --- a/app-admin/lib_users/lib_users-0.15-r1.ebuild +++ b/app-admin/lib_users/lib_users-0.15-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/app-admin/linode-cli/Manifest b/app-admin/linode-cli/Manifest index 822bb234b6ca..6d4f5deb8e8f 100644 --- a/app-admin/linode-cli/Manifest +++ b/app-admin/linode-cli/Manifest @@ -1,3 +1,2 @@ -DIST linode-cli-5.47.1.tar.gz 128364 BLAKE2B db21cdd9a1bfbe17fb17b8b0e27ca36bb15c7d3b16ddde4dcc59a9ce64cd34d644d3d5d120efb88bb146767cf9b2c3ee820a847a2fcff487a11bc3abd6973870 SHA512 b61ac1e7c97a1395b150227fe822bc2e7199ed15a44c6d93d71bfdbc2f919827e87e89cf41a47b069be06144a849f5ab11c9dd7f38d138f80ce80563f55bf75a -DIST linode-cli-5.48.3.tar.gz 142927 BLAKE2B 48ae197d780f77a7a4dbf54d4e9959d28c117d90e052f401f563f1557dc11155afc5d16da1140e9ed2828fa3e19243e91205759636247d2fb893383975d89f43 SHA512 9efd3f0392848ebcd896becff191e94c90cbec01cc2b805c0262ecb3c40c51346d0b42891ddaadb9191d75e379083f68e4c9aa35f9ba7c6309c74ae3febbde7a DIST linode_cli-5.48.4.tar.gz 142928 BLAKE2B 28b1c90bb0709afc594b7023ef846b6d59e0376730f05d9701ebbc6744376f33536ad5a6f53b7b26a25805b258dc58378a76b0e6a4157e149f83e691d862dec8 SHA512 b07a3612afc329fc346b523412ac03932c84213d6bc23726f4c0e5edc737100bf65ec84f8131943439444fee268646789dc4d135cd61b2362311d1ab18601c3e +DIST linode_cli-5.49.1.tar.gz 146883 BLAKE2B b4124b84f812b00c93e09e7c91c128b7ff15fbaf3a5c487613dbc4d26b1c5f00f083f521d8501e9a8649d3dc970a6349100602586dbb4acec27a7859470ba3b1 SHA512 06859939ac0c65a152acc012c87c53322a2a8cc1d4267c5dd0526b8ed0ad2b7aad7f3df42e24657d9bcca4b3fa02956ec23ea0d90ce4f5f9b61247a5b288dc72 diff --git a/app-admin/linode-cli/linode-cli-5.47.1.ebuild b/app-admin/linode-cli/linode-cli-5.47.1.ebuild deleted file mode 100644 index 45ee6333667a..000000000000 --- a/app-admin/linode-cli/linode-cli-5.47.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -inherit distutils-r1 pypi - -DESCRIPTION="Linode Command Line Interface" -HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/boto3[${PYTHON_USEDEP}] - dev-python/openapi3[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/rich[${PYTHON_USEDEP}] - <dev-python/urllib3-3[${PYTHON_USEDEP}] -" diff --git a/app-admin/linode-cli/linode-cli-5.48.3.ebuild b/app-admin/linode-cli/linode-cli-5.49.1.ebuild index 2ce8851657d3..21d1ca44d811 100644 --- a/app-admin/linode-cli/linode-cli-5.48.3.ebuild +++ b/app-admin/linode-cli/linode-cli-5.49.1.ebuild @@ -5,10 +5,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -inherit distutils-r1 pypi +inherit distutils-r1 pypi shell-completion -DESCRIPTION="Linode Command Line Interface" +DESCRIPTION="Official command-line interface for interacting with the Linode API" HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/" LICENSE="BSD" @@ -21,7 +20,7 @@ RESTRICT="test" RDEPEND=" dev-python/boto3[${PYTHON_USEDEP}] - dev-python/linode-metadata[${PYTHON_USEDEP}] + >=dev-python/linode-metadata-0.3[${PYTHON_USEDEP}] dev-python/openapi3[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] @@ -29,3 +28,18 @@ RDEPEND=" dev-python/rich[${PYTHON_USEDEP}] <dev-python/urllib3-3[${PYTHON_USEDEP}] " + +python_install_all() { + distutils-r1_python_install_all + + PYTHONPATH=. ${EPYTHON} linodecli completion bash > "${T}/${PN}".bash || die + PYTHONPATH=. ${EPYTHON} linodecli completion fish > "${T}/${PN}".fish || die + + newbashcomp "${T}/${PN}".bash ${PN} + newfishcomp "${T}/${PN}".fish ${PN} + + dosym ${PN} "$(get_bashcompdir)"/linode + dosym ${PN} "$(get_bashcompdir)"/lin + dosym ${PN} "$(get_fishcompdir)"/linode + dosym ${PN} "$(get_fishcompdir)"/lin +} diff --git a/app-admin/logstalgia/Manifest b/app-admin/logstalgia/Manifest index 86f5b8266148..952b9aa7aadd 100644 --- a/app-admin/logstalgia/Manifest +++ b/app-admin/logstalgia/Manifest @@ -1 +1,2 @@ DIST logstalgia-1.1.2.tar.gz 2330691 BLAKE2B 20fb549282dde860ef1db272c75360219ce4614838264a2ad7dbaa25cd3c8509f215d61ec88679165eda9619d8a3d83d9201796fa7691517ca822fa110f37d14 SHA512 e2bd41cbc6edabc1ff82d0da4ad6f749e0e6d44e5a23ea976c31d19339f56e5f693ba86b81ceee3c7590842df61d61fe69f1378711b8e7d1c30deff330cacb1e +DIST logstalgia-1.1.4.tar.gz 2341698 BLAKE2B adec0a5a9f2de3316e94bbcd5f64db44c6458f60704291b4039bd5d76421a4b9b3baf0a9a09d11183b3fb0dbcdd638ecb6af4334fdb324be14334e756cef65f1 SHA512 54036abae0b846d354edf27f39bfb4f324806d3e376d32d89df8aadf145819980d6a637a914fe400458d5fb46097990083e5cde0b2a5bb3351a99b4ad7471619 diff --git a/app-admin/logstalgia/logstalgia-1.1.4.ebuild b/app-admin/logstalgia/logstalgia-1.1.4.ebuild new file mode 100644 index 000000000000..0226cfea295c --- /dev/null +++ b/app-admin/logstalgia/logstalgia-1.1.4.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Replays or streams an access_log as a retro arcade game-like simulation" +HOMEPAGE="https://logstalgia.io/" +SRC_URI="https://github.com/acaudwell/Logstalgia/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/boost:= + dev-libs/libpcre2:= + media-libs/freetype:2 + media-libs/glew:0= + media-libs/libglvnd + media-libs/libsdl2[opengl,threads(+)] + media-libs/libpng:0= + media-libs/sdl2-image[jpeg,png] + virtual/glu +" +DEPEND=" + ${RDEPEND} + media-libs/glm +" +BDEPEND=" + virtual/pkgconfig +" + +DOCS=( ChangeLog INSTALL README THANKS ) diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest index a14181dcd744..1c7ea74a6aff 100644 --- a/app-admin/mcelog/Manifest +++ b/app-admin/mcelog/Manifest @@ -1,2 +1,3 @@ DIST mcelog-197.tar.gz 319167 BLAKE2B cbeac1b29ab0b9b7d23470213f5b186f1c1c2a1095617436ccb9a29824fbf6d461642df32e69f7d743a2b3dfce5e06fcffbe5af3cc90a99c00bf9ba4796514b7 SHA512 4975f533fa6546b956190a33f51974614911aa8b707e07f73abf1e0055cd13997eeacaeedaf84762debcea9fd9b95e7d537befc0f818ba29873dd72be4ceed1a DIST mcelog-198.tar.gz 319372 BLAKE2B c1a6eed5b77843cd3963ac82d20270ed915562b3e2940ee685f4aa827b6e05c656eb55b57e380d582c8fda2f3d1ee3d13ff40c0771fd410d504d03e62f71eaeb SHA512 5168a1d1d83c7fa69438412db4b5f559528439f84ad65348b147117c7fdfe689c9ab3273350ff5321ed351ef0fe17065ee9073aac5115e87cf27878b8e2ff7df +DIST mcelog-199.tar.gz 316883 BLAKE2B 522cdb663936e17f0be7de008127f8dce9e5abd3b01f89c41123e72dc65d0764185fffd14ecf6546aea2aea83cf94bc652f4e1cff0b7430f1fe414220aeef075 SHA512 5b6a5ff85f100532d4417bca0885bc8cfb83a583a079b57dbcda17fb457263e12e9e736a51969be88e58d9b98db79cc23f6f6a313fd508ee9fd60d71e5c02fbb diff --git a/app-admin/mcelog/mcelog-198.ebuild b/app-admin/mcelog/mcelog-198.ebuild index 07d93a66d81f..b689f7a70a9c 100644 --- a/app-admin/mcelog/mcelog-198.ebuild +++ b/app-admin/mcelog/mcelog-198.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.t LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="selinux" RDEPEND="selinux? ( sec-policy/selinux-mcelog )" diff --git a/app-admin/mcelog/mcelog-199.ebuild b/app-admin/mcelog/mcelog-199.ebuild new file mode 100644 index 000000000000..07d93a66d81f --- /dev/null +++ b/app-admin/mcelog/mcelog-199.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit linux-info python-any-r1 systemd toolchain-funcs + +DESCRIPTION="A tool to log and decode Machine Check Exceptions" +HOMEPAGE="http://mcelog.org/" +SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="selinux" + +RDEPEND="selinux? ( sec-policy/selinux-mcelog )" +DEPEND="${PYTHON_DEPS}" + +# TODO: add mce-inject to the tree to support test phase +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch + "${FILESDIR}"/${PN}-129-debugflags.patch +) + +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() { + default + tc-export CC + python_fix_shebang genconfig.py +} + +src_install() { + default + + insinto /etc/logrotate.d/ + newins ${PN}.logrotate ${PN} + + newinitd "${FILESDIR}"/${PN}.init-r1 ${PN} + systemd_dounit ${PN}.service + + dodoc *.pdf +} diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest index 590e5d21aab4..0c29b3d0e43e 100644 --- a/app-admin/mongo-tools/Manifest +++ b/app-admin/mongo-tools/Manifest @@ -1,4 +1,5 @@ DIST mongo-tools-100.4.1.tar.gz 3793073 BLAKE2B 0a5dbd7a638035e7e54922c46be4473f154f79cb6370ca72f87dfee49ea1353ebf60ccf4d324b0bc6f5388b8c095f68f423aafdf83358ac41ad59d1215dce69c SHA512 a6560f8ce2a86c1ae4400f3ef182f448991a238ef657bcd5eb6f98de0adb2cbd660a81ce00f3ca051f2db6d22a492158da9254b264424506669bf771d7a40fe6 DIST mongo-tools-100.5.1.tar.gz 3796549 BLAKE2B 6f95e1eb9f9c6c07725269f99dee0d940ffc5145e95b17b3e0a87f4cd60b1b0589a99a813c359f0b670bc34274fbd1f5b9c561caf07840bd85633174232a48ed SHA512 a488b15a6862cacaccaeb57698d423e4ee710d395b1280a66382e140cb71fec84aa738f3819a87b4a71faecd9c9da7bd92780a19d6d11fdebaf5142e594b2028 +DIST mongo-tools-100.9.4.tar.gz 4742913 BLAKE2B 12cb5b7e6c0164f5c026410a3143cd383b18ffc3498026bc568b888039980090289fc5e7ed48be292d33f3ecad38ce781fccc8db2aca6c913f567bce74de3be9 SHA512 3c857da4587d4c473b495d5bf9b5ce2e64b7fd8c831baa89b462e93f1090d297069e6be18514412c233f2dab6ed024c7db5523c1e623513734cdd0d8d6f7167f DIST mongo-tools-4.2.15.tar.gz 15028734 BLAKE2B 7479c5d0d9b6051f51e563f53a5c704a69dc3719d9417b216bcc1a65220d0ab2c9441fd24d8ac8e5b1600766797ef102df07ebfd946ee60949d3287673dfbaaf SHA512 f613ab61a4cf029548aa0e5623fef3798642ced791bf52f229e7d14d31de9472bfc3c8bfb3fa7b4542555a17c79ff9a514480c674cb3e45fb99c4f1745fdb9f0 DIST mongo-tools-4.2.17.tar.gz 15028859 BLAKE2B dfd9165bd83571cb3ae134f13072e8a06707d714f28107a70e41e8bf507f87bb44ef32a27c15c188e6b831e8c33907f201cb7a3f217868e0a88e6c31efce0f79 SHA512 e59df0593caf93b44fe5694e07e37e49e9d4237007ae33f0156f773987cbaeb59c7b3da8012f9a9b07f4eb146f8392b2d2bbcad97309284b0d67238a69af2663 diff --git a/app-admin/mongo-tools/mongo-tools-100.9.4.ebuild b/app-admin/mongo-tools/mongo-tools-100.9.4.ebuild new file mode 100644 index 000000000000..5f398ca3a28c --- /dev/null +++ b/app-admin/mongo-tools/mongo-tools-100.9.4.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A high-performance, open source, schema-free document-oriented database" +HOMEPAGE="https://www.mongodb.com" +SRC_URI="https://github.com/mongodb/mongo-tools/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="kerberos sasl ssl" + +DEPEND="dev-lang/go:= + kerberos? ( app-crypt/mit-krb5 ) + sasl? ( dev-libs/cyrus-sasl ) + ssl? ( dev-libs/openssl:0= ) +" +BDEPEND="dev-lang/go:=" + +# Do not complain about CFLAGS etc since go projects do not use them. +QA_FLAGS_IGNORED='.*' + +EGO_PN="github.com/mongodb/mongo-tools" +S="${WORKDIR}/src/${EGO_PN}" + +src_unpack() { + mkdir -p "${S%/*}" || die + default + mv ${P} "${S}" || die +} + +src_compile() { + local myconf=() + + if use kerberos; then + myconf+=(gssapi) + fi + + if use sasl; then + myconf+=(sasl) + fi + + if use ssl; then + myconf+=(ssl) + fi + + # build pie to avoid text relocations wrt #582854 + local buildmode="pie" + + # skip on ppc64 wrt #610984 + if use ppc64; then + buildmode="default" + fi + + mkdir -p bin || die + for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop; do + echo "Building $i" + GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \ + -ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" -x --tags "${myconf[*]}" "$i/main/$i.go" || die + done +} + +src_install() { + dobin bin/* +} diff --git a/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild new file mode 100644 index 000000000000..c8d659c9e0b4 --- /dev/null +++ b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit prefix + +DESCRIPTION="User land tool for cleaning up old perl installs" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git" +else + SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="pkgcore" + +[[ "${PV}" == "9999" ]] && BDEPEND="sys-apps/help2man" + +RDEPEND=" + app-shells/bash + dev-lang/perl + pkgcore? ( sys-apps/pkgcore ) + !pkgcore? ( + app-portage/portage-utils + sys-apps/portage + ) +" + +src_prepare() { + default + eprefixify ${PN} +} + +src_install() { + dosbin perl-cleaner + doman perl-cleaner.1 +} diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild index b7bf446c4729..c8d659c9e0b4 100644 --- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild +++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest index 78f1fc36a962..93c1df56388f 100644 --- a/app-admin/qtpass/Manifest +++ b/app-admin/qtpass/Manifest @@ -1,2 +1 @@ -DIST qtpass-1.3.2.tar.gz 310316 BLAKE2B ac0f562fd263e9d46980a69183cfd556596750e1050dbc50748cd9be45bc4bf39e4de14cb59f778cfc54f5c32050d567d88d65ec039cba1e9c2e8ef24d7ae99a SHA512 9026f74f6ff75fcef2f6a0862484a2a1eaed1370edd0659e8b4d20039affe846e0da3a0a26a804563813bc678638ab67fa516441208e70c7e9de9b2eda876a10 DIST qtpass-1.4.0.tar.gz 581368 BLAKE2B 12bf414ea781bad34d97fe28ae39f44e17812039f0d798162b6d875918f20a1583f7a53a1e98ed917edf41c15709c7693c7651205c5e4ec85860ee773350f075 SHA512 47c1284c10e0d8a3bf63c049fc29d785d1a53bef6f183bbe22efebf466371dd454a6e43c944739f487d609f3cde188701ba538e9cb8e2c7e5530f8fa6f992625 diff --git a/app-admin/qtpass/qtpass-1.3.2-r2.ebuild b/app-admin/qtpass/qtpass-1.3.2-r2.ebuild deleted file mode 100644 index 6c2724ff6e11..000000000000 --- a/app-admin/qtpass/qtpass-1.3.2-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils virtualx - -DESCRIPTION="Multi-platform GUI for pass, the standard unix password manager" -HOMEPAGE="https://qtpass.org https://github.com/IJHack/qtpass" -SRC_URI="https://github.com/IJHack/qtpass/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="test" - -RDEPEND="|| ( app-admin/pass app-admin/gopass ) - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - net-misc/x11-ssh-askpass" -DEPEND="${RDEPEND} - dev-qt/qtsvg:5 - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/QtPass-${PV}" - -DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md ) - -src_prepare() { - default - - if ! use test ; then - sed -i '/SUBDIRS += src /s/tests //' \ - qtpass.pro || die "sed for qtpass.pro failed" - fi -} - -src_configure() { - eqmake5 PREFIX="${EPREFIX}"/usr -} - -src_test() { - virtx default -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs - - insinto /usr/share/qtpass/translations - doins localization/*.qm - - doman qtpass.1 - domenu qtpass.desktop - newicon artwork/icon.png qtpass-icon.png - insinto /usr/share/metainfo - doins qtpass.appdata.xml -} diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest index 525219668f42..fb51dda3ab9c 100644 --- a/app-admin/r10k/Manifest +++ b/app-admin/r10k/Manifest @@ -1,4 +1,3 @@ -DIST r10k-3.16.0.tar.gz 253547 BLAKE2B 683fdd5588c7b3c3b47ae0d28d75fbfb929d5595c715531eed86b8d89f76708c91f38f9ca558040b36fac38c038211086a74fdf109b37350126bc78b25f8b751 SHA512 399a357cf8617427632516e0f439a40464ba0c8201ee7b6ce15c893ae029bfd9ae1438b76aff3b9601685d14febf8fc71dbdd2954eb3352d6ce713e769cb586d -DIST r10k-4.0.0.tar.gz 254074 BLAKE2B 8053d435691d33cd1d8b3c55c2cb3a153cd952112a93f2eeb4b715c6c0b92e9192c65f8809b4187d5ff4f5f6b9ed8f67a644d7920bf8d8294dd0b5d8fd735836 SHA512 a6b92fabcc405fe6678da724743e43d9dc3a286e3a973a3320ac94c25dd385315baaaf495dbd1706005d31f13d4c52f1c425148d3b397448fed07fd83acb04fa DIST r10k-4.0.1.tar.gz 254147 BLAKE2B 83c71c39f50aaf390ef75b8d87a693ba8d131297fcb12c3e408665565e35119d3e9e2832b8172b0616145459368dd5af38bcecca666ac1020ba96a59abc83657 SHA512 74583a79637d8c60f3935cd7ea382fff189beb7d6825b10b9c6bfc0a625a62f81648795cefc878cec608d96ba2396749f7fc0a1c7bdfa9bfcf914848135a0675 DIST r10k-4.0.2.tar.gz 254228 BLAKE2B b98a665200978a023dc2566bc4b3c141eed6c950d27dc0401c8c7e8d1096f5fa0562874bd1a0e1726dd687a046cf345c0ce5003d5a2a7f72bf397d91b07065c3 SHA512 5f4d9b5fdcd45ffe5b9c2ef95fff7b7ae3136adefcee754782815bb523d0281ec3ee50615600b2fe80ee9d98b75d80747072c425c4d15c795cd7dcb27d1f192b +DIST r10k-4.1.0.tar.gz 254276 BLAKE2B ba154d8500beef70cb6a8761833b05e0b5a3122b6a4a04dafc7c20ccce76e6fd30dbe0ac0bae667fac7d985ddc2921f43657c0bf2cd0c6d877370b7d2e73e799 SHA512 c8c78b013fa75a29b205ae9a6ee24f1369b4ffec2d3d7d9e9b3b5482ffa77c19f360dc8fd8444388dd527cbb31fd9c2aa96201d5f60d53f0b23a55d446d43a8c diff --git a/app-admin/r10k/r10k-3.16.0.ebuild b/app-admin/r10k/r10k-3.16.0.ebuild deleted file mode 100644 index a3baf5d7fa01..000000000000 --- a/app-admin/r10k/r10k-3.16.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -USE_RUBY="ruby31" - -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" -SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz" - -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:1 >=dev-ruby/gettext-setup-0.24:0 ) - || ( dev-ruby/fast_gettext:2 >=dev-ruby/fast_gettext-1.1:0 ) - >=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2 - >=dev-ruby/ruby-gettext-3.0.2:0 - ~dev-ruby/log4r-1.1.10 - >=dev-ruby/minitar-0.9:0 - >=dev-ruby/multi_json-1.10:0 - =dev-ruby/puppet_forge-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' \ - -i ${RUBY_FAKEGEM_GEMSPEC} || die - - # Avoid specs for unpackaged rugget git provider - rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die - - # Avoid spec making assumptions on availability of relative symlinks - rm -f spec/integration/util/purageable_spec.rb || die -} diff --git a/app-admin/r10k/r10k-4.0.0.ebuild b/app-admin/r10k/r10k-4.1.0.ebuild index fa99e710fd2f..97a2b986e36f 100644 --- a/app-admin/r10k/r10k-4.0.0.ebuild +++ b/app-admin/r10k/r10k-4.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby31 ruby32" +USE_RUBY="ruby31 ruby32 ruby33" RUBY_FAKEGEM_RECIPE_DOC="none" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -25,23 +25,21 @@ IUSE="+git" ruby_add_rdepend " ~dev-ruby/colored2-3.1.2 >=dev-ruby/cri-2.15.10:0 - || ( dev-ruby/gettext-setup:1 >=dev-ruby/gettext-setup-0.24:0 ) - >=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2 + dev-ruby/gettext-setup:1 + >=dev-ruby/jwt-2.2.3:2 >=dev-ruby/ruby-gettext-3.0.2:0 ~dev-ruby/log4r-1.1.10 >=dev-ruby/minitar-0.9:0 - >=dev-ruby/multi_json-1.10:0 dev-ruby/puppet_forge:5 " -ruby_add_bdepend "test? ( - >=dev-ruby/minitar-0.9 -)" - RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" all_ruby_prepare() { + # Remove unused multi_json dependency. It is not used anywhere and + # the code for which is was introduced originally is gone. sed -e '/s.files/d' \ + -e '/multi_json/ s:^:#:' \ -i ${RUBY_FAKEGEM_GEMSPEC} || die # Avoid specs for unpackaged rugget git provider diff --git a/app-admin/restart-services/restart-services-1.3.ebuild b/app-admin/restart-services/restart-services-1.3.ebuild index 10daef1472d7..9892b5f355ef 100644 --- a/app-admin/restart-services/restart-services-1.3.ebuild +++ b/app-admin/restart-services/restart-services-1.3.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" RDEPEND=" app-admin/lib_users diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 2d4f225b28ee..2e797aee8216 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,6 +1,4 @@ -DIST rsyslog-8.2312.0.tar.gz 3358109 BLAKE2B 8b463c07a44efa60b6faeaa466498a2540eefc158efa759479cc6fc36acb04a718dd6ee4015f311343e6b66b6e074d5ed40db29cbcad6c71b42286a58cb92d7c SHA512 a65ca1c6fe2d9dd853d073d93cfd4d007c3533bd10c633113fcf94c4746192945ed0a2b2ff84f9174b55de90ade2a062a0bd556ffe375864fad3772ef8ce39e3 DIST rsyslog-8.2402.0.tar.gz 3404026 BLAKE2B fc33244f0e4699d446ffab19aa8078ac49518b1722a5d7e72e57d7768ef42565bc3fa54b6c594e857715b5d5439ef675811eee888c81aadec3d1e05d5416c51e SHA512 dea9a14abc6ea25b3e5b676eda6a772c0c6266afd95eea0446ea85b29b2f98c058e1495cbdc16dba1c78d5d0919980e4fdfc13ef597082e7f3bf8b6be4cb5723 DIST rsyslog-8.2404.0.tar.gz 3408657 BLAKE2B 67170f1ba4ad61bd79088a313ee9b093ecaab512ce24ca56cfe605d4589276406abe593d791736ecb7b2f44be998b3836173272eb5dd69f7bc9ea8d5b49d462e SHA512 fda8032ab7f9cb6c46693edeb95d2b47ab7673836ff44d0686bbbd5a3759885f65a80e1a311c809c2332a19559b0297ac7d8e59e5f828372839f67dbf362e6b1 -DIST rsyslog-doc-8.2312.0.tar.gz 6621561 BLAKE2B 2aca14d24606e3a125259cad5fa43af61da2b70ba0b1916e5496f3d4eb6a28b612287bb83c3fa610f0f367deedcec4f0b3e93a552643194fdcf552dff3d408b6 SHA512 2fe8ab0e37a6899a545c09ea2586c33ab89a3e3d93ff079f99b15e9b1743423bbe54931684ba8509ed4f578a4b55ea22f6306aca256ee2245f88115a5f44e400 DIST rsyslog-doc-8.2402.0.tar.gz 6525910 BLAKE2B 20bc3398db00cc2a0e92b610032cb86bcf17b71b31f70a47213b608c7ea9a1a81e9aad5caa74b7f23f0a28fdab7ef3627ec89f5910d535ac1ade5408b3300939 SHA512 dfffb6138cff6121020648c7ed20cec7c881020af956295f88ea297c3198ed6dd49a7fbcb651164c6a774520391d00743a3c34c7acc5f705b668c8048c289eea DIST rsyslog-doc-8.2404.0.tar.gz 6568723 BLAKE2B 4bc522f9146754a9ebae5f5f7ffb87cfa2da3d9b0832b902c73896d788a061ad4b99cd269b4fb8fc42917311ea5621dfd398428046c53883e9bba859252172ec SHA512 ea88fcf81fb45be515f1b8e7699efabba98eb7e5fcd2d5046424c303db95926a36baa1215143c05e39b9a86dcfdbc73c5c3a76dee382d7b8f1916653169df264 diff --git a/app-admin/rsyslog/rsyslog-8.2312.0.ebuild b/app-admin/rsyslog/rsyslog-8.2312.0.ebuild deleted file mode 100644 index 166eeab07c63..000000000000 --- a/app-admin/rsyslog/rsyslog-8.2312.0.ebuild +++ /dev/null @@ -1,507 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit autotools linux-info python-any-r1 systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - SRC_URI=" - https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) - " - - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" - -IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" -IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" -IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" -IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" -IUSE+=" systemd test usertools +uuid xxhash zeromq" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - kubernetes? ( normalize ) - ssl? ( || ( gnutls openssl ) ) -" - -BDEPEND=">=dev-build/autoconf-archive-2015.02.24 - sys-apps/lsb-release - virtual/pkgconfig - test? ( - jemalloc? ( <sys-libs/libfaketime-0.9.7 ) - !jemalloc? ( sys-libs/libfaketime ) - ${PYTHON_DEPS} - )" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.8:= - >=dev-libs/libestr-0.1.9 - >=sys-libs/zlib-1.2.5 - curl? ( >=net-misc/curl-7.35.0 ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - imhttp? ( - dev-libs/apr-util - www-servers/civetweb - virtual/libcrypt:= - ) - impcap? ( net-libs/libpcap ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - kubernetes? ( >=net-misc/curl-7.35.0 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( dev-db/mysql-connector-c:= ) - normalize? ( - >=dev-libs/liblognorm-2.0.3:= - ) - clickhouse? ( >=net-misc/curl-7.35.0 ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( - >=dev-libs/hiredis-0.11.0:= - dev-libs/libevent[threads(+)] - ) - relp? ( >=dev-libs/librelp-1.2.17:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - >=dev-libs/openssl-0.9.8y:0= - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( - gnutls? ( >=net-libs/gnutls-2.12.23:0= ) - openssl? ( - dev-libs/openssl:0= - ) - ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - xxhash? ( dev-libs/xxhash:= ) - zeromq? ( - >=net-libs/czmq-4:=[drafts] - )" - -DEPEND=" - ${RDEPEND} - elibc_musl? ( sys-libs/queue-standalone ) -" - -if [[ "${PV}" == "9999" ]]; then - BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - BDEPEND+=" >=app-alternatives/lex-2.5.39-r1" - BDEPEND+=" >=app-alternatives/yacc-2.4.3" - BDEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_unpack() { - if [[ "${PV}" == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack "${P}.tar.gz" - fi - - if use doc; then - if [[ "${PV}" == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH="${EGIT_BRANCH}" - - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - - unpack ${PN}-doc-${PV}.tar.gz - fi - fi -} - -src_prepare() { - default - - # Bug: https://github.com/rsyslog/rsyslog/issues/3626 - sed -i \ - -e '\|^#!/bin/bash$|a exit 77' \ - tests/mmkubernetes-cache-expir*.sh \ - || die "Failed to disable known test failure mmkubernetes-cache-expir*.sh" - - sed -i \ - -e '\|^#!/bin/bash$|a exit 0' \ - tests/omprog-close-unresponsive*.sh \ - || die "Failed to disable test omprog-close-unresponsive*.sh" - - sed -i \ - -e '\|^#!/bin/bash$|a exit 0' \ - tests/uxsock_simple.sh \ - || die "Failed to disable test uxsock_simple.sh" - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - --disable-liblogging-stdlog - --disable-imfile-tests # Some imfile tests fail (noticed in version 8.2208.0) - $(use_enable test testbench) - $(use_enable test libfaketime) - $(use_enable test extended-tests) - # Input Plugins without dependencies - --enable-imbatchreport - --enable-imdiag - --enable-imdocker - --enable-imfile - --enable-improg - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without dependencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmtaghostname - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-fmhash - --enable-fmunflatten - $(use_enable xxhash fmhash-xxhash) - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmdb2diag - --enable-pmlastmsg - $(use_enable normalize pmnormalize) - --enable-pmnull - --enable-pmpanngfw - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis imhiredis) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug valgrind) - # Misc - $(use_enable clickhouse) - $(use_enable curl fmhttp) - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable imhttp) - $(use_enable impcap) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable kubernetes mmkubernetes) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable omhttp) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable gnutls) - $(use_enable openssl) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} - - systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/${PN}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/${PN}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - if ! hash certtool &>/dev/null; then - die "certtool not found! Is net-libs/gnutls[tools] is installed?" - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" || die - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.2404.0.ebuild b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild index bb01f397f550..95315d04e1e0 100644 --- a/app-admin/rsyslog/rsyslog-8.2404.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild @@ -24,7 +24,7 @@ else ) " - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 779c5a6e36ea..e2718884de8b 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -2,3 +2,4 @@ DIST salt-3005.5.tar.gz 17940104 BLAKE2B c7a820bc946c2cd8124fb6f559608ab1dc3cd85 DIST salt-3006.5.tar.gz 20536455 BLAKE2B cf475dc5e919f6ab180578db2aae5f3655623b39b134d67609da4f607be909340c6e55c940cfb66f129cc75d40b5cdda094e866db116d8a45aa5eef26d8fa1eb SHA512 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23 DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729 SHA512 9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d DIST salt-3007.0.tar.gz 20304228 BLAKE2B 3db95ce779cfd08d61536dcfb4ff6ac31788ad1d6d4665b640dcc430f5a33847f231f94fd574c5d8df7b14e2854511c80610a37cd19be5429c4643be8bd9e0eb SHA512 0e49d76dafdb981ee380ea89ceba2cddeae8cd95df1d188a6f8ba64a175c606aaf2f8101bacb040792255afdb46ae668cbc9464d0dbb055986e85cee4d5c130b +DIST salt-3007.1.tar.gz 19401831 BLAKE2B ea8c89a24991467367dc0c50e3d2f864e2f6211ba9a71195d6308a86df16229fc77baa2ec837f043ebad36d9d7a6673fefa3a1a826472d900925e657e2152718 SHA512 732820bae98ce2eb74175a2c37c986076572e0e60d04a270861fd3b0b6871cd2cc703683a8c0d97ffc43b2f7fffb76ae709a1aea839d10abc9f5d0837eaade4b diff --git a/app-admin/salt/salt-3005.5-r1.ebuild b/app-admin/salt/salt-3005.5-r1.ebuild index 835496219717..f03f25365305 100644 --- a/app-admin/salt/salt-3005.5-r1.ebuild +++ b/app-admin/salt/salt-3005.5-r1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_BRANCH="develop" else inherit pypi - KEYWORDS="amd64 ~arm arm64 ~riscv x86" + KEYWORDS="amd64 arm64 ~riscv x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/salt/salt-3007.1.ebuild b/app-admin/salt/salt-3007.1.ebuild new file mode 100644 index 000000000000..d8b9533aac5e --- /dev/null +++ b/app-admin/salt/salt-3007.1.ebuild @@ -0,0 +1,611 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_1{0..2} ) + +DISTUTILS_USE_PEP517=setuptools +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" +else + inherit pypi + KEYWORDS="~amd64 ~riscv ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE=" + cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova portage profile redis selinux test raet + +zeromq vim-syntax +" + +RDEPEND=" + sys-apps/pciutils + dev-libs/openssl:0=[-bindist(-)] + dev-python/aiohttp[${PYTHON_USEDEP}] + >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}] + >=dev-python/cryptography-42.0.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + dev-python/looseversion[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-24.0.0[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}] + dev-python/python-gnupg[${PYTHON_USEDEP}] + >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/tornado[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( + >=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}] + dev-python/aiosignal[${PYTHON_USEDEP}] + >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}] + dev-python/async-timeout[${PYTHON_USEDEP}] + ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + dev-python/libvirt-python[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1}) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1}) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + sys-apps/findutils + dev-python/build[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + app-arch/zip + dev-python/apache-libcloud[${PYTHON_USEDEP}] + dev-python/boto3[${PYTHON_USEDEP}] + >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-2.0.0[${PYTHON_USEDEP}] + <dev-python/moto-5[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/pygit2[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-1.0.0_rc29[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/pytest-shell-utilities[${PYTHON_USEDEP}] + dev-python/pytest-skip-markers[${PYTHON_USEDEP}] + dev-python/pytest-system-statistics[${PYTHON_USEDEP}] + dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] + dev-util/yamllint[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] ) + ) +" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE=" + || ( raet zeromq ) + test? ( cheetah genshi ) + nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) + neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) +" +RESTRICT=" + !test? ( test ) + x86? ( test ) +" + +PATCHES=( + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" +) + +python_prepare_all() { + local -a remove_test_files=( + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + tests/integration/externalapi/test_venafiapi.py + tests/integration/modules/test_rabbitmq.py + tests/integration/modules/test_supervisord.py + tests/integration/states/test_match.py + tests/pytests/functional/fileserver/hgfs/test_hgfs.py + tests/pytests/functional/loader/test_loader.py + tests/pytests/functional/modules/file/test_readlink.py + tests/pytests/functional/modules/file/test_symlink.py + tests/pytests/functional/modules/state/test_jinja_filters.py + tests/pytests/functional/modules/state/test_jinja_renderer.py + tests/pytests/functional/modules/state/test_mako_renderer.py + tests/pytests/functional/modules/state/test_pyobjects_renderer.py + tests/pytests/functional/modules/test_aptpkg.py + tests/pytests/functional/modules/test_dockermod.py + tests/pytests/functional/modules/test_etcd_mod.py + tests/pytests/functional/modules/test_grains.py + tests/pytests/functional/modules/test_mac_service.py + tests/pytests/functional/modules/test_saltcheck.py + tests/pytests/functional/modules/test_saltutil.py + tests/pytests/functional/modules/test_test.py + tests/pytests/functional/pillar/hg_pillar/test_hg_pillar.py + tests/pytests/functional/pillar/test_git_pillar.py + tests/pytests/functional/pillar/test_gpg.py + tests/pytests/functional/returners/test_etcd_return.py + tests/pytests/functional/runners/test_winrepo.py + tests/pytests/functional/sdb/test_etcd_db.py + tests/pytests/functional/state/test_masterless_tops.py + tests/pytests/functional/states/file/test_keyvalue.py + tests/pytests/functional/states/file/test_patch.py + tests/pytests/functional/states/file/test_rename.py + tests/pytests/functional/states/rabbitmq + tests/pytests/functional/states/test_docker_container.py + tests/pytests/functional/states/test_docker_network.py + tests/pytests/functional/states/test_etcd_mod.py + tests/pytests/functional/states/test_module.py + tests/pytests/functional/states/test_mysql.py + tests/pytests/functional/states/test_svn.py + tests/pytests/functional/states/test_virtualenv_mod.py + tests/pytests/functional/test_version.py + tests/pytests/functional/utils/gitfs + tests/pytests/functional/utils/test_vault.py + tests/pytests/integration/cli/test_syndic_eauth.py + tests/pytests/integration/daemons/test_memory_leak.py + tests/pytests/integration/grains/test_grains.py + tests/pytests/integration/master/test_clear_funcs.py + tests/pytests/integration/minion/test_reauth.py + tests/pytests/integration/modules/grains/test_append.py + tests/pytests/integration/modules/grains/test_module.py + tests/pytests/integration/modules/saltutil/test_grains.py + tests/pytests/integration/modules/saltutil/test_modules.py + tests/pytests/integration/modules/saltutil/test_wheel.py + tests/pytests/integration/modules/state/test_state_pillar_errors.py + tests/pytests/integration/modules/state/test_state_test.py + tests/pytests/integration/modules/test_cmdmod.py + tests/pytests/integration/modules/test_event.py + tests/pytests/integration/modules/test_file.py + tests/pytests/integration/modules/test_jinja.py + tests/pytests/integration/modules/test_pillar.py + tests/pytests/integration/modules/test_vault.py + tests/pytests/integration/modules/test_virt.py + tests/pytests/integration/modules/test_x509_v2.py + tests/pytests/integration/proxy/test_deltaproxy.py + tests/pytests/integration/proxy/test_shell.py + tests/pytests/integration/reactor/test_reactor.py + tests/pytests/integration/returners/test_noop_return.py + tests/pytests/integration/runners/state/orchestrate/test_orchestrate.py + tests/pytests/integration/runners/test_cache.py + tests/pytests/integration/runners/test_jobs.py + tests/pytests/integration/runners/test_manage.py + tests/pytests/integration/runners/test_saltutil.py + tests/pytests/integration/runners/test_vault.py + tests/pytests/integration/sdb/test_vault.py + tests/pytests/integration/ssh/state/test_pillar_override.py + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_requisite_fail.py + tests/pytests/integration/ssh/state/test_retcode_pillar_render_exception.py + tests/pytests/integration/ssh/state/test_retcode_render_exception.py + tests/pytests/integration/ssh/state/test_retcode_render_module_exception.py + tests/pytests/integration/ssh/state/test_retcode_run_fail.py + tests/pytests/integration/ssh/state/test_retcode_state_run_remote_exception.py + tests/pytests/integration/ssh/state/test_state.py + tests/pytests/integration/ssh/state/test_with_import_dir.py + tests/pytests/integration/ssh/test_cmdmod.py + tests/pytests/integration/ssh/test_config.py + tests/pytests/integration/ssh/test_cp.py + tests/pytests/integration/ssh/test_deploy.py + tests/pytests/integration/ssh/test_grains.py + tests/pytests/integration/ssh/test_jinja_mods.py + tests/pytests/integration/ssh/test_master.py + tests/pytests/integration/ssh/test_mine.py + tests/pytests/integration/ssh/test_pillar.py + tests/pytests/integration/ssh/test_pillar_compilation.py + tests/pytests/integration/ssh/test_pre_flight.py + tests/pytests/integration/ssh/test_publish.py + tests/pytests/integration/ssh/test_py_versions.py + tests/pytests/integration/ssh/test_raw.py + tests/pytests/integration/ssh/test_saltcheck.py + tests/pytests/integration/ssh/test_slsutil.py + tests/pytests/integration/states/test_beacon.py + tests/pytests/integration/states/test_file.py + tests/pytests/integration/states/test_include.py + tests/pytests/integration/states/test_ini_manage.py + tests/pytests/integration/states/test_state_test.py + tests/pytests/integration/states/test_x509_v2.py + tests/pytests/integration/utils/test_templates.py + tests/pytests/integration/wheel/test_key.py + tests/pytests/pkg/integration/test_check_imports.py + tests/pytests/pkg/integration/test_clean_zmq_teardown.py + tests/pytests/pkg/integration/test_enabled_disabled.py + tests/pytests/pkg/integration/test_help.py + tests/pytests/pkg/integration/test_logrotate_config.py + tests/pytests/pkg/integration/test_pip.py + tests/pytests/pkg/integration/test_pkg.py + tests/pytests/pkg/integration/test_python.py + tests/pytests/scenarios/compat/test_with_versions.py + tests/pytests/unit/loader/test_lazy.py + tests/pytests/unit/modules/test_mongodb.py + tests/pytests/unit/modules/test_mysql.py + tests/pytests/unit/modules/test_schedule.py + tests/pytests/unit/modules/test_yaml.py + tests/pytests/unit/pillar/test_consul_pillar.py + tests/pytests/unit/pillar/test_mysql.py + tests/pytests/unit/pillar/test_pillar.py + tests/pytests/unit/renderers/test_yamlex.py + tests/pytests/unit/roster/test_ansible.py + tests/pytests/unit/roster/test_dir.py + tests/pytests/unit/runners/test_reactor.py + tests/pytests/unit/states/file/test_keyvalue.py + tests/pytests/unit/utils/jinja/test_get_template.py + tests/pytests/unit/utils/jinja/test_salt_cache_loader.py + tests/pytests/unit/utils/test_cache.py + tests/pytests/unit/utils/test_etcd_util.py + tests/pytests/unit/utils/test_package.py + tests/pytests/unit/utils/test_versions.py + tests/pytests/unit/utils/test_x509.py + tests/unit/ext/test_ipaddress.py + tests/unit/modules/test_boto_elb.py + tests/unit/modules/test_boto_secgroup.py + tests/unit/modules/test_boto_vpc.py + tests/unit/modules/test_elasticsearch.py + tests/unit/modules/test_k8s.py + tests/unit/modules/test_kubernetesmod.py + tests/unit/modules/test_vsphere.py + tests/unit/netapi/rest_tornado/test_saltnado.py + tests/unit/states/test_boto_vpc.py + tests/unit/states/test_module.py + tests/unit/test_module_names.py + tests/unit/test_zypp_plugins.py + tests/unit/utils/test_extend.py + tests/unit/utils/test_pbm.py + tests/unit/utils/test_schema.py + tests/unit/utils/test_vmware.py + tests/unit/utils/test_vsan.py + + # tests that require network access + tests/integration/cloud + tests/integration/netapi + tests/pytests/functional/cli/test_salt_cloud.py + tests/pytests/functional/cli/test_salt_run_.py + tests/pytests/functional/modules/test_ansiblegate.py + tests/pytests/functional/modules/test_http.py + tests/pytests/functional/netapi + tests/pytests/functional/states/test_pip_state.py + tests/pytests/functional/utils/test_etcd_util.py + tests/pytests/functional/utils/test_http.py + tests/pytests/integration/cli/test_salt_proxy.py + tests/pytests/integration/daemons/test_masterapi.py + tests/pytests/integration/modules/state/test_state.py + tests/pytests/integration/modules/state/test_state_state_events.py + tests/pytests/integration/netapi + tests/pytests/integration/pillar/cache/test_pillar_cache.py + tests/pytests/integration/pillar/test_fileclient.py + tests/pytests/integration/pillar/test_pillar_include.py + tests/pytests/integration/proxy/test_simple.py + tests/pytests/integration/runners/state/orchestrate/test_events.py + tests/pytests/integration/wheel/test_pillar_roots.py + tests/pytests/pkg/downgrade/test_salt_downgrade.py + tests/pytests/pkg/integration/test_pip_upgrade.py + tests/pytests/pkg/integration/test_salt_api.py + tests/pytests/pkg/integration/test_salt_call.py + tests/pytests/pkg/integration/test_salt_exec.py + tests/pytests/pkg/integration/test_salt_grains.py + tests/pytests/pkg/integration/test_salt_key.py + tests/pytests/pkg/integration/test_salt_minion.py + tests/pytests/pkg/integration/test_salt_output.py + tests/pytests/pkg/integration/test_salt_pillar.py + tests/pytests/pkg/integration/test_salt_state_file.py + tests/pytests/pkg/integration/test_salt_ufw.py + tests/pytests/pkg/integration/test_salt_user.py + tests/pytests/pkg/integration/test_systemd_config.py + tests/pytests/pkg/integration/test_version.py + tests/pytests/pkg/upgrade/test_salt_upgrade.py + tests/pytests/scenarios/cluster/test_cluster.py + tests/pytests/scenarios/dns/multimaster/test_dns.py + tests/pytests/scenarios/dns/test_dns.py + tests/pytests/unit/client/ssh/test_ssh.py + tests/pytests/unit/cloud/clouds/vmware + tests/pytests/unit/loader/test_loading_modules.py + tests/pytests/unit/runners/test_net.py + tests/pytests/unit/states/file/test_mod_beacon.py + tests/pytests/unit/test_client.py + tests/pytests/unit/utils/test_aws.py + tests/pytests/unit/utils/test_http.py + tests/unit/modules/test_boto3_elasticsearch.py + tests/unit/modules/test_boto3_route53.py + tests/unit/modules/test_network.py + tests/unit/modules/test_zcbuildout.py + tests/unit/states/test_zcbuildout.py + + # tests require root access + tests/integration/pillar/test_git_pillar.py + tests/integration/states/test_lxd_container.py + tests/integration/states/test_lxd_image.py + tests/integration/states/test_lxd_profile.py + tests/integration/states/test_supervisord.py + tests/pytests/functional/cache/test_mysql.py + tests/pytests/functional/cli/test_salt.py + tests/pytests/functional/modules/test_mysql.py + tests/pytests/functional/modules/test_vault.py + tests/pytests/functional/states/file/test_accumulated.py + tests/pytests/scenarios/performance/test_performance.py + tests/pytests/unit/cloud/test_map.py + tests/pytests/unit/engines/test_slack_bolt_engine.py + tests/pytests/unit/modules/state/test_state.py + tests/pytests/unit/modules/state/test_top_file_merge.py + tests/pytests/unit/proxy/test_netmiko_px.py + tests/pytests/unit/proxy/test_ssh_sample.py + tests/pytests/unit/roster/test_sshknownhosts.py + + # tests that require boto + tests/pytests/unit/engines/test_sqs_events.py + + # first test always fails + tests/pytests/unit/utils/parsers/test_log_parsers.py + ) + + rm -r "${remove_test_files[@]}" || die + + # axe the boto dep (bug #888235) + find "${S}/tests" -name 'test_boto_*.py' -delete || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die + + # called_once should be assert_called_once_with + find "${S}/tests" -name '*.py' -print0 \ + | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + local -x USE_SETUPTOOLS=1 + distutils-r1_python_install_all + + local svc + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local -a EPYTEST_DESELECT=( + # doesn't like the distutils warning + tests/pytests/integration/cli/test_batch.py::test_batch_retcode + tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch + + # hangs indefinitely + tests/pytests/unit/test_minion.py::test_master_type_disable + + # needs root + tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group + tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert_failure + + # don't like sandbox + tests/integration/modules/test_cp.py::CPModuleTest::test_get_file_str_https + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_ftp + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_dest_empty + tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_no_dest + tests/integration/states/test_git.py::LocalRepoGitTest::test_latest_force_reset_true_fast_forward + tests/pytests/functional/fileserver/test_roots.py::test_symlink_list + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline + tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline + tests/pytests/functional/modules/test_defaults.py::test_defaults_get + tests/pytests/functional/modules/test_system.py::test_get_system_date_time + tests/pytests/functional/modules/test_system.py::test_get_system_date_time_utc + tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match + tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd + tests/pytests/functional/states/file/test_append.py::test_issue_1896_file_append_source + tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043 + tests/pytests/functional/states/file/test_comment.py::test_issue_62121 + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id + tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name + tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites + tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls + tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path + tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208 + tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data + tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff + tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case + tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter + tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg + tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd + tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775 + tests/pytests/functional/states/test_pip_state.py::test_22359_pip_installed_unless_does_not_trigger_warnings + tests/pytests/functional/states/test_pip_state.py::test_issue_2028_pip_installed_state + tests/pytests/functional/states/test_pip_state.py::test_issue_54755 + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_errors + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed_venv + tests/pytests/functional/states/test_pip_state.py::test_pip_installed_specific_env + tests/pytests/functional/states/test_x509_v2.py::"test_private_key_managed_passphrase_changed_not_overwrite[existing_pk0]" + tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing + tests/pytests/functional/utils/test_pillar.py::test_gitpython_env + tests/pytests/functional/utils/test_pillar.py::test_gitpython_fetch_request + tests/pytests/functional/utils/test_pillar.py::test_gitpython_multiple_repos + tests/pytests/functional/utils/test_pillar.py::test_pygit2_env + tests/pytests/functional/utils/test_pillar.py::test_pygit2_multiple_repos + tests/pytests/functional/utils/test_winrepo.py::test_gitpython_winrepo_simple + tests/pytests/functional/utils/test_winrepo.py::test_pygit2_winrepo_simple + tests/pytests/integration/minion/test_return_retries.py::test_pillar_timeout + tests/pytests/integration/minion/test_return_retries.py::test_publish_retry + tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[False]" + tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[True]" + tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order + tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings + tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_call + tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_salt + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args0-kwargs0]" + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args1-kwargs1]" + tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args2-kwargs2]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args0-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args1-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args2-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args3-20]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args4-0]" + tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args5-20]" + tests/pytests/integration/ssh/test_jinja_filters.py::test_dateutils_strftime + tests/pytests/integration/ssh/test_terraform.py::test_terraform_roster + tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate + tests/pytests/unit/grains/test_core.py::test_get_machine_id + tests/pytests/unit/grains/test_package.py::test_grain_package_type + tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed + tests/pytests/unit/modules/test_beacons.py::test_add + tests/pytests/unit/modules/test_beacons.py::test_add_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_delete + tests/pytests/unit/modules/test_beacons.py::test_delete_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_disable + tests/pytests/unit/modules/test_beacons.py::test_enable + tests/pytests/unit/modules/test_beacons.py::test_enable_beacon_module + tests/pytests/unit/modules/test_beacons.py::test_save + tests/pytests/unit/modules/test_gpg.py::test_create_key_with_passphrase_with_gpg_passphrase_in_pillar + tests/pytests/unit/modules/test_gpg.py::test_create_key_without_passphrase + tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache + tests/pytests/unit/modules/test_saltutil.py::test_list_extmods + tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk + tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message + tests/pytests/unit/states/test_pkg.py::test_mod_beacon + tests/pytests/unit/states/test_service.py::test_mod_beacon + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina + tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument + tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror + tests/unit/utils/test_thin.py::SSHThinTestCase::test_thin_dir + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis + tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode + tests/unit/utils/test_vt.py::VTTestCase::test_vt_size + + # tests that need network access + tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures + tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config + tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none + tests/pytests/unit/test_ext_importers.py::test_tornado_import_override + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false + tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true + tests/pytests/unit/utils/test_http.py::test_query_proxy + tests/pytests/unit/utils/test_network.py::test_isportopen + + # tests that need root access + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command2 + tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_1 + ) + [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=( + tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black + tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black + ) + [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=( + tests/integration/modules/test_mine.py::MineTest::test_get_allow_tgt + tests/integration/modules/test_mine.py::MineTest::test_mine_delete + tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt + tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt_compound + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall_saltenv + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_run + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_saltenv + tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_state + tests/integration/output/test_output.py::OutputReturnTest::test_output_highstate + tests/integration/output/test_output.py::OutputReturnTest::test_output_json + tests/integration/output/test_output.py::OutputReturnTest::test_output_nested + tests/integration/output/test_output.py::OutputReturnTest::test_output_pprint + tests/integration/output/test_output.py::OutputReturnTest::test_output_raw + tests/integration/output/test_output.py::OutputReturnTest::test_output_txt + tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml + tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml_namespaced_dict_wrapper + tests/integration/output/test_output.py::OutputReturnTest::test_static_simple + tests/integration/runners/test_manage.py::ManageTest::test_down + tests/integration/runners/test_manage.py::ManageTest::test_up + tests/integration/shell/test_master_tops.py::MasterTopsTest::test_custom_tops_gets_utilized + tests/integration/states/test_archive.py::ArchiveTest::test_local_archive_extracted_with_skip_files_list_verify_and_keep_source_is_false + tests/pytests/functional/states/test_pip_state.py::test_issue_2087_missing_pip + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]" + tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]" + tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is + tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed + tests/pytests/unit/utils/vault/test_auth.py::"test_approle_auth_get_token_login[secret_id-approle]" + tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info + tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors + ) + + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die + ( + test_exports=( + TMPDIR + SHELL="/bin/bash" + USE_SETUPTOOLS=1 + NO_INTERNET=1 + PYTHONDONTWRITEBYTECODE=1 + ) + export "${test_exports[@]}" + + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + epytest --run-slow + ) +} diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index 2e475c76c75d..dafa5d1085b1 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -1,2 +1,2 @@ -DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1 DIST setools-4.4.4.tar.bz2 262867 BLAKE2B d64605ef050a2d51531e2a180bff086da536aa8d5e5c8cb96a81e137f575d089f9e9ec117cf0de9864f07174d92258b27ebf8fbc462714ef50bbd6d9f80d0a60 SHA512 ef72a7244ba0c724c4aea3afc40d71427e9c0592715f81cccaa8917e96836a88807ea78039c11c261dd3b4d72294accd76ab4bd37447cd500772030245db3c6e +DIST setools-4.5.1.tar.bz2 264998 BLAKE2B 479cec6f541c1e7125d641928ba49aee949e538612a478840cec2d70106dcf9f7fa5b8049c9d18c560587670ee624a3a744714667d52b99cff24c51e72026db7 SHA512 1045c223423fcb056ffbc2f93c4dc0ccc6ae078ce7d2acbe3a3c65de19440fe801b5b9f71038cde62bf9851f52d868c845aafbe33691ee531cf9854217e061d8 diff --git a/app-admin/setools/files/setools-4.4.1-cython3.patch b/app-admin/setools/files/setools-4.4.1-cython3.patch deleted file mode 100644 index 386b92f44576..000000000000 --- a/app-admin/setools/files/setools-4.4.1-cython3.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://bugs.gentoo.org/898664 -https://github.com/SELinuxProject/setools/pull/105/commits/fc443b5a0379f3644e071a458e996ea6115ccba3 -(cherry-picked from https://github.com/SELinuxProject/setools/commit/31e104c3a9ca97038e09d3a4549fe2b8c8df36e8) - -From fc443b5a0379f3644e071a458e996ea6115ccba3 Mon Sep 17 00:00:00 2001 -From: Chris PeBenito <chpebeni@linux.microsoft.com> -Date: Mon, 17 Jul 2023 16:08:21 -0400 -Subject: [PATCH] SELinuxPolicy: Add explicit cast for libspol message - callback. - -Cython 3.0 is more strict. The change fixes this issue: - -setools/policyrep/selinuxpolicy.pxi:685:46: Cannot assign type 'void (void *, sepol_handle_t *, const char *, ...) except *' to 'msg_callback' - -Additionally, the msg_callback is not typedef-ed in sepol/debug.h, so it must -be explicitly defined in sepol.pxd for the casting to work. - -Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com> ---- a/setools/policyrep/selinuxpolicy.pxi -+++ b/setools/policyrep/selinuxpolicy.pxi -@@ -668,7 +668,7 @@ cdef class SELinuxPolicy: - if self.sh == NULL: - raise MemoryError - -- sepol.sepol_msg_set_callback(self.sh, sepol_logging_callback, self.handle) -+ sepol.sepol_msg_set_callback(self.sh, <sepol.msg_callback>sepol_logging_callback, self.handle) - - if sepol.sepol_policydb_create(&self.handle) < 0: - raise MemoryError ---- a/setools/policyrep/sepol.pxd -+++ b/setools/policyrep/sepol.pxd -@@ -16,8 +16,10 @@ cdef extern from "<sepol/handle.h>": - void sepol_handle_destroy(sepol_handle_t *sh) - - -+ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...) -+ -+ - cdef extern from "<sepol/debug.h>": -- ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...) - void sepol_msg_set_callback(sepol_handle * handle, msg_callback cb, void *cb_arg) - - diff --git a/app-admin/setools/setools-4.4.2.ebuild b/app-admin/setools/setools-4.5.1.ebuild index a0fdba4cdd9d..22f10e5d09ca 100644 --- a/app-admin/setools/setools-4.4.2.ebuild +++ b/app-admin/setools/setools-4.5.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then S="${WORKDIR}/${P}" else SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="amd64 arm arm64 x86" + KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/${PN}" fi @@ -28,23 +28,20 @@ IUSE="test X" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS} + >=dev-python/networkx-2.6[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pygraphviz[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] +BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}] test? ( - >=dev-python/networkx-2.0[${PYTHON_USEDEP}] sys-apps/checkpolicy )" -PATCHES=( - "${FILESDIR}"/${PN}-4.4.1-cython3.patch -) - distutils_enable_tests pytest python_prepare_all() { diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild index ec3d11050109..0ce34473cb2a 100644 --- a/app-admin/setools/setools-9999.ebuild +++ b/app-admin/setools/setools-9999.ebuild @@ -28,15 +28,16 @@ IUSE="test X" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS} - >=dev-python/networkx-2.0[${PYTHON_USEDEP}] + >=dev-python/networkx-2.6[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pygraphviz[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}] +BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}] test? ( sys-apps/checkpolicy )" diff --git a/app-admin/stow/stow-2.4.0.ebuild b/app-admin/stow/stow-2.4.0.ebuild index a69e14905be7..99d81a9e7808 100644 --- a/app-admin/stow/stow-2.4.0.ebuild +++ b/app-admin/stow/stow-2.4.0.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" diff --git a/app-admin/supervisor/supervisor-4.2.5-r1.ebuild b/app-admin/supervisor/supervisor-4.2.5-r1.ebuild index 0ec69aee0dc9..065fd0635e6a 100644 --- a/app-admin/supervisor/supervisor-4.2.5-r1.ebuild +++ b/app-admin/supervisor/supervisor-4.2.5-r1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/" LICENSE="repoze ZPL BSD HPND GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" # setuptools is required because the package uses pkg_resources RDEPEND=" diff --git a/app-admin/sysstat/sysstat-12.6.2-r1.ebuild b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild index bb65c56dfae5..6fdcaea03441 100644 --- a/app-admin/sysstat/sysstat-12.6.2-r1.ebuild +++ b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit systemd toolchain-funcs DESCRIPTION="System performance tools for Linux" -HOMEPAGE="http://sebastien.godard.pagesperso-orange.fr/" +HOMEPAGE="https://sysstat.github.io/" SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-admin/sysstat/sysstat-12.6.2-r2.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild index 2645fb504348..17f79510f663 100644 --- a/app-admin/sysstat/sysstat-12.6.2-r2.ebuild +++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit systemd toolchain-funcs DESCRIPTION="System performance tools for Linux" -HOMEPAGE="http://sebastien.godard.pagesperso-orange.fr/" +HOMEPAGE="https://sysstat.github.io/" SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-admin/testdisk/files/testdisk-7.2-musl.patch b/app-admin/testdisk/files/testdisk-7.2-musl.patch new file mode 100644 index 000000000000..d01c2797bf28 --- /dev/null +++ b/app-admin/testdisk/files/testdisk-7.2-musl.patch @@ -0,0 +1,25 @@ +From 2c6780ca1edd0b0ba2e5e86b12634e3cc8475872 Mon Sep 17 00:00:00 2001 +From: Christophe Grenier <grenier@cgsecurity.org> +Date: Tue, 14 May 2024 17:34:56 +0200 +Subject: [PATCH] src/hdaccess.c: Fix build with musl-1.2.5 See + https://github.com/cgsecurity/testdisk/issues/154 + https://bugs.gentoo.org/931887 + +--- + src/hdaccess.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/hdaccess.c b/src/hdaccess.c +index 91ec7915..9768c07c 100644 +--- a/src/hdaccess.c ++++ b/src/hdaccess.c +@@ -109,6 +109,9 @@ + #ifdef HAVE_GLOB_H + #include <glob.h> + #endif ++#ifdef HAVE_LIBGEN_H ++#include <libgen.h> ++#endif + + #if defined(__CYGWIN__) || defined(__MINGW32__) + #include "win32.h" diff --git a/app-admin/testdisk/testdisk-7.2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild index ea419d0652ee..cfc23c0f8bc4 100644 --- a/app-admin/testdisk/testdisk-7.2.ebuild +++ b/app-admin/testdisk/testdisk-7.2.ebuild @@ -60,6 +60,8 @@ BDEPEND="gui? ( dev-qt/linguist-tools:5 )" DOCS=() PATCHES=( + # https://github.com/cgsecurity/testdisk/commit/2c6780ca1edd0b0ba2e5e86b12634e3cc8475872 + "${FILESDIR}/${P}-musl.patch" ) src_configure() { diff --git a/app-admin/vault/vault-1.15.6.ebuild b/app-admin/vault/vault-1.15.6.ebuild index 2a8f84f25ca1..0d3c950161cf 100644 --- a/app-admin/vault/vault-1.15.6.ebuild +++ b/app-admin/vault/vault-1.15.6.ebuild @@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" IUSE="+webui" BDEPEND=" diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild deleted file mode 100644 index befaf688f6f1..000000000000 --- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# 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-1.55-r4.ebuild b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild index cc2e8028b578..171bf028c53a 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r4.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild @@ -14,7 +14,7 @@ then 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Gentoo's installer for web-based applications" |