Sync with portage [Thu Apr 6 09:03:08 MSK 2023].

master
root 1 year ago
parent d031634932
commit bd317038de

@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
MANIFEST Manifest.files.gz 29446 BLAKE2B 656870384b31d35df8c2aae164d27678d0debb9e4b04fd921dded729fd5d279e4daf1a87663d0baa146d879da18b043c83a457aaced12aeca5c35d4ad625e03b SHA512 d94cbb6fc2d83c2af9f0bc4e88f158f649be140378f1a9dc38aeee945f145e46b973a1a407226b0ec13958d26159515fb7bfaf77217fc26cc4efc6ef74ec79f4
TIMESTAMP 2023-04-01T16:39:37Z
MANIFEST Manifest.files.gz 29470 BLAKE2B 1e42037198d4e005df28cee3b05e194bdcdd961752100a09ba2c75545c8b1870bec6567f9e04ab82dbffe7836354e3379e1d5ab2d68e4cfdd7f331659d41e93b SHA512 72414cc6ab7b331f64ddc86a35885f033c4f180442fef042d3a1790fa9df65f2cef3c631708ccb6967342297be966ac72dff58b648a7c41b193ee012b50cbb30
TIMESTAMP 2023-04-06T05:39:54Z
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQoXklfFIAAAAAALgAo
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQuWypfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
klB5Qw//VG7fT6EXktB6ZK7s8O43dlCSB816jaT+DjuN30OYmKMw77A1rB2bIQdz
+kZUQdfzYet5vpljPMfUTxjxslgfqInJdkbtPMH+ilMg+oFGjUMUJZfJK7ays2bt
NkH85sntBjkXujiHoiYxNwdQ0fpKNYVDvriglwyLZd5m3piNWJviZKRvCLDZP8Qx
wDCyw9MljNPg5V/omzbhNYWs6d6+ZBIyFuVShEr9t3qjc+Jv2HXCR4/Z5eITmaGf
WIm/cswSVa90c1GXABMXp1p64f+GDYzlGD98cR3nVPK1skcnN9q17bE8S58TWXwT
3RUYKWKR9vUCvVLgNroC1bkAoAeXqNABGxzQlwTLnSN+zqkiuurDTeGKoq61Kx3i
xHiIzdY7aXHnfEj/Vqlnn3qOXsSPpKSZfE7KB+8rYb73Ubrb46Qv+AedY7xvT+dG
D1j5rQvaG8MYQ3nJSQOsJyKJGP59P9mOps/RscR5HstHT75ulKvbX+TNxepsqOe/
Tjfy19AmmdS0+MyrQG1gu747XSMd5XorS9aeuZLX6I7HC3uic8oIQuiSe1rBhAtx
0W+RG8T4RCgdnMFY5guPptN3k62rBJpzRTGXiHqT/tryNdb4Ty/RUNEtSDf93OAg
rSLpFI/XTf/5xQyNE1tGfhJiicOUbPNkjumrEqMx/50UVeGZ7nk=
=XcY9
klDgbw//UETKp98NrOstPFN8gfGN+DYeRat8c/j1AoT/5bHuZBC94usXtYQNbXcv
hptIRncrqW6w0EPFkOMF5WIUGkm9scaDiOFW/VrUBYbkUhY+yJ0EcGL2mmuvpCMq
y5vAfUI9hSOke8wwRGfSSlCO1zK+Onl3PpTU+CHdoCEQr9KIdlhnINMqekK1ZZBE
9LqU8b6cgi5cPu/P6CQeez+FN6KScaLjdtNcFA/Ubb12TYJ573frgoheZn51qK2I
Pk0ZfJMSPcu7XXJyDBxwKQ20foQZdZVodGMlN6S66C2U/GN/z34OSAsh5GP+sE99
Il3pDwZ81T++EJq6+pU6g/vz9SB32GiPEsEZOa+kLezTB+V4GPvefK75q01gFtWB
94jmPIQCtOdny/Na8WiWFT4x6RskIN9g9/2imw8qSfQc8ISIXf3Xw8Q+tv4anqfk
7JtKd49BB1altyfczAoTipKN8fZxw/2LDIkRnSKc0BnWcjZyER+zA0qfDUKgjY2R
Wa1cs1ZWbo7B+H8RSA8IFWW4m9uwM+FPPNqkAHttI2LQFx8DTro+Xlyf2oXLeW/a
7Z5ZlgR5DqjmVp/ukOS3wkhy6mAghsZwfPv1hadQZB8VG9KPiV7vaJWF8w9ZbXDK
G6rrZKquJ0dn42TZsKD4uhobPOEswEh3y+y02nGDOYtOIu1pvo8=
=JSUx
-----END PGP SIGNATURE-----

Binary file not shown.

Binary file not shown.

@ -1,2 +1,2 @@
EBUILD deluge-0-r1.ebuild 227 BLAKE2B a23328b1439d5b7a8fc3692a7116936037ba8e4d8e094d48f01dd60aa9361c69afc455035a75288a3207e28fedece08e95a0af030ca5021c3139accfea9de286 SHA512 b5bf59b6daa781df5c678d94d7772aca3b449aefe4c924f58730857f756fd9c7c15c08637c74371b44933137320bc9c01522c90dc1a595a8ec684bab6cdb4855
EBUILD deluge-0-r1.ebuild 258 BLAKE2B 7822697aab1c4daad787e7c42d41263e5811668a5bad80a175bf0dd38d90a033fa4ef72dde639d70cd0199c4d816ca103d7508c4b9ca6154203f2ce0e34e2822 SHA512 a8e6f801efc0bc60180b5fc260f6b1ca1618ee37148cc47e424c51ca7870429aecd4576c15d081073fb35edd323da07bcea9119297bee529eca8d62931f54630
MISC metadata.xml 521 BLAKE2B e4adb92b824153ea2e9d79164c2111a1e49049286cbe9e1662ff0ee8300031092d65b3ca97c3cf449ca7a57bcdb78f86c9988154244686879194686f0bf3048c SHA512 d37d8f08b7b7d5a5a00d1c0ecbcf27d42610df9c4a1e68dbb2f17272cbc73fe000bba406f0f9ca40aba22f081ef2de097029886af6938d1b64e63a6d25fc8bba

@ -1,4 +1,4 @@
# Copyright 2019-2020 Gentoo Authors
# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -8,5 +8,6 @@ inherit acct-user
DESCRIPTION="user for deluge"
ACCT_USER_ID=454
ACCT_USER_GROUPS=( deluge )
ACCT_USER_HOME=/var/lib/deluge
acct-user_add_deps

Binary file not shown.

@ -1,5 +1,3 @@
DIST kontrast-22.08.3.tar.xz 128100 BLAKE2B c30380c716ace5f9d1987a9244350fb58592babc963d3b0bf312ca75e966fd9abe254898bd80b4f7bfdeb1d7bccc7424781ccdb0cd1b28784add6bf4edafe764 SHA512 18a1df4c888457f42c9a7273d6462479b8c44d87529b54868ea80c8fd8d9a8a20a96c25b9508a8cb4e93e94d6dd23d7251af1ca908d81a588002d1a29410d843
DIST kontrast-22.12.3.tar.xz 201576 BLAKE2B 9a5e931e6654ba45952b5b1be1290643b45f7e9ac5de3ef540812d8a58348f770d24c3df5aaf491a3ba8dd83a2e1582d7b6d7f334f6212629c51b943f2f9acc6 SHA512 e60a60866d805c7d0934257892da4e4a8176d776c20a06fa50ae9931dc2b7e620d32ba076e10d5e8a3a0bd1b04ede48100b45bbf4d64c97f977bd320cb1a2396
EBUILD kontrast-22.08.3.ebuild 759 BLAKE2B b27f7e0da34001918842d1fcc208ce15e576d676231e39c082612e9530f335410eb453f65aff39d5a39e9801a4b7192718b61851c60fb9753747409a37928773 SHA512 2f6ab079e9fe1062046d497cbec5a09b0de0d00fd6affb8ca9a97090d34836497cd389dcf123ba8a4291b9cbfffdb82b4489313c1d39785d1cdfd44e14f67d8c
EBUILD kontrast-22.12.3.ebuild 763 BLAKE2B 9e1dafc54f7a9e6e2bda4e9f6eb12ecf7c26ed24a05c7fa2772ddf7c39c4130bc5ade10f70979b9d7e2f99d286289390caa0ca71430bbe358fb2c78b3327dd1d SHA512 d056eedd984cc4935d604b4a864eba24cb98a8b482e4cd54f98fad3a36ab5586caad7b787ff867e2f3aa2d75a9d4af103813d699964bd7af18883f181c4cde65
EBUILD kontrast-22.12.3.ebuild 760 BLAKE2B f965a996107628be5a9cfd4d06f7dd6a99a6434a35cd6db596a24b9aca9eec35c32ab29b5ac85e683be21399b1cfb4dc01d9391a3428c0229765432e523afe5f SHA512 6133abef038d41c555ea6a0ca223035659c72a821b8bb084a9d329476dfe78c6510926823486a32bbc1aeb601e1002e8f1b2d0f997435642619fc33ddea7543a
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6

@ -1,32 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
KFMIN=5.96.0
QTMIN=5.15.5
inherit ecm gear.kde.org
DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
HOMEPAGE="https://apps.kde.org/kontrast/"
LICENSE="GPL-3+"
SLOT="5"
KEYWORDS="amd64 arm64 ~riscv x86"
IUSE=""
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
"
RDEPEND="${DEPEND}
kde-plasma/xdg-desktop-portal-kde
"

@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/"
LICENSE="GPL-3+"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
KEYWORDS="amd64 arm64 ~riscv x86"
IUSE=""
DEPEND="

Binary file not shown.

@ -1,7 +1,7 @@
DIST ansible-lint-6.12.1.tar.gz 466371 BLAKE2B f43b3403c5d3db80d3ec3e3526cafc22bee68b31b5458e378a73bbec900de5411c597e9fc079a77cffc66a278a37bf0fc9ecfcaba3beccf74c6eecbe5b6148b9 SHA512 05c92c930d91419c212a9513aed5506c99e993acbce9437b6f8f3b95bd78ca5b0ff8e1a7d39f32907df72d858a2e4e6c74f47443c0f937b3644c7a18d1d59252
DIST ansible-lint-6.14.2.tar.gz 473090 BLAKE2B 7ee73ab0b9539ae56cdf0220d79b271c45747fc1379f818e14f99b0d361e87cd7410548261e369a1d90cb3dceeb53bd46d614b041c837253ef643b653430bf51 SHA512 bb7350b56b9f81d398509b612cf1631020c21bed4f08ea8dda482460c18a1c0388269af513833778f29f1003a114366af885e7b7f31149731bad2067a904d30a
DIST ansible-lint-6.14.3.tar.gz 474969 BLAKE2B ea32928ccb27750bfa410907cdf03b8b5bd29cafafe04615782b06705ef540e5d7f92fafdb824bbf86337d4a4b63e377362fb758d59a7942c7891a1d80a94762 SHA512 a8dcc8ba7920da141f235a9b70156a3d65f45ac335511a6caf708c81b29f47fcde38cc02a9e1eedb1cb70643c98a0a9d92218b7723da94319b2a220ee181868c
DIST ansible-lint-6.14.4.tar.gz 475223 BLAKE2B 01649f9890ca8c78097a810524fe6e6737cf77359d7537e799210ba25dd6aa0f7bb9f1e4a1ba80bb9dafcdedcde73d5c15bb71c47cc2ae18176e9d5cd91db093 SHA512 5274cab25bd648b87f1edaf55b480e3daf29d3ccc7c9d7c5f4013b96b7101c95ed264a2456789ad819be41712c8faad6206133ad26fa100353ef7d2d36c5fe43
EBUILD ansible-lint-6.12.1.ebuild 1629 BLAKE2B 4c50e08619c06228173e959f79e2b9ea7da7908a366326d7bbdf7935f64baff7c8a6ec1280e03f3c3ce9c7954952380cec6ba1ce9f8adbfa831c4a801ac1605e SHA512 f59fb0cad5f796537f39597c8187ffae282cd9e8229b2152e8cfcaeefed57a5c7cce7290b16b68d325848e50a2377ac5b5f27ba55ece35a6d8af8a99b26a96bc
EBUILD ansible-lint-6.14.2.ebuild 1604 BLAKE2B ec4ff3d9b33da0cf820b73fd956b1de8670870446f5991896339148a807f4feb0cbdcd85d29bbe3e9ee3852dcfdbfec03e7a5dcc60086ae14741f74511bf2d36 SHA512 54bbabf0853d26252e7a7facc6dd750aa327a8ec689695fb61dfc12c5c5b06346db45dac07c62c03545e73d28ff8ecf2740e242cc9d7bb44783d077252bb8272
EBUILD ansible-lint-6.14.3.ebuild 1604 BLAKE2B ec4ff3d9b33da0cf820b73fd956b1de8670870446f5991896339148a807f4feb0cbdcd85d29bbe3e9ee3852dcfdbfec03e7a5dcc60086ae14741f74511bf2d36 SHA512 54bbabf0853d26252e7a7facc6dd750aa327a8ec689695fb61dfc12c5c5b06346db45dac07c62c03545e73d28ff8ecf2740e242cc9d7bb44783d077252bb8272
EBUILD ansible-lint-6.14.4.ebuild 1604 BLAKE2B d618374fb585486bc228af2795b3b70fb1331152f2c862d3b2ba18acd9c8ad5f22f43e1bdec3e0148602a26796b487e1191fd9d09e965a8592f599b1fcb55b40 SHA512 bae54ade1fbb362a3cdf02dcfa0daa2b7744008e46038c92b55b4f5c31ecfdb39d16bc935d6d555be04a52ecb5cdb6160e574dd99fd4276fedd709415c806f76
MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36

@ -1,55 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{10..11} )
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 ~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-2.2.7[${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/pyyaml-5.4.1[${PYTHON_USEDEP}]
>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
>=dev-python/ruamel-yaml-0.17.21[${PYTHON_USEDEP}]
>=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}]
>=dev-util/yamllint-1.26.3[${PYTHON_USEDEP}]
dev-vcs/git"
BDEPEND="
>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
test? (
dev-python/pytest-mock[${PYTHON_USEDEP}]
>=dev-python/pytest-plus-0.2[${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
}

@ -0,0 +1,55 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
PYTHON_COMPAT=( python3_{10..11} )
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 ~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-2.2.7[${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/pyyaml-5.4.1[${PYTHON_USEDEP}]
>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
>=dev-python/ruamel-yaml-0.17.21[${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/pytest-mock[${PYTHON_USEDEP}]
>=dev-python/pytest-plus-0.2[${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
}

@ -6,5 +6,5 @@ DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5
DIST httpd-2.4.56.tar.bz2 7456418 BLAKE2B f9aaf5038543aeec79d5b8615b1b2120fe321966280574c685070f2356f8f1dba1d55a9a25f46cb5ecdd6e3f03785fe7a4e1b965506896cb889720728aa18101 SHA512 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12
EBUILD apache-tools-2.4.54-r3.ebuild 2677 BLAKE2B af27235ab1c8ae302c0684136208c3b598434f2fb27fe0bf908e04078052b61bbee6e1742f079ec4c226f2c66cf181a9c50f53db197f356204d8ceb8db44438c SHA512 bfd73d3bcaa27450b84bb950958c944bbaafde7e2b492147d41d5bfbd21560bef47183353a62c933012e7724afb687093e5b53e718352a6fbcc6b9b4482458a4
EBUILD apache-tools-2.4.55.ebuild 2677 BLAKE2B af27235ab1c8ae302c0684136208c3b598434f2fb27fe0bf908e04078052b61bbee6e1742f079ec4c226f2c66cf181a9c50f53db197f356204d8ceb8db44438c SHA512 bfd73d3bcaa27450b84bb950958c944bbaafde7e2b492147d41d5bfbd21560bef47183353a62c933012e7724afb687093e5b53e718352a6fbcc6b9b4482458a4
EBUILD apache-tools-2.4.56.ebuild 2683 BLAKE2B 224cb22adaae1ea4d43c73d9ae67b35b73e534e74047913fdbe66d8c3c719907ddf195520e925f0e029789dc04f0608c27abc8f137f1a635935865f929253d09 SHA512 56d7f8b144a3c3938ec26772d1dc29ed97d1082f6a7c9f87a905be53e952dfcbf2d9ad0a99a5e9ef22c57724f10525db37ab54b3163e6164ad4b8ff05e710e28
EBUILD apache-tools-2.4.56.ebuild 2682 BLAKE2B 2390bfbbc9d79310cfbbc100bc413b7d2780aa95cc43c178af66fffcee993c4824d9ea97185a23e1cbe15e0dfe64dda8b81bc0b94974c2fbba85923376bd8155 SHA512 3b947fe7c2b692083c063277ec15876825dda1de2e0eb02c2abf09498901de259baeaaf8ed3bcb80a13a29c006206d409b0d855a968272c316077f35a621c438
MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819

@ -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 ~sparc64-solaris ~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 ~sparc64-solaris ~x64-solaris"
IUSE="ssl"
RESTRICT="test"

@ -2,5 +2,5 @@ AUX apachetop-0.19.7-c++17.patch 2309 BLAKE2B 3cc4cae51d25ed559d4c463dd296f319da
DIST apachetop-0.19.7.tar.gz 132665 BLAKE2B 248247c361d1585de68a0a9adae22f98db72991babfb4a75f01fa67ef28443a3c04cf1da9c1ea34ed923599955b58959528cc9e0a881fbb7b463b1d64c0cb7bd SHA512 40d546facee23a9914483c06323940e219602518751d80f729d835c4dbf991c7d1dd9bcebcaa4ca6a2d64799d48c8a00d421bc324afc2959691c962113386969
DIST apachetop-0.23.2.tar.gz 169381 BLAKE2B fd524e8b313c8536bf016ab481f93d73ff32f256634b9fcc28c035207fda6821298087c240227508c1ab6fb7f80a0879945cc931125204bf81c3897b3d33408e SHA512 c278b6fc286eacb69746547e562c40eec50e7ff55df22a32e9387af057c25801e331c6c4b286726aa1bcee6ebcd3578747aca25be3dfec1745b876e95696d7fc
EBUILD apachetop-0.19.7.ebuild 721 BLAKE2B 56c4ad6a76a58eaf7e42c50795e66105ff1544acb087de4833129d1bac37b4059620fff711b7a236e3921ca0ab181adac7456cfe688f8fd936777d035b146eb7 SHA512 b0983f0849c934c45a22ccddce2785dd9064f12e4d3f457229c984925aa26669a863813b4de393078e22dec8e1f51c443b0dd880d8c9d167b62b40fbcc57d1f2
EBUILD apachetop-0.23.2.ebuild 677 BLAKE2B b564426158bac955fc2bf3791349a8b7de1d48fd05d64dbd8adbe3b8afcd4865ca6ac8579d7e0436393e3a4c6ec9a746c2e3c8dbd52cc4a374a7e8da9f30a8e5 SHA512 d7e3aef7f4d9f07d3cd8cd5e4b82ae53937df98f4cf655c4a171fd64a3d8f183199ced759f4da373eec3626d506535a878a73a49c1c74933f9cf485d4145f2a9
EBUILD apachetop-0.23.2.ebuild 673 BLAKE2B 400fdab89fec32d6efdd9f31059ff1f23cc2280a57a22426c7ebeee5a7cce622343df05019a03e17817d4f43ea3cd3532dff9cd37bd68e8aa547b28ab6c006b0 SHA512 0cc6829ce6fe3163940a2a5a2f75635fd465dd2035dd11a9538632a2b2e48ecf8d60d8ce5a6bfc42f72e986b32a9b71f05f6e405e673a95e87202c49076a2126
MISC metadata.xml 249 BLAKE2B 141880499487b29052f0a977f506fd9967e84ee48965a1abd8ea7c12c56246dd1359723fed5680948bf643040e4c1c01822ee9f39408ff303d71ce2831582fe5 SHA512 dfa5bd639db93c8b76c0aa86bcaae906f3d5eb47f0da64ba522b189a7fd8b5f2c042af6c7c1c8864247f89d88a4e8401b2a5584c85ca2afb18f5c50650d504aa

@ -9,7 +9,7 @@ SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
KEYWORDS="amd64 ~hppa ~mips ppc sparc x86"
IUSE="fam pcre"
RDEPEND="

@ -1,17 +1,9 @@
DIST aws-cli-1.27.100.gh.tar.gz 2389951 BLAKE2B 02fac88ec2451c7c0f8b96c17c08e767ab629ab4480abf195023298aaf8b3f98f2fe5805da0051cbcc2fad0a93e5277dfaa38ffdf979d991f3873268ee530ffd SHA512 2a6f0be41d0d20edef0d5d2b75d455e928d82e373cdfc921f1fed5a189b42c11c5f08eb516d312caa5de13fd4a6139240233a7b0d4784640bb3b6dbfe5485895
DIST aws-cli-1.27.101.gh.tar.gz 2390624 BLAKE2B ccb01bf7d3349c709b095b7a1fe3b0e39f6fbc0e7239d39f7fd0ff4c6f716fe0df0190518cbf9765d04e38111bbca934c74970f5e1f55d5f69ceee1eb3f49160 SHA512 9184326d067c59517aeb5178fc308cf753c6b6a3b2e3489b040c1053a24b63d637e9b775e7de52e0e501f4ec69bb410bff4e4e8f8ec294d089b7aaa7f604e514
DIST aws-cli-1.27.102.gh.tar.gz 2390826 BLAKE2B b756ebd3f73d24f3456f4a1ece5230bc91335e2fd655220cfdfb85a4d853f6e18370adbf83ac650e6e5b375c681280bea414a1411fcda4a952f3788ddc11f1f5 SHA512 9a4018224bf1cd22377650ac5beabf44db3069196ef7bf21880edeb2e547e85b1ef9febb3355f22957d8c69e321a3be934ccf01ae817ab2151e1e51a503ad1b1
DIST aws-cli-1.27.103.gh.tar.gz 2392724 BLAKE2B 294a0cfc4d5ad4a258edf38728dced04d50937cadd5418b5be8fde36f75a3c0ffd8367db19b79ecbe0adc3467a09d8552222625bb0e6d6fde8d43ea0a04b7255 SHA512 771f28f6a6c3526aeee6b6487a018093b7ac60f4ecab4dec1af70a9dbc90ebcc39b56ffab6c5f3b965e27c545accc99910bfd28639f540dccb19461ccb237623
DIST aws-cli-1.27.104.gh.tar.gz 2392876 BLAKE2B 860f0d8ddf4c283d7b4e98ded1c9ca66b23e6a63107be0810b1ec3a513a05196aaa3d613a0597af84f4637621b05ab30e89f221bd47478342693611be5ee306d SHA512 57e26dcca866ab7c30abf0c2e15ea7ce617c0abe123a983157ab188c6c7c8d217d8515f1c9e329ae1fd53561e6aa6711e2ee50d9258fe3aadeca7a9b5de92ac4
DIST aws-cli-1.27.89.gh.tar.gz 2382599 BLAKE2B 3a2dae3cc1928e149dd605de1e9a350989e1cf4f813dc14466ba40c0a2747e69b6a8c5716d48f2526920798f0d341dcaa7ec0c2fd95af1b5decd3830814a243b SHA512 9a90c933e5ae3f25271ec369607cb6c44adf96dc9d324205714c9790b6744d7f2c8e4c6b901d4bb4f58b6871c315e0543b3f846cf530e7f95ed31d196f8c3326
DIST aws-cli-1.27.94.gh.tar.gz 2385480 BLAKE2B 8712056c53d704e368f81d38779201d0ef28d0b633ac4a877957b5d6338a6daf45b5408dcf0bee3f6c48a0b10af625bfee835f63e837814b42ec3a57745e4d61 SHA512 48dc09f0af71eb9b9d93ffd2c008511e2379f2a47d4913c6c4296804d3ec3c30a1811564c017388329cac9261b1c3021fadc60771ca9d0952982401f5e4f7c59
DIST aws-cli-1.27.106.gh.tar.gz 2394080 BLAKE2B a83e50310ba5db667fb999f2f8dc4a32159b3934c7e305d48f09075f8210a298acce56f63827ac22a3686fd4c948fcde3382da005b9989287a09724734718c83 SHA512 8659a92851f0bffc3d92430aa955a319c689783ff907c51ed0b42bc0edd5301293c390269504cfee5833f69c69c372dae3995964460d41adf755966124b22579
DIST aws-cli-1.27.107.gh.tar.gz 2394636 BLAKE2B f64dec24fbebaf22aa734c54cf54084b036ea627f1c004705f3a630a6efef59b5c826c5ffd4372dffebf86c4cfa507ed465f965a3a200e2a997cde5f166e0b6e SHA512 3e32ab758eba1d7b4bc8b4e5bc6c71bbe72a69d6b50dc5b51c6f8a0eb44cc53a4f91680ca84003f7692c1b1bdc727de41772df03940e0f19bddbc7b40682fd4c
DIST aws-cli-1.27.99.gh.tar.gz 2388286 BLAKE2B f9be204722470fdbc5b4a1f7453370033c78800dac6d4ca63480705988e6bd02899f0646c034f39a3e87a2988f79d9d23989ba9f4036e931102ca4c0e46989b1 SHA512 a07ac30eab8cd8f19f35bb7d203b6ef150c585a61df63dfa54d469591e57766f3cbdab3053a155837da82d1c9f702302f4821558c7b7cb9dc985fec7a58dacf1
EBUILD awscli-1.27.100.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
EBUILD awscli-1.27.101.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
EBUILD awscli-1.27.102.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
EBUILD awscli-1.27.103.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
EBUILD awscli-1.27.104.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
EBUILD awscli-1.27.89.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
EBUILD awscli-1.27.94.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
EBUILD awscli-1.27.99.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
EBUILD awscli-1.27.106.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
EBUILD awscli-1.27.107.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
EBUILD awscli-1.27.99.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab

@ -1,80 +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 bash-completion-r1 distutils-r1 multiprocessing
MY_P=aws-cli-${PV}
DESCRIPTION="Universal Command Line Environment for AWS"
HOMEPAGE="
https://github.com/aws/aws-cli/
https://pypi.org/project/awscli/
"
SRC_URI="
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-> ${MY_P}.gh.tar.gz
"
S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
# botocore is x.(y+2).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
!app-admin/awscli-bin
"
BDEPEND="
test? (
dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"
distutils_enable_tests pytest
src_prepare() {
# do not rely on bundled deps in botocore (sic!)
find -name '*.py' -exec sed -i \
-e 's:from botocore[.]vendored import:import:' \
-e 's:from botocore[.]vendored[.]:from :' \
{} + || die
# strip overzealous upper bounds on requirements
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
distutils-r1_src_prepare
}
python_test() {
local EPYTEST_DESELECT=(
# TODO
tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
)
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
}
python_install_all() {
newbashcomp bin/aws_bash_completer aws
insinto /usr/share/zsh/site-functions
newins bin/aws_zsh_completer.sh _aws
distutils-r1_python_install_all
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
}

@ -1,80 +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 bash-completion-r1 distutils-r1 multiprocessing
MY_P=aws-cli-${PV}
DESCRIPTION="Universal Command Line Environment for AWS"
HOMEPAGE="
https://github.com/aws/aws-cli/
https://pypi.org/project/awscli/
"
SRC_URI="
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-> ${MY_P}.gh.tar.gz
"
S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
# botocore is x.(y+2).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
!app-admin/awscli-bin
"
BDEPEND="
test? (
dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"
distutils_enable_tests pytest
src_prepare() {
# do not rely on bundled deps in botocore (sic!)
find -name '*.py' -exec sed -i \
-e 's:from botocore[.]vendored import:import:' \
-e 's:from botocore[.]vendored[.]:from :' \
{} + || die
# strip overzealous upper bounds on requirements
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
distutils-r1_src_prepare
}
python_test() {
local EPYTEST_DESELECT=(
# TODO
tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
)
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
}
python_install_all() {
newbashcomp bin/aws_bash_completer aws
insinto /usr/share/zsh/site-functions
newins bin/aws_zsh_completer.sh _aws
distutils-r1_python_install_all
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
}

@ -1,80 +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 bash-completion-r1 distutils-r1 multiprocessing
MY_P=aws-cli-${PV}
DESCRIPTION="Universal Command Line Environment for AWS"
HOMEPAGE="
https://github.com/aws/aws-cli/
https://pypi.org/project/awscli/
"
SRC_URI="
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-> ${MY_P}.gh.tar.gz
"
S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
# botocore is x.(y+2).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
!app-admin/awscli-bin
"
BDEPEND="
test? (
dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"
distutils_enable_tests pytest
src_prepare() {
# do not rely on bundled deps in botocore (sic!)
find -name '*.py' -exec sed -i \
-e 's:from botocore[.]vendored import:import:' \
-e 's:from botocore[.]vendored[.]:from :' \
{} + || die
# strip overzealous upper bounds on requirements
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
distutils-r1_src_prepare
}
python_test() {
local EPYTEST_DESELECT=(
# TODO
tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
)
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
}
python_install_all() {
newbashcomp bin/aws_bash_completer aws
insinto /usr/share/zsh/site-functions
newins bin/aws_zsh_completer.sh _aws
distutils-r1_python_install_all
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
}

@ -1,80 +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 bash-completion-r1 distutils-r1 multiprocessing
MY_P=aws-cli-${PV}
DESCRIPTION="Universal Command Line Environment for AWS"
HOMEPAGE="
https://github.com/aws/aws-cli/
https://pypi.org/project/awscli/
"
SRC_URI="
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-> ${MY_P}.gh.tar.gz
"
S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
# botocore is x.(y+2).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
!app-admin/awscli-bin
"
BDEPEND="
test? (
dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"
distutils_enable_tests pytest
src_prepare() {
# do not rely on bundled deps in botocore (sic!)
find -name '*.py' -exec sed -i \
-e 's:from botocore[.]vendored import:import:' \
-e 's:from botocore[.]vendored[.]:from :' \
{} + || die
# strip overzealous upper bounds on requirements
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
distutils-r1_src_prepare
}
python_test() {
local EPYTEST_DESELECT=(
# TODO
tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
)
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
}
python_install_all() {
newbashcomp bin/aws_bash_completer aws
insinto /usr/share/zsh/site-functions
newins bin/aws_zsh_completer.sh _aws
distutils-r1_python_install_all
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
}

@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
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-)"

@ -3,5 +3,5 @@ AUX ccze-fbsd.patch 531 BLAKE2B ef16b94b4c1a94a3385b3b21c6c1fc51a463769de06f65cb
AUX ccze-ldflags.patch 424 BLAKE2B a769c1c617b7f421a0cac4cdb3141169eca8a0e23fd384b4bac702a2f84c15643e2a780eed2b706540a88b8c881227592caf588d1278148dbf8cec8e55dd3847 SHA512 7dff2e235acc665abcc3ed35744776e60a336b45cafbd80e3f4707f61d3746821e63949e73c32ee4fc5ca43b5639a816c42bb5e0b08912a7c617744dff39ec07
AUX ccze-segfault.patch 660 BLAKE2B 863fa14c8ded2df423b0ff5cd9936ccb390b11d3b0dfa396d515e9a85e411c9f9f7f3ba76f04c4ba04ccc19cc43594f4d304b54cb2155ef44ef08c9c00d4b691 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900
DIST ccze-0.2.1.tar.gz 139795 BLAKE2B 112e3968ca00bdb9ebda91b30a697f4422935755b3bf33d47c0a8800f3d05e371a4ca4db0ef52f10e5cba1c537ee3f666479103dc88a30f270c76268fece5cb6 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7
EBUILD ccze-0.2.1-r4.ebuild 908 BLAKE2B 8fad7a420cf8ed078397c784c7a60f879f3d0d24e109f70c563e99f304b2255e713914f7cdff61bef9133ce405448e487837bd1e7cd0debc8ff929373152cfc2 SHA512 b8714757a4eefdcd00a39cc8854ce42e68d047987977ce61267fb7040c40c1cae0464f0484bddd0cb5aa2e1cf828dafbfc35b3c1575fe5b8c21e073538b1c899
EBUILD ccze-0.2.1-r4.ebuild 912 BLAKE2B f9af8b72c1fc4dae22aa3c59d8e4a8f664277b30f66883dfa0e1716c29f517f2090e5b3a85c5e376d5e9f2df10c5e10cdd917b03426b54e84817197cda2038c5 SHA512 605ec72fc25c76bea925b9ef3ed3031d918cd071e36d9163e242dfc5bb8c2b03687695ba0864a9af5f0a766ba70721cce8850f27010aee6a9540773aaa219b41
MISC metadata.xml 502 BLAKE2B 24d091728901e59b3367f3bb2787b3bc61d424e5dfd3288b9baaf7355e468e5e03bcbc66f2b8c49dc3069c527438b4ae8723f1b9542de101532c3d788352e2a2 SHA512 02da4256cd16cadf57bd3bea7f1871fe03f3a673911efe80d7b46efd84a4388562f044219423468e52e8fe393447939136dbee76dbf7874da9238492fe24d4c7

@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -6,7 +6,7 @@ EAPI=6
inherit autotools fixheadtails toolchain-funcs
DESCRIPTION="A flexible and fast logfile colorizer"
HOMEPAGE="https://github.com/madhouse/ccze/releases"
HOMEPAGE="https://git.madhouse-project.org/archive/ccze"
SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"

@ -1,4 +1,5 @@
AUX fetchlog-1.4-fix-build-system.patch 631 BLAKE2B ebbc0d0e90c5183a2ac396ffc26356223b5b8072100a9a6dc2f7fd0c9c94287213f7f8f8749e3e54612f7c777848012f92fccfbb02295345d578dcbd974f3091 SHA512 480a30e040f56e3e1cf21172dc7f7f060fa81a8a0efb95e15a20b7762444b356547435f3eacc4cdb7a504f3049f6b05a7fab219f6cab9d3fe7901968a69c796e
DIST fetchlog-1.4.tar.gz 32393 BLAKE2B 2741c536dfb17414ffaf90cebd9f8c7c1a1c80edb30bc726f15aa6acd610a07afb926c2566d27b30125e7f4733c1abde8eb81c68d81f609bc05328cf90755d44 SHA512 51590c0cdfa8f4a15fcb4a436375d960c25f35d84558ab46def58f83c97da30caee449eea7c62c539da786a613c2b1e51dbc223d70d56c21daad6e9faf8a51ad
EBUILD fetchlog-1.4-r1.ebuild 898 BLAKE2B 1714dbc34feedf2d573816715af9797e341fb832a97dea0a75b9f786bdfa19bc4dfbd06a7bafaafb7643403c2bd2fd1c9813033e648580e074fcfa6a1f152406 SHA512 f24513e6d4baa6322a2c0e0c77da25fc331724b393fd9c9b9527e922f4bc647bbb6e31b5462a921f4e67f456747ed103915679fda1d9ac07501d13446d544ff9
EBUILD fetchlog-1.4-r1.ebuild 900 BLAKE2B 48b41cf53fcde1a31406c75cecc7193aad803c2f8ed495e25bda0e937297a8100aa22fff11c649e8c35503a2922bd65318ac424be30aec8721e58a3a07d582d3 SHA512 66f07ba3529482e64bb3e71c9ae46ffac291aebf379c64fb988e62b89e5e4c859b2eee0988192536ce9535a45a4c676e2f22254b6a7111253c086ba597fe70a7
EBUILD fetchlog-1.4-r2.ebuild 894 BLAKE2B 46fcacf205b7edd2e1e1cd38909d3fde254ed61e910d5e66933e747116e0100aca288ee663763ace87522ec58944a5f1a38b1d16a35e58385d6126fb4313aa1b SHA512 332250f0e3d6947cd011cb2b28902c8275e1ebb5844e69caf5f237d61ac6e1bc2a9a3b480674710b21b1131ae27c2577b50de3f5cdd6dfd69637507dbf6e1767
MISC metadata.xml 251 BLAKE2B c119f716a25eaf3897a61c2ffb6d3f03c9981141aade031b0f8878ae448b0c75f4dad96d6528db0dfcb39623eddc30cb5afeac072d316f47bf4ecfef2be95743 SHA512 8b8b0e3a412b4283748a5b0a25577fcd95c896b7bc54fa0125be1da0cd39e517ee25105516cc034e30efb421c559844579dd3c935fb7693061cdcce362a63da4

@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -6,10 +6,10 @@ EAPI=6
inherit toolchain-funcs
DESCRIPTION="Displays the last new messages of a logfile"
HOMEPAGE="http://fetchlog.sourceforge.net/"
HOMEPAGE="https://fetchlog.sourceforge.net/"
SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
LICENSE="GPL-2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="snmp"

@ -0,0 +1,44 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit toolchain-funcs
DESCRIPTION="Displays the last new messages of a logfile"
HOMEPAGE="https://fetchlog.sourceforge.net/"
SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="snmp"
RDEPEND="
snmp? (
>=dev-perl/Net-SNMP-4.0.1-r2
>=net-analyzer/net-snmp-5.0.6
)"
PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch )
src_configure() {
tc-export CC
}
src_install() {
dobin fetchlog
einstalldocs
dodoc *cfg*
doman fetchlog.1
}
pkg_preinst() {
elog
elog "This utility can be used together with Nagios"
elog "To make use of these features you need to"
elog "install net-analyzer/nagios."
elog "This feature depends on SNMP, so make sure you"
elog "have 'snmp' in your USE flags"
elog
}

@ -1,4 +1,4 @@
AUX filewatcher.conf 567 BLAKE2B af300ec8d7c4017bfdff12423e409ed853ab39a7cf4cb3496a9d128de80d6d45137b3dfdead346d9777fd45a86baacd69f76e1d4157c05bd745c8e4b1872f579 SHA512 74108243a29e3993cf2c1b6bc4821907918e978a0bd7e6ca76c62172485ac94587a685c504fbb0a32a326e5537ebe00d0418f56229dc2031e3142773571ced14
DIST filewatcher-2.4.6.tar.gz 37459 BLAKE2B 41fc1a6a289247d428cc3101eb9b437ae99d4b11c6df51c712a825cadba8ff8bc00cffa3cc4c4554565cebe596a821cac20a273453a186f2092ef93cb1752f7b SHA512 a6e1d2fb11f54352f963c21a1cbb42ceadcf3aff0ebf2b0e629d7827fada12c03531ecc9b9400afc65937830f92a0f16c54abd1cc034392351b72326943d6442
EBUILD filewatcher-2.4.6-r1.ebuild 890 BLAKE2B e6671bd369acdf1c1c28094abd33989fe65decdd0320cff2ca1aab3fb660e5967b39ce81d8ef6a99e8aba90f5c9087a146b55ec17462c04d69b57c1c4297c88a SHA512 b0c53b07b6291277346de663325a8a88a1782ef752efe7a36a34d5d6584a0c154095ccb2ff56c3afab0711bbe866977ae40ba9c4213048f59c3e65b3361d28d4
EBUILD filewatcher-2.4.6-r1.ebuild 888 BLAKE2B 2ba43c17fd68f5c38d6c407467592de57001b95f158efbe01ecc96ae5877fcffd90ba3a06564ed498dbfe0430fbeb1f72a059ec1ac1953d2244d87246b6ca05f SHA512 8aaf758465a376714817b4c41235d5bacc4261874812cb76b53d9d0c78f15f01ccbad03ae5d819d8c6165544dccddcd2113fbac8266a4c83441860c888e1a7a2
MISC metadata.xml 249 BLAKE2B 5fba4adbcb6dfa8e9f15736d3bf926b49a7de6f28b93eeddd6fde5c6d622ee350eaf7debe114232e379a5bf7a2631117b797ee37b7b99e4fdf7b4f716add9083 SHA512 6aea4965d08e41035c54069894d8467d484ee4d83c9fe64b0da9c5175ec73dc10d4f9b09247f96044d5e546d78c69f4677c5f6740b79c1dffc2c4f30b96e2575

@ -1,13 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=8
DESCRIPTION="File control configuration system and IDS"
HOMEPAGE="https://sourceforge.net/projects/filewatcher/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"

@ -3,5 +3,5 @@ DIST git-credential-gopass-1.15.3.tar.gz 20583 BLAKE2B caf091710a0fa4f6ac461c6be
DIST git-credential-gopass-1.15.4-deps.tar.xz 33138508 BLAKE2B 7cbb930e55f1ed53f3ce8c47e51d8066d1a518801d5d364b8c8b90b376910e916e34c5f2493cb062ac5c03e0b9aeb96119f129a8655b6ad3f1d9fec4600cb0a1 SHA512 14ecefd8b36513195cae86d355d974d596e859c46450121350af2d2aaf27f592b54e55e697c200eb89e94959f278e65712dbb4d534d0c1bcbc711fb4db829625
DIST git-credential-gopass-1.15.4.tar.gz 20592 BLAKE2B 2fef319cb7c1d90c89512f305fffbbe88ce5efa25bde798adfebdbf1a29847b1c62d51ca4ece4262c6746e5abb0f31e01804e827de8fdd364fa6bfbe2a9fd414 SHA512 4e456c35fb5fb4d91fada4c2ccafa5a48c9261746653dd363638b1fccfeea647f465d0956146a18bb0d50ffb8bd2c7502497efcac54095db7d37441074aeb6cb
EBUILD git-credential-gopass-1.15.3.ebuild 566 BLAKE2B 79d21810446b14fe210b2f2a49d453e9e826934c45de4c9819c6d3b553dc6bfd407b8f7732ae14488eb2b26c7b5b502d7970cb07dce3cf977bab2740f399e21e SHA512 da1a40c4eb672ae35c51933e7b2ea43dd221e06e27d30b3c87eef95253ce1d45e6db0e917abae0ac13e022a04813412903683e8f33b27385a105a76800b3cd09
EBUILD git-credential-gopass-1.15.4.ebuild 567 BLAKE2B b54520728f6d984c8d9bf57cb9295a78709b1a146a4c2750d38f555e7de67c9ed7c6569478ad3b093760be732089c37cbf4a723b9e8219c63dfedea613838908 SHA512 49b1cc5e3397d4853f53b4c9d333fef60e86f55086e241b7856bac6acb990f84984ca793e94ca846c0d7d623e8f15bb01bd3ba7cf6fa03e17be49e31efe72559
EBUILD git-credential-gopass-1.15.4.ebuild 566 BLAKE2B 79d21810446b14fe210b2f2a49d453e9e826934c45de4c9819c6d3b553dc6bfd407b8f7732ae14488eb2b26c7b5b502d7970cb07dce3cf977bab2740f399e21e SHA512 da1a40c4eb672ae35c51933e7b2ea43dd221e06e27d30b3c87eef95253ce1d45e6db0e917abae0ac13e022a04813412903683e8f33b27385a105a76800b3cd09
MISC metadata.xml 263 BLAKE2B 406fed6e34644b2aa7b04586fb3cc42c37dd6c097db64e0d713418b36654e82b8b46491ec49774a7e1e2203dbfad0ff24965ed816e126fa3a80ea108d5f2495e SHA512 e5a37932228eb86fb5a3593b2d69130bff196a096efbe28ded5e7ed78d4e37e1e0fe03c28ba6cbba7a2791197e59d3eca73ed2a5e4d06c87c352938db5ff2c60

@ -12,7 +12,7 @@ SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz
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="

@ -1,4 +0,0 @@
AUX gixy-0.1.20-backports.patch 2169 BLAKE2B 1e34947b01988a676fd0bbc597613722fa98dc05011cd3dcf11fbc1315ae26fe536f34215a5f89bff414e458c75675631d78bf153ef4e9e4b5305c83a77c0129 SHA512 597f61611ac805f756c8020f823467a11260e4e09bb5c0499dd7ce4f203f89510fdbf0a5a5391856f122fefc5c32e5b3bb2e5feca155c79735b22d79a6001942
DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
EBUILD gixy-0.1.20-r1.ebuild 724 BLAKE2B 2a360ef029e5ce6408d5cef34188b8275281ca7cff518b8a8178ab7e4d51cff166219c910f08a27f0ca260a730098bb04a0d616d07c3dcf81c892a4bccae4cc0 SHA512 fbd7839b90940e53d4240dbb6a63796d9814df5c5ffedba6226721e42d02ec11e9f2bcad8996796eb97d5382dc2ac0ba7730d76db024dce39192687413d1e3d2
MISC metadata.xml 324 BLAKE2B f6f81a115f0e155af5bb5031ddf6e8fb5cdc293c83fd93c4fddc38b06074866b5755f76ec4836cc0736550142e2f3e6c41f105ddb32069862a984a39fa0345f3 SHA512 161132676a924c42219b89d8c994159c4e89cb44d5f7598652ad42e5b19ae799185e430adb9a266410ef1f8dd5ae9f39b8385bbc9aa9bfbf8285d399ac0d07d0

@ -1,76 +0,0 @@
diff --git a/gixy/core/regexp.py b/gixy/core/regexp.py
index 7a96187..f360604 100644
--- a/gixy/core/regexp.py
+++ b/gixy/core/regexp.py
@@ -3,7 +3,11 @@ import logging
import re
import random
import itertools
-from cached_property import cached_property
+
+try:
+ from functools import cached_property
+except ImportError:
+ from cached_property import cached_property
import gixy.core.sre_parse.sre_parse as sre_parse
diff --git a/gixy/directives/block.py b/gixy/directives/block.py
index 5e5b1ed..cc9bcb0 100644
--- a/gixy/directives/block.py
+++ b/gixy/directives/block.py
@@ -1,4 +1,7 @@
-from cached_property import cached_property
+try:
+ from functools import cached_property
+except ImportError:
+ from cached_property import cached_property
from gixy.directives.directive import Directive
from gixy.core.variable import Variable
diff --git a/gixy/parser/raw_parser.py b/gixy/parser/raw_parser.py
index 6a30b7f..0f43308 100644
--- a/gixy/parser/raw_parser.py
+++ b/gixy/parser/raw_parser.py
@@ -1,7 +1,11 @@
import logging
import codecs
import six
-from cached_property import cached_property
+
+try:
+ from functools import cached_property
+except ImportError:
+ from cached_property import cached_property
from pyparsing import (
Literal, Suppress, White, Word, alphanums, Forward, Group, Optional, Combine,
diff --git a/requirements.txt b/requirements.txt
index dbf6d5f..47a1b54 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
pyparsing>=1.5.5
-cached-property>=1.2.0
+cached-property>=1.2.0;python_version<"3.8"
argparse>=1.4.0
six>=1.1.0
Jinja2>=2.8
-ConfigArgParse>=0.11.0
\ No newline at end of file
+ConfigArgParse>=0.11.0
diff --git a/setup.py b/setup.py
index e4314a6..e57842b 100644
--- a/setup.py
+++ b/setup.py
@@ -18,8 +18,8 @@ setup(
url='https://github.com/yandex/gixy',
install_requires=[
'pyparsing>=1.5.5',
- 'cached-property>=1.2.0',
- 'argparse>=1.4.0',
+ 'cached-property>=1.2.0;python_version<"3.8"',
+ 'argparse>=1.4.0;python_version<"3.2"',
'six>=1.1.0',
'Jinja2>=2.8',
'ConfigArgParse>=0.11.0'

@ -1,28 +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} )
inherit distutils-r1
DESCRIPTION="Nginx configuration static analyzer"
HOMEPAGE="https://github.com/yandex/gixy"
# Use GitHub source insted PyPi to get tarball with tests
SRC_URI="https://github.com/yandex/gixy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
>=dev-python/ConfigArgParse-0.11.0[${PYTHON_USEDEP}]
>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
distutils_enable_tests nose
PATCHES=(
"${FILESDIR}"/${P}-backports.patch
)

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>jsmolic@gentoo.org</email>
<name>Jakov Smolić</name>
</maintainer>
<upstream>
<remote-id type="github">yandex/gixy</remote-id>
</upstream>
</pkgmetadata>

@ -3,5 +3,5 @@ DIST gopass-hibp-1.15.3.tar.gz 24961 BLAKE2B 477a5bdd285e1ff53a24e1f9f7e860b3226
DIST gopass-hibp-1.15.4-deps.tar.xz 33365976 BLAKE2B 15c125423cc52b89a93d650c30a94b95452d923884ef3637c5e04aef9885e89dfce4e1f2205ab18a362eea6624439accdb15420bc8fa950d4755cc741638deb6 SHA512 7f1312372ea9f134e81069de62d97d475c402e899248534923a9e5b3557360004dd92a01ca4bb0f1e3289c599bc027999742a9d24aa6922d8b2653f0e18a1f40
DIST gopass-hibp-1.15.4.tar.gz 24968 BLAKE2B 04c20ac2e29fd4268a01aca998ac32884c41b8e9a5f40772427a54a737ada5bcd6da0224a5e5939db082ddb5cc216deb24c9eea6db9320f8c89618bbff5fcfbe SHA512 64cd2beed3c1089b0be474722caba9511abdfac875c1a47ee29d2ec26591edf613801d0d3687a58d1cb67d9235093922fe5372effc96a373f49b09e7ffec54b1
EBUILD gopass-hibp-1.15.3.ebuild 553 BLAKE2B 986120dd09df04341032118efe8aa47c53869600a17f4ed792780a5d9f6361aaeffd7c08ce009818167d8e302beb59d8e427dd2bdea8127e803678a1948d1d56 SHA512 f010dad6210f1d627d7759c2b36f533aed9eaf4355de34ee5ab6a726373be085712a78bc41efbc27b6ce1e11908e925ea00df8435019a43d1d0ec51b26760de6
EBUILD gopass-hibp-1.15.4.ebuild 554 BLAKE2B 2019204ec3c5fe09d70ccd752603ca7d4301664df72fe3b5515da41572da42582e4885cd075a5de1dcced63a4d2522d0745b99ef3c3cb631af22520979cf2ae4 SHA512 188cb3d4d02f4fde2a8b69c084d53e3994854db2daa95c1914681b8a8536c04b09211bea814a98bdf85c074ae7c6e2718766b3ed1d78d00ad5a35235cdd8e79f
EBUILD gopass-hibp-1.15.4.ebuild 553 BLAKE2B 986120dd09df04341032118efe8aa47c53869600a17f4ed792780a5d9f6361aaeffd7c08ce009818167d8e302beb59d8e427dd2bdea8127e803678a1948d1d56 SHA512 f010dad6210f1d627d7759c2b36f533aed9eaf4355de34ee5ab6a726373be085712a78bc41efbc27b6ce1e11908e925ea00df8435019a43d1d0ec51b26760de6
MISC metadata.xml 253 BLAKE2B 9355711340b552cd5fcf8809184c92c33b39050b43c582a351f5423f3772f895fe192f0cf7261e00250cb424cbe846002b4d0c9357fa18d3fa6eff3f5afd0c30 SHA512 70093621a9cea5ade5ec64ab0f87c5d84b8f52e3b3c2ee6cfc1929a3cb833bda2ae2773b12647e473bc96fe3d39b33030942f30f9733aa5d2d2054410239319c

@ -12,7 +12,7 @@ SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.t
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="

@ -4,5 +4,5 @@ DIST gopass-jsonapi-1.15.3.tar.gz 32273 BLAKE2B ed0befce03a00336329f322a9d682a82
DIST gopass-jsonapi-1.15.4-deps.tar.xz 33151484 BLAKE2B 40ce78be07dcc3a795da0e76f5b66b2a2a95b222170655773f5ee62e849780d8d6c618233f19f28af3087e116935d6fc7f5ac0ba653158b5ea27014776d9ed26 SHA512 820f92f7ae7dbe9b546ddf7573c72a3b4a2516610932e499e6e15dbcb6a2fc16a5a8710b02c730d0e7654dd1ac9c0e57eb753df1236ef1b6edc2ae86b2e999b5
DIST gopass-jsonapi-1.15.4.tar.gz 32293 BLAKE2B 5796bf2c8eceb50dc05643e27ec8673ca4bb350a57776b57e6b3aaa7379c643efbafe9eea1662af9615a68adad03ef82eb76fa01ae209fa59a0cffaecfe225a7 SHA512 9471210eb1feb6bdefd88c2c051fd2327ac0915963c6958f9ca2991139437e21c964e7da549d1803367c2b77b6755211921651ffaa2a14925b00826410cb4651
EBUILD gopass-jsonapi-1.15.3.ebuild 603 BLAKE2B 3eaac674ad6d8aa2d60d2b2d6c83d08444f45734babe1dee02483715cf7c5f242255b3a5db71f394b5616c2755bd7935d084aacf7175c0726d6c56a48dde8288 SHA512 41d23267da2cc956741a327f925415a7c52da87bfa7defd1aefd0bf9fecf7dc9b7a4431b9304f27c7a29c225e90eb0563af16fbc670154764fd4ba7a87a3e896
EBUILD gopass-jsonapi-1.15.4.ebuild 604 BLAKE2B 15ac6f3e7efad36c6daa14855a250fbb093b37323b5611583ebbc03f76c1f8344771353ebc46ac91792d055b36298db4dd1dd3793e4473d54f1cc1bbac4f2214 SHA512 ca900a69003ef4d6203779c34da7005e7707714fb8e80a9ad6acd3df329201ad08f05c07fc59f6557cb02dd1e5e959a869773edce35555437a8504934d0c8abf
EBUILD gopass-jsonapi-1.15.4.ebuild 603 BLAKE2B 3eaac674ad6d8aa2d60d2b2d6c83d08444f45734babe1dee02483715cf7c5f242255b3a5db71f394b5616c2755bd7935d084aacf7175c0726d6c56a48dde8288 SHA512 41d23267da2cc956741a327f925415a7c52da87bfa7defd1aefd0bf9fecf7dc9b7a4431b9304f27c7a29c225e90eb0563af16fbc670154764fd4ba7a87a3e896
MISC metadata.xml 256 BLAKE2B 2184101c756bf7e34131b4e44dd51a30fb5195c57901d5373ed648b172e4689887fd94be3ca19b5cb021b4c99ff2f0d3ad81ea12696b857471769ba61e349891 SHA512 12c961836136e3a833b04d0e8111a1797d1f004e6dea69fc843f42280b844ff158b8333f4a1ea5ea45886d66f6f42f9658efc18d1ce9300c6147ae7c23a1700f

@ -12,7 +12,7 @@ SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P
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="

@ -3,5 +3,5 @@ DIST gopass-summon-provider-1.15.3.tar.gz 17573 BLAKE2B 641f84b3ad27fa3af961a3d2
DIST gopass-summon-provider-1.15.4-deps.tar.xz 33138508 BLAKE2B 7cbb930e55f1ed53f3ce8c47e51d8066d1a518801d5d364b8c8b90b376910e916e34c5f2493cb062ac5c03e0b9aeb96119f129a8655b6ad3f1d9fec4600cb0a1 SHA512 14ecefd8b36513195cae86d355d974d596e859c46450121350af2d2aaf27f592b54e55e697c200eb89e94959f278e65712dbb4d534d0c1bcbc711fb4db829625
DIST gopass-summon-provider-1.15.4.tar.gz 17546 BLAKE2B 9c0a8fc50ed4f39139d5b14e389066afc42814ff60036022877fe933b598f100b2169455b4576a2d83d18ea19c8ebce852510940e2c24e8a61073f074509c444 SHA512 6ba06f561379284bc1344ca6982f8bb7ed6641c790bc4907b235fc5a330551f829b21aadb4a72f962692d5d36bde68845f798eb9cc4116787a9015fd2bfc65d3
EBUILD gopass-summon-provider-1.15.3.ebuild 561 BLAKE2B 6422ddb6a47f1e95179509967460a10a79c0f96585b090225cacebbec517c773ba7087f4292f8f00035a02c04f8f5a8bb12ade3777ad499fada2f8db082ab842 SHA512 bbefdeba7b483a239e2514e3316d07fddd8441aab57cf9cd479aaf23d59598dc4801b4089e9bcd4449244ed6bb2f133fd6c76b43f3394a18df89c941f354ae7d
EBUILD gopass-summon-provider-1.15.4.ebuild 562 BLAKE2B 8e3544bddd8067f1c5bfe56afea8697f4a55c0439894ca950b76950ac144332d9cbe3d79693fdcdee9f1e6d31f4b8d79be49426b237d56bc21024838d453efcc SHA512 29bbd160392510391a0e124a69ee1f286021c3f6584cbee6f0626c5e2b230ba7f3be23b84a8ce6f51b625c6baac56b542c5a05e2ddf39b56a53a976edb86f479
EBUILD gopass-summon-provider-1.15.4.ebuild 561 BLAKE2B 6422ddb6a47f1e95179509967460a10a79c0f96585b090225cacebbec517c773ba7087f4292f8f00035a02c04f8f5a8bb12ade3777ad499fada2f8db082ab842 SHA512 bbefdeba7b483a239e2514e3316d07fddd8441aab57cf9cd479aaf23d59598dc4801b4089e9bcd4449244ed6bb2f133fd6c76b43f3394a18df89c941f354ae7d
MISC metadata.xml 264 BLAKE2B 287a185ac5ffd0004918df5d9dfe9906bd46140af3d5e437d00a3cdbdfb9fbb8184910368d47de1439a7e3e957f26f9bf70adbcaa8277320c94d53ce68d63c9e SHA512 91b9fccf54e6644ab6dbb291672c1c45bf93f9dab6a853a249ab782a0b385c4ff7441f41c41c22665347570e244a5b242287517e0557fdc4a2c3f8597580dde2

@ -12,7 +12,7 @@ SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.g
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="

@ -1,10 +1,8 @@
AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3419dbb7b3e418f8903f3104fcf8d525cb117ce278f4669551a6cbeadd7f03d3bd022781a88c335c6ac84600d3bdf02a3d8277d3 SHA512 77312f9346c7e16141a57a5e44964d0b2cab77a428403d19cfc9558af55b250be7c9fadaecf87c8d78075251a7fc3ab309e0cbbdbb30ddc4423717cb3979a1db
AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
DIST mcelog-190.tar.gz 314409 BLAKE2B 287b5ccba24ef7afe4b2653f2ab8ddd9ae94451e1131941d61031042a039cb9ed633f75b0ddf0035f3fef023cdf67c5c0b01169d0afac4ae47f9badcc55d16ef SHA512 26347d5255c602189961c63f8bf44f0c73b8f7fb0d455108c604a84e73e00303646961759101aab42157d12a7678f8c47277829b0460b0832a64c8b5c913d952
DIST mcelog-191.tar.gz 317354 BLAKE2B a02df41304aac994a37f4abd7be65408bd19d72e2aa20a15a3b55b6b152aebfad09309c9bfbb710e6bde493da980004a9f664ca71efeaf5ccd2ca0f0e1452adf SHA512 8716c2a63660d61da0fc9f1f8c5065cacc77c696456eed2167cd451e74e665e838bf5ab1d865d073379cb2fda2ff7c71e946cb74e905585d6c5d714159603a78
DIST mcelog-192.tar.gz 317443 BLAKE2B 071c9e29aa049a2b559feb692d258df0685baaec614c4866d09cc8e9c8e8dad1e5064e661215c179649792cf3375e98aaa70fbe2629f5ba2b51b489ed9198b20 SHA512 dbdab35a4d3d2a3d395adb6384143d6ce53a2f598a9868e8777bd0588837621f7be74fdf6299b9949a4195ab6b242d9069686d07fe14fe23447d13e2dcfe7966
EBUILD mcelog-190.ebuild 1129 BLAKE2B 9ff00a93a582ceed3b42c5ce28b7e23099f345cca9e4411f35f32d70fe2e46bed47265fd6a48bfac773512faac5281e778130403135b0514c6bcea5fcfa19657 SHA512 13a6cf3907e5b5e0813504bf9a6a877e612fcfe392fd8a4ff34774058ec0abfbecbeaf1bea014db29f1d59e5a3afe02460c9683566b4fc42d776a217bab11e46
EBUILD mcelog-191.ebuild 1131 BLAKE2B 10eccf37a64cee135911a7c33d10a27fbdebff2940f67b7bc52b662977168390cbbc8c5ce978286f207bb6a905f66a3c6f1c6809ee0396c59615588c2d0b2959 SHA512 66301d1517a74ee22f94b3627f49b1af176b2d26d39e35665fadc461e0cd6d6cfd15026e98386d5dc8939dcea5b70198f45609f4a01f888f48eee5f5a8271934
EBUILD mcelog-192.ebuild 1131 BLAKE2B 10eccf37a64cee135911a7c33d10a27fbdebff2940f67b7bc52b662977168390cbbc8c5ce978286f207bb6a905f66a3c6f1c6809ee0396c59615588c2d0b2959 SHA512 66301d1517a74ee22f94b3627f49b1af176b2d26d39e35665fadc461e0cd6d6cfd15026e98386d5dc8939dcea5b70198f45609f4a01f888f48eee5f5a8271934
DIST mcelog-193.tar.gz 317427 BLAKE2B cd83a671e79549ecf38908de6ae5f2561ef48d0d210d26786f6f0299c31ee5c712df8a37a9e0969f3a88e43c9ec092befb599dca3a72eb2f5368daa6d110d882 SHA512 d0854222ce651ef583d0ebc8ec5cdeb8a06354c514a9e1465dd96b9bc914a32b6e730e8cd2dff71b08cd20a7a5ef13c8e191b47955cdcbbe9eee3ae9906491ec
EBUILD mcelog-192.ebuild 1129 BLAKE2B 5dcdcbf6d07baca3a81624ffa61d9bb083713c399abd04ffaa1c6c0c8bb21855e8cbfdf969c2f03bd78f3aa03196ca22059f2dc3ee5c5bc8ae7ec5a067d85b11 SHA512 1af01c906c6110b9fffbfe0e564a31b4b2bff60cd321b622ffdd04ea1d6eb4782e7b0a5ff25018c5d72af98f534b0a1c80e08619f11244472251a08fee872330
EBUILD mcelog-193.ebuild 1131 BLAKE2B 10eccf37a64cee135911a7c33d10a27fbdebff2940f67b7bc52b662977168390cbbc8c5ce978286f207bb6a905f66a3c6f1c6809ee0396c59615588c2d0b2959 SHA512 66301d1517a74ee22f94b3627f49b1af176b2d26d39e35665fadc461e0cd6d6cfd15026e98386d5dc8939dcea5b70198f45609f4a01f888f48eee5f5a8271934
MISC metadata.xml 538 BLAKE2B 02cb85b3717b287e5e6a02db8c5485d52d1a5f7c9f927fad728ea8c313a93ebdb1aac5ac070cb852f18aae2cfebf5096ddb2c298948bc60180e4093c532aa899 SHA512 865e9e806a9fcf1d21ae7cd15c0e65196b3ccf7f866dc69237594908f020e224eca35d2d49fe70bef1e4d38b084ec8558e849148e470d3e22959f85177545bdc

@ -1,51 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
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://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${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"
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() {
eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
"${FILESDIR}"/${PN}-129-debugflags.patch
eapply_user
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
}

@ -13,7 +13,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="selinux"
RDEPEND="selinux? ( sec-policy/selinux-mcelog )"

@ -1,3 +1,3 @@
DIST mei-amt-check-0_p20170515.tar.gz 10793 BLAKE2B 78244b1d7c31d30d4d3da8964628c867dbb1425f015ec96b595adfbdf182b8a6277556c1ddddeda62955ff6f052fdc19fc1925a15fd2f730234cdd7859423b93 SHA512 62ac6d3b2cacfc4770a076bffad1a4f8ba9233acef09b2e7bc77da545a67886b86e4076cceecd5ca8aab38c661cf8a1ddb178e7caf181b2da6171c467fbd8988
EBUILD mei-amt-check-0_p20170515.ebuild 702 BLAKE2B 7d89739d180af45bed2e23d03101dcead722352f3231927a42761049b179ccf48c49e40e01f6e9e35fdafec0460bc5f60c1a612355305d6a64da7e475675c5e3 SHA512 875c018b4844f8df9e9335b2b5374798cb7f3f9a187ab3b2646955bddcbef28bb56f24768ed7798bd7195a632d88cfe0fd3d276a7914b42182c38855cdd5c1a6
EBUILD mei-amt-check-0_p20170515.ebuild 705 BLAKE2B 3037380f09a6d95411385dfe92e2c59285262f1445e0974d6e1a8c1977c73c70ff94a4fef6dd1e2d5bed310f47073dbcd3a9c15c8481c3963196cbfc506c1e24 SHA512 581e1452e4db8d117cb9c5d1abe1a490ca0467e558f409b13862b24d46f06ea243e4692c0d7d58044778117f027409323116bcca75b706acd74e53623c16b026
MISC metadata.xml 257 BLAKE2B c495f59f5998aebcfb846d539ffd06c91151827170fd1ce344f6092bc29eeea48b2a66a82fb3c220a0f10323b82d4e294500efef25604600995aac6240878a8e SHA512 260642c15d9992e651f92e52d0cefcd19faa599dc3d0c740e4c02629114891c5056629aeb089c9df8d2e9c06aa5948f99931efc9729de4bac6bd7f304a6a6d11

@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=8
inherit vcs-snapshot linux-info toolchain-funcs
@ -10,10 +10,9 @@ HOMEPAGE="https://github.com/mjg59/mei-amt-check/"
COMMIT="d07672120ce7a0c79e949e537f3d19efecec1700"
SRC_URI="https://github.com/mjg59/mei-amt-check/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
CONFIG_CHECK="~INTEL_MEI_ME"
ERROR_INTEL_MEI_ME="Need to activate INTEL_MEI_ME to run the tool"

@ -7,19 +7,16 @@ AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d
AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039
DIST rsyslog-8.2206.0.tar.gz 3246829 BLAKE2B cfe88f12821146011914610e33cb907bd96f19b6e67c0eb3f9bd88b749eebd3a91ae27e445688842a806719cfe9757778d3f9705cd2d6a497d358015c9ddf36b SHA512 000d2a05ef4823879e615a347f62f76d3af7d43cddb119e7f57a8470aade00139475368579385ba008a1d5979082128ef6148e0fac2478f6e0ccb26e68d317b7
DIST rsyslog-8.2208.0.tar.gz 3262298 BLAKE2B c13920c755a24d8060335f3281a349d2f32c3c99de7351991e09e62302f6d9f61f4390b7945e30816c7d28afe5f757f6a49b2855e40e3f2f518a423662196b1b SHA512 e63f2465011722eb1bc99676ef6afd66e655af4fb9d751b3d8776499d054c422b195c65fef9ea6b9012d9fb334b7ed8a1c918167fecff389cbb79aa6b74acb73
DIST rsyslog-8.2210.0.tar.gz 3266727 BLAKE2B fc94e7d9b7d828c35e6117ff44d40aa421b79ecd9072cc143177cb77ac6e84adaa5e2b9ae9a66e4bb70d8b93411715f63f0e3707e53c965ef892d9146ec43c92 SHA512 c665b7f7a3c5ef31c9b62b50f815cfbb52db0cbe4a06934f4f1c3cd2a56fb49c319d33857ee92ab843aa5894cac16c16b8eccdf83714f31ab57a95049c4af231
DIST rsyslog-8.2212.0.tar.gz 3268012 BLAKE2B 72347c8281ce537cade415b73a5f15b80ad035ccf9091bcbb72952da32790064a8dd88416d3b7682e6fb77f23dbd51cb2b596587498d4cbccedf21c41c2c6305 SHA512 ca8c3d4c035f9dd5fb6b2d27c66f5e3211458cb1afbf2a73d3e268424a40e3e8746499d7db2e313cf2833f2f73640eb79924770198fb3009ef5461479cf80d15
DIST rsyslog-8.2302.0.tar.gz 3273655 BLAKE2B 41ab639dcc93e325b6e092bc7c2c8fa60ce6192ec20033665930573ed5944af5830fc91aa3e607501c2b4759775efcd55631f82096e18ff1df67f00c3e956d6b SHA512 ebdf179c320425a137d1d20eef15163b342165435879e55531aa0dd9ae459fa35266696cc80fecae63a7e1eef31be51ba4154360e5dbe3c00471a84883c03168
DIST rsyslog-doc-8.2206.0.tar.gz 6553532 BLAKE2B 51288f5e819393ad6b5af1acfa030b262c1a97c9cc791606c16792201eb8f7bbc9750bb004e7592a99fa1261b971911a6c2bbe6c0b82a6c3bb067b077ce22641 SHA512 23d686241bb6422146602420e21a53208ff82f39f76258d7147dc0b5c06863f8229e1e2df06bfcae63408d06e70b68f7a0b0d216671b78302527d436091a698a
DIST rsyslog-doc-8.2208.0.tar.gz 6563848 BLAKE2B ec68684f1d7d895833f656ba6224a8013213a12b1bc7a28a268f2f629c25a3fbac7c379091f17eae24b6d71278c087e4a4cbed1656554de743fe5616a96559bf SHA512 428c2fe9e5025928d4a9d33f05f4eb20ac1bbde052b7fa2a8a0e45bfffe111eecc94eb2b6ec129de1011f0eabb106b4fb41d402b2a270e4148d3b1081e3b1da0
DIST rsyslog-doc-8.2210.0.tar.gz 6572454 BLAKE2B feb865e3585ee441117f38de61748a6ca99767dae113cfcf2cd0d0a124cc692889be713134163fc91f4ab43b9fe530e3c7c0b84e4bd4e70081c4539297ae1406 SHA512 e7847a9307a91fdf87d6cf91d2391eb75869679905b9598310c456fb3fe1864fc06dbdc649778f5b3788e47ffda0a6d89cb894258e55db441f7df7e74b0ae9f4
DIST rsyslog-doc-8.2212.0.tar.gz 6574799 BLAKE2B b81bef5a15c2c76a517617cb64682c663809f3308ffb2427beca180db7c91b4000fa72041ef83440134917e10ee6f4cd16ff58633d719bdb895c7316a87d8dc9 SHA512 bbecf2b9b9752f7d8a10bc3125c55e4def2a61108a65a717d7d86e7b63634e010ecd31fe40b2256611822d3dd17be20cbf9eb65efd787315723aba6b29cb3a8a
DIST rsyslog-doc-8.2302.0.tar.gz 6586882 BLAKE2B bd79d53670234df46fae79234e03bbee05129dcd5bfe36d74595ce90e91ed8efa2d32cc817dadc9634a67eab7b9e640ad686685495cff75ebb1ff16730c8e904 SHA512 b922a4ed3e7b7235aa4a00c26a45b3b9f3a092679a7ce324543eea0c59cb34ad5a0ee2cac3a37e8964a4bc059cbcc661932496c7ff5765ef4f2da19cb6d35ee2
EBUILD rsyslog-8.2206.0-r2.ebuild 13033 BLAKE2B fa77254d47b3ce17f1455cb73ee69f5c5f72a4af9699b4486e70b651d2768bcddfa8e5cf87baad77df01a884c585f18a5b2459baa44b9ec1df3e8a0d89fcc5ae SHA512 fcc55ed4fd2171950e39fffc6f06e5ac8743a1743ea58af5ab91af57690dfa3ced2bdae484f615a0ae3dc63565f74d8d8336ad2a1b4679ea79fc1ad04b718ebb
EBUILD rsyslog-8.2208.0-r2.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
EBUILD rsyslog-8.2210.0-r2.ebuild 13176 BLAKE2B 8a99355f5ae45c15f1e39b19cbc0d3ca4d08d20ccca21d381eb49d21d437109325a4572c4e08cac21167720548830fa0a8d390d6452afae97d79e858cc22f08b SHA512 4ae5f2a663f2dab7afe5133d4e7d7528c2078091da97b93753563c4e0619175f156f762199ddfd1cef87f3486b13d6ab22774e2a473e2124f7362edea3df6dec
EBUILD rsyslog-8.2212.0-r1.ebuild 13139 BLAKE2B af709abeded1a831b1289b322ad135d898dfcaf5ae1508924d1190f5e6f1d9fc66a5fd8eb65db515d3f219a0b116e5ec30d5955ef49e4194353640dc410598ac SHA512 3621b8b40cc3fc38fc1eb3168e4e270e693f155ea7d61f4ae96fea07c9d3a95b729ab3806ec39a06a864fa0c6cb7db5891512670ca792f5eb5ab7c4e3ff7a96d
EBUILD rsyslog-8.2302.0.ebuild 13139 BLAKE2B af709abeded1a831b1289b322ad135d898dfcaf5ae1508924d1190f5e6f1d9fc66a5fd8eb65db515d3f219a0b116e5ec30d5955ef49e4194353640dc410598ac SHA512 3621b8b40cc3fc38fc1eb3168e4e270e693f155ea7d61f4ae96fea07c9d3a95b729ab3806ec39a06a864fa0c6cb7db5891512670ca792f5eb5ab7c4e3ff7a96d
EBUILD rsyslog-8.2302.0.ebuild 13136 BLAKE2B 0e9eea82ae95e53cce39fa765fef26a4fe934a133ca30b0ac02cddd9038b71727595e6e74d85f3a8002f32f43400634c16cd411f8ec41bab3170a6dbb89b62c9 SHA512 250f1194bd28feeea036c99d19f4302c5e9bb5f3de8dd26c19acac5dfb06062a1329f5dd88d37633c91bf63b4281a10c7319f6a1bd957ed4b777e1d378952b01
MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365

@ -1,495 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
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
KEYWORDS="amd64 arm arm64 ~hppa ~ia64 x86"
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 )
"
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=">=sys-devel/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+=" >=sys-devel/flex-2.5.39-r1"
BDEPEND+=" >=sys-devel/bison-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
# https://github.com/rsyslog/rsyslog/issues/3626
sed -i \
-e '\|^#!/bin/bash$|a exit 77' \
tests/mmkubernetes-cache-expir*.sh \
|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.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
$(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"
}

@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
SRC_URI="
https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz

@ -8,16 +8,9 @@ AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb
AUX salt-3003-gentoolkit-revdep.patch 514 BLAKE2B aff27558a2043970feeb3eda70cf8e9112b5545af40ba215c7859520ef95a9824001274e837929ef6c25f8e1c35a8ac73f1033e63336bcbaf48dbd4b54c2d42c SHA512 c8a4649ac241f219cf576b0896f48dffc0d5a273118713829c0ad34594f77cffceaa4f06a4d0f47a17b13d6e71b5787fc27f8ee97c774e53a6d15d1b282f99b3
AUX salt-3003-skip-tests-that-oom-machine.patch 732 BLAKE2B b9e10cf8d9ce7f36371fd30fcf592dce4933a05ca2d85c41b2159233272f2e7c90315fbd998c4064f3733b5b1944f9f96816418ed7eb434f3b9df324de2e859b SHA512 e7bc9c63d95a9af4e85372ca973c5023660c332b67486382ce898e7d60c3f50e2aca59e2634a2e87ab7fa8b34e45bfd3a781e04b8003108efbfcc67cd921aff4
AUX salt-3003.1-tests.patch 1151 BLAKE2B b2f0d99bf4bd90a7ea85ae5cc6abb91dd078ad8a95b062863a21573067f3df6045fe23ffd1b3f397e28b90b25126798253e8a9001509ad786cee3f318a900321 SHA512 9340a1dd343af45467be63b1f6991cd06fa57ffc187bcff4a96c75a9666a1429b98ce5b497354bc4cb975c0f6bcd9a64dbfb819b6bfdba02bb5917446d0a36fc
AUX salt-3004.1-py310.patch 2071 BLAKE2B 23f8db2e2bc7307fd58e535bf642e9c76172d03d49b3e86333ee82434adbaa5f437330fa951221f233bba9e09b514611180d19f1db2856ba7d0a3a231a4b385f SHA512 6eec860778ceab15f5ea4260b648cd96df52daaec900dd093257af97e873e8a5be1296d4181767846eb63277a0b903e92ab6550772046acd7a8dea72eb0447f8
AUX salt-3004.1-relax-pyzmq-dep.patch 348 BLAKE2B 75a5947cf6f92fd08da25d50b9064d82c13eaf9f2f2f4ed627f8690ba8893b58de7ef2f0a976879ce94f8f542b9198c637021ba08bc067f3eb56aa40e9598c75 SHA512 7c48d3f86cd81d11077c80ca9536a85c9825299dd9c2a81fd43fc2c2781211d9bb72e4dd79381343851c3292210eab41de049006e608ceb340af31a84cd244bb
AUX salt-3004.1-tests.patch 13025 BLAKE2B fd86808b3d43a25abb88f5d454dd2618d896aa8c8ff843d4f9b46ff32d98d07d245d308599d0a93814d80ff9b1cb120da4296b6f06f64825da4ce603ec37d4fb SHA512 4634fe96479c481fdb9daf8decd3632e9ed8daa9ab62942d71bd6c11e603ae5ac96acfdb68e4e91ec2c829efd33689fa122bc53979b7b5ce02ea63189bebe349
AUX salt-3004.2-importlib.patch 584 BLAKE2B f9ccf7a6205228dc12847d9c86b7d9e539fdbccc1e27a77fccf05622b53f58504226f2eb4aecb2a5bf95789cf72c43e86ab22cb190d62aca903b0d14373a3df0 SHA512 61b966f010445c8a594a5c618441b33e9f7feb9481972aa4c7246d977003c5605c152459eeebc0922c2d9d7e28436243f891e738856a86a88a82a7489825f52a
AUX salt-3004.2-jinja-3.patch 589 BLAKE2B 249e81ea2760cbe75ff66bfd86cbfaab58ea673fea240bb9e787896b89645ef523c0d98305214bcce545a7372e8bc545b6ae385ca3311d71cf7bd6fd66f52c7c SHA512 6615f5824c5b53a426395bf7def9c8f54f3c753f28f3e3b23119849900f10686968cec0787d4ffa16bbbd763a19072348617165e1af6a0f87bb81e9fd8be20e6
AUX salt-3004.2-pyzmq-23.patch 1605 BLAKE2B b0c3e9722f0ff88b586f7e9f863d246a35bc10789568e1f4c3f9728022032dc8686ba0988a35225d2d01d00198c8a00253ec33331e24d6c3a7100d4a10c576ab SHA512 57a5c5a23ec1fd450e1f24740d6cd1d4b29947de5b5d984b7a55c89791e7b7f0eef44390cd9f959210b6c27fdb325650edeb2a53b3302f925ad182ee4ac8ac1c
AUX salt-3005-relax-pyzmq-dep.patch 332 BLAKE2B d22d94b7680fb81e642b83cb7d823137e7e208b43a1720b131401fb957bcb3deb6a0fe5ca87da528cdf60ac219820d259d0b03a905e17142c9cd4d939b4bacf1 SHA512 7c5b963436c3066bf8e8f528acf04ea8ddfa2a5a19adb9486f9888346d55e56fdfcd97a4a04db18d85476cb8ecc8a350343855d765387744706e43e868464f5e
AUX salt-3005-tests.patch 4101 BLAKE2B 6a7d7dee4e631a7619bf1b7fa6bd08b93c0bf31342ce72f734bb645206604ffed9ae2ddae9cebe01401cbe100c224e97f18a69ede5f40a041158d1cd8878dc0f SHA512 cbc3b3d625ab8e20aa7b166dd6ddca1728c4bf562cc14d28fa684573c6ee1d42a270b0f029e5d978803a30103e7ad281d516afff66d18bf31308528fae79c00c
AUX salt-3005.1-importlib-metadata-5-r1.patch 1162 BLAKE2B cbc8df0043881725eb00a6e45ccc03e25f95a6260b4a4b42343c69a6bd8edcf0bb45312644a8e6a66b50a0c4ce0aad7be454b1b8d54a786851b33c7d4b143e10 SHA512 7d2f8c86f22b238dabda0727c338e2e8d33e06a36fcccf5b3b508ac610899f2d6416d7c9e285e992f0d76fc9d04c126640b2b84a227f9a82f4973cb472a4a14a
AUX salt-3005.1-importlib-metadata-5.patch 1498 BLAKE2B 20ec469e0cd53ffaffaa0f95e868f90d90030a0343705147f90738aea50aecfe0ee6610c53d6d44152ea03d4472daa286a1d1f6fb44b063038cc06f540d372b6 SHA512 22cad969c876a272316677af7436d66d7ae380b4ab2f86192f1e38d32bcb4c2c6efe7639c1f8bfff9bbb7aacdf60fef7c68a2de860e06cd3d80e73feeeb77599
AUX salt-3005.1-modules-file-python-3.11-host.patch 4206 BLAKE2B 9cd3cb68b5c1a95475834ae917a2f6fbdbe3424c9f1e837a0e797b84e291e3530f86a2f7d2286e0070f433817ec06b2fd4d0a069b47acb1b0646653862337ece SHA512 4bc03979e1a4202d5ccb2b3159e178bc72c2a4be4297d7b9306479a5c7fe8cc81fc7d25474d80c2627e638db25e73cd4e8f7e1b25c8e15317e22986d63307823
AUX salt-3005.1-no-entry-points.patch 428 BLAKE2B 1bcf3b070afd01c56985290051a3cb031d5ca83b42631eba5f05d7648eabf13bca44573811b767d739dc9bc6d0a5da6f99de87b57c678df79cc172fa6dd5495f SHA512 ed5712689a6d39da9c6a67f28a48d35bbd271a6a3b898cbb0e0493e1813cc99e64388fb60707e6fee95691e339336c2656278780115b39d285c380ded92fe3cb
AUX salt-3005.1-tests.patch 2367 BLAKE2B 467af423de22b4ddeb80fef3d4682976283116698b7c2551c4710e049d8ad7749a4eb07c541a427ed540fdea6a0e4f4e63d96988bafd92974cc3b1026e27fd03 SHA512 4ba3c36be9de377848880819fc4bacf72978a12e483bea90a4e5e7524d7212b5d554302000f6c628156ec5aafbf48d662dec2764d96253be74fa202c73e7fc67
@ -27,11 +20,6 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405
AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58
AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14
DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef
DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
DIST salt-3005.tar.gz 17894520 BLAKE2B 67e755bdbe772991f620d09f61836f8ccfa2039722c3281ec4cfaa8ef76e34c57e4db861cc652545e37eb965ab765f6b6ba0250407d7d7448aa5d4685ad9492a SHA512 c2019a97a5a98b4810cdace826d5e0a6d2890a984da4b95109c1b9328a2fd11cafd2fb0ef9752adeea1d36f8b2a69b3a4a6a5a092b6a7f050c60ec52da314a18
EBUILD salt-3004.2-r2.ebuild 6525 BLAKE2B 41a9504844bd0d0666f9bbb6fc4bb460245bcc792908b7b58bfcaffd663cfa0ff98474277a463b9fc2dce4df9a142b555a32cb0640fedb43dd720c09c0d95a52 SHA512 9cfa16ff9f4f9c214e389342467ada2de70fe0ea10141cef7228b58c678a316f22932f160613acce878add5d4bef52b15f22745e69db1a898b9c85f3e8ab89e1
EBUILD salt-3005-r1.ebuild 6973 BLAKE2B 45322d0eb4b8f62f9a177c8be25a723013c3076f8eea15b11245f9361c128537ca1347d359627f63b90f86d95ef806507eb0a1b6f3b2eb439b600b4af20a1b16 SHA512 0d0c67122ca3979bdd1f819a64a75caa148c5c0750a3b2dd024815f6c627475ad4557b284a7beaa7268ce0424502013079f72e24bbf931b47237c71ceee6e5e3
EBUILD salt-3005.1-r1.ebuild 7220 BLAKE2B 5a045d17bcd6b6402a16963bf6df5875a09cbbaa70d35a8e6e730e918b040aa2905785b766379045f5a2c0c95b438fbd54d5ab256a3dc4a5ad24d7589c5cd479 SHA512 956f1ed2a31cb6962fa90cf63e37bfa4054cc7057305a7ecc957a96f6920f6360acd9b38cef32a56c85ee9117777cafb33f72ce0a6114b0bf39599e0850ed0bf
EBUILD salt-3005.1.ebuild 7207 BLAKE2B 1bd9d5b35ddc5e988da19381c157198f16a8ae08c2d920fefe51ac54ffeda5a795edc8f79abac8973dea9f29cca42d5a24cfda6363a00f6270a9f6432fc8179e SHA512 a09d8c7f4c36b53fa8bcf9b54cab5f484a0786ddbf61dd216cda0d5c3f94d8ac4b19a6ae00adfcac0c6b48a2963403f089af3f9f970efaadf5c16fa1233c1883
MISC metadata.xml 2384 BLAKE2B 8ccb0cbfc8d0944e684f979731884c354655d28fd9029f8d9abae1a313734102952fb817617d54032dd5cafa64925d73ee2a3e8a38ae16d2ff9c1af8c53d514c SHA512 6a4e1b8f2e041ad1a83bf2c85c35ac30ae7db3a20aa868204661c1dde9abdfab1dff1392e2dab8a844472434b325355fea71702229de99f7751e841d063fc0da

@ -1,53 +0,0 @@
From a58bbbe058df8f45872c43a95992f6a7a7914ab9 Mon Sep 17 00:00:00 2001
From: piterpunk <piterpunk@slackware.com>
Date: Fri, 15 Oct 2021 11:03:20 -0300
Subject: [PATCH] Fix _compat.py importlib logic for Python 3.10
Use the same logic in _compat.py and entrypoints.py to load
the same importlib.metadata. Python's built in implementation for
Python >= 3.10 and the Salt one for others.
---
salt/_compat.py | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/salt/_compat.py b/salt/_compat.py
index 8149657bea61..a402f17a3c71 100644
--- a/salt/_compat.py
+++ b/salt/_compat.py
@@ -11,19 +11,23 @@
else:
import salt.ext.ipaddress as ipaddress
+if sys.version_info >= (3, 10):
+ # Python 3.10 will include a fix in importlib.metadata which allows us to
+ # get the distribution of a loaded entry-point
+ import importlib.metadata # pylint: disable=no-member,no-name-in-module
+else:
+ # importlib_metadata before version 3.3.0 does not include the functionality we need.
+ try:
+ import importlib_metadata
-# importlib_metadata before version 3.3.0 does not include the functionality we need.
-try:
- import importlib_metadata
-
- importlib_metadata_version = [
- int(part)
- for part in importlib_metadata.version("importlib_metadata").split(".")
- if part.isdigit()
- ]
- if tuple(importlib_metadata_version) < (3, 3, 0):
+ importlib_metadata_version = [
+ int(part)
+ for part in importlib_metadata.version("importlib_metadata").split(".")
+ if part.isdigit()
+ ]
+ if tuple(importlib_metadata_version) < (3, 3, 0):
+ # Use the vendored importlib_metadata
+ import salt.ext.importlib_metadata as importlib_metadata
+ except ImportError:
# Use the vendored importlib_metadata
import salt.ext.importlib_metadata as importlib_metadata
-except ImportError:
- # Use the vendored importlib_metadata
- import salt.ext.importlib_metadata as importlib_metadata

@ -1,12 +0,0 @@
diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
index 62cb775d87..ffa1589043 100644
--- a/requirements/zeromq.txt
+++ b/requirements/zeromq.txt
@@ -1,6 +1,4 @@
-r base.txt
-r crypto.txt
-pyzmq<=20.0.0 ; python_version < "3.6"
-pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9"
-pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9"
+pyzmq

@ -1,311 +0,0 @@
diff --git a/tests/pytests/functional/fileserver/test_roots.py b/tests/pytests/functional/fileserver/test_roots.py
index c65efc8d52..9060fb61e2 100644
--- a/tests/pytests/functional/fileserver/test_roots.py
+++ b/tests/pytests/functional/fileserver/test_roots.py
@@ -15,6 +15,7 @@ def configure_loader_modules(base_env_state_tree_root_dir):
return {roots: {"__opts__": opts}}
+@pytest.mark.skip("needs network access")
# nox -e pytest-zeromq-3.8(coverage=False) -- -vvv --run-slow --run-destructive tests\pytests\functional\fileserver\test_roots.py
def test_symlink_list(base_env_state_tree_root_dir):
with pytest.helpers.temp_file(
diff --git a/tests/pytests/functional/pillar/test_gpg.py b/tests/pytests/functional/pillar/test_gpg.py
index aaa4733f1d..b55cc9b4cf 100644
--- a/tests/pytests/functional/pillar/test_gpg.py
+++ b/tests/pytests/functional/pillar/test_gpg.py
@@ -203,7 +203,7 @@ def gpg_homedir(salt_master, pillar_state_tree):
universal_newlines=True,
)
ret = ProcessResult(
- exitcode=proc.returncode,
+ returncode=proc.returncode,
stdout=proc.stdout,
stderr=proc.stderr,
cmdline=proc.args,
@@ -220,7 +220,7 @@ def gpg_homedir(salt_master, pillar_state_tree):
input=TEST_KEY,
)
ret = ProcessResult(
- exitcode=proc.returncode,
+ returncode=proc.returncode,
stdout=proc.stdout,
stderr=proc.stderr,
cmdline=proc.args,
@@ -250,7 +250,7 @@ def gpg_homedir(salt_master, pillar_state_tree):
input="KILLAGENT",
)
ret = ProcessResult(
- exitcode=proc.returncode,
+ returncode=proc.returncode,
stdout=proc.stdout,
stderr=proc.stderr,
cmdline=proc.args,
diff --git a/tests/pytests/integration/cli/test_salt_proxy.py b/tests/pytests/integration/cli/test_salt_proxy.py
index c32c7e11e2..a9ee9fbd8d 100644
--- a/tests/pytests/integration/cli/test_salt_proxy.py
+++ b/tests/pytests/integration/cli/test_salt_proxy.py
@@ -40,6 +40,7 @@ def test_exit_status_no_proxyid(salt_master, proxy_minion_id):
assert "error: salt-proxy requires --proxyid" in exc.value.stderr, exc.value
+@pytest.mark.skip("Currently broken")
@pytest.mark.skip_on_windows(reason="Windows does not do user checks")
def test_exit_status_unknown_user(salt_master, proxy_minion_id):
"""
@@ -66,7 +67,7 @@ def test_exit_status_unknown_argument(salt_master, proxy_minion_id):
factory = salt_master.salt_proxy_minion_daemon(proxy_minion_id)
factory.start("--unknown-argument", start_timeout=10, max_start_attempts=1)
- assert exc.value.exitcode == salt.defaults.exitcodes.EX_USAGE, exc.value
+ assert exc.value.returncode == salt.defaults.exitcodes.EX_USAGE, exc.value
assert "Usage" in exc.value.stderr, exc.value
assert "no such option: --unknown-argument" in exc.value.stderr, exc.value
@@ -89,8 +90,8 @@ def test_exit_status_correct_usage(salt_master, proxy_minion_id, salt_cli):
assert factory.is_running()
# Let's issue a ping before terminating
ret = salt_cli.run("test.ping", minion_tgt=proxy_minion_id)
- assert ret.exitcode == 0
+ assert ret.returncode == 0
assert ret.json is True
# Terminate the proxy minion
ret = factory.terminate()
- assert ret.exitcode == salt.defaults.exitcodes.EX_OK, ret
+ assert ret.returncode == salt.defaults.exitcodes.EX_OK, ret
diff --git a/tests/pytests/integration/sdb/test_vault.py b/tests/pytests/integration/sdb/test_vault.py
index 7dc4c55417..6c48296a0c 100644
--- a/tests/pytests/integration/sdb/test_vault.py
+++ b/tests/pytests/integration/sdb/test_vault.py
@@ -107,7 +107,7 @@ def vault_container_version(request, salt_call_cli, vault_port):
if proc.returncode == 0:
break
ret = ProcessResult(
- exitcode=proc.returncode,
+ returncode=proc.returncode,
stdout=proc.stdout,
stderr=proc.stderr,
cmdline=proc.args,
@@ -133,7 +133,7 @@ def vault_container_version(request, salt_call_cli, vault_port):
)
if proc.returncode != 0:
ret = ProcessResult(
- exitcode=proc.returncode,
+ returncode=proc.returncode,
stdout=proc.stdout,
stderr=proc.stderr,
cmdline=proc.args,
@@ -150,7 +150,7 @@ def vault_container_version(request, salt_call_cli, vault_port):
universal_newlines=True,
)
ret = ProcessResult(
- exitcode=proc.returncode,
+ returncode=proc.returncode,
stdout=proc.stdout,
stderr=proc.stderr,
cmdline=proc.args,
diff --git a/tests/pytests/unit/modules/test_cmdmod.py b/tests/pytests/unit/modules/test_cmdmod.py
index bc1d2818aa..3bd93862b7 100644
--- a/tests/pytests/unit/modules/test_cmdmod.py
+++ b/tests/pytests/unit/modules/test_cmdmod.py
@@ -440,6 +440,7 @@ def test_run_cwd_doesnt_exist_issue_7154():
cmdmod.run_all(cmd, cwd=cwd)
+@pytest.mark.skip("needs root access")
@pytest.mark.skip_on_darwin
@pytest.mark.skip_on_windows
def test_run_cwd_in_combination_with_runas():
diff --git a/tests/pytests/unit/modules/test_portage_config.py b/tests/pytests/unit/modules/test_portage_config.py
index 5cc6b90596..db37d2c4f1 100644
--- a/tests/pytests/unit/modules/test_portage_config.py
+++ b/tests/pytests/unit/modules/test_portage_config.py
@@ -29,6 +29,7 @@ def test_get_config_file_wildcards():
assert portage_config._get_config_file("mask", atom) == expected
+@pytest.mark.skip("test needs root access")
def test_enforce_nice_config(tmp_path):
atoms = [
("*/*::repo", "repo"),
diff --git a/tests/pytests/unit/state/test_state_compiler.py b/tests/pytests/unit/state/test_state_compiler.py
index fc43cf154d..7aa511c9f7 100644
--- a/tests/pytests/unit/state/test_state_compiler.py
+++ b/tests/pytests/unit/state/test_state_compiler.py
@@ -679,6 +679,7 @@ def test_verify_retry_parsing():
assert set(expected_result).issubset(set(state_obj.call(low_data)))
+@pytest.mark.skip("test requires root access")
def test_render_requisite_require_disabled():
"""
Test that the state compiler correctly deliver a rendering
@@ -719,6 +720,7 @@ def test_render_requisite_require_disabled():
assert run_num == 0
+@pytest.mark.skip("test requires root access")
def test_render_requisite_require_in_disabled():
"""
Test that the state compiler correctly deliver a rendering
diff --git a/tests/pytests/unit/state/test_state_format_slots.py b/tests/pytests/unit/state/test_state_format_slots.py
index 57b7bb2b87..7d2abce8d0 100644
--- a/tests/pytests/unit/state/test_state_format_slots.py
+++ b/tests/pytests/unit/state/test_state_format_slots.py
@@ -218,6 +218,7 @@ def test_slot_append(state_obj):
assert cdata == {"args": ["arg"], "kwargs": {"key": "value1thing~"}}
+@pytest.mark.skip("test needs root")
# Skip on windows like integration.modules.test_state.StateModuleTest.test_parallel_state_with_long_tag
@skipIf(
salt.utils.platform.is_windows(),
diff --git a/tests/pytests/unit/test_minion.py b/tests/pytests/unit/test_minion.py
index 985ec99276..eb8a476e30 100644
--- a/tests/pytests/unit/test_minion.py
+++ b/tests/pytests/unit/test_minion.py
@@ -493,6 +493,7 @@ def test_scheduler_before_connect():
minion.destroy()
+@pytest.mark.skip("test needs root access")
def test_minion_module_refresh():
"""
Tests that the 'module_refresh' just return in case there is no 'schedule'
@@ -520,6 +521,7 @@ def test_minion_module_refresh():
minion.destroy()
+@pytest.mark.skip("test needs root access")
def test_minion_module_refresh_beacons_refresh():
"""
Tests that 'module_refresh' calls beacons_refresh and that the
diff --git a/tests/pytests/unit/test_version.py b/tests/pytests/unit/test_version.py
index bc6bbfeadd..2653b558b0 100644
--- a/tests/pytests/unit/test_version.py
+++ b/tests/pytests/unit/test_version.py
@@ -140,6 +140,7 @@ def test_sha(commit, match):
assert ret is None
+@pytest.mark.skip("test is broken if some optional deps aren't installed")
def test_version_report_lines():
"""
Validate padding in versions report is correct
diff --git a/tests/support/helpers.py b/tests/support/helpers.py
index d82b14cb90..751018162c 100644
--- a/tests/support/helpers.py
+++ b/tests/support/helpers.py
@@ -40,7 +40,7 @@ import salt.utils.platform
import salt.utils.pycrypto
import salt.utils.stringutils
import salt.utils.versions
-from saltfactories.exceptions import FactoryFailure as ProcessFailed
+from pytestshellutils.exceptions import FactoryFailure as ProcessFailed
from saltfactories.utils.ports import get_unused_localhost_port
from saltfactories.utils.processes import ProcessResult
from tests.support.mock import patch
@@ -1720,7 +1720,7 @@ class VirtualEnv:
kwargs.setdefault("env", self.environ)
proc = subprocess.run(args, check=False, **kwargs)
ret = ProcessResult(
- exitcode=proc.returncode,
+ returncode=proc.returncode,
stdout=proc.stdout,
stderr=proc.stderr,
cmdline=proc.args,
@@ -1735,7 +1735,7 @@ class VirtualEnv:
cmdline=proc.args,
stdout=proc.stdout,
stderr=proc.stderr,
- exitcode=proc.returncode,
+ returncode=proc.returncode,
)
return ret
diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py
index 1d3d1393a9..df331761e2 100644
--- a/tests/unit/modules/test_boto_route53.py
+++ b/tests/unit/modules/test_boto_route53.py
@@ -4,6 +4,8 @@ from collections import namedtuple
import pkg_resources # pylint: disable=3rd-party-module-not-gated
+import pytest
+
import salt.config
import salt.loader
import salt.utils.versions
@@ -99,6 +101,7 @@ class BotoRoute53TestCase(TestCase, LoaderModuleMockMixin):
def tearDown(self):
del self.opts
+ @pytest.mark.skip("test currently broken")
@mock_route53_deprecated
def test_create_healthcheck(self):
"""
diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py
index 907c67f477..3f68cfe8f3 100644
--- a/tests/unit/utils/test_parsers.py
+++ b/tests/unit/utils/test_parsers.py
@@ -6,6 +6,8 @@ import os
import shutil
import tempfile
+import pytest
+
import salt.config
import salt.log.setup as log
import salt.syspaths
@@ -983,6 +985,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase):
if os.path.exists(self.log_file):
os.unlink(self.log_file)
+ @pytest.mark.skip("needs root access")
def test_jid_option(self):
jid = salt.utils.jid.gen_jid({})
args = ["--jid", jid]
@@ -991,6 +994,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase):
parser.parse_args(args)
assert parser.options.jid == jid
+ @pytest.mark.skip("needs root access")
def test_jid_option_invalid(self):
jid = salt.utils.jid.gen_jid({}) + "A"
args = ["--jid", jid]
@@ -1041,6 +1045,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase):
if os.path.exists(self.ssh_log_file):
os.unlink(self.ssh_log_file)
+ @pytest.mark.skip("needs root access")
def test_jid_option(self):
jid = salt.utils.jid.gen_jid({})
args = ["--jid", jid] + self.args
@@ -1049,6 +1054,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase):
parser.parse_args(args)
assert parser.options.jid == jid
+ @pytest.mark.skip("needs root access")
def test_jid_option_invalid(self):
jid = salt.utils.jid.gen_jid({}) + "A"
args = ["--jid", jid] + self.args
diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
index 8c648f5288..74b9bc6981 100644
--- a/tests/unit/utils/test_schema.py
+++ b/tests/unit/utils/test_schema.py
@@ -872,6 +872,7 @@ class ConfigTestCase(TestCase):
},
)
+ @skipIf(True, "Does not work in network sandbox")
@skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
def test_hostname_config_validation(self):
class TestConf(schema.Schema):
@@ -2098,6 +2099,7 @@ class ConfigTestCase(TestCase):
item = schema.NotItem(item=schema.BooleanItem())
self.assertEqual(item.serialize(), {"not": item.item.serialize()})
+ @skipIf(True, "Does not work in network sandbox")
@skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
def test_not_config_validation(self):
class TestConf(schema.Schema):

@ -1,11 +0,0 @@
--- a/salt/_compat.py 2022-06-28 01:50:45.630746476 -0000
+++ b/salt/_compat.py 2022-06-28 01:51:52.970217848 -0000
@@ -14,7 +14,7 @@
if sys.version_info >= (3, 10):
# Python 3.10 will include a fix in importlib.metadata which allows us to
# get the distribution of a loaded entry-point
- import importlib.metadata # pylint: disable=no-member,no-name-in-module
+ import importlib.metadata as importlib_metadata # pylint: disable=no-member,no-name-in-module
else:
# importlib_metadata before version 3.3.0 does not include the functionality we need.
try:

@ -1,14 +0,0 @@
diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
index 6502831aff..dec847364a 100644
--- a/tests/unit/utils/test_jinja.py
+++ b/tests/unit/utils/test_jinja.py
@@ -22,7 +22,8 @@ import salt.utils.files
import salt.utils.json
import salt.utils.stringutils
import salt.utils.yaml
-from jinja2 import DictLoader, Environment, Markup, exceptions
+from jinja2 import DictLoader, Environment, exceptions
+from markupsafe import Markup
from salt.exceptions import SaltRenderError
from salt.utils.decorators.jinja import JinjaFilter
from salt.utils.jinja import (

@ -1,35 +0,0 @@
diff --git a/salt/log/handlers/logstash_mod.py b/salt/log/handlers/logstash_mod.py
index bc462018f5..7e0d98c5ba 100644
--- a/salt/log/handlers/logstash_mod.py
+++ b/salt/log/handlers/logstash_mod.py
@@ -160,6 +160,8 @@ import logging
import logging.handlers
import os
+import zmq
+
import salt.utils.json
import salt.utils.network
import salt.utils.stringutils
@@ -435,7 +437,7 @@ class ZMQLogstashHander(logging.Handler, NewStyleClassMixIn):
# Above the defined high water mark(unsent messages), start
# dropping them
self._publisher.setsockopt(zmq.HWM, self._zmq_hwm)
- except AttributeError:
+ except (AttributeError, zmq.error.ZMQError):
# In ZMQ >= 3.0, there are separate send and receive HWM
# settings
self._publisher.setsockopt(zmq.SNDHWM, self._zmq_hwm)
diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
index dc024d7eff..4c989095a5 100644
--- a/salt/transport/zeromq.py
+++ b/salt/transport/zeromq.py
@@ -902,7 +902,7 @@ class ZeroMQPubServerChannel(salt.transport.server.PubServerChannel):
try:
pub_sock.setsockopt(zmq.HWM, self.opts.get("pub_hwm", 1000))
# in zmq >= 3.0, there are separate send and receive HWM settings
- except AttributeError:
+ except (AttributeError, zmq.error.ZMQError):
# Set the High Water Marks. For more information on HWM, see:
# http://api.zeromq.org/4-1:zmq-setsockopt
pub_sock.setsockopt(zmq.SNDHWM, self.opts.get("pub_hwm", 1000))

@ -1,37 +0,0 @@
commit b676e6338a7c094cb3335d11f851ac0e12222017
Author: MKLeb <calebb@vmware.com>
Date: Wed Oct 5 15:49:37 2022 -0400
Allow entrypoint compatibility for importlib-metadata>=5.0.0
diff --git a/salt/utils/entrypoints.py b/salt/utils/entrypoints.py
index 3effa0b494..ac65ae2df4 100644
--- a/salt/utils/entrypoints.py
+++ b/salt/utils/entrypoints.py
@@ -38,13 +38,20 @@ def iter_entry_points(group, name=None):
entry_points_listing = []
entry_points = importlib_metadata.entry_points()
- for entry_point_group, entry_points_list in entry_points.items():
- if entry_point_group != group:
- continue
- for entry_point in entry_points_list:
- if name is not None and entry_point.name != name:
+ # pre importlib-metadata 5.0.0
+ if hasattr(entry_points, "items"):
+ for entry_point_group, entry_points_list in entry_points.items():
+ if entry_point_group != group:
continue
- entry_points_listing.append(entry_point)
+ for entry_point in entry_points_list:
+ if name is not None and entry_point.name != name:
+ continue
+ entry_points_listing.append(entry_point)
+ # starting with importlib-metadata 5.0.0
+ for entry_point in entry_points.select(group=group):
+ if name is not None and entry_point.name != name:
+ continue
+ entry_points_listing.append(entry_point)
return entry_points_listing

@ -1,197 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_10 )
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"
SRC_URI=""
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
mongodb neutron nova openssl portage profile redis selinux test raet
+zeromq vim-syntax"
RDEPEND="
sys-apps/pciutils
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
dev-python/libnacl[${PYTHON_USEDEP}]
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/tomli[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] )
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
<dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
libvirt? (
dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
dev-python/pyopenssl[${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}]
)
cherrypy? ( >=dev-python/cherrypy-3.2.2[${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? (
>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
)
neutron? (
>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
)
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="
test? (
${RDEPEND}
>=dev-python/boto-2.32.1[${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-0.3.6[${PYTHON_USEDEP}]
dev-python/passlib
dev-python/pip[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
>=dev-python/pytest-salt-factories-1.0.0_rc13[${PYTHON_USEDEP}]
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
dev-python/pytest-subtests[${PYTHON_USEDEP}]
dev-python/flaky[${PYTHON_USEDEP}]
dev-python/libcloud[${PYTHON_USEDEP}]
net-dns/bind-tools
>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
!x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
)"
DOCS=( README.rst AUTHORS )
REQUIRED_USE="|| ( raet zeromq )
test? ( cheetah genshi )"
RESTRICT="!test? ( test ) x86? ( test )"
PATCHES=(
"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
"${FILESDIR}/salt-3002-tests.patch"
"${FILESDIR}/salt-3003.1-tests.patch"
"${FILESDIR}/salt-3004.2-jinja-3.patch"
"${FILESDIR}/salt-3004.1-tests.patch"
"${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch"
"${FILESDIR}/salt-3004.1-py310.patch"
"${FILESDIR}/salt-3004.2-importlib.patch"
"${FILESDIR}/salt-3004.2-pyzmq-23.patch"
)
python_prepare_all() {
# remove tests with external dependencies that may not be available, and
# tests that don't work in sandbox
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
rm tests/unit/states/test_boto_vpc.py || die
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
rm tests/pytests/functional/transport/server/test_req_channel.py || die
# tests that require network access
rm tests/unit/{states,modules}/test_zcbuildout.py || die
rm -r tests/integration/cloud || die
rm -r tests/kitchen/tests/wordpress/tests || die
rm tests/kitchen/test_kitchen.py || die
rm tests/unit/modules/test_network.py || die
rm tests/pytests/functional/modules/test_pip.py || die
rm tests/pytests/unit/client/ssh/test_ssh.py || die
# tests require root access
rm tests/integration/pillar/test_git_pillar.py || die
rm tests/integration/states/test_supervisord.py || die
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
# pycryptodome rather than pycryptodomex
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
distutils-r1_python_prepare_all
}
python_prepare() {
einfo "Fixing collections.abc warnings for ${EPYTHON}"
local abc
abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
# removes contextvars, see bug: https://bugs.gentoo.org/799431
sed -i '/^contextvars/d' requirements/base.txt || die
}
python_install_all() {
local svc
USE_SETUPTOOLS=1 distutils-r1_python_install_all
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() {
# 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)"
(
export TMPDIR
cleanup() { rm -rf "${TMPDIR}" || die; }
trap cleanup EXIT
addwrite "${TMPDIR}"
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
"${EPYTHON}" -m pytest -vv \
|| die "testing failed with ${EPYTHON}"
)
}
pkg_postinst() {
:
}

@ -1,206 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_10 )
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"
SRC_URI=""
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="
cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
mongodb neutron nova openssl portage profile redis selinux test raet
+zeromq vim-syntax
"
RDEPEND="
sys-apps/pciutils
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
dev-python/libnacl[${PYTHON_USEDEP}]
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/tomli[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
<dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
libcloud? (
dev-python/aiohttp[${PYTHON_USEDEP}]
dev-python/aiosignal[${PYTHON_USEDEP}]
dev-python/async-timeout[${PYTHON_USEDEP}]
>=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}]
)
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
libvirt? (
dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
dev-python/pyopenssl[${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}]
)
cherrypy? ( >=dev-python/cherrypy-3.2.2[${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? (
>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
)
neutron? (
>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
)
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="
test? (
${RDEPEND}
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
dev-python/certifi[${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/passlib
dev-python/pip[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pytest-7.0.1[${PYTHON_USEDEP}]
>=dev-python/pytest-salt-factories-1.0.0_rc17[${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/flaky[${PYTHON_USEDEP}]
dev-python/libcloud[${PYTHON_USEDEP}]
net-dns/bind-tools
>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
dev-util/yamllint[${PYTHON_USEDEP}]
!x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
)
"
DOCS=( README.rst AUTHORS )
REQUIRED_USE="|| ( raet zeromq )
test? ( cheetah genshi )"
RESTRICT="!test? ( test ) x86? ( test )"
PATCHES=(
"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
"${FILESDIR}/salt-3002-tests.patch"
"${FILESDIR}/salt-3003.1-tests.patch"
"${FILESDIR}/salt-3005-relax-pyzmq-dep.patch"
"${FILESDIR}/salt-3005-tests.patch"
)
python_prepare_all() {
# remove tests with external dependencies that may not be available, and
# tests that don't work in sandbox
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
rm tests/unit/states/test_boto_vpc.py || die
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
rm tests/pytests/functional/transport/server/test_req_channel.py || die
rm tests/pytests/functional/utils/test_async_event_publisher.py || die
rm tests/pytests/functional/runners/test_winrepo.py || die
# tests that require network access
rm tests/unit/{states,modules}/test_zcbuildout.py || die
rm -r tests/integration/cloud || die
rm -r tests/kitchen/tests/wordpress/tests || die
rm tests/kitchen/test_kitchen.py || die
rm tests/unit/modules/test_network.py || die
rm tests/pytests/functional/modules/test_pip.py || die
rm tests/pytests/unit/client/ssh/test_ssh.py || die
rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
# tests require root access
rm tests/integration/pillar/test_git_pillar.py || die
rm tests/integration/states/test_supervisord.py || die
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
# pycryptodome rather than pycryptodomex
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
distutils-r1_python_prepare_all
}
python_prepare() {
einfo "Fixing collections.abc warnings for ${EPYTHON}"
local abc
abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
# removes contextvars, see bug: https://bugs.gentoo.org/799431
sed -i '/^contextvars/d' requirements/base.txt || die
}
python_install_all() {
local svc
USE_SETUPTOOLS=1 distutils-r1_python_install_all
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() {
# 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)"
(
export TMPDIR
cleanup() { rm -rf "${TMPDIR}" || die; }
trap cleanup EXIT
addwrite "${TMPDIR}"
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
"${EPYTHON}" -m pytest -vv \
|| die "testing failed with ${EPYTHON}"
)
}

@ -1,219 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_10 )
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"
SRC_URI=""
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="
cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
mongodb neutron nova openssl portage profile redis selinux test raet
+zeromq vim-syntax
"
RDEPEND="
sys-apps/pciutils
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
dev-python/jmespath[${PYTHON_USEDEP}]
dev-python/libnacl[${PYTHON_USEDEP}]
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/tomli[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
libcloud? (
dev-python/aiohttp[${PYTHON_USEDEP}]
dev-python/aiosignal[${PYTHON_USEDEP}]
dev-python/async-timeout[${PYTHON_USEDEP}]
>=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}]
)
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
libvirt? (
dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
dev-python/pyopenssl[${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}]
)
cherrypy? ( >=dev-python/cherrypy-3.2.2[${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? (
>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
)
neutron? (
>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
)
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="
test? (
${RDEPEND}
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
dev-python/certifi[${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/passlib
dev-python/pip[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pytest-7.0.1[${PYTHON_USEDEP}]
>=dev-python/pytest-salt-factories-1.0.0_rc17[${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/flaky[${PYTHON_USEDEP}]
dev-python/libcloud[${PYTHON_USEDEP}]
net-dns/bind-tools
>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
dev-util/yamllint[${PYTHON_USEDEP}]
!x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
)
"
DOCS=( README.rst AUTHORS )
REQUIRED_USE="|| ( raet zeromq )
test? ( cheetah genshi )"
RESTRICT="!test? ( test ) x86? ( test )"
PATCHES=(
"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
"${FILESDIR}/salt-3002-tests.patch"
"${FILESDIR}/salt-3003.1-tests.patch"
"${FILESDIR}/salt-3005-relax-pyzmq-dep.patch"
"${FILESDIR}/salt-3005-tests.patch"
"${FILESDIR}/salt-3005.1-no-entry-points.patch"
"${FILESDIR}/salt-3005.1-importlib-metadata-5.patch"
"${FILESDIR}/salt-3005.1-tests.patch"
)
python_prepare_all() {
# remove tests with external dependencies that may not be available, and
# tests that don't work in sandbox
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
rm tests/unit/states/test_boto_vpc.py || die
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
rm tests/pytests/functional/transport/server/test_req_channel.py || die
rm tests/pytests/functional/utils/test_async_event_publisher.py || die
rm tests/pytests/functional/runners/test_winrepo.py || die
# tests that require network access
rm tests/unit/{states,modules}/test_zcbuildout.py || die
rm -r tests/integration/cloud || die
rm -r tests/kitchen/tests/wordpress/tests || die
rm tests/kitchen/test_kitchen.py || die
rm tests/unit/modules/test_network.py || die
rm tests/pytests/functional/modules/test_pip.py || die
rm tests/pytests/unit/client/ssh/test_ssh.py || die
rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
# tests require root access
rm tests/integration/pillar/test_git_pillar.py || die
rm tests/integration/states/test_supervisord.py || die
# removes contextvars, see bug: https://bugs.gentoo.org/799431
sed -i '/^contextvars/d' requirements/base.txt || die
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
# pycryptodome rather than pycryptodomex
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
distutils-r1_python_prepare_all
}
python_install_all() {
local svc
USE_SETUPTOOLS=1 distutils-r1_python_install_all
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() {
# testsuite likes lots of files
ulimit -n 4096 || die
local -a disable_tests=(
# doesn't like the distutils warning
batch_retcode
multiple_modules_in_batch
# hangs indefinitely
master_type_disable
# needs root
runas_env_sudo_group
# don't like sandbox
split_multibyte_characters_{shiftjis,unicode}
# doesn't like sandbox env
log_sanitize
)
local textexpr
testexpr=$(printf 'not %s and ' "${disable_tests[@]}")
# ${T} is too long a path for the tests to work
local TMPDIR
TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
(
export TMPDIR
cleanup() { rm -rf "${TMPDIR}" || die; }
trap cleanup EXIT
addwrite "${TMPDIR}"
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
"${EPYTHON}" -m pytest -vv -k "${testexpr%and }" \
|| die "testing failed with ${EPYTHON}"
)
}

@ -1,6 +1,4 @@
AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
DIST sysstat-12.6.2.tar.gz 1455025 BLAKE2B aba2d8fd5fae8d6df740173d7ccd60beb0628c4c2205342f72ec03d6c48995d397de0d6f2cace24accf1a9274da37cf3bba86888717bc8d62d262ffd1c6f995e SHA512 376047de55598c6f671b999203809219a40206a9c58499399681af9ebe6048dd4da96c8ef5827d75cc369a7b69c3f1aadef1a5e8deec318a12b230d61f09fc08
DIST sysstat-12.7.1.tar.gz 1464847 BLAKE2B dd4cb510d45879665945d7c3efcb9e1011f6b77d152c7f989ef6a3e8f203c05c1ca708959030cb864c31810ec27a5e880a9cfcd805f26c4f3537d55bdd9fd763 SHA512 5c1da0f5a1bf26091f029c5ea138f836616becb1e531843aa2c150a66ddc1f07b43cffeac98445855bf70319942fe22838a682c2f7685893bead7d8de7e9e2a8
EBUILD sysstat-12.6.2.ebuild 1711 BLAKE2B 313c12c5b93011df55a75bc5622af45016902e5743f80dcdc44152a076f48b0927855c33da49365d8d92f0768d3d627a30146ad143ca2d412878f59001b1b0a6 SHA512 8960804c787c4e74343ea8cb76b100740f0572ed0fa549392f89c1effc750612081f66df86d09ddbafafea70ab2a858cf49f1069779543cc1eeb1ceed478b29e
EBUILD sysstat-12.7.1.ebuild 1710 BLAKE2B a80b09459bcfcf523f7346545a3a904166e53f067a79eef11c7ad232f9133b01359158cef1f0a9c0b277ae9e2637d1dbbdce4fb8f7b700e1099622d59ee01f76 SHA512 1b3ef2572970945d0b2809755854d83d63eedbc738293c7d6edc0e8472499623dd1931b9ff77ee210770ccf53893e121d3a46b2864b530672dc5651b4891da64
EBUILD sysstat-12.6.2.ebuild 1710 BLAKE2B 575b73d0afe41bfe83bf70bb2d4723d9c6324371b20bbdbf4fb0a62f8e27bc567c47f1050979ca24a0b4ab3afa32d0019bf3905bca5cc54c478f8ebf00e20e4b SHA512 8312739cca30d5fab338186fb1b16d6f7ed171694b3af0474b62a1616cbf27579af95ed93ada68600fd80173558e35de9a8e51256eb25fdc9d6cee12ad94a99e
MISC metadata.xml 617 BLAKE2B e890e68addd784d7478e282d4518a7cab0d7ca4fc86ad44db58063e5c7027084b66d1e4fe63b702b992a60f0d9cd5816cf8ad6016b17e185760a820f08907579 SHA512 1dcf5a80e3f3cfdf1cc8cd3730847c6ed9107eec7286b37e1de01287189e8811e729e16328a283abe196443c5355d905d7c95104c43e23f7d4ce3c56e2fa4ad9

@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="dcron debug nls lm-sensors lto selinux systemd"
BDEPEND="

@ -1,84 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
HOMEPAGE="http://sebastien.godard.pagesperso-orange.fr/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="dcron debug nls lm-sensors lto selinux systemd"
BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
"
COMMON_DEPEND="
nls? ( virtual/libintl )
lm-sensors? ( sys-apps/lm-sensors:= )
"
DEPEND="${COMMON_DEPEND}"
RDEPEND="
${COMMON_DEPEND}
!dcron? ( !sys-process/dcron )
selinux? ( sec-policy/selinux-sysstat )
"
REQUIRED_USE="dcron? ( !systemd )"
src_prepare() {
if use dcron; then
sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
fi
default
}
src_configure() {
tc-export AR
sa_lib_dir=/usr/lib/sa \
conf_dir=/etc \
econf \
$(use_enable !systemd use-crond) \
$(use_enable lm-sensors sensors) \
$(use_enable lto) \
$(use_enable nls) \
$(usex debug --enable-debuginfo '') \
--disable-compress-manpg \
--disable-stripping \
--disable-pcp \
--enable-copy-only \
--enable-documentation \
--enable-install-cron \
--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
}
src_compile() {
LFLAGS="${LDFLAGS}" default
}
src_install() {
keepdir /var/log/sa
emake \
CHOWN=true \
DESTDIR="${D}" \
DOC_DIR=/usr/share/doc/${PF} \
MANGRPARG='' \
install
dodoc -r contrib/
newinitd "${FILESDIR}"/${PN}.init.d ${PN}
systemd_dounit ${PN}.service
rm "${D}"/usr/share/doc/${PF}/COPYING || die
}

@ -11,17 +11,23 @@ DIST vault-1.11.4-vendor.tar.gz 52097178 BLAKE2B 3f0fdddff8d9a834dff77bfb696c8c4
DIST vault-1.11.4-webui.tar.xz 1335580 BLAKE2B 9c2c58448083e781e74d4bd9e6bc9128224a9d10020c6b30af111c869a86467bde4683825908b892f20f7024eda081d026d2fa01b9ee0fb02fa94d7f412dacb4 SHA512 6739ac2845eaf2e82b7f5177bbfc42ccaf05a1fd1c50b2e53e296faf8a631846f9495d2d19269735723cc60f2ecbd5c90533a9fa88efd7c8d9c8c6575e4801d9
DIST vault-1.11.5-vendor.tar.gz 52130355 BLAKE2B 0047b52439c12512e6da4b797742b079ca2dcd6f858b7f27637e409c3061de04a9d38b4d05269bd440c2178fd9547b1323bc680d65cb74a3ce98816303d72c1f SHA512 70db863583ee5f1180068b70ddf8baaf95e61a31d816db2e212703e1052c1a70b7098bfd53b2b28319dbf21e168b660e16cc5907b503e5e558c6763540d70eba
DIST vault-1.11.5-webui.tar.xz 1335704 BLAKE2B 7a8161070fd9762645a01e00fb88ab7ef4847810856e0c7e9a478cb149401db53789ca4d377a06ed4843b3cc77c655cee7036510c5625bc503f6dd9f7e347420 SHA512 d6b49dd31877bf8a9cf7b7588df58163c35c9fe5fe225b595ca421209acd4c823b71d21195a2f217dc8b63a825b5323b3475e1fe42be6d2c8d471d91e6f75097
DIST vault-1.11.9-vendor.tar.gz 52398089 BLAKE2B cb84d50fb328c299b828dd8f9fe619e49e9ebf22efc3a8f54cfb6324352a3e9fc28c71c0c3201579d3f6ca3c6a36ac9c6277082234c646c1bcd4b2e306cbfb40 SHA512 ce527465660c0b793293331b26500cbc39d4999e7d530f6c28d44bdc89390d6564138ea84d4aaa4e0bf94fb5045bf07ee2dfd8c5376f4a27fce139e0335b564e
DIST vault-1.11.9-webui.tar.xz 1335624 BLAKE2B 0f1274238b7a2a8a52f4e0e6c1d4311f89b33351370f58e905c75758c1b1f2c3fd9910126cc472de534f9c5da1d68c4aba4a05f8123b418771f0af1a8b01e740 SHA512 bd73655b57ef7bfdabdc7ff00299c64dda77604c27a1f8e81ec1e791bfaea248a05f8334de4d5c7b1ca411e7e6b424ce8a76ed6124ba75438f33d90277842684
DIST vault-1.12.0-vendor.tar.gz 53774794 BLAKE2B 2aa91274bcd3efe2c34c9acdc3000af9903e2d1d67dcd0484b4046a78dbc140b460d2f5f9dc73f96302991245da5381483d4c24444f83c0f642b56956e9ea6a4 SHA512 42593ea9b731d02c8a6d6ec7adb2adb7dc5b5a41c549a44991eb66e79dce8b3cac3553157ef1c34202f662279de1da03da87271090649a6c773f53d5d6971e25
DIST vault-1.12.0-webui.tar.xz 1413084 BLAKE2B 5f681ac61b14694e64be0a55445d0849b9b7481dc2456c923297f496b60d843ffae2d7f27b029ed33b4e7efd3029d99c1cb30110da3ad3162ee4135f3856d60e SHA512 4399f2e4c85712cd83b8265315186d6f7161fa545e0708a56ff7c56fbde335eb2ab9a357720850c0007e55679b94edbaadd3c2318671676e658f270f4d04de34
DIST vault-1.12.1-vendor.tar.gz 53818036 BLAKE2B 58bf72efa345d737dd74a58bd56be3740d19fa5849d11f4aa4bc3ccb46ca42e84b1aa85bcf9f76e4ae5a72c3b954519a1ac989ff0f779c5fd25a42fe17b573c6 SHA512 55ccb2c61e6baf69627e1443ce6f524c2d6f8bf1ff59103173acd74e1a3a0a79a90a5dab95790f002ca7261e80c38dc2c8c27f95553bac65e2d0fa7f48254b23
DIST vault-1.12.1-webui.tar.xz 1413308 BLAKE2B 1a6008bc67f08037a0dbd966d004c424b249597cd9f1002e30a23262bd1df6ddc388e7d863ff3f62350d8a4b3807de40a1d33da08ade1fe5ec84d4cecc64ade8 SHA512 87d30c77772fa982a110cfe4fa0d118b302796e7dcdfa71b94e6bd1cca0369cb0555169ef48acc68e16d11a1ab47ef096cc91e204be3189f4779125449cd9cd1
DIST vault-1.12.2-vendor.tar.gz 53842063 BLAKE2B 42917c6310ca53254be9d6339a786902327074635297ad84fcacd2a73b9b2d974830f91f527116f6764ea8f848809944fd52e623c3ecc2ac88dae698aa6f4636 SHA512 8c6fd33c363099bda13a2992200356d4a877ff4c52ca4613f1cb2c8d2cbabaf0f9f760dcd6bcd3d4e4453324edce3efe07d27700f30bced85da0f56ef9321697
DIST vault-1.12.2-webui.tar.xz 1413036 BLAKE2B 7d773274c27d93ca8f492d792390896b6b7ab0e52b3636428f182a62161049d1593aef5280826dd83535e9ad86e925edba234ca982f2c9d1d06d2012c9757779 SHA512 0076e7b75fc0d3c400022a95cc6abc4a9224fd76d3d9716f7d4a80e4856c9deb1890ba13e7e5adf86ee81486c2f530f2eb48e49d8bdb7fde6eab5bb83f815293
DIST vault-1.12.5-vendor.tar.gz 53968923 BLAKE2B ea00b99e5cecbd0157222057269a570ea10194aa60821efeee8fa85c6a7497f3dd46d2d6fe04ad2c881e8176fff6bc033986099657e9333c9dfe6dd1c796aea1 SHA512 554b2e23120045d8ae22365d509756aa47754d4ba8c02886619fdf383a95fcbad172b2fe4b738df1c09ff0368aab6fc68aa70305b075254f103358e99fbc508e
DIST vault-1.12.5-webui.tar.xz 1415000 BLAKE2B b3fc8fd9074456b4b9518c4eb8ce2657fb3d3ef16338afc548a2a397d1d2e9e8f1520549cfd2833554249f6eb8f64fe798e1743c1745d81c58710299dbeb50b3 SHA512 e77616d03042dd101fa854004a36ab74641196dd3dfb40daef58896dc330b3b17da3fad56a29ca7d93a034901a30cac1928e44ed6e48e77dc5aa16f6369e7d3e
EBUILD vault-1.10.7.ebuild 2024 BLAKE2B a9c4d0a36f3dc15e96fdf85c26228e6bc33eab38da1ab0119396cbbab0722162f9c079cd804c8d4ddf5b953f1424fa3c77fb2d9909ed0a18171270166b1acd1c SHA512 e404fce90bb878d834ad156356a7c4b4b6585465ce1e242b580b99ec1da0a22510a975d410ce8c465635423916572670c4ec4c089908da0505905b853de44866
EBUILD vault-1.10.8.ebuild 2024 BLAKE2B a9c4d0a36f3dc15e96fdf85c26228e6bc33eab38da1ab0119396cbbab0722162f9c079cd804c8d4ddf5b953f1424fa3c77fb2d9909ed0a18171270166b1acd1c SHA512 e404fce90bb878d834ad156356a7c4b4b6585465ce1e242b580b99ec1da0a22510a975d410ce8c465635423916572670c4ec4c089908da0505905b853de44866
EBUILD vault-1.11.4.ebuild 2091 BLAKE2B d0803a4206e29127e35b3c2c5b0d6c41d57f643bf89ab7a0b97e13225b6e5103676712204bbddf4603a1dc94de34d8b5751710cf1004a9b97f381e2f3d62a9c0 SHA512 060ae598f2372b2217659fca84a40bc83b2c16ad2b10230e5dc535d4dcf06547afe938e371166bfdb13c8be34dc2f77e9775a6629c82cc2e1ea707cd938a910d
EBUILD vault-1.11.5.ebuild 2091 BLAKE2B d0803a4206e29127e35b3c2c5b0d6c41d57f643bf89ab7a0b97e13225b6e5103676712204bbddf4603a1dc94de34d8b5751710cf1004a9b97f381e2f3d62a9c0 SHA512 060ae598f2372b2217659fca84a40bc83b2c16ad2b10230e5dc535d4dcf06547afe938e371166bfdb13c8be34dc2f77e9775a6629c82cc2e1ea707cd938a910d
EBUILD vault-1.11.9.ebuild 2089 BLAKE2B 23d3719084e4895b526d0ed86b5fab81a06ab17da013c224af5a011751d0cfd893b2606d6053b32dd3ca6ae65342ec6afeea973fd1042008c222830a75e1e6cf SHA512 ecf8526ce2fb148cdcd59d9aa84647363998b31df18222016a78505c26916aa83103522e2d7c237480e226056f6225ab46a25efa09751e675ef3e5f6adeb7ce7
EBUILD vault-1.12.0.ebuild 2098 BLAKE2B 9826f0c812e207ab734f9077524f651b2dcd98e1f588bfa64760e773c713cce4cf6f3e3d6a5916db66f2d3baed938ac57852959ad889e719b1176047b045fd3e SHA512 e447ba38ef5ed2ba21b55b4a8ee63eae0a9f0db77a9b9362e934e17fdab77ba49bf944eeba992aebf636ec8cf734e4b93626ccd4f172270738b026b8be9ba4e0
EBUILD vault-1.12.1.ebuild 2098 BLAKE2B 9826f0c812e207ab734f9077524f651b2dcd98e1f588bfa64760e773c713cce4cf6f3e3d6a5916db66f2d3baed938ac57852959ad889e719b1176047b045fd3e SHA512 e447ba38ef5ed2ba21b55b4a8ee63eae0a9f0db77a9b9362e934e17fdab77ba49bf944eeba992aebf636ec8cf734e4b93626ccd4f172270738b026b8be9ba4e0
EBUILD vault-1.12.2.ebuild 2098 BLAKE2B 9826f0c812e207ab734f9077524f651b2dcd98e1f588bfa64760e773c713cce4cf6f3e3d6a5916db66f2d3baed938ac57852959ad889e719b1176047b045fd3e SHA512 e447ba38ef5ed2ba21b55b4a8ee63eae0a9f0db77a9b9362e934e17fdab77ba49bf944eeba992aebf636ec8cf734e4b93626ccd4f172270738b026b8be9ba4e0
EBUILD vault-1.12.5.ebuild 2096 BLAKE2B fca083286620ca0cf90fa6f428e627851948afd1b77125171cf8b6c1e6bbfe599ca38cbfed8d22f7c83235d1d27e7fd8c011022d4cba68b3c1518319c7ca6ba0 SHA512 b7888e02d2cea6b5418f09f885391d4ef07da44a810caa866c0a52452e43c78138cde10032a72b7d37e3dd19540c7f03dbf24c84ea2cbd63472030d2af3b6a83
MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02

@ -0,0 +1,86 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit fcaps go-module systemd
DESCRIPTION="A tool for managing secrets"
HOMEPAGE="https://vaultproject.io/"
VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
webui? (
https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
)"
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
IUSE="+webui"
BDEPEND="
app-arch/zip
dev-go/gox
>=dev-lang/go-1.15.3"
COMMON_DEPEND="acct-group/vault
acct-user/vault"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
FILECAPS=(
-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
)
RESTRICT="test"
S=${WORKDIR}/${P}-vendor
src_unpack() {
default
}
src_prepare() {
default
# Avoid the need to have a git checkout
sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-e 's:^\(GIT_DIRTY=\).*:\1:' \
-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
-i scripts/build.sh || die
sed -e "/hooks/d" \
-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-e "s/gofumpt/gofmt/g" \
-i Makefile || die
if [[ -d "${WORKDIR}/http/web_ui" ]]; then
rm -rf "${S}/http/web_ui" || die
mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
die "mv failed"
else
mkdir -p "${S}/http/web_ui" || die
touch "${S}/http/web_ui/no_web_ui" || die
fi
}
src_compile() {
mkdir "${T}"/bin || die
BUILD_TAGS="$(usex webui ui '')" \
GOPATH="${T}" \
XC_ARCH=$(go env GOARCH) \
XC_OS=$(go env GOOS) \
XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
emake bin
}
src_install() {
dobin bin/${PN}
dodoc CHANGELOG.md CONTRIBUTING.md README.md
insinto /etc/${PN}.d
doins "${FILESDIR}/"*.json.example
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
systemd_dounit "${FILESDIR}/${PN}.service"
keepdir /var/log/${PN}
fowners ${PN}:${PN} /var/log/${PN}
}

@ -0,0 +1,86 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit fcaps go-module systemd
DESCRIPTION="A tool for managing secrets"
HOMEPAGE="https://vaultproject.io/"
VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
webui? (
https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
)"
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~riscv"
IUSE="+webui"
BDEPEND="
app-arch/zip
dev-go/gox
>=dev-lang/go-1.15.3"
COMMON_DEPEND="acct-group/vault
acct-user/vault"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
FILECAPS=(
-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
)
RESTRICT="test"
S=${WORKDIR}/${P}-vendor
src_unpack() {
default
}
src_prepare() {
default
# Avoid the need to have a git checkout
sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-e 's:^\(GIT_DIRTY=\).*:\1:' \
-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
-i scripts/build.sh || die
sed -e "/hooks/d" \
-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-e "s/gofumpt/gofmt/g" \
-i Makefile || die
if [[ -d "${WORKDIR}/http/web_ui" ]]; then
rm -rf "${S}/http/web_ui" || die
mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
die "mv failed"
else
mkdir -p "${S}/http/web_ui" || die
touch "${S}/http/web_ui/no_web_ui" || die
fi
}
src_compile() {
mkdir "${T}"/bin || die
BUILD_TAGS="$(usex webui ui '')" \
GOPATH="${T}" \
XC_ARCH=$(go env GOARCH) \
XC_OS=$(go env GOOS) \
XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
emake bin
}
src_install() {
dobin bin/${PN}
dodoc CHANGELOG.md CONTRIBUTING.md README.md
insinto /etc/${PN}.d
doins "${FILESDIR}/"*.json.example
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
systemd_dounit "${FILESDIR}/${PN}.service"
keepdir /var/log/${PN}
fowners ${PN}:${PN} /var/log/${PN}
}

@ -1,5 +1,5 @@
AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab25ceeb8a22392ac8de0dd489462e28bc48512c151f3f438ddc7f9bd093d5c63b46ba29b SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476
AUX xstow-1.1.0-clang.patch 1092 BLAKE2B b00444730f525ce39c2692e7f1ab120b40d1e671d88c1c4f9b2b85f0c97ef34a89f12ba47c8eabd53464d05e5e3a94f28f84c3ce277072a983c34e188f149edd SHA512 804df13381f1d0f365303547c1b8e8b5fa2dd06e357596bd65ba349fe6b63e906491e78a19a6bf9190e7e8a81ae26b77a66f0f5290ff5b640f91024eca136537
DIST xstow-1.1.0.tar.bz2 187761 BLAKE2B ed3822e638aedf8900a3baba62a5af9de9d7b98dcdf27ca81a6898353b9f5c7f767ec7d8e68ead4d5ef318af5a6eda2b1cc68a5c80a6a8ad2b9c8adf03ae3377 SHA512 30f2e0be0c2aba668b4cc781fe69ac74c2460cc681c6b47a55ee66af5c0f2ac14dee9fe2e95a288ce06059378407a2b99d2156430a5a6dcbf06def793f579015
EBUILD xstow-1.1.0.ebuild 1225 BLAKE2B 7f58c2726265412a7544d99388a9ebb36d990045cca4fa52078005837b2a51369bd3bf132bc045c11ccd4f61e9d90a187e844095b8fd16fcf320949a04b3b98d SHA512 6ce9e4287bd20c77731e30206ecec2d2d740fdcbac36082f10174d43f99d6ce4a0a72c0ef3be165432e661421a0f7a80b7ec456427544e3401a4dca474279100
EBUILD xstow-1.1.0.ebuild 1226 BLAKE2B 6a728a574e414f4ea966adaec835f1f61d3c0427eea5682d460daacd2161a87ae0e8b3c863bef1cee5658767c685e046da013376a22ed96a408c66174c441aa0 SHA512 ef32f0a0aaf528053932b5a020191cbe085dd99a3b7fd47f8b2459ed386d4ac667aa20f97f8a69cceb76caf12f600cd8402e2ddb136b82fe56e2ee480eeddfa8
MISC metadata.xml 301 BLAKE2B aace14f4b6ef5f8874f165c8bf5f6c3df1c8a259a54f48cf8805a62baa9530bdeea7dbe85a9c445151fdac6a53674f1967bf960ef0c9b26e4ccc8923d89cef55 SHA512 dafc481314893bacf1024daa509819b09d99f7f7c2bbb0613ac092cc0e14eb61ec708ba1a6d5b3d48774855707481745d0da462b94a973dd88a22ec64cc667de

@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -6,7 +6,7 @@ EAPI=8
inherit autotools
DESCRIPTION="Replacement for GNU stow with extensions"
HOMEPAGE="http://xstow.sourceforge.net/"
HOMEPAGE="https://xstow.sourceforge.net/"
SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
LICENSE="GPL-2"

Binary file not shown.

@ -1,9 +1,9 @@
DIST bzip3-1.1.8.tar.xz 269668 BLAKE2B fe85ba2ecca8e2433501c13e57856720da731b6c959340a68dd4654a516c12e034a90ff6cd6aed55dd2160c3860fdc3e60cddd47ffd00737a657a2e6c73704af SHA512 36141a48f0d5b35de4b06117ceca3c5d5cdc3df6be187856f1436751984b0154942e0eece531ee7b191cc0cd7056960de6a1ca3ec0fc2bcc7ff1d50444cd1e3e
DIST bzip3-1.2.1.tar.xz 271652 BLAKE2B ef4eae00d93b00dd6dcf2d3beb980c5b0466e8d1af5b6a1c1a493c1524fb91043cbafe404d9ac6907491ab5e894676b3802b572125e14e9a8be19f7ffa22abaa SHA512 b20a7ea52f83a4ddfab0965e34809be66729b516688f1f04b8a21adf5c3c1ad0819dab416f3e844d88d8f52dbe098bedefe63f879c8a6322ffcb19f3f1b3d2d8
DIST bzip3-1.2.2.tar.xz 275872 BLAKE2B 601f0b150dee756d204c186f6ace5106fbc90189862cb1bcba7d4f2a2dd093ded64bb8feba0f214aac39ad138a23e6ef430a5e75829dd2ebab77c79d85342197 SHA512 476876f3949ac285e86625a9a83741308910ddce5b9449c0ca02b41d9c336f759b9702f2ce6b61243f1fde59a9ef8cf926fb2e94911828d5f39e207319bf522d
DIST bzip3-1.2.3.tar.xz 276568 BLAKE2B 08f762174ea565e4115cd7ee0e8d22bf5aae3f060955715cf7e0f22f388b99976baa571db501cc973fe93bcd5245e991ca149f097929336817169ea488bf8907 SHA512 cd83092c5f84d9491209a15a002def26bd1b1043631e4c6e90eb8e28d977da696a24c9e80994383943e104766d120acd5a7f6dc2f6892b16661ea1fe57745c53
DIST bzip3-1.3.0.tar.xz 276724 BLAKE2B 4b9ddd4da193cc784265eb2584804cfe7ddb55947634dab9068f7df8d0f7ee8684b3ce1cc50df355780aa8514462d23e93ff637ce2ca552f3d09b32bf1edcde2 SHA512 3777f6f0c337b5014b510c97ca3d19c77e7e474482d9e83143186ab593967fcec3e19163b32b03e6d8243838091f24e45eca245e35f0a6e5e713f29873ad62c4
EBUILD bzip3-1.1.8.ebuild 780 BLAKE2B 40c5d480da40010a89acd6f33a35048bdf5983017b9701840b917ff2fc56ffff93da2189cc783f1009d2de3063a41892bba33d3a59bf5a1d9d0c4104075dc71b SHA512 2b3d5355ca469a43563a54ffc1bc8f3e1378955e955e5e603659f7367296c68cbf0392550df77c2ae29f919b01ab33505371ed0a871e98ede7174eb7bf15c6f5
EBUILD bzip3-1.2.1.ebuild 780 BLAKE2B 40c5d480da40010a89acd6f33a35048bdf5983017b9701840b917ff2fc56ffff93da2189cc783f1009d2de3063a41892bba33d3a59bf5a1d9d0c4104075dc71b SHA512 2b3d5355ca469a43563a54ffc1bc8f3e1378955e955e5e603659f7367296c68cbf0392550df77c2ae29f919b01ab33505371ed0a871e98ede7174eb7bf15c6f5
EBUILD bzip3-1.2.2.ebuild 780 BLAKE2B c0beeaff4442ba49098444f5b0c04625180a4529776ac9c3b73cf5c9cdde95229c5e42b6db53cae58952b83c7aef907f83ab366e80958f24ba5f3bb3697640f9 SHA512 f68707c80a45818b97de6210cb137b26129ae5e90d57aded24c99a83817ce3e67c6b77b90bbd4a5b8329140dc76754b48d60503e50df16f26f11b944fca25440
EBUILD bzip3-1.2.3.ebuild 782 BLAKE2B e2e032db4b8b2a8ec53f240c3dd78e9863ee88d9ee9cef1b48fa7f573b0d0510b3426d4d6fd56ee969aceeeb8351990e7e9d701ee0572baec969c4ae8b0ea3b3 SHA512 e9ecd0a9932d41902bb232d4b6e6862a627b15f50d48bf70450e4b55341dde203fc22327894faf41f09bd0711ebe4bdda2d324ece79f1deedd6070dfd9d10ba2
EBUILD bzip3-1.3.0.ebuild 782 BLAKE2B e2e032db4b8b2a8ec53f240c3dd78e9863ee88d9ee9cef1b48fa7f573b0d0510b3426d4d6fd56ee969aceeeb8351990e7e9d701ee0572baec969c4ae8b0ea3b3 SHA512 e9ecd0a9932d41902bb232d4b6e6862a627b15f50d48bf70450e4b55341dde203fc22327894faf41f09bd0711ebe4bdda2d324ece79f1deedd6070dfd9d10ba2
MISC metadata.xml 879 BLAKE2B eacb925ae4939be72ae25f0f333d8c8e1c08b2fd7946e27dfadd214b8fd5f27eef3f141f9ca911cf89151245f2fa11c7a8c5459c63badbfaf71e62aaca6d67f4 SHA512 963eae34b110b883993959f97a84c5fbaae914e009d024379d8b83ad02b335f3d7404ecd9020e291a38e78cb358dd4d0ff1b4b8f3604a2cc719e9d82ebee1e50

@ -1,32 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit toolchain-funcs
DESCRIPTION="A better and stronger spiritual successor to BZip2"
HOMEPAGE="https://github.com/kspalaiologos/bzip3"
if [[ ${PV} == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
else
SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
KEYWORDS="amd64 arm64 ~loong ~x86"
fi
LICENSE="LGPL-3+"
SLOT="0"
src_configure() {
# ./configure script will default to Clang if it is found on the system,
# force the use of CC selected by the user with CC=$(tc-getCC)
econf CC=$(tc-getCC)
}
src_install() {
default
find "${ED}" -type f -name '*.la' -delete || die
}

@ -0,0 +1,32 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit toolchain-funcs
DESCRIPTION="A better and stronger spiritual successor to BZip2"
HOMEPAGE="https://github.com/kspalaiologos/bzip3"
if [[ ${PV} == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
else
SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~loong ~x86"
fi
LICENSE="LGPL-3+"
SLOT="0"
src_configure() {
# ./configure script will default to Clang if it is found on the system,
# force the use of CC selected by the user with CC=$(tc-getCC)
econf CC=$(tc-getCC)
}
src_install() {
default
find "${ED}" -type f -name '*.la' -delete || die
}

@ -1,4 +1,4 @@
DIST dtrx-8.5.0.tar.gz 34061 BLAKE2B d8ecbd9f3594440656e40d811846dd302d271f189711176a406572871db69f98bb4fd81a76ebdce697faf8d56029f4dcf735d18795adf732809e6017a7395cf2 SHA512 0ef0c0c9c22d948f6a8ee801372605dae52f4f571a32bbaa180c2c1daab061d623119c91b745f6a86cd28d7d08cdb47029a4de38354bdb28c62acfab080cc0f1
EBUILD dtrx-8.5.0.ebuild 1079 BLAKE2B 7b943e98cef55dd14137b303290d161e1f2508465bdb26b4fb22f2f16b58a89f4ca1d9ab2e43bc85f90838c6318dd11cd9a0879e1e2429b65e97c699fbfabe3d SHA512 b45e86fa5444053b8cd737abc461f364030c6d4a056b96746f5703ddcf2cb2077c988f41f51c059893a436b5016019eaf2179ed2a02cbc0721f3780e4de10951
EBUILD dtrx-8.5.0.ebuild 1098 BLAKE2B 6c2022944f781903b8c466b54ed6627b3e5744d424e3e72a9efdeebcb49ad6db39d5710c8d853cbf9e2b8158ee8d8805e66ec918b6dd0dcc9b7df7c8cd580db0 SHA512 f7b010efa34cc5923691eb397e27ca437f901b25a6d7afc69e5c429daaaec18416063fff44d4aa2e1424b5704be2cc1772f1e803b53be975e9e0dcd80cca6238
EBUILD dtrx-9999.ebuild 1080 BLAKE2B 473add785e51e2e1fdc1c7ab623671bb45639334e4817dff92d214410f629807a6a2e81a47f56145ca1ffa0327da9982633abd1d59eb72d55d223ad4bfb72e22 SHA512 ac336d34d9bf3ca95117b020acc8b5f6ec55533056e6a65d41d3cf6178b8ef9f04be8b6452109fdbede210a552add61104c26af375252ad43753b59d307e63a6
MISC metadata.xml 439 BLAKE2B 7490943dfd8a50c9d0ba628b72b6e8367a148b942aba496744337559e1134e26bb1b8fc0741ac912607826b8084643a568198a578c95bc10315f868bcea7742a SHA512 69a3996fd3834a22f1a028873c1061cca325224cfdf321b4c01687d5099aff4e7ed6c601076eaca5b88affab20f0d46b921a13db838de7243d3973fe71a4ab42

@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/${PN}-py/${PN}.git"
else
inherit pypi
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
fi
LICENSE="GPL-3+"

@ -5,8 +5,10 @@ AUX zstd-1.5.4-tests-no-programs.patch 2252 BLAKE2B 014fab10a60fd6f5ecf5399ebc77
DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f7451254d8dba3f429101048532fd9c84a5b9083ae90d0457e9e1b1d48256581a1697e7db19b09d73595f070 SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e
DIST zstd-1.5.4.gh.tar.gz 2161536 BLAKE2B ffc5fcbbdf4ab04bc14b5037308bf4e879d4cbaaf863462ea1e8af3f1b86b935ee6036e49298c83ac42b00472c003e32c263c977f0ae7d64f31d9ae63c5c28cb SHA512 2896a6dd6b60cc251720356babcbab6018c874eb2149121b26e28041496fc355a9cb5fd1b39c91558fcfbafb789b3d721264a0f9b5734f893d5f3cdf97016394
DIST zstd-1.5.5.tar.gz 2368543 BLAKE2B 7680e27a0adacfb809d9fc81e06d3f99bf74df30374d3b5cb2d58f667dd1b7d5c41697e608592709e17c0e32277f20a6d615edee409b5d7cdcb15da2799a2350 SHA512 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6
EBUILD zstd-1.4.9.ebuild 1676 BLAKE2B 31a1c1f3b06f03aee1f79be98fd352ebc850cf763a5fca287810fae13042587d434e28f1826e0e86194bffeadb60704d9b36f0b0036aa72a51fa7be11257e814 SHA512 b878ad96130da9450c92597354335b294b24341c6ac0b8f236f9bcd55efda8c46f700f0571ac80822da34a5b854d463d02cf8707ea1e7b3b2b713a6f6924025c
EBUILD zstd-1.5.2-r3.ebuild 1490 BLAKE2B 3acb86024c045b85682d2e4b138dd83ab85de948dbc95529aadd260728c6ffe2ddb1168ba3165cab65da7c803f9d715ec2c70f9a0c9d65b7ff01e06ae57d560a SHA512 9fdb17e7d37b41cb2b1cc5553005223d50d3aa0d62fd56100878ac5c30c994e0c515b5dd0aede1f053fc413614810bfd73f4a64da18f12b31f2644537cc6d0a9
EBUILD zstd-1.5.4-r2.ebuild 2085 BLAKE2B d4b17ef1cdf4ae53f6c1381fc6198471385ddd338b09697466bf3cde1501b4780ca97994c86444a9a64e155ec1c53dcc7860cb6fae92fb6931f6a08c2b76bc6f SHA512 54d69027986b64efcc12decc93a9114223663888d20802ad88600eeb6acb6acb5a3a882380341e8bdc7f124c1e8e32c499d18d6a8d026646df8456a6d8fec67e
EBUILD zstd-1.5.4-r3.ebuild 2123 BLAKE2B 1fccdea8475e5baecabb15d126fef67098f0a87e4c5de5d635bf81ebc5f2ea1d7c7cecdbd7d64b485fedc6bc92bb3b2531856d8bca616e6dce005c0021ba816d SHA512 d33a3358e628cb1b63cd49dfd7283ecd7edbf327231848012d75875b42af4d91c33584b7c74365a15d3edbaf51b4a8e1037ac7952da4df3e6dd59b2213c90df2
EBUILD zstd-1.5.4-r3.ebuild 2122 BLAKE2B d15de3f454cd6a608aed507d1d21afac3e535c11768e35f204054fbee70d3136901b7aaaa4fca12b632d1c5895d2163a1dda4519e9518c1b7bd8c0c130f7ee35 SHA512 4f6799f4857269e0d16e37bd3ac8cf29df88082c363829e6144df37a25f486b60dd452c34be77065a121e0c0a28b8d09e7e967723228f2648b01903c0a599c23
EBUILD zstd-1.5.5.ebuild 1792 BLAKE2B 5053a8f2e957a716af4618696f3c4f562d039714acb61c4c27a9737e46dc400f678f5913472d0a92cd9eeaed0cfdb0c657bbdacf1baa1ac5653b6f3a07e90f4e SHA512 a934259ac50c9d807adb95a2d7c06a05a629b314a68139949475550a30bc08c985e78441bbfb25e8d3e1624e6e533ca23aff8448e787d1f676f78ec11d41248d
MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6

@ -14,7 +14,7 @@ S="${WORKDIR}"/${P}/build/meson
LICENSE="|| ( BSD GPL-2 )"
SLOT="0/1"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+lzma lz4 static-libs test zlib"
RESTRICT="!test? ( test )"

@ -0,0 +1,73 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit meson-multilib usr-ldscript
DESCRIPTION="zstd fast compression library"
HOMEPAGE="https://facebook.github.io/zstd/"
SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz"
S="${WORKDIR}"/${P}/build/meson
LICENSE="|| ( BSD GPL-2 )"
SLOT="0/1"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+lzma lz4 static-libs test zlib"
RESTRICT="!test? ( test )"
RDEPEND="
lzma? ( app-arch/xz-utils )
lz4? ( app-arch/lz4:= )
zlib? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}"
MESON_PATCHES=(
# Workaround until Valgrind bugfix lands
"${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch
)
PATCHES=(
)
src_prepare() {
cd "${WORKDIR}"/${P} || die
default
cd "${S}" || die
eapply "${MESON_PATCHES[@]}"
}
multilib_src_configure() {
local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
# This replaces the no-find-valgrind patch once bugfix lands in a meson
# release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372)
cat >> ${native_file} <<-EOF || die
[binaries]
valgrind='valgrind-falseified'
EOF
local emesonargs=(
-Ddefault_library=$(multilib_native_usex static-libs both shared)
$(meson_native_true bin_programs)
$(meson_native_true bin_contrib)
$(meson_use test bin_tests)
$(meson_native_use_feature zlib)
$(meson_native_use_feature lzma)
$(meson_native_use_feature lz4)
--native-file "${native_file}"
)
meson_src_configure
}
multilib_src_install() {
meson_src_install
multilib_is_native_abi && gen_usr_ldscript -a zstd
}

Binary file not shown.

@ -24,9 +24,9 @@ AUX bareos-sd.initd 654 BLAKE2B 9cec4086c4ee0a5bbb2643a2e9179d09094281f6f93c99d1
AUX bareos-sd.service 812 BLAKE2B 7ac9754d98ea177614450045fbbaf7406592b30a280646eacdf31271a0cafd63e88ac463b1d94143ccac96c289de3f88a177edab665f073e7c7692037ffedb68 SHA512 6a0fdb3af03e9f94e0d755a3286aff36b41ab1f00a82e9864f6d3de6931691f6aba79aeb7fc952cec039e4174b545f53c23e96fcfbaed71192877d201b3086ad
AUX tmpfiles.d-bareos.conf 33 BLAKE2B 68feed7629dde0dad019470851cea33140be3b17186fbbee7ad6c6a591978236ec09252d890117030d8706d22ea02f9971063aa80a393d3726510128527401d0 SHA512 65d3f72e57eb3afc557ab6b56a8ec1895a679b904114fefd1c9d0ceeb6b9fa8413575591ed81e1ce6963bdaf34dad227e781865b39bb237afc6bb5652306d2ef
DIST bareos-20.0.8.tar.gz 13429247 BLAKE2B 5576cf738fccad0ac39f7c92e8da01f4925d58e4373c8bc19f68ddb8cc8d6a07bf73dfd39bd2111766ccd20ce2da224680b8ab9adf7b84421874ae916e633f75 SHA512 1da30d0ff2f1fda2c4a41ec6d41ec60e3212b1bdb153c7f397931580894f31e36ab84f655d263aed47b9eb21e68ef7e59ec3b7bbd4f2c8981ae04b84733ffb68
DIST bareos-21.1.6.tar.gz 11654525 BLAKE2B 9b023a07e28098fd93aca57aead5b2bf993b85c52dc8f76870dc53ee88ec5995bcc908397173c7d3504c78214e37311442dd96bb563fa4382ae35904fef69e0a SHA512 e9ccafd379ea2a7ede2b6852fa544e7d4b63b23e9d91e8b747c1aecf5d764b06991a57f658842d48fbbe49335a92f29eea90e56b613a3123246a9cd9e8273f36
DIST bareos-22.0.2.tar.gz 14442217 BLAKE2B 34b8a506b608765f803cb788a203b7556dda67ae8bdd2cb82e1c8ea1ea8a07759f381c33b25e743d296417bef1072ccfcfecf536096cc1babdf20c57767cc369 SHA512 924e07aafa44829730f367a29f0a17356d06d5e44bcbe511936ebfe582912439010d8376370530982dfdfe54d8a722ff257648634cea429cbfbd566d2c25e464
DIST bareos-21.1.7.tar.gz 11666508 BLAKE2B 8b5efffb987b53d1bc289aa104c10827c6bed630ffee16c26e8ab428ee20aa63a9e1e2fc03a7656d26f5905443b06c6a6f6d4860be413776874917e2c1cd0ef2 SHA512 2b7dfb16b74aa912449269efb92c85b6720f08526122c7dc9bfb648aed70b2ca81df41eacb60c53e2a154793c6ed209dd1571ecec7913a357e491064b1faab41
DIST bareos-22.0.3.tar.gz 14529338 BLAKE2B 7759059f8652cf0b55a8754325b86257130695918f0b2d4672a7a21aa3ed6595da9fcba9a5a5f1c854af7994aa21c304720131ab99d577f01cd706f55184b621 SHA512 cbdf4bfb5284104894e7fb8ddbb20d6ecedd827c8133b13913e9a27c4e3b98b550ec60a9a23c2c4efe6d566c94ed745d77946a444e5fccb56c09ab8f740d9f8c
EBUILD bareos-20.0.8.ebuild 11419 BLAKE2B a0d365eb1512b818911ee8a5972445245db641915ea43f010fb085a899a8d5fa6758b2060f42cfa014e28e2c481af9891e6fd90c4018ce317467769b3093bef7 SHA512 ed7d20782ebbc436c60c22fb62c10f17dd88001b91a3ed7be75faf152850e6afe7145fe96397f039c2c8f1b7b90b551a9fac42a52cc0b753b646583191e47f7c
EBUILD bareos-21.1.6.ebuild 11573 BLAKE2B 0446ea365f7c92a161cb94e13cd0eec01e3db7472221376d79aee373e9398cf3236e766975929e41a70dac8ac8854d2fac2e7e67b7e801b9cc88f0e330308cbd SHA512 281f546efe764eda1b15419d5b8e21217ad77173cc142c1ecd4193ef83919390e57d54b292a37ae91fe038be13f9d6565f0983f9ee700405ef4c11466ce970be
EBUILD bareos-22.0.2.ebuild 11838 BLAKE2B dc0bca0885dbae52cbbec6badc9f957e5e59c5f98d038a72096bd0113f35d4260b89621071f9eb2b84ec344139c6872d2c750a1f9578cd98950bf5627212ae3f SHA512 2455908074c8491f38e697a0a6a70429a8803bad6fff758241f3dbbeaeaeb1787472180586a4ce487fc88a50ded3a1a46abf8739ea31ac38ffa302c174e64bb6
EBUILD bareos-21.1.7.ebuild 11573 BLAKE2B 0446ea365f7c92a161cb94e13cd0eec01e3db7472221376d79aee373e9398cf3236e766975929e41a70dac8ac8854d2fac2e7e67b7e801b9cc88f0e330308cbd SHA512 281f546efe764eda1b15419d5b8e21217ad77173cc142c1ecd4193ef83919390e57d54b292a37ae91fe038be13f9d6565f0983f9ee700405ef4c11466ce970be
EBUILD bareos-22.0.3.ebuild 11838 BLAKE2B dc0bca0885dbae52cbbec6badc9f957e5e59c5f98d038a72096bd0113f35d4260b89621071f9eb2b84ec344139c6872d2c750a1f9578cd98950bf5627212ae3f SHA512 2455908074c8491f38e697a0a6a70429a8803bad6fff758241f3dbbeaeaeb1787472180586a4ce487fc88a50ded3a1a46abf8739ea31ac38ffa302c174e64bb6
MISC metadata.xml 1221 BLAKE2B 190840f3e1003bd12c5d6b3b1904f37ea102982c5bb97de4c11adc128fcb86c3af17812b4ad886969bcade9b460753291bb4508321892f1b85e3e43f068a737e SHA512 bf55fff95a0bd8695fdea054b827453f7c8dd96caeee60af7755c25c88bab62548c57dcfb03cf09fbe23f32228878084b8fc3056d2c41b793c9b8ef024c20455

@ -1,9 +1,11 @@
AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
AUX borgmatic-1.7.3-systemd_service_bin_path.patch 604 BLAKE2B 9b1c613ce2667d2b8846e1bdf7e7bd838529fb9029af2ca572dcbafc5a8c9b64c79cab820be3b750c5fcb060da72cdf1c449cbe50efefe63ef1eb6a884e26e14 SHA512 6ca6c351697db1ae26de2b00ad543fc8f1cea1b0f4ef84f82f9578d9e56da58b4437ed48839c5aaf7d5ea66fcb79620d0cc12b8a2b30862b488fae07ad182638
DIST borgmatic-1.7.10.tar.gz 361036 BLAKE2B c4d81ef9a69c5ff5f8bf3d55a209f62f9c721f76207c996f335a5a5212533f93e71c77a2f4fee709de1228d0dcb8cfddf90d6734446f26f4fb7f0282acba0e18 SHA512 6b555afdbf60623632ac27824f48fb974cf9cce0bd9101beda01757749746221b5045b915497b69778726a7a528a618594a6259526d684dc43d8f90fbf8757f1
DIST borgmatic-1.7.11.tar.gz 365247 BLAKE2B a06737c48722fdf24efca76d40f6b413f39635b4137685d6279bf7a7dd002fadef28dab35a503fabf872c732a0f32fbff8c791fa9b4602299937aeae568d6137 SHA512 cedca889cd409e92484c15240fd8da91c655f81e38c6672d25e44feedc4adf6594281d92f7072fd11edc5c9f8589098226a3520e71e3441ee7a7acf97e1b2daa
DIST borgmatic-1.7.5.tar.gz 338412 BLAKE2B e27fd709070a27c2ddd01fdfe23ef9caeb942c52d756332b4abd6d6cf39724656677a0d142a5392e35e0a0f25958421fe23edf04a252d212d761f48a0c320d9b SHA512 c27a364617e0e8fc1c11adac5375deac4e1663236a545d3fb70280974614d50ffe3821010ed5e4345afa3c3dab5f45c0d3bbfc946f50321601acb56965fd555d
DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525
EBUILD borgmatic-1.7.10.ebuild 1644 BLAKE2B 465b07ef81d128ec67d4c3dc5a34f073760086a150d7ab790542c523a79935723cf67487227414fdca2e18b820073f703c0b247c4f3fc79c83deb7b40c87ca36 SHA512 c181db6113a06e11f7c4a16cb5d4f1c5282a104c3b3516e87580c215d0cd0fc7c1d7426a4a9bb7cc9c67068b31db44b51dbca22a85d2ab3c13bae9375bd0d5ce
EBUILD borgmatic-1.7.11.ebuild 2046 BLAKE2B c7f49967f3783c437566bfc3819ee42c953ede06df4996efb565d1f39b133f8f0e388f95c91d9637a17f00344b10a151aaeeaeab7b3e31cb953c9542b23f20d4 SHA512 bc18e9feaa4aa68ac4cee4e99e576f79f5b7b2c520810ecd798ed416739fa254c59c7e4fd40adb44d04421088dfab9776acba9c653d8b42d0ce91b9e765465c0
EBUILD borgmatic-1.7.5.ebuild 1918 BLAKE2B 09d0272a6a18e422370c410d63fc8deb0edc64e365dcf0e3402d91a88b56e913d26eefccc2138b9356d38efeef6ce8920e84d337c22c44fd1c742e3fe319aa3a SHA512 d2e3794241904a03e464b6c22d6f8d7caa75e5f013f063b43b7259168f76881a9cb05c4a0de76f4a7da5e6149bcb52d99f8df5f2e301d47ecae9817daf91c21c
EBUILD borgmatic-1.7.8.ebuild 1644 BLAKE2B 465b07ef81d128ec67d4c3dc5a34f073760086a150d7ab790542c523a79935723cf67487227414fdca2e18b820073f703c0b247c4f3fc79c83deb7b40c87ca36 SHA512 c181db6113a06e11f7c4a16cb5d4f1c5282a104c3b3516e87580c215d0cd0fc7c1d7426a4a9bb7cc9c67068b31db44b51dbca22a85d2ab3c13bae9375bd0d5ce
MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f

@ -0,0 +1,73 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 systemd pypi
DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
HOMEPAGE="https://torsion.org/borgmatic/"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
# borg is called as an external tool, hence no pythonic stuff
RDEPEND="app-backup/borgbackup
$(python_gen_cond_dep '
<dev-python/colorama-0.5[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
')"
BDEPEND="
test? (
$(python_gen_cond_dep '
>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
')
)"
PATCHES=(
"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
"${FILESDIR}"/${PN}-1.7.3-systemd_service_bin_path.patch
)
# A fragile test whose only purpose is to make sure the NEWS file
# has been updated for the current version.
EPYTEST_DESELECT=(
tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
)
distutils_enable_tests pytest
src_install() {
distutils-r1_src_install
systemd_dounit sample/systemd/borgmatic.{service,timer}
keepdir /etc/borgmatic
}
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
elog "To generate a sample configuration file, run:"
elog " generate-borgmatic-config"
else
local oldver
for oldver in ${REPLACING_VERSIONS}; do
if ver_test "${oldver}" -lt 1.7.11; then
ewarn "Since version 1.7.11 ${PN} defaults to a different way of selecting archives for multi-archive actions."
ewarn "For details, please see"
ewarn
ewarn " https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#archive-naming"
ewarn
break
fi
done
fi
elog
elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
}

@ -1,8 +1,8 @@
DIST mkstage4-0.3.1.tar.gz 19416 BLAKE2B d9d2ec0d9c3aba6331e2500f927cdeace8b728a535f9cc4b4cb8ea93fb7dea2bc5f95be5dbea76c9948836f35bea832a9fdb2acea34518f9a4b5a456507973e0 SHA512 f58c89d0d9cc3a65cfa62cc18b0c5f172a69d4b4582e839e98ecd52cafd584395a91e5531ceb171dacd5e4975d6858ae91c5f97a26b62dab0f4ab809f7bcd4c0
DIST mkstage4-0.3.tar.gz 18648 BLAKE2B 3a881bc1ec14f5c9795d49306966b586c30a8b415542fb500b5a2af7735008832ebc64f0a166ea4e2fdb48a555bd789b352784f1b05118116ae3f634937beed6 SHA512 6971bf4b43a2fdef0b54802b010c99e95caf896c8e109c54f5a6beb4db1714ea5639e0859ba3f958eed92b9fc6a3bb613bb82de440729e71e53543d60549d2db
DIST mkstage4-0.4.2.tar.gz 19860 BLAKE2B d5ab8c0bfd79796ec0f5310a52ed3ba6290b6cc11272a3d69408617f84758981b912628c5f796c1db5129a23db26049e14bf289e6f63f95e2877ab983e568c87 SHA512 2b481950f443e8f62ba837fe3d4238db79299776f3a115696e999a484ff6bb664bc54c74e61d31ff8d827c8c9c1174225d613d39ab5d93e0106725889990bd6d
DIST mkstage4-0.4.tar.gz 19769 BLAKE2B 833b343f8d8deba2914c24aad07b802f551102f598fa6b149ad2aa8df3b96d189b8a29be8904e510cc4200609b4a2a19d83c510c58745b734898a119ae259313 SHA512 13f867c45fe9891754e62f2204e35260ce9c6a756eddea807800cce5cb5d9e7a1b21c27dd0d5142a13bc8b88c441cf618ba5ce6827a0644f6468759062a9e34c
EBUILD mkstage4-0.3.1.ebuild 564 BLAKE2B 361ec0f9ce67246612993ebab79ad5be98aed1cefe645f8df7b52cbff36056c1dc95edbdecc29bbf18d671ace4990e7e9453fca46d4a2911319cc71a01f3f3e3 SHA512 2070dfbb893aff9934eb179a34ac217fab849a0c1fe5a562c21e85a1979266f6e547f94a0b2bb3de01c919ae880807ca2c1ca670135a4b3b496feaba54172823
EBUILD mkstage4-0.3.ebuild 564 BLAKE2B 04c3f8d12d73b68f5dcbc19403f3cf7c26d29e1ac4dc7f183bf0e150ceb7265c0d24b5da31a121d53b00e80389245037263f524c706d8d665cc9a9e0b5657c02 SHA512 1a53dff6acf100669b0fa9b6be0e9ba4b07a2028238891de1baf7bd80d52bf28ca58b26f61139adab004018c0275d855c12aac536fc43334069393677cc8bf4d
EBUILD mkstage4-0.4.ebuild 593 BLAKE2B 4effa155325d873c254a5b3060bc224e554083638b53e1146477743cdcf59d4eb89b2d9e1677be289d5cb60d088a0bb45ae7a8e4699a7eeb4609faaef5766229 SHA512 55e5368b7301aa975e4ff8fc6f418cee17b9831e7008634c9dcea941bba333016451ac70a5c1f485a177409fc64f686a95f3f186a2aa143129a927ff7ee7f385
EBUILD mkstage4-9999.ebuild 480 BLAKE2B a3b2354257d980c979a2bcfbb4185771c7a95017b5e036a0df45c8304d9e783d972c4ca3349255a676da7f3541d46288e789888d750b868fc3ea8fa210adf451 SHA512 c3b797b4f49964d188c88196c51d6f41c70e1cad7c361c119071548c7859d65808749826f14882abd5419fbe4f0d712c547c1fe04dc8d64163dfc16c8ff16a1e
EBUILD mkstage4-0.3.1.ebuild 567 BLAKE2B 47e3518548f68c7e91dc77a27210abbf3c8d2f58eaed5445956a2338979b16bae6d5037bc59a21f9aaf0656a533f057a9eb927504bbbd49df7aa9b20390124d5 SHA512 fc433255d4d8a23b9fdd2787e07476a6087689c9d7a8b9ed98a92446de9c2897d548e57d75d4e82c77d3ae00d15929eea6006de84e9c23dca81633fbd58dd057
EBUILD mkstage4-0.4.2.ebuild 596 BLAKE2B f2cdac41c0cfb83ec369f9e0438af984c9afa68640ed661cda6eca24d06bd98fd9d9b140200a5313ba4dd6f56b3029efec115bd16769312ee5a796f6e6020f23 SHA512 60b239ae9b2d8e0c4be71a9bd33b9d65c59afc8b10e3f5f99e5bf1b803f68ad592d66fc9a36471cd51532abee505c68a0e17ead18a394278e9c6f4e1858d9163
EBUILD mkstage4-0.4.ebuild 596 BLAKE2B f2cdac41c0cfb83ec369f9e0438af984c9afa68640ed661cda6eca24d06bd98fd9d9b140200a5313ba4dd6f56b3029efec115bd16769312ee5a796f6e6020f23 SHA512 60b239ae9b2d8e0c4be71a9bd33b9d65c59afc8b10e3f5f99e5bf1b803f68ad592d66fc9a36471cd51532abee505c68a0e17ead18a394278e9c6f4e1858d9163
EBUILD mkstage4-9999.ebuild 520 BLAKE2B 2c37352d3898a490474293f9cded90a4813dde58a8f15e3ea1f35ef36178c3078666d55eea5bdb54b02a879be92a9bac0184d628143b2d6348258bb9b642957d SHA512 9919ac3025a211c5e71bc499de543bb98ff7e9011f3ceec861597f8fece141384fadbdacc6d139543b8dafc5f6d4b9bf107377cd5dcc8707f20ed3c39f5e80df
MISC metadata.xml 529 BLAKE2B 74c2cbdcca72e6000fb8ea9e06afbe8ef62ffed46d5e826b062e426940835a97e7d551cb0730cb8427b6f53ec34cf105728ff0f34e00239e6207f00879cac25b SHA512 f78895fe8380196f172f80f9f27ddea970b2e05c7933f4b53e8125881acb6e51b549573e19ef5358ea4367b31913b467e90dff2994311af5b92958c5122f28f3

@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
HOMEPAGE="https://github.com/TheChymera/mkstage4"
@ -25,5 +25,5 @@ src_install() {
}
src_test() {
bats tests/* || die
bats -r tests/* || die
}

@ -1,29 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
HOMEPAGE="https://github.com/TheChymera/mkstage4"
SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="test? ( dev-util/bats )"
RDEPEND="
app-shells/bash
app-arch/tar
"
src_install() {
newbin mkstage4.sh mkstage4
einstalldocs
}
src_test() {
bats tests/* || die
}

@ -0,0 +1,30 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
HOMEPAGE="https://github.com/TheChymera/mkstage4"
SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="test? ( dev-util/bats )"
RDEPEND="
app-shells/bash
app-arch/tar
"
src_install() {
newbin mkstage4.sh mkstage4
newbin exstage4.sh exstage4
einstalldocs
}
src_test() {
bats -r tests/* || die
}

@ -26,5 +26,5 @@ src_install() {
}
src_test() {
bats tests/* || die
bats -r tests/* || die
}

@ -23,3 +23,7 @@ src_install() {
newbin exstage4.sh exstage4
einstalldocs
}
src_test() {
bats -r tests/* || die
}

@ -1,8 +1,7 @@
AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
AUX rdiff-backup-2.0.5-py311.patch 1649 BLAKE2B 89a4885cabb8a921522ee39f96187ac81dcd3d5b37a9c9ae3f0d3cd526eca432e1a007fc7add4dd436b03e09dcc57b016542437f0cd15fc5203e04f515c05124 SHA512 f085eab1cc1ec6de1f5c166752db0d1cfa07618e60537008c4d6edee0085a039a0f3d460c0d5ceefd2810d1aa3870a5b176567796577921c00359d9cb039c22e
DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
DIST rdiff-backup-2.2.3.tar.gz 940780 BLAKE2B 37f36ab06e3ebbe67f42af9edc26e1862b11043777775fc100ffdbdc44f9442972601df1fb298c5ca0c5caebb18e0bdfeff86cdc1636a2a615c5f830448373a2 SHA512 5b243316deb04b444c48f64677979e9df208a21699bfd6af0f1459cea331d60deb37f664d168b3ec45a9a774a8898d5d0a8b0e3e9bf711931839e2d1174fd4d0
DIST rdiff-backup-2.2.4.tar.gz 941625 BLAKE2B 5635c8a418f482d44bac354415f33ec46d7f82fe4212517aef65712977ff9024c253515ef74b5696d200cf3d2b4f132887c22d35b633f02963ce56cab687b89d SHA512 3777038f90a702aaf0d87737ccd79dd6a0bc9d6bd49dc8154fbcd240b9b1971f5a5f3cc0ebffb623f1eeec82cb939fbdee75a813d27ef9eb78d5700ecc2716b5
EBUILD rdiff-backup-2.0.5-r1.ebuild 1012 BLAKE2B ac77f2576c939098ff7bd56e0a24bdb01ea152e70b60fa459643c42f32cd10252bc8621af4b33687492ef0f1d3fcc9a8f5882f4039c1c03d79b613385d046372 SHA512 817d5be88a71dddcab46a751ce25eba49b9781c0c76c70b1865e84d35160819bc025eb293842f439c1f00921e570eead17e912a60d16c0bce6212d63adb2b454
EBUILD rdiff-backup-2.2.3.ebuild 848 BLAKE2B e07bda4bf8c72e22a678e40c7f1121436171a14c0219549924f5ba6681d05d5a86046bdb58756aff1bfec222c3eb42945cd5d7fd95c4a029d3eeec2546a7de53 SHA512 d51a0fc350686be296fb6dc47839115c48e09730754633b72c751863c673e162544f996307869c5984ded32db8cac49d8ee87ae91afb77ea695fd252c580a031
EBUILD rdiff-backup-2.2.4.ebuild 848 BLAKE2B e07bda4bf8c72e22a678e40c7f1121436171a14c0219549924f5ba6681d05d5a86046bdb58756aff1bfec222c3eb42945cd5d7fd95c4a029d3eeec2546a7de53 SHA512 d51a0fc350686be296fb6dc47839115c48e09730754633b72c751863c673e162544f996307869c5984ded32db8cac49d8ee87ae91afb77ea695fd252c580a031
EBUILD rdiff-backup-2.0.5-r1.ebuild 1044 BLAKE2B 20b4ce3754dc0cb0fa6118ee294ab24ecddfb72905bbeb89dc9b89cd047a633bbd3527caeb7d6e0950f8c2549ed007d3a97b32fd003c425a70743964efb7155f SHA512 6b29b36819e311e9cdb3b4dde30e1465742d13c19776eaeb955317ad7b54995400506b5bd6fc5eabdd0e95696d3ba7c2d55d03e7796ad59e7bc0172b280593f1
EBUILD rdiff-backup-2.2.4-r1.ebuild 869 BLAKE2B 267233fd4e7ed9c19ec3e611009eddd809648fab57295598266fdab7ddbdf34bb86648ed7d572be230c0837a9153c3c31450069307813d4f158892289839dceb SHA512 120fd57b040d988f806dce90de6b4000aae5ab7557506f088f95696bb6907b8f3a0ff932d4671c572dc0747de0fb21489a1a75fdb0f0781b961112827960c968
MISC metadata.xml 393 BLAKE2B 345d8ca991657bcc7a84568942ff68f074568c247a6b68bd650967673e1ea126045ddcd4c16d8761bfd763b6daf86856fa5e4f7c503db2417e8a5eec47d6595b SHA512 c2ac0d3e6ff267541b42dc421ffefe57b4c8b34b57123a2fa2f9c9137deffe380202b97bacb989d0b11dfdc66daf76c3f3969d6bdfec2aaaa45bc57d7f5c6491

@ -0,0 +1,42 @@
From 5e5cc54b5a633d3c6c0469283b2f26dbdde7908f Mon Sep 17 00:00:00 2001
From: Frank Crawford <frank@crawford.emu.id.au>
Date: Sun, 2 Jan 2022 18:44:57 +1100
Subject: [PATCH] Added patch for Python3.11 as per bpo-39573.
---
src/_librsyncmodule.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/_librsyncmodule.c b/src/_librsyncmodule.c
index a46567fc4..158104d2e 100644
--- a/src/_librsyncmodule.c
+++ b/src/_librsyncmodule.c
@@ -25,6 +25,16 @@
#include <librsync.h>
#define RSM_JOB_BLOCKSIZE 65536
+/* ----------------------------------------------------------------------- *
+ * Update for Python 3.11 - Contributed by Victor Stinner in bpo-39573.
+ * Compatibility macro for older Python versions.
+ * ----------------------------------------------------------------------- */
+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE)
+static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
+{ ob->ob_type = type; }
+#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type)
+#endif
+
static PyObject *librsyncError;
/* Sets python error string from result */
@@ -540,8 +550,9 @@ PyMODINIT_FUNC PyInit__librsync(void)
{
PyObject *m, *d;
- Py_TYPE(&_librsync_SigMakerType) = &PyType_Type;
- Py_TYPE(&_librsync_DeltaMakerType) = &PyType_Type;
+ /* Update for Python 3.11 - bpo-39573. */
+ Py_SET_TYPE(&_librsync_SigMakerType, &PyType_Type);
+ Py_SET_TYPE(&_librsync_DeltaMakerType, &PyType_Type);
static struct PyModuleDef librsync_def = {
PyModuleDef_HEAD_INIT, "_librsync", "RSync Lib", -1, _librsyncMethods, };
m = PyModule_Create(&librsync_def);

@ -26,6 +26,7 @@ RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
PATCHES=(
"${FILESDIR}/${PN}-2.0.3-no-docs.patch"
"${FILESDIR}/${P}-py311.patch"
)
python_install_all() {

@ -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..11} )
PYPI_NO_NORMALIZE=1
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 pypi
DESCRIPTION="Local/remote mirroring+incremental backup"
HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# Tests use a tox environment and separate steps for test env preparation
RESTRICT="test"
DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
>=net-libs/librsync-1.0:0="
RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
dev-python/pyxattr[${PYTHON_USEDEP}]
>=net-libs/librsync-1.0:0="
src_prepare() {
sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die
default
}

@ -0,0 +1,30 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
PYPI_NO_NORMALIZE=1
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 pypi
DESCRIPTION="Local/remote mirroring+incremental backup"
HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# Tests use a tox environment and separate steps for test env preparation
RESTRICT="test"
RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
dev-python/pyxattr[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
>=net-libs/librsync-1.0:0="
DEPEND="${RDEPEND}
dev-python/setuptools-scm[${PYTHON_USEDEP}]"
src_prepare() {
sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die
default
}

@ -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..11} )
PYPI_NO_NORMALIZE=1
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 pypi
DESCRIPTION="Local/remote mirroring+incremental backup"
HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# Tests use a tox environment and separate steps for test env preparation
RESTRICT="test"
DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
>=net-libs/librsync-1.0:0="
RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
dev-python/pyxattr[${PYTHON_USEDEP}]
>=net-libs/librsync-1.0:0="
src_prepare() {
sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die
default
}

@ -5,5 +5,5 @@ AUX dsmcad.init.d-r1 531 BLAKE2B 840b6431f083df2da7f42d79a1b28a87ed3b90d497e54a1
AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed61564fd45380ac792c89c20da1f8296f617467c411605f86a5cc2190d2135be771348c1d58b7c56c SHA512 e3572098abf5b2831d10a3b649337b5c9f1cd9fda4ed58844408b6fe31fdc68a3bbc197eab227f9808bc9ab4b4a7488c766aaa472e801d88631b6b8ec398eb45
AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
DIST 8.1.13.3-TIV-TSMBAC-LinuxX86.tar 593264640 BLAKE2B 0dec77e87403f86aaf98b3dbc61c4dcf7a107d2dbdb1733ad97294669b122a202034928b6c83df931877c6cd08272f7920250fbd6262ec9f565afdc06dd42c2b SHA512 dac6b7f701e7fb8af49988da8df952c93879b57ea57daa88d4fff3c531423c73b24e89995894c041601faf1c33f115e5153461e2672254d9f29b65dd30c8ab8e
EBUILD tsm-8.1.13.3.ebuild 7492 BLAKE2B 1d0f834cb55185a89ffd0077d05124a675af1a109db971a85d2790f1cace017ea32d2c840c984feff1cb9800b186333981e3b020d1a8c5a388b262d0ddfd73d2 SHA512 f49f0510c705450854a0fe4804c608ac1174af92eea99600cfeec5b0c066141c63e8ad809f667ce55a29173675088d10844e1a5e050586187bbe25f4209af16f
EBUILD tsm-8.1.13.3.ebuild 7470 BLAKE2B d370575b4b7dce060caac31330a326d8bab9e90d23aef5390eac51df20f40aba2cc3d1e5abbf12c93586785d47f02fbb027b784122f0f61303805500b1194653 SHA512 15b8334e4a631e7033f6d52877bbfacf94948f41df3402073ad061f36bb84220877f11465c9969ff40e234e505d4f9cb9516967a94cd1313fd5829c0a5c7f127
MISC metadata.xml 399 BLAKE2B 286d9d8e3c94ff45959b763044b769441b4cca5bfc85640f364da79726288578c270c0f52027465eb94f7358fb702b04a69f0996af90efe0e10bc4b90df9d2e5 SHA512 564b638560a6d38bb606b06731a6e5790daf5c91498015cc30000192d588fcec56c18c688955eaf09072108d31c28446c3c73c12165fb7cb8989592681cfbec5

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save