parent
6904005a12
commit
57ef8c39ad
Binary file not shown.
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST ansible-core-2.14.13.tar.gz 3145413 BLAKE2B 75b11feaaefa9a63c6f83f64c796ceacf7c6b08322ac0b85f6dcf968db7b80cc97262ea6f8f839e5e41e800ad7cae610e96f312c1ae0f58882c8891246a81b8a SHA512 195885815d40448d8497eae9533a4104c4b9f17ab3a812d544a403f41d2e77e7be2c15bae5a6df07563499052beb273580a569d51b667d0a9c5a16e55b35258a
|
||||
DIST ansible-core-2.15.8.tar.gz 3160606 BLAKE2B 439a3f584940e5ab46b43b0b47395e0618a3ea52c67ebcd51667f31220cb038dda35506e7843d177d555b77a55a9d2c6245a916741ab1dcdf222c535afb5f83d SHA512 020191ef4b005abbf799204da68270bd4f13a85c7f23cb9dffe85b1c5c093c0ad86e061211ab9fcc8fd0be9367717fb0baadefb1ebecd3579471120fb2e8647f
|
||||
DIST ansible-core-2.16.2.tar.gz 3163899 BLAKE2B 6365dd573ae4a2f3ebfc870ae3ea399b268615333de2ddf7e21323189dfdd9bf61ae836b536c86d713f4a934468ed36835084e06e4b6d9b32c4b633f55353ad9 SHA512 6e2389fc6b34645c0f1566eca960da36616619a5ed5e35b46f3d659979fe519db20d89b4f598344a389f4b6ac33bb660ea91a1a6509002bbf4ac791ea3cb4cbd
|
||||
DIST ansible-core-2.16.4.tar.gz 3170397 BLAKE2B 8226641621ce4b2a8cd564f831cd21e36345b2db6680f8d9f3d3388a05ff66df74f4d286300dbb1b73601a0bf4a781d266e62e9fd0c894a79f89d545930c854a SHA512 d05737eec9a6a0e71891821acd4540576b3a993f59d88c12c2da8e7f075bc11c712e0eba850b3f7a2643e3c970f51938267fed6fa7f99f2c4c205b64f9b13259
|
||||
|
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
DISTUTILS_USE_SETUPTOOLS=bdepend
|
||||
PYPI_NO_NORMALIZE=1
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
|
||||
HOMEPAGE="https://www.ansible.com/"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/ansible/ansible.git"
|
||||
EGIT_BRANCH="devel"
|
||||
else
|
||||
inherit pypi
|
||||
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/paramiko[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/cryptography[${PYTHON_USEDEP}]
|
||||
dev-python/httplib2[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
dev-python/netaddr[${PYTHON_USEDEP}]
|
||||
dev-python/pexpect[${PYTHON_USEDEP}]
|
||||
>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
|
||||
<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
|
||||
net-misc/sshpass
|
||||
virtual/ssh
|
||||
"
|
||||
BDEPEND="
|
||||
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
dev-python/botocore[${PYTHON_USEDEP}]
|
||||
dev-python/pytz[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
python_compile() {
|
||||
export ANSIBLE_SKIP_CONFLICT_CHECK=1
|
||||
distutils-r1_python_compile
|
||||
}
|
@ -1,3 +1,4 @@
|
||||
DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9
|
||||
DIST ansible-8.7.0.tar.gz 49317896 BLAKE2B d5923753e368e908a569c5f8f261b1afe7c51d5381db190bf7de1e81f0a6359136581852faa2974f174e816944c66e2c0f625d3d62bdde324758309982c90de9 SHA512 6a67f8553c3fa56559e4a31ec627cfe2c5f42e147d94bea305ec4580af9ba8add136092b209a5a3d7f9022407e9d557484f044d23cb227973fe4e4341fed7983
|
||||
DIST ansible-9.1.0.tar.gz 48839908 BLAKE2B caa652b339fb93334bff7246d1bab6bbdd9672a096637aa0695cd94a7f50d0e5ca7a1bfeb559792833c97eb9d16486965776b609354dc05ca63b1474d43e767b SHA512 ec6d86b3d05e66053001720b6b7d7bd1dba8bd50917c913e1f08a63b0c94f76a5d69732c78e793d038622a0b8c652860290a89cee1dfb22491a81763923ef843
|
||||
DIST ansible-9.3.0.tar.gz 38240168 BLAKE2B 0cd243a21b12163fcb37f014a69f6041f9c48dae84d1aeea342713daf8150246efa14ac94f43890e449896d111f1839ebe2dba7d9c48c2359fb01e4aadfd270b SHA512 71eff05455aee0a013b69790145a73325ac7037fc509545a7cdca358aa54c1731f7dc6fb0169f602d668e9da9e41a0879ff48ba1243d372e02dae9382ac46c5c
|
||||
|
@ -0,0 +1,29 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
inherit distutils-r1 pypi
|
||||
|
||||
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
|
||||
HOMEPAGE="https://www.ansible.com/"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND=">=app-admin/ansible-core-2.16.0
|
||||
<app-admin/ansible-core-2.17"
|
||||
|
||||
python_compile() {
|
||||
local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
|
||||
distutils-r1_python_compile
|
||||
}
|
||||
python_install() {
|
||||
local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
|
||||
distutils-r1_python_install
|
||||
}
|
@ -0,0 +1,90 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
inherit bash-completion-r1 distutils-r1
|
||||
|
||||
MY_P=aws-cli-${PV}
|
||||
DESCRIPTION="Universal Command Line Environment for AWS"
|
||||
HOMEPAGE="
|
||||
https://github.com/aws/aws-cli/
|
||||
https://pypi.org/project/awscli/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
|
||||
-> ${MY_P}.gh.tar.gz
|
||||
"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
|
||||
# botocore is x.(y+2).z
|
||||
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
|
||||
RDEPEND="
|
||||
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
|
||||
dev-python/colorama[${PYTHON_USEDEP}]
|
||||
dev-python/docutils[${PYTHON_USEDEP}]
|
||||
dev-python/rsa[${PYTHON_USEDEP}]
|
||||
>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
!app-admin/awscli-bin
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/packaging[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-forked[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
EPYTEST_XDIST=1
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_prepare() {
|
||||
# do not rely on bundled deps in botocore (sic!)
|
||||
find -name '*.py' -exec sed -i \
|
||||
-e 's:from botocore[.]vendored import:import:' \
|
||||
-e 's:from botocore[.]vendored[.]:from :' \
|
||||
{} + || die
|
||||
# strip overzealous upper bounds on requirements
|
||||
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local serial_tests=(
|
||||
tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
|
||||
tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
|
||||
tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
|
||||
tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
|
||||
tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
|
||||
tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
|
||||
tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
|
||||
tests/unit/customizations/test_sessionmanager.py
|
||||
tests/unit/test_compat.py::TestIgnoreUserSignals
|
||||
tests/unit/test_help.py
|
||||
tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
|
||||
)
|
||||
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
|
||||
EPYTEST_XDIST= epytest "${serial_tests[@]}"
|
||||
|
||||
local EPYTEST_DESELECT=( "${serial_tests[@]}" )
|
||||
# integration tests require AWS credentials and Internet access
|
||||
epytest tests/{functional,unit}
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
newbashcomp bin/aws_bash_completer aws
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins bin/aws_zsh_completer.sh _aws
|
||||
|
||||
distutils-r1_python_install_all
|
||||
|
||||
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
|
||||
}
|
@ -0,0 +1 @@
|
||||
DIST redfishtool-1.1.8.tar.gz 83028 BLAKE2B 376d7513776aaf72bdc249d27312f25134c16ede12584ce334d7f89b07fc2abd986baa775fbc5f497d0679fba6997d5f908062af32186364b6609625fcb6e0c5 SHA512 c9aee7461013144e7d2ba2825f750cca52270cd658bb07e65764923c0ba489ec1e8a5ecb12a1b4f43ef8c0227fbe195a6869c2ae264ed778a5dddc513cbaa542
|
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>marecki@gentoo.org</email>
|
||||
<name>Marek Szuba</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="pypi">redfishtool</remote-id>
|
||||
<remote-id type="github">DMTF/Redfishtool</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
@ -0,0 +1,21 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
inherit distutils-r1 pypi
|
||||
|
||||
DESCRIPTION="Python package and command-line tool for accessing the Redfish API"
|
||||
HOMEPAGE="https://github.com/DMTF/Redfishtool"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/python-dateutil[${PYTHON_USEDEP}]
|
||||
dev-python/requests[${PYTHON_USEDEP}]
|
||||
"
|
@ -1,6 +1,6 @@
|
||||
DIST rsyslog-8.2308.0.tar.gz 3346424 BLAKE2B fc55323ab9f7e88cc84f32f95531a8cad87aad22bbb7a23303033bb841c8badc4053a8a9fc302611aeb4288efc148708affa7d873e41b07521cbece7e3ccfc45 SHA512 f8bcbbfe2c5c0a7e56203fc4ff285594cfa27fa7c998db2fe065a3f06b9bc30692626787c509b1f5d081a4b176680183b651625c5e3ccb4580ac59f3980ae8a5
|
||||
DIST rsyslog-8.2310.0.tar.gz 3349174 BLAKE2B df451f473fdf1714d2ff2bf92afe5e53d00395eb21508fd00c628784fa577aaf6fed597f79c99e64f62bd3a5eadde0748ce08e6c082a24a507fa687055599d70 SHA512 f04e14ede8c35e1799eadc711a6e99dbe56d312c7909c7ebed4d4bd489d310a44a5c2d3ed23968fbf3ccff5b580870d0f3ceeb690deb1d1424420fc9d3220696
|
||||
DIST rsyslog-8.2312.0.tar.gz 3358109 BLAKE2B 8b463c07a44efa60b6faeaa466498a2540eefc158efa759479cc6fc36acb04a718dd6ee4015f311343e6b66b6e074d5ed40db29cbcad6c71b42286a58cb92d7c SHA512 a65ca1c6fe2d9dd853d073d93cfd4d007c3533bd10c633113fcf94c4746192945ed0a2b2ff84f9174b55de90ade2a062a0bd556ffe375864fad3772ef8ce39e3
|
||||
DIST rsyslog-doc-8.2308.0.tar.gz 6668327 BLAKE2B ca82fa7b69b19ba03fd30adbdf2bdc37eb7f11c714ec7f79d4cfb352fcdf42aae4cf146a6911ec26212de64057ac23416bb2ca27e8001cbe9f9945fd7c7a931e SHA512 f0a581e2a7642d100cdca94125c39cf00acfc3339114ddad067d726f1526941f52ab33c0f5789f9cbd4197b3e1f3c841da86c71886fa97306990193db8d6c935
|
||||
DIST rsyslog-8.2402.0.tar.gz 3404026 BLAKE2B fc33244f0e4699d446ffab19aa8078ac49518b1722a5d7e72e57d7768ef42565bc3fa54b6c594e857715b5d5439ef675811eee888c81aadec3d1e05d5416c51e SHA512 dea9a14abc6ea25b3e5b676eda6a772c0c6266afd95eea0446ea85b29b2f98c058e1495cbdc16dba1c78d5d0919980e4fdfc13ef597082e7f3bf8b6be4cb5723
|
||||
DIST rsyslog-doc-8.2310.0.tar.gz 6674428 BLAKE2B e951d564a63c57c1d9d130a315c4bc9f4c25c9cfaf83bece1bbda582eb40260f000c7d9805faca550d8df7b0f6074aff6cc86ff877706cad69909040c3dff5b1 SHA512 cf452f3705680fc81495e940ea7d5ae705a6dbfe0e2ce5a87865c3043f79daaec243df20e8aadd9fac6144a3df8f19d7c56fdf19ec68df78e2fdaffa45096143
|
||||
DIST rsyslog-doc-8.2312.0.tar.gz 6621561 BLAKE2B 2aca14d24606e3a125259cad5fa43af61da2b70ba0b1916e5496f3d4eb6a28b612287bb83c3fa610f0f367deedcec4f0b3e93a552643194fdcf552dff3d408b6 SHA512 2fe8ab0e37a6899a545c09ea2586c33ab89a3e3d93ff079f99b15e9b1743423bbe54931684ba8509ed4f578a4b55ea22f6306aca256ee2245f88115a5f44e400
|
||||
DIST rsyslog-doc-8.2402.0.tar.gz 6525910 BLAKE2B 20bc3398db00cc2a0e92b610032cb86bcf17b71b31f70a47213b608c7ea9a1a81e9aad5caa74b7f23f0a28fdab7ef3627ec89f5910d535ac1ade5408b3300939 SHA512 dfffb6138cff6121020648c7ed20cec7c881020af956295f88ea297c3198ed6dd49a7fbcb651164c6a774520391d00743a3c34c7acc5f705b668c8048c289eea
|
||||
|
@ -1,9 +1,3 @@
|
||||
DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
|
||||
DIST salt-3005.3.tar.gz 17932868 BLAKE2B 18b1b3fe0708c2b425a410766df1545c093b43e69527b1213e1b043668b914016dc95b5c96c0619b1234b57fa404fdbe4fc245ac11d4f0b121edf4b0deacb3ee SHA512 4a40b21f0ee8ac31d3ca3d4d43706c3a484b9e19bd5797764475772af42fe682476b19f9097f003c838683529f15a757aab769eb0a15578cbc2fc449d8216604
|
||||
DIST salt-3005.4.tar.gz 17936876 BLAKE2B e06ec0e357fac18fe0ad823cf80e6261d80dbf22d856f0680a1c044d368133a1f94a6c9ff37b0f07ab305b835f808e96ae42a510eabedb6b2691b23959fa796e SHA512 31c699fc369c1f3c47f4f3a9a572381dd8c54323771194bdcc73128b55d983da7338b03061a6cdec6631aca62048e5829ea38687c3b0fdb1cdcbd5df9d000f05
|
||||
DIST salt-3005.5.tar.gz 17940104 BLAKE2B c7a820bc946c2cd8124fb6f559608ab1dc3cd85d6f0e7d0a2a87b7bc0dda361178e83b307c2fecd8a47d59032f85dc9f4caeef5698e98c0e349d1c6979f9f68a SHA512 1332c9751a225dbf569601eb1932fe3ebea93c8d8be7485b1b8150d5200ad2e82954c970d59ba0e888860062d059db78a50bffe69fc367bdb7b2388b62e19f32
|
||||
DIST salt-3006.2.tar.gz 20411634 BLAKE2B dff474017918ef3ee0031856a2739282077205d8c2589809a91e5f1c3741cb26d2bd2458734ea4d3533118c881851dfd853f4ba4f1c631e7db28e95bc1b6f7f8 SHA512 2626cb5beb1b30fc63f554f5804f0d9b7e36b7c569c5f9049e5f5ac5a413e9d99a98b3d91089683338e3d3890ec973dff80782b4e41acb291872e45084fd2546
|
||||
DIST salt-3006.3.tar.gz 20461738 BLAKE2B dfa4698dbc611c9c4954b4631d11b685e1efc978915918ce6d8f1890bb4a230d234b6a191166ffff9243058d44530bfc14b43386c8bc295c035c6609d6bf3fa0 SHA512 9cced766db2144de445ed53b52c1551c986ba43774c40512fd07973862d6d3a361e25f55fcfeeb0e03ba44eec1051909834e5d0a352ead5ec6f418b15c909628
|
||||
DIST salt-3006.4.tar.gz 20465324 BLAKE2B 8cf9acf8850e9eefbff32f3e347d8773ed7e28f58a0a441af9ec0a4c87a0bba49ff2b82e6f5816511de7303e16d79246df8c0024464a5c267f3ef7e370c8be98 SHA512 c48c69730ba81d3e279cbb01cb26c743dd8b4945c2fc16a7c959472ab4050316fcdaee935e009b7f472bd3b08172ac69defe64774a2d93e143a050cd559997ef
|
||||
DIST salt-3006.5.tar.gz 20536455 BLAKE2B cf475dc5e919f6ab180578db2aae5f3655623b39b134d67609da4f607be909340c6e55c940cfb66f129cc75d40b5cdda094e866db116d8a45aa5eef26d8fa1eb SHA512 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23
|
||||
DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729 SHA512 9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d
|
||||
|
@ -1,20 +0,0 @@
|
||||
diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
|
||||
index 6ee6aeb002..db9aeaee95 100644
|
||||
--- a/tests/unit/modules/test_boto_apigateway.py
|
||||
+++ b/tests/unit/modules/test_boto_apigateway.py
|
||||
@@ -154,6 +154,7 @@ def _has_required_botocore():
|
||||
return True
|
||||
|
||||
|
||||
+@skipIf(True, "Causes machines to OOM")
|
||||
class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
|
||||
conn = None
|
||||
|
||||
@@ -190,6 +191,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
|
||||
self.addCleanup(delattr, self, "utils")
|
||||
|
||||
|
||||
+@skipIf(True, "Causes machines to OOM")
|
||||
class BotoApiGatewayTestCaseMixin:
|
||||
def _diff_list_dicts(self, listdict1, listdict2, sortkey):
|
||||
"""
|
@ -1,21 +0,0 @@
|
||||
diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
|
||||
index 5f3d2a4982..82366185ff 100644
|
||||
--- a/tests/unit/modules/test_boto_apigateway.py
|
||||
+++ b/tests/unit/modules/test_boto_apigateway.py
|
||||
@@ -155,7 +155,7 @@ def _has_required_botocore():
|
||||
else:
|
||||
return True
|
||||
|
||||
-
|
||||
+@pytest.mark.skip("Causes machine to OOM")
|
||||
class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
|
||||
conn = None
|
||||
|
||||
@@ -192,6 +192,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
|
||||
self.addCleanup(delattr, self, "utils")
|
||||
|
||||
|
||||
+@pytest.mark.skip("Causes machine to OOM")
|
||||
class BotoApiGatewayTestCaseMixin:
|
||||
def _diff_list_dicts(self, listdict1, listdict2, sortkey):
|
||||
"""
|
@ -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"
|
||||
else
|
||||
inherit pypi
|
||||
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/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
|
||||
dev-python/async-timeout[${PYTHON_USEDEP}]
|
||||
)
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
dev-python/libvirt-python[${PYTHON_USEDEP}]
|
||||
)
|
||||
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/apache-libcloud[${PYTHON_USEDEP}]
|
||||
>=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}]
|
||||
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-r1.patch"
|
||||
"${FILESDIR}/salt-3005.1-tests.patch"
|
||||
"${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.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,235 +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"
|
||||
else
|
||||
inherit pypi
|
||||
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.1.2[${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-6.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-2.31.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/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
|
||||
dev-python/async-timeout[${PYTHON_USEDEP}]
|
||||
)
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
dev-python/libvirt-python[${PYTHON_USEDEP}]
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
>=dev-python/pyopenssl-23.2.0[${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/apache-libcloud[${PYTHON_USEDEP}]
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
|
||||
dev-python/cherrypy[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
dev-python/mako[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-factories-1.0.0_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}]
|
||||
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-tests.patch"
|
||||
"${FILESDIR}/salt-3005.1-no-entry-points.patch"
|
||||
"${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch"
|
||||
"${FILESDIR}/salt-3005.1-tests.patch"
|
||||
"${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch"
|
||||
"${FILESDIR}/salt-3006.2-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() {
|
||||
local -a EPYTEST_DESELECT=(
|
||||
# doesn't like the distutils warning
|
||||
tests/pytests/integration/cli/test_batch.py::test_batch_retcode
|
||||
tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
|
||||
# hangs indefinitely
|
||||
tests/pytests/unit/test_minion.py::test_master_type_disable
|
||||
# needs root
|
||||
tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
|
||||
# don't like sandbox
|
||||
tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_has_ip
|
||||
tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_init
|
||||
tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_ready
|
||||
tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_disable
|
||||
tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_enable
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_is_set_before_events_return_then_no_data_should_be_returned
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_then_all_collected_data_should_be_returned
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_is_set_before_other_events_are_completed_then_result_should_be_empty_dictionary
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_then_all_collected_data_should_be_returned
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_min_wait_time_has_not_passed_then_disbatch_should_not_return_expected_data_until_time_has_passed
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_minions_all_return_then_all_collected_data_should_be_returned
|
||||
tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
|
||||
tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
|
||||
tests/pytests/unit/utils/test_vt.py::test_log_sanitize
|
||||
tests/pytests/unit/test_master.py::test_fileserver_duration
|
||||
tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
|
||||
)
|
||||
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 4096 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
local TMPDIR
|
||||
TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
|
||||
(
|
||||
export TMPDIR
|
||||
cleanup() { rm -rf "${TMPDIR}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${TMPDIR}"
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
epytest
|
||||
)
|
||||
}
|
@ -1,235 +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"
|
||||
else
|
||||
inherit pypi
|
||||
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.1.2[${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-6.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-2.31.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/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
|
||||
dev-python/async-timeout[${PYTHON_USEDEP}]
|
||||
)
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
dev-python/libvirt-python[${PYTHON_USEDEP}]
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
>=dev-python/pyopenssl-23.2.0[${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/apache-libcloud[${PYTHON_USEDEP}]
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
|
||||
dev-python/cherrypy[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
dev-python/mako[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-factories-1.0.0_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}]
|
||||
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-tests.patch"
|
||||
"${FILESDIR}/salt-3005.1-no-entry-points.patch"
|
||||
"${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch"
|
||||
"${FILESDIR}/salt-3005.1-tests.patch"
|
||||
"${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch"
|
||||
"${FILESDIR}/salt-3006.2-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() {
|
||||
local -a EPYTEST_DESELECT=(
|
||||
# doesn't like the distutils warning
|
||||
tests/pytests/integration/cli/test_batch.py::test_batch_retcode
|
||||
tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
|
||||
# hangs indefinitely
|
||||
tests/pytests/unit/test_minion.py::test_master_type_disable
|
||||
# needs root
|
||||
tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
|
||||
# don't like sandbox
|
||||
tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_has_ip
|
||||
tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_init
|
||||
tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_ready
|
||||
tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_disable
|
||||
tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_enable
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_is_set_before_events_return_then_no_data_should_be_returned
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_then_all_collected_data_should_be_returned
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_is_set_before_other_events_are_completed_then_result_should_be_empty_dictionary
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_then_all_collected_data_should_be_returned
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_min_wait_time_has_not_passed_then_disbatch_should_not_return_expected_data_until_time_has_passed
|
||||
tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_minions_all_return_then_all_collected_data_should_be_returned
|
||||
tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
|
||||
tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
|
||||
tests/pytests/unit/utils/test_vt.py::test_log_sanitize
|
||||
tests/pytests/unit/test_master.py::test_fileserver_duration
|
||||
tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
|
||||
)
|
||||
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 4096 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
local TMPDIR
|
||||
TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
|
||||
(
|
||||
export TMPDIR
|
||||
cleanup() { rm -rf "${TMPDIR}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${TMPDIR}"
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
epytest
|
||||
)
|
||||
}
|
@ -1,232 +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"
|
||||
else
|
||||
inherit pypi
|
||||
KEYWORDS="~amd64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="
|
||||
cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
|
||||
mongodb neutron nova openssl portage profile redis selinux test raet
|
||||
+zeromq vim-syntax
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/pciutils
|
||||
>=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
|
||||
dev-python/jmespath[${PYTHON_USEDEP}]
|
||||
dev-python/libnacl[${PYTHON_USEDEP}]
|
||||
dev-python/looseversion[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
|
||||
dev-python/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/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
|
||||
dev-python/async-timeout[${PYTHON_USEDEP}]
|
||||
)
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
dev-python/libvirt-python[${PYTHON_USEDEP}]
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
>=dev-python/pyopenssl-23.2.0[${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="
|
||||
dev-python/build[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/apache-libcloud[${PYTHON_USEDEP}]
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
|
||||
dev-python/cherrypy[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
dev-python/mako[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/bcrypt[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-subtests[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
|
||||
dev-python/flaky[${PYTHON_USEDEP}]
|
||||
net-dns/bind-tools
|
||||
>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
|
||||
dev-util/yamllint[${PYTHON_USEDEP}]
|
||||
!x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
|
||||
)
|
||||
"
|
||||
|
||||
DOCS=( README.rst AUTHORS )
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )
|
||||
test? ( cheetah genshi )"
|
||||
RESTRICT="!test? ( test ) x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
|
||||
"${FILESDIR}/salt-3005.1-no-entry-points.patch"
|
||||
"${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
|
||||
"${FILESDIR}/salt-3006-tests.patch"
|
||||
"${FILESDIR}/salt-3006.2-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 || 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
|
||||
rm tests/unit/netapi/rest_tornado/test_saltnado.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() {
|
||||
local -a EPYTEST_DESELECT=(
|
||||
# doesn't like the distutils warning
|
||||
tests/pytests/integration/cli/test_batch.py::test_batch_retcode
|
||||
tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
|
||||
# hangs indefinitely
|
||||
tests/pytests/unit/test_minion.py::test_master_type_disable
|
||||
# needs root
|
||||
tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
|
||||
# don't like sandbox
|
||||
tests/pytests/functional/cli/test_salt.py::test_versions_report
|
||||
tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
|
||||
tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
|
||||
tests/pytests/unit/utils/test_vt.py::test_log_sanitize
|
||||
tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
|
||||
tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
|
||||
tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
|
||||
tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
|
||||
tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
|
||||
tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
|
||||
)
|
||||
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 4096 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
local TMPDIR
|
||||
TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
|
||||
(
|
||||
export TMPDIR
|
||||
cleanup() { rm -rf "${TMPDIR}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${TMPDIR}"
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
epytest
|
||||
)
|
||||
}
|
@ -1,237 +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"
|
||||
else
|
||||
inherit pypi
|
||||
KEYWORDS="~amd64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="
|
||||
cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
|
||||
mongodb neutron nova openssl portage profile redis selinux test raet
|
||||
+zeromq vim-syntax
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/pciutils
|
||||
>=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
|
||||
dev-python/jmespath[${PYTHON_USEDEP}]
|
||||
dev-python/libnacl[${PYTHON_USEDEP}]
|
||||
dev-python/looseversion[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
|
||||
dev-python/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/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
|
||||
dev-python/async-timeout[${PYTHON_USEDEP}]
|
||||
)
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
dev-python/libvirt-python[${PYTHON_USEDEP}]
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
>=dev-python/pyopenssl-23.2.0[${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="
|
||||
dev-python/build[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/apache-libcloud[${PYTHON_USEDEP}]
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
|
||||
dev-python/cherrypy[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
dev-python/mako[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/bcrypt[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-subtests[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
|
||||
dev-python/flaky[${PYTHON_USEDEP}]
|
||||
net-dns/bind-tools
|
||||
>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
|
||||
dev-util/yamllint[${PYTHON_USEDEP}]
|
||||
!x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
|
||||
)
|
||||
"
|
||||
|
||||
DOCS=( README.rst AUTHORS )
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )
|
||||
test? ( cheetah genshi )"
|
||||
RESTRICT="!test? ( test ) x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
|
||||
"${FILESDIR}/salt-3005.1-no-entry-points.patch"
|
||||
"${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
|
||||
"${FILESDIR}/salt-3006.2-tests.patch"
|
||||
"${FILESDIR}/salt-3006.3-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 || 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
|
||||
rm tests/unit/netapi/rest_tornado/test_saltnado.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
|
||||
# called_once should be assert_called_once_with
|
||||
find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local 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() {
|
||||
local -a EPYTEST_DESELECT=(
|
||||
# doesn't like the distutils warning
|
||||
tests/pytests/integration/cli/test_batch.py::test_batch_retcode
|
||||
tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
|
||||
# hangs indefinitely
|
||||
tests/pytests/unit/test_minion.py::test_master_type_disable
|
||||
# needs root
|
||||
tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
|
||||
# don't like sandbox
|
||||
tests/pytests/functional/cli/test_salt.py::test_versions_report
|
||||
tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
|
||||
tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
|
||||
tests/pytests/unit/utils/test_vt.py::test_log_sanitize
|
||||
tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
|
||||
tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
|
||||
tests/pytests/unit/test_master.py::test_fileserver_duration
|
||||
tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
|
||||
tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
|
||||
tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
|
||||
tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
|
||||
tests/pytests/unit/modules/test_msteams.py::test_post_card
|
||||
tests/pytests/unit/states/test_file.py::test_file_recurse_directory_test
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
|
||||
)
|
||||
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 4096 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
local TMPDIR
|
||||
TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
|
||||
(
|
||||
export TMPDIR
|
||||
cleanup() { rm -rf "${TMPDIR}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${TMPDIR}"
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
epytest
|
||||
)
|
||||
}
|
@ -1,235 +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"
|
||||
else
|
||||
inherit pypi
|
||||
KEYWORDS="~amd64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="
|
||||
cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
|
||||
mongodb neutron nova openssl portage profile redis selinux test raet
|
||||
+zeromq vim-syntax
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/pciutils
|
||||
>=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
|
||||
dev-python/jmespath[${PYTHON_USEDEP}]
|
||||
dev-python/libnacl[${PYTHON_USEDEP}]
|
||||
dev-python/looseversion[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
|
||||
dev-python/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/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
|
||||
dev-python/async-timeout[${PYTHON_USEDEP}]
|
||||
)
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
dev-python/libvirt-python[${PYTHON_USEDEP}]
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
>=dev-python/pyopenssl-23.2.0[${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="
|
||||
dev-python/build[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/apache-libcloud[${PYTHON_USEDEP}]
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
|
||||
dev-python/cherrypy[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
dev-python/mako[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/bcrypt[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-subtests[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
|
||||
dev-python/flaky[${PYTHON_USEDEP}]
|
||||
net-dns/bind-tools
|
||||
>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
|
||||
dev-util/yamllint[${PYTHON_USEDEP}]
|
||||
!x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
|
||||
)
|
||||
"
|
||||
|
||||
DOCS=( README.rst AUTHORS )
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )
|
||||
test? ( cheetah genshi )"
|
||||
RESTRICT="!test? ( test ) x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
|
||||
"${FILESDIR}/salt-3005.1-no-entry-points.patch"
|
||||
"${FILESDIR}/salt-3006-skip-tests-that-oom-machine.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 || 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
|
||||
rm tests/unit/netapi/rest_tornado/test_saltnado.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
|
||||
# called_once should be assert_called_once_with
|
||||
find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local 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() {
|
||||
local -a EPYTEST_DESELECT=(
|
||||
# doesn't like the distutils warning
|
||||
tests/pytests/integration/cli/test_batch.py::test_batch_retcode
|
||||
tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
|
||||
# hangs indefinitely
|
||||
tests/pytests/unit/test_minion.py::test_master_type_disable
|
||||
# needs root
|
||||
tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
|
||||
# don't like sandbox
|
||||
tests/pytests/functional/cli/test_salt.py::test_versions_report
|
||||
tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
|
||||
tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
|
||||
tests/pytests/unit/utils/test_vt.py::test_log_sanitize
|
||||
tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
|
||||
tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
|
||||
tests/pytests/unit/test_master.py::test_fileserver_duration
|
||||
tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
|
||||
tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
|
||||
tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
|
||||
tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
|
||||
tests/pytests/unit/modules/test_msteams.py::test_post_card
|
||||
tests/pytests/unit/states/test_file.py::test_file_recurse_directory_test
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
|
||||
tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
|
||||
)
|
||||
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 4096 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
local TMPDIR
|
||||
TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
|
||||
(
|
||||
export TMPDIR
|
||||
cleanup() { rm -rf "${TMPDIR}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${TMPDIR}"
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
epytest
|
||||
)
|
||||
}
|
@ -0,0 +1,194 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
inherit autotools python-single-r1 systemd
|
||||
|
||||
DESCRIPTION="syslog replacement with advanced filtering features"
|
||||
HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
|
||||
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="amqp caps dbi geoip2 grpc http json kafka mongodb mqtt pacct python redis smtp snmp test spoof-source systemd tcpd"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
|
||||
test? ( python )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.10.1:2
|
||||
>=dev-libs/ivykis-0.42.4
|
||||
>=dev-libs/libpcre2-10.0
|
||||
dev-libs/openssl:0=
|
||||
!dev-libs/eventlog
|
||||
amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
|
||||
caps? ( sys-libs/libcap )
|
||||
dbi? ( >=dev-db/libdbi-0.9.0 )
|
||||
geoip2? ( dev-libs/libmaxminddb:= )
|
||||
grpc? (
|
||||
dev-libs/protobuf:=
|
||||
net-libs/grpc:=
|
||||
)
|
||||
http? ( net-misc/curl )
|
||||
json? ( >=dev-libs/json-c-0.9:= )
|
||||
kafka? ( >=dev-libs/librdkafka-1.0.0:= )
|
||||
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
|
||||
mqtt? ( net-libs/paho-mqtt-c:1.3 )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
')
|
||||
)
|
||||
redis? ( >=dev-libs/hiredis-0.11.0:= )
|
||||
smtp? ( net-libs/libesmtp:= )
|
||||
snmp? ( net-analyzer/net-snmp:0= )
|
||||
spoof-source? ( net-libs/libnet:1.1 )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-libs/criterion )"
|
||||
BDEPEND="
|
||||
>=sys-devel/bison-3.7.6
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
grpc? ( dev-libs/protobuf:= )"
|
||||
|
||||
DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
|
||||
contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
|
||||
"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local f
|
||||
|
||||
# disable python-modules test as it requires additional python modules not
|
||||
# packaged in Gentoo
|
||||
sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die
|
||||
|
||||
use python && python_fix_shebang .
|
||||
|
||||
# remove bundled libs
|
||||
rm -r lib/ivykis || die
|
||||
|
||||
# drop scl modules requiring json
|
||||
if use !json; then
|
||||
sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
|
||||
fi
|
||||
|
||||
# drop scl modules requiring http
|
||||
if use !http; then
|
||||
sed -i -r '/slack|telegram/d' scl/Makefile.am || die
|
||||
fi
|
||||
|
||||
# use gentoo default path
|
||||
if use systemd; then
|
||||
sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
|
||||
-i contrib/systemd/syslog-ng@default || die
|
||||
fi
|
||||
|
||||
for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
|
||||
sed \
|
||||
-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
|
||||
"/etc/init.d/syslog-ng reload")#g" \
|
||||
"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
|
||||
done
|
||||
|
||||
for f in syslog-ng.conf.gentoo.hardened.in-r1 \
|
||||
syslog-ng.conf.gentoo.in-r1; do
|
||||
sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die
|
||||
done
|
||||
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Needs bison/flex.
|
||||
unset YACC LEX
|
||||
|
||||
local myconf=(
|
||||
--disable-docs
|
||||
--disable-java
|
||||
--disable-java-modules
|
||||
--disable-riemann
|
||||
--enable-ipv6
|
||||
--enable-manpages
|
||||
--localstatedir=/var/lib/syslog-ng
|
||||
--sysconfdir=/etc/syslog-ng
|
||||
--with-embedded-crypto
|
||||
--with-ivykis=system
|
||||
--with-module-dir=/usr/$(get_libdir)/syslog-ng
|
||||
--with-pidfile-dir=/var/run
|
||||
--with-python-packages=none
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
$(use_enable amqp)
|
||||
$(use_with amqp librabbitmq-client system)
|
||||
$(use_enable caps linux-caps)
|
||||
$(use_enable dbi sql)
|
||||
$(use_enable geoip2)
|
||||
$(use_enable grpc)
|
||||
$(use_enable grpc cpp)
|
||||
$(use_enable http)
|
||||
$(use_enable json)
|
||||
$(use_enable kafka)
|
||||
$(use_enable mongodb)
|
||||
$(use_enable mqtt)
|
||||
$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
|
||||
$(use_enable pacct)
|
||||
$(use_enable python)
|
||||
$(use_enable redis)
|
||||
$(use_enable smtp)
|
||||
$(use_enable snmp afsnmp)
|
||||
$(use_enable spoof-source)
|
||||
$(use_enable systemd)
|
||||
$(use_enable tcpd tcp-wrapper)
|
||||
)
|
||||
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# Install default configuration
|
||||
insinto /etc/default
|
||||
doins contrib/systemd/syslog-ng@default
|
||||
|
||||
insinto /etc/syslog-ng
|
||||
newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${T}/syslog-ng.logrotate" syslog-ng
|
||||
|
||||
newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
|
||||
newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
|
||||
keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
|
||||
use python && python_optimize
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# bug #355257
|
||||
if ! has_version app-admin/logrotate ; then
|
||||
elog "It is highly recommended that app-admin/logrotate be emerged to"
|
||||
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
|
||||
elog "for logrotate to use."
|
||||
fi
|
||||
|
||||
if use systemd; then
|
||||
ewarn "The service file for systemd has changed to support multiple instances."
|
||||
ewarn "To start the default instance issue:"
|
||||
ewarn "# systemctl start syslog-ng@default"
|
||||
fi
|
||||
}
|
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST patool-1.15.0.tar.gz 1993753 BLAKE2B 18dbbb6d73862778af9774b64f192e20d48f1454c078a2ab0bf9ccf12f3de988b7799c5e6116b1f49fe48b2512968789d363e37aa504d622a72c22a620398f5f SHA512 c7cbcd829a803025a99df67c8d4aca1d803d3bd8e06f2897c65bc0e2475fbd42e273654f978090fe4c2bbcac02e5d1f8e322cb90220e746ac9ef9d0755e0c717
|
||||
DIST patool-2.0.0.tar.gz 1987911 BLAKE2B a9c12f8083e82835792445f50e1e72f55e98c505f0019656cd00c1f882a860ae61c7484ea16c7744101b6a983c1934fad12dbb58af2a03e82d0ec4ceb417aa92 SHA512 c81a65fa89ff77ee80ae85fbc6868e5414d5141e47433028546273b3a231ce3240d6b30baae114247bc0ab0b3e4e91c6e127b8734eff9af8721abdae7f464ef5
|
||||
DIST patool-2.1.1.tar.gz 1991183 BLAKE2B f33c92c628ffcca349ad897c29cec935730aba7f2e9a5581acedb9b3ecb0bab22046cd16af9f2d2e605bc483c2dc624db01b52dea8459388a8b140b7f357b193 SHA512 3b51fe917da9672dbeae015852680b67e81ec35d609af3e465f0d53afb12c35bee885f4f3db4a135c01521cc70db182b27fc25320d141f96eaf098ba99524f63
|
||||
DIST patool-2.2.0.tar.gz 1995287 BLAKE2B ec7a188abfbfc2198e0171568324cb0e372a5629363aaeabfa404767f08062669028d6a9771e80370eb096677f3668da75923f7def7fbb4525f5ce7418cdf68a SHA512 eae774e7da2be13c7644038dc47457105caff7a51a9d3b99e38962dd26c0ace0129f1c0151c27766708ee9754049aec283873fd4a2e8647015a1a07acd48de60
|
||||
|
@ -0,0 +1,128 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
inherit distutils-r1 pypi
|
||||
|
||||
DESCRIPTION="Portable archive file manager"
|
||||
HOMEPAGE="https://wummel.github.io/patool/"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
BDEPEND="
|
||||
test? (
|
||||
app-arch/arj
|
||||
app-arch/bzip2
|
||||
app-arch/bzip3
|
||||
app-arch/cabextract
|
||||
app-alternatives/cpio
|
||||
app-arch/dpkg
|
||||
app-arch/gzip
|
||||
app-arch/lbzip2
|
||||
app-arch/lcab
|
||||
app-arch/lha
|
||||
app-arch/libarchive
|
||||
app-arch/lz4
|
||||
app-arch/lzip
|
||||
app-arch/lzop
|
||||
app-arch/ncompress
|
||||
app-arch/p7zip[rar]
|
||||
app-arch/pbzip2
|
||||
app-arch/pdlzip
|
||||
app-arch/pigz
|
||||
app-arch/plzip
|
||||
app-arch/rpm
|
||||
app-arch/rzip
|
||||
app-arch/sharutils
|
||||
app-arch/tar
|
||||
app-arch/unace
|
||||
app-arch/unadf
|
||||
app-arch/unzip
|
||||
app-arch/xdms
|
||||
app-arch/xz-utils
|
||||
app-arch/zip
|
||||
app-arch/zopfli
|
||||
app-arch/zpaq
|
||||
app-arch/zstd
|
||||
app-cdr/cdrtools
|
||||
dev-libs/chmlib
|
||||
media-libs/flac
|
||||
media-sound/shorten
|
||||
sys-apps/diffutils
|
||||
sys-apps/file
|
||||
sys-apps/grep
|
||||
!elibc_musl? ( app-arch/rar )
|
||||
!x86? (
|
||||
app-arch/clzip
|
||||
app-arch/lrzip
|
||||
app-arch/unar
|
||||
)
|
||||
)
|
||||
"
|
||||
# Test dependencies which are packaged but can't be tested for various reasons.
|
||||
# app-arch/arc
|
||||
# app-arch/zoo
|
||||
# media-sound/mac
|
||||
|
||||
# app-arch/rar is masked on musl
|
||||
# app-arch/clzip is unkeyworded on x86
|
||||
# app-arch/lrzip bug #916317 on x86
|
||||
# app-arch/unar is unkeyworded on x86
|
||||
|
||||
# Unpackaged testable dependencies
|
||||
# archmage
|
||||
# genisoimage
|
||||
# lhasa
|
||||
# nomarch
|
||||
# pdzip2
|
||||
# py_{bz2,echo,gzip,tarfile,zipfile}
|
||||
# rpm2cpio
|
||||
# rzip
|
||||
# star
|
||||
# unalz
|
||||
# uncompress.real
|
||||
# 7zz ( app-arch/7zip:guru )
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_install() {
|
||||
distutils-r1_src_install
|
||||
|
||||
newdoc doc/README.txt README.md
|
||||
doman doc/patool.1
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local EPYTEST_IGNORE=(
|
||||
# zoo emits a non-zero exit status on a possibly false consistency check
|
||||
# Zoo: WARNING: Archive header failed consistency check.
|
||||
"tests/archives/test_zoo.py"
|
||||
# Doesn't accept long arguments, such as those that files in ${S} would have.
|
||||
# Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo
|
||||
"tests/archives/test_arc.py"
|
||||
# Error: 1002 (invalid input file)
|
||||
"tests/archives/test_mac.py"
|
||||
)
|
||||
|
||||
if use elibc_musl; then
|
||||
EPYTEST_IGNORE+=(
|
||||
"tests/archives/test_rar.py"
|
||||
)
|
||||
fi
|
||||
|
||||
if use x86; then
|
||||
EPYTEST_IGNORE+=(
|
||||
"tests/archives/test_clzip.py"
|
||||
# bug #916317
|
||||
"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
|
||||
)
|
||||
fi
|
||||
|
||||
epytest
|
||||
}
|
Binary file not shown.
@ -1,3 +1,3 @@
|
||||
DIST crun-1.11.2.tar.xz 738176 BLAKE2B ef13475089c87599159ce00dd26fbb19c7f2bb9564352c1f8040925e521bb924cf28a8d1f37cc95ce7d1b2797b8654740e9ad08352e357c8c9e2d176466101e0 SHA512 ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977
|
||||
DIST crun-1.8.1.tar.xz 692152 BLAKE2B b5dce1a454641221c591f50ac8519d4e9e9d892ea56232fa3fc9916934c19eba5853019238b1837cd5fb61f0dec5e0e6a11c02f628bece3b69c9c4f5750addae SHA512 6230b378f4746aff1d53f3ed797229b2056ece76e8e5b22d6f5f7b42e6042c6aff5294298f3cfd1293b4a87371dfa58cc69e57455e20948abd7269059ad39042
|
||||
DIST crun-1.14.3.tar.xz 750456 BLAKE2B 5a63b5da2f85ff1a83d4589be224c5b7a1123b6d7714b90a63c1907b78d42392aff25ffe5d9a4127173ac47026d57e9c93a39f5ba4b07de7f9f3722c14e6d203 SHA512 d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1
|
||||
DIST crun-1.8.4.tar.xz 729552 BLAKE2B 8169518a0ddd8deb3820f7030d03dec6941d5d34fb73a036b82f15b0d8f2f702e117de00b829a16cb9976e118f5a5ca732b1cd572708f664cfeafc564f883824 SHA512 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0
|
||||
|
@ -1,8 +1,4 @@
|
||||
DIST nerdctl-0.22.2-vendor.tar.gz 8374960 BLAKE2B 84b8cb1bef03d05f9277c6931f1f4596609b35ba4e555b02885a5ad99aa692ac8c7b32c778f18993bba518945816dc9ca2ebdb4818b733fc999c4b717c0c7313 SHA512 fa6c166c5376395e129b2b79653382c7e5bc6fcc4a744063afd92fc4b5e84afc41489543c58c0f65c893d7b3d906d502b520d5cb4401ca4ca49c9526606c9291
|
||||
DIST nerdctl-0.23.0-vendor.tar.gz 8420534 BLAKE2B 824ea8761a81ed063b853f5a78bd7506f7eecfe6f7b6e3e7d9fbb7113477c32236b59e669821851117b07eb7b5be82cab6b8750ddef59a053535dfa48a65dc77 SHA512 e8431d292a0e8f6db828b3475bb2e918612961b46212e6dcad6b1edadf6fca828c7ff0aeeadbc6e847b8a2d2b0c362f789b6a19ebb6c20922e0f77e46d3df84a
|
||||
DIST nerdctl-1.0.0-vendor.tar.gz 8189234 BLAKE2B 610cf1cc3b68f110023e4d2c7aea99b33c702e4f11afa39db92e1c1ae3873500a12bb71cbbf547d03eaaa9a2b1c277addebef48759abdcafa85500d0cd382cc6 SHA512 9367dd9339b62c3ef0bea7f9f85040dacd9cffc527f22175ed4337c76a16f8dad554fed4086eeee0c58286a751c061fddd21f119504dbd26ccc46ad3b44d0799
|
||||
DIST nerdctl-1.1.0-vendor.tar.gz 8022993 BLAKE2B 7fe1f1337255aaac39137a7081141ace4fa762e1dda683370843320dfc6549129aaf998737684c60067f7d0765bcd143b6598c7e43b247aeb9da5bf4ba027fd9 SHA512 382382abae0cd07afcf525bce3d424461dcd3c19086bf8f2847ca43ca17db218bc99afdbe36953fd9eb63689f68484c82973dffe087dc8bf9f963d6a6122bfff
|
||||
DIST nerdctl-1.3.1-go-mod-vendor.tar.gz 6756835 BLAKE2B 55ba1d184bd57cadc30e1f539687461065efff9402f063ff2660e03f61b771ee110d79eeceb451fc4e5eb5e1ac0e8fc4281e17ee43663996a9de0175d20a80c2 SHA512 5d15fa5e723a14d992c1834d4c3327c4d137a240d9edfffa3ca51e8ba502006de1d75ea4c5252a78622eccae333b039193546d5f037ba7d95cfc9ef9bea2268f
|
||||
DIST nerdctl-1.3.1.tar.gz 509270 BLAKE2B bd51203db7fc45098328ba3c6dc6864be48e3f6fcb21bea4b79ac14979e79a1e16f3f556c6fc00c26b46b9ddeb200f3d1e7f8f9c8c4d2eee4067b300ea3ddbf1 SHA512 478a9ae8162233a12c569ca9a2216dda652d450944a9fa70ba7b4b41405b5f569b870a8a9d6fcaa14afc2991ea9e97a20ebfa9b1b5154e052c65fd78d6f32e3c
|
||||
DIST nerdctl-1.4.0-go-mod-vendor.tar.gz 6711566 BLAKE2B 242648545d82bfcdde6dd5056e4225d9b37021a6b210632ad112e18659d3f6f89bb53e31aee55106b5654080fab8dfd33268138b5f0a0b36d425395e1be89728 SHA512 fd2b3d30c35dee73eb2325188477659fc08a974737b8f555275524368aa59583987b04f19057cbd4c03c0bf7df89f38e3d115c36da2f089ac9d908bf77e774b8
|
||||
DIST nerdctl-1.4.0.tar.gz 515068 BLAKE2B 68daacc251322b5efe0591fe6cd615cd7a11df803a66a3a151b3ae46e1a3b22bfbde7726bf4418b0df988965578cecd3dc2fac67b45b1d765d059c92aab1ec12 SHA512 b14cd92b76d9699b4042fcd7a6906b1c714221b30cff1074a1d59ea038cf74ea6437d4a4d9a265e7b0f4c96397c82d53856f9e43d08aa8abcb98af5e9fb6e8dc
|
||||
DIST nerdctl-1.7.4-go-mod-vendor.tar.gz 7197938 BLAKE2B 14a95cd634acc652d5532d1c6aa28abf24c1cf26393d63fd627e864ba73e5f3355832afd8c3c31eb0dcef9ae1d82c35a7df49c017c5719b45145496ec9243e79 SHA512 aefc9d23114bb2ca0a640287ed27e2afeeb9075a4fdfa33817310300ac8a1ca492defd4a5436f71f4f06a2b8916a75793ce846eac0878a8e51e1accadd21d13f
|
||||
DIST nerdctl-1.7.4.tar.gz 516231 BLAKE2B 3f1726945c5b816b4ca922187ae0bde0af82ca38227fe3ad2509b8b1654a2ee22d3929296d9633275cc7c3495202c66d90a956ac92c790f17eb2d1254bdb2c17 SHA512 a2cf60e2d704bef6a9c2abc697ef44a6a833b5fcc276bbffec503437281c830e2cd73fc541ef85be2444bad8f2b827c832b7685a3c74ebba503019ed39a19d75
|
||||
|
@ -1,33 +0,0 @@
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit go-module
|
||||
|
||||
DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
|
||||
HOMEPAGE="https://github.com/containerd/nerdctl"
|
||||
|
||||
EGIT_COMMIT="2899222cb0715f1e5ffe356d10c3439ee8ee3ba4"
|
||||
# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
|
||||
# so they are instead distributed via a combined tarball.
|
||||
SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
|
||||
BDEPEND=">=dev-lang/go-1.16"
|
||||
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
S=${WORKDIR}/${P}-vendor
|
||||
|
||||
src_prepare() {
|
||||
sed -e 's:/usr/local/bin:/usr/bin:' \
|
||||
-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
|
||||
-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
|
||||
-i Makefile || die
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS=(README.md docs examples)
|
||||
default_src_install
|
||||
}
|
@ -1,33 +0,0 @@
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit go-module
|
||||
|
||||
DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
|
||||
HOMEPAGE="https://github.com/containerd/nerdctl"
|
||||
|
||||
EGIT_COMMIT="660680b7ddfde1d38a66ec1c7f08f8d89ab92c68"
|
||||
# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
|
||||
# so they are instead distributed via a combined tarball.
|
||||
SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
|
||||
BDEPEND=">=dev-lang/go-1.16"
|
||||
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
S=${WORKDIR}/${P}-vendor
|
||||
|
||||
src_prepare() {
|
||||
sed -e 's:/usr/local/bin:/usr/bin:' \
|
||||
-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
|
||||
-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
|
||||
-i Makefile || die
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS=(README.md docs examples)
|
||||
default_src_install
|
||||
}
|
@ -1,33 +0,0 @@
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit go-module
|
||||
|
||||
DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
|
||||
HOMEPAGE="https://github.com/containerd/nerdctl"
|
||||
|
||||
EGIT_COMMIT="c00780a1f5b905b09812722459c54936c9e070e6"
|
||||
# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
|
||||
# so they are instead distributed via a combined tarball.
|
||||
SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
|
||||
BDEPEND=">=dev-lang/go-1.16"
|
||||
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
S=${WORKDIR}/${P}-vendor
|
||||
|
||||
src_prepare() {
|
||||
sed -e 's:/usr/local/bin:/usr/bin:' \
|
||||
-e "s|^VERSION[[:space:]]*?=.*|VERSION := v${PV}|" \
|
||||
-e "s|^REVISION[[:space:]]*?=.*|REVISION := ${EGIT_COMMIT}|" \
|
||||
-i Makefile || die
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS=(README.md docs examples)
|
||||
default_src_install
|
||||
}
|
@ -1,33 +0,0 @@
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit go-module
|
||||
|
||||
DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
|
||||
HOMEPAGE="https://github.com/containerd/nerdctl"
|
||||
|
||||
EGIT_COMMIT="18944bc70784dfa83010d37054d75487a58ab581"
|
||||
# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
|
||||
# so they are instead distributed via a combined tarball.
|
||||
SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
|
||||
BDEPEND=">=dev-lang/go-1.16"
|
||||
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
S=${WORKDIR}/${P}-vendor
|
||||
|
||||
src_prepare() {
|
||||
sed -e 's:/usr/local/bin:/usr/bin:' \
|
||||
-e "s|^VERSION[[:space:]]*?=.*|VERSION := v${PV}|" \
|
||||
-e "s|^REVISION[[:space:]]*?=.*|REVISION := ${EGIT_COMMIT}|" \
|
||||
-i Makefile || die
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS=(README.md docs examples)
|
||||
default_src_install
|
||||
}
|
@ -0,0 +1,138 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit go-module tmpfiles linux-info
|
||||
|
||||
DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
|
||||
HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/containers/podman.git"
|
||||
else
|
||||
SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${P/_rc/-rc}"
|
||||
if [[ ${PV} != *rc* ]] ; then
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv"
|
||||
fi
|
||||
fi
|
||||
|
||||
# main pkg
|
||||
LICENSE="Apache-2.0"
|
||||
# deps
|
||||
LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
|
||||
SLOT="0"
|
||||
IUSE="apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
app-crypt/gpgme:=
|
||||
>=app-containers/conmon-2.0.0
|
||||
>=app-containers/containers-common-0.56.0
|
||||
dev-libs/libassuan:=
|
||||
dev-libs/libgpg-error:=
|
||||
sys-apps/shadow:=
|
||||
|
||||
apparmor? ( sys-libs/libapparmor )
|
||||
btrfs? ( sys-fs/btrfs-progs )
|
||||
cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 )
|
||||
!cgroup-hybrid? ( app-containers/crun )
|
||||
wrapper? ( !app-containers/docker-cli )
|
||||
fuse? ( sys-fs/fuse-overlayfs )
|
||||
init? ( app-containers/catatonit )
|
||||
rootless? ( app-containers/slirp4netns )
|
||||
seccomp? ( sys-libs/libseccomp:= )
|
||||
selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
dev-go/go-md2man
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/seccomp-toggle-4.7.0.patch"
|
||||
)
|
||||
|
||||
CONFIG_CHECK="
|
||||
~USER_NS
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
|
||||
linux-info_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# assure necessary files are present
|
||||
local file
|
||||
for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
|
||||
[[ -f hack/"${file}".sh ]] || die
|
||||
done
|
||||
|
||||
local feature
|
||||
for feature in apparmor systemd; do
|
||||
cat <<-EOF > hack/"${feature}"_tag.sh || die
|
||||
#!/usr/bin/env bash
|
||||
$(usex ${feature} "echo ${feature}" echo)
|
||||
EOF
|
||||
done
|
||||
|
||||
echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
|
||||
cat <<-EOF > hack/btrfs_tag.sh || die
|
||||
#!/usr/bin/env bash
|
||||
$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
|
||||
EOF
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export PREFIX="${EPREFIX}/usr"
|
||||
|
||||
# For non-live versions, prevent git operations which causes sandbox violations
|
||||
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
|
||||
[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
|
||||
|
||||
# BUILD_SECCOMP is used in the patch to toggle seccomp
|
||||
emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
|
||||
|
||||
insinto /etc/cni/net.d
|
||||
doins cni/87-podman-bridge.conflist
|
||||
|
||||
newconfd "${FILESDIR}"/podman.confd podman
|
||||
newinitd "${FILESDIR}"/podman.initd podman
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/podman.logrotated" podman
|
||||
|
||||
keepdir /var/lib/containers
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
PODMAN_ROOTLESS_UPGRADE=false
|
||||
if use rootless; then
|
||||
has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
|
||||
|
||||
local want_newline=false
|
||||
if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
|
||||
${want_newline} && elog ""
|
||||
elog "For rootless operation, you need to configure subuid/subgid"
|
||||
elog "for user running podman. In case subuid/subgid has only been"
|
||||
elog "configured for root, run:"
|
||||
elog "usermod --add-subuids 1065536-1131071 <user>"
|
||||
elog "usermod --add-subgids 1065536-1131071 <user>"
|
||||
want_newline=true
|
||||
fi
|
||||
}
|
Binary file not shown.
@ -0,0 +1,313 @@
|
||||
https://bugs.gentoo.org/925557
|
||||
https://dev.gnupg.org/D566
|
||||
|
||||
From 8ab1682e80a2b4185ee9ef66cbb44340245966fc Mon Sep 17 00:00:00 2001
|
||||
From: Werner Koch <wk@gnupg.org>
|
||||
Date: Mon, 20 Mar 2023 08:31:04 +0100
|
||||
Subject: [PATCH] Fix problem with inclusion of wrong memory.h.
|
||||
|
||||
* secmem/memory.h: Rename to ...
|
||||
* secmem/secmem.h: this.
|
||||
* pinentry/pinentry.h: Include secmem.h. Remove almost all inclusions
|
||||
of memory.h or replace them by "../secmem/secmem.h".
|
||||
--
|
||||
|
||||
See-also: https://dev.gnupg.org/D566
|
||||
---
|
||||
fltk/main.cxx | 1 -
|
||||
fltk/pinwindow.cxx | 2 +-
|
||||
gnome3/pinentry-gnome3.c | 2 --
|
||||
pinentry/password-cache.c | 2 +-
|
||||
pinentry/pinentry-curses.c | 7 +++----
|
||||
pinentry/pinentry-emacs.c | 2 +-
|
||||
pinentry/pinentry.c | 1 -
|
||||
pinentry/pinentry.h | 2 ++
|
||||
secmem/Makefile.am | 2 +-
|
||||
secmem/secmem++.h | 2 +-
|
||||
secmem/secmem.c | 2 +-
|
||||
secmem/{memory.h => secmem.h} | 0
|
||||
tqt/secqstring.h | 2 +-
|
||||
tty/pinentry-tty.c | 1 -
|
||||
w32/main.c | 1 -
|
||||
15 files changed, 12 insertions(+), 17 deletions(-)
|
||||
rename secmem/{memory.h => secmem.h} (100%)
|
||||
|
||||
--- a/fltk/main.cxx 2019-03-05 23:09:48.000000000 -0800
|
||||
+++ b/fltk/main.cxx 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -34,7 +34,6 @@
|
||||
#include <getopt.h>
|
||||
#include <assert.h>
|
||||
|
||||
-#include "memory.h"
|
||||
#include <memory>
|
||||
|
||||
#include <pinentry.h>
|
||||
--- a/fltk/pinwindow.cxx 2017-12-03 08:13:05.000000000 -0800
|
||||
+++ b/fltk/pinwindow.cxx 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <FL/Fl_Return_Button.H>
|
||||
#include <FL/Fl_Pixmap.H>
|
||||
|
||||
-#include "memory.h"
|
||||
+#include "../secmem/secmem.h"
|
||||
|
||||
#include "encrypt.xpm"
|
||||
#include "icon.xpm"
|
||||
--- a/gnome3/pinentry-gnome3.c 2022-08-24 03:31:59.000000000 -0700
|
||||
+++ b/gnome3/pinentry-gnome3.c 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -30,8 +30,6 @@
|
||||
|
||||
#include <assuan.h>
|
||||
|
||||
-#include "memory.h"
|
||||
-
|
||||
#include "pinentry.h"
|
||||
|
||||
#ifdef FALLBACK_CURSES
|
||||
--- a/pinentry/password-cache.c 2017-12-03 08:13:15.000000000 -0800
|
||||
+++ b/pinentry/password-cache.c 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -31,7 +31,7 @@
|
||||
#endif
|
||||
|
||||
#include "password-cache.h"
|
||||
-#include "memory.h"
|
||||
+#include "../secmem/secmem.h"
|
||||
|
||||
#ifdef HAVE_LIBSECRET
|
||||
static const SecretSchema *
|
||||
--- a/pinentry/pinentry.c 2022-08-24 03:31:59.000000000 -0700
|
||||
+++ b/pinentry/pinentry.c 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -44,7 +44,6 @@
|
||||
|
||||
#include <assuan.h>
|
||||
|
||||
-#include "memory.h"
|
||||
#include "secmem-util.h"
|
||||
#include "argparse.h"
|
||||
#include "pinentry.h"
|
||||
--- a/pinentry/pinentry-curses.c 2022-08-24 03:31:59.000000000 -0700
|
||||
+++ b/pinentry/pinentry-curses.c 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -62,8 +62,6 @@
|
||||
#include <utime.h>
|
||||
#endif /*HAVE_UTIME_H*/
|
||||
|
||||
-#include <memory.h>
|
||||
-
|
||||
#ifdef HAVE_WCHAR_H
|
||||
#include <wchar.h>
|
||||
#endif /*HAVE_WCHAR_H*/
|
||||
@@ -1017,10 +1015,11 @@
|
||||
#ifndef HAVE_DOSISH_SYSTEM
|
||||
int no_input = 1;
|
||||
#endif
|
||||
-
|
||||
#ifdef HAVE_NCURSESW
|
||||
char *old_ctype = NULL;
|
||||
+#endif
|
||||
|
||||
+#ifdef HAVE_NCURSESW
|
||||
if (pinentry->lc_ctype)
|
||||
{
|
||||
old_ctype = strdup (setlocale (LC_CTYPE, NULL));
|
||||
--- a/pinentry/pinentry-emacs.c 2021-08-11 04:16:10.000000000 -0700
|
||||
+++ b/pinentry/pinentry-emacs.c 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <assuan.h>
|
||||
|
||||
#include "pinentry-emacs.h"
|
||||
-#include "memory.h"
|
||||
+#include "../secmem/secmem.h"
|
||||
#include "secmem-util.h"
|
||||
|
||||
/* The communication mechanism is similar to emacsclient, but there
|
||||
--- a/pinentry/pinentry.h 2022-08-24 03:31:59.000000000 -0700
|
||||
+++ b/pinentry/pinentry.h 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -21,6 +21,8 @@
|
||||
#ifndef PINENTRY_H
|
||||
#define PINENTRY_H
|
||||
|
||||
+#include "../secmem/secmem.h"
|
||||
+
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#if 0
|
||||
--- a/secmem/Makefile.am 2017-12-03 08:13:05.000000000 -0800
|
||||
+++ b/secmem/Makefile.am 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -22,7 +22,7 @@
|
||||
noinst_LIBRARIES = libsecmem.a
|
||||
|
||||
libsecmem_a_SOURCES = \
|
||||
- memory.h \
|
||||
+ secmem.h \
|
||||
secmem-util.h \
|
||||
util.h \
|
||||
secmem.c \
|
||||
--- a/secmem/memory.h 2017-12-03 08:13:05.000000000 -0800
|
||||
+++ b/secmem/memory.h 1969-12-31 16:00:00.000000000 -0800
|
||||
@@ -1,55 +0,0 @@
|
||||
-/* Quintuple Agent secure memory allocation
|
||||
- * Copyright (C) 1998,1999 Free Software Foundation, Inc.
|
||||
- * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
|
||||
- *
|
||||
- * This program is free software; you can redistribute it and/or modify
|
||||
- * it under the terms of the GNU General Public License as published by
|
||||
- * the Free Software Foundation; either version 2 of the License, or
|
||||
- * (at your option) any later version.
|
||||
- *
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
- * GNU General Public License for more details.
|
||||
- *
|
||||
- * You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, see <https://www.gnu.org/licenses/>.
|
||||
- * SPDX-License-Identifier: GPL-2.0+
|
||||
- */
|
||||
-
|
||||
-#ifndef _MEMORY_H
|
||||
-#define _MEMORY_H
|
||||
-
|
||||
-#include <sys/types.h>
|
||||
-
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" {
|
||||
-#if 0
|
||||
-}
|
||||
-#endif
|
||||
-#endif
|
||||
-
|
||||
-
|
||||
-/* values for flags, hardcoded in secmem.c */
|
||||
-#define SECMEM_WARN 0
|
||||
-#define SECMEM_DONT_WARN 1
|
||||
-#define SECMEM_SUSPEND_WARN 2
|
||||
-
|
||||
-void secmem_init( size_t npool );
|
||||
-void secmem_term( void );
|
||||
-void *secmem_malloc( size_t size );
|
||||
-void *secmem_realloc( void *a, size_t newsize );
|
||||
-void secmem_free( void *a );
|
||||
-int m_is_secure( const void *p );
|
||||
-void secmem_dump_stats(void);
|
||||
-void secmem_set_flags( unsigned flags );
|
||||
-unsigned secmem_get_flags(void);
|
||||
-size_t secmem_get_max_size (void);
|
||||
-
|
||||
-#if 0
|
||||
-{
|
||||
-#endif
|
||||
-#ifdef __cplusplus
|
||||
-}
|
||||
-#endif
|
||||
-#endif /* _MEMORY_H */
|
||||
--- a/secmem/secmem.c 2022-08-24 03:31:59.000000000 -0700
|
||||
+++ b/secmem/secmem.c 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -34,7 +34,7 @@
|
||||
#endif
|
||||
#include <string.h>
|
||||
|
||||
-#include "memory.h"
|
||||
+#include "secmem.h"
|
||||
|
||||
#ifdef ORIGINAL_GPG_VERSION
|
||||
#include "types.h"
|
||||
--- a/secmem/secmem++.h 2017-12-03 08:13:05.000000000 -0800
|
||||
+++ b/secmem/secmem++.h 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -19,7 +19,7 @@
|
||||
#ifndef __SECMEM_SECMEMPP_H__
|
||||
#define __SECMEM_SECMEMPP_H__
|
||||
|
||||
-#include "secmem/memory.h"
|
||||
+#include "../secmem/secmem.h"
|
||||
#include <cstddef>
|
||||
|
||||
namespace secmem {
|
||||
--- a/secmem/secmem.h 1969-12-31 16:00:00.000000000 -0800
|
||||
+++ b/secmem/secmem.h 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -0,0 +1,55 @@
|
||||
+/* Quintuple Agent secure memory allocation
|
||||
+ * Copyright (C) 1998,1999 Free Software Foundation, Inc.
|
||||
+ * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation; either version 2 of the License, or
|
||||
+ * (at your option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
|
||||
+ * SPDX-License-Identifier: GPL-2.0+
|
||||
+ */
|
||||
+
|
||||
+#ifndef _MEMORY_H
|
||||
+#define _MEMORY_H
|
||||
+
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#if 0
|
||||
+}
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+/* values for flags, hardcoded in secmem.c */
|
||||
+#define SECMEM_WARN 0
|
||||
+#define SECMEM_DONT_WARN 1
|
||||
+#define SECMEM_SUSPEND_WARN 2
|
||||
+
|
||||
+void secmem_init( size_t npool );
|
||||
+void secmem_term( void );
|
||||
+void *secmem_malloc( size_t size );
|
||||
+void *secmem_realloc( void *a, size_t newsize );
|
||||
+void secmem_free( void *a );
|
||||
+int m_is_secure( const void *p );
|
||||
+void secmem_dump_stats(void);
|
||||
+void secmem_set_flags( unsigned flags );
|
||||
+unsigned secmem_get_flags(void);
|
||||
+size_t secmem_get_max_size (void);
|
||||
+
|
||||
+#if 0
|
||||
+{
|
||||
+#endif
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
+#endif /* _MEMORY_H */
|
||||
--- a/tqt/secqstring.h 2017-12-03 08:33:12.000000000 -0800
|
||||
+++ b/tqt/secqstring.h 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -65,7 +65,7 @@
|
||||
|
||||
extern "C"
|
||||
{
|
||||
-#include "memory.h"
|
||||
+#include "../secmem/secmem.h"
|
||||
}
|
||||
|
||||
/* We need the original qchar and qstring for transparent conversion
|
||||
--- a/tty/pinentry-tty.c 2021-08-11 04:16:10.000000000 -0700
|
||||
+++ b/tty/pinentry-tty.c 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -41,7 +41,6 @@
|
||||
#include <gpg-error.h>
|
||||
|
||||
#include "pinentry.h"
|
||||
-#include "memory.h"
|
||||
|
||||
#ifndef HAVE_DOSISH_SYSTEM
|
||||
static int timed_out;
|
||||
--- a/w32/main.c 2022-08-24 03:31:59.000000000 -0700
|
||||
+++ b/w32/main.c 2024-02-26 11:02:47.822134762 -0800
|
||||
@@ -29,7 +29,6 @@
|
||||
#endif
|
||||
|
||||
#include "pinentry.h"
|
||||
-#include "memory.h"
|
||||
|
||||
#include "resource.h"
|
||||
/* #include "msgcodes.h" */
|
@ -0,0 +1,108 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
|
||||
inherit autotools qmake-utils verify-sig
|
||||
|
||||
DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
|
||||
HOMEPAGE="https://gnupg.org/aegypten2/"
|
||||
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
|
||||
SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="caps efl emacs gtk keyring ncurses qt5 wayland X"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/libassuan-2.1
|
||||
>=dev-libs/libgcrypt-1.6.3
|
||||
>=dev-libs/libgpg-error-1.17
|
||||
efl? ( dev-libs/efl[X] )
|
||||
keyring? ( app-crypt/libsecret )
|
||||
ncurses? ( sys-libs/ncurses:= )
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
wayland? ( kde-plasma/kwayland:5 )
|
||||
X? (
|
||||
dev-qt/qtx11extras:5
|
||||
x11-libs/libX11
|
||||
)
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
gtk? ( app-crypt/gcr:0[gtk] )
|
||||
"
|
||||
BDEPEND="
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
verify-sig? ( sec-keys/openpgp-keys-gnupg )
|
||||
"
|
||||
PDEPEND="emacs? ( app-emacs/pinentry )"
|
||||
IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.0.0-AR.patch"
|
||||
"${FILESDIR}/${PN}-1.2.1-automagic-capslock.patch" # bug #819939, bug #837719
|
||||
"${FILESDIR}/${PN}-1.2.1-include-memory.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
unset FLTK_CONFIG
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export PATH="$(qt5_get_bindir):${PATH}"
|
||||
export QTLIB="$(qt5_get_libdir)"
|
||||
|
||||
local myeconfargs=(
|
||||
$(use_enable efl pinentry-efl)
|
||||
$(use_enable emacs pinentry-emacs)
|
||||
$(use_enable keyring libsecret)
|
||||
$(use_enable gtk pinentry-gnome3)
|
||||
$(use_enable ncurses fallback-curses)
|
||||
$(use_enable ncurses pinentry-curses)
|
||||
$(use_enable qt5 pinentry-qt)
|
||||
$(use_enable wayland kf5-wayland)
|
||||
$(use_enable X qtx11extras)
|
||||
$(use_with X x)
|
||||
|
||||
--enable-pinentry-tty
|
||||
--disable-pinentry-fltk
|
||||
--disable-pinentry-gtk2
|
||||
|
||||
MOC="$(qt5_get_bindir)"/moc
|
||||
ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
|
||||
|
||||
$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
rm "${ED}"/usr/bin/pinentry || die
|
||||
|
||||
use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
eselect pinentry update ifunset
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect pinentry update ifunset
|
||||
}
|
Binary file not shown.
@ -1,6 +1,2 @@
|
||||
DIST micro-2.0.11-deps.tar.xz 19390200 BLAKE2B 3f4e3a60395854e1dcba0ed69c7f6b95d7e1efa6897da01232e66b253a0ef2f88c29cc9628ddcc569dc5d4bc63ed21866fb5861ffdfb4de61ae5654f4b6a7ae4 SHA512 c4fcd2ce5d8e85bdaf969d7d2fec5b526ea650b7a58649dd3546f0164b10478e248eaeb1cf4fe371f44ff0a3cd70541e1c4751d01ac33a49a6bd853f78941436
|
||||
DIST micro-2.0.11.tar.gz 549261 BLAKE2B 30c21d7747870a9a85a8fb552ec9035af5c42232f4d2ee0744c24671e78ee22ff5eea803fbc19fac704b49644df0597538950b735f955eecc921e681c0ad924c SHA512 3aa3dd10baaec9fa73b5c673c3d29eb8b4d04b468e36866118bcfc70dd638c50e56d51fc6085dcc7441a2ce0d9bbf742c37fd26a7e2b92d8b20844c8a7b53487
|
||||
DIST micro-2.0.12-deps.tar.xz 27563572 BLAKE2B 416548c7b2effa88f80aeb00e15645ace642859af9b3992ec8bc702237a2a17440d34a0ccdad4079933e38fec5ae4d06749a094d211d9fc9f7a11cca9b098a29 SHA512 157f655dfab205e918367c1ea9de849c3c90671bbdf50e8c869e239350f923c62540695839e114e44d6740c06bb0855d5aa139876fe38fe87d24e3162029daef
|
||||
DIST micro-2.0.12.tar.gz 562941 BLAKE2B b360560cb0e4b27739e4efc880c66e4e934e3b6515062fb853f29ca9ee21e62edfac8ab0d554bff0062089c20ef2ab11b7d28180b851774f25327c6da58793e2 SHA512 a03fe2b91914c423f0195e9a7c7d35c3c6a38ec2ba65ca8dd8719da38806f2bc5a7b10efb73f9a2ee884bdf3f2a71a04bc3404a7a811b4fb329ffdf41336b78a
|
||||
DIST micro-2.0.13-deps.tar.xz 27532560 BLAKE2B ed994b56a73861db0eaff9c394df5a5b6c0900328c068ab9b6e4cace2ffd36082e455da22f02cd43d41386fe587b51189fb01dd04bae821aeccdefb679ec9a6a SHA512 23959b46e7602091f61ddb01d25188956b558585674dc8a782e191dd52d4912132bea860530d1a25e97015d242a2a28a9cf4c5098974e85dcf78c3dc4757734a
|
||||
DIST micro-2.0.13-deps.tar.xz 10314120 BLAKE2B 45b7c6ecbf5af8f234bfe612cff3ab33bb7115b3ff55395632cdfb89ac7645f599802460ae17271bf8279a189fe51d3e4d47039849dac23885ea0c344a0d100c SHA512 c592e37c7673d172d4c1c60a0689af886fd551b8c812370c3312d474d3cc0e81b299a1d1d339fff4edb3c0feed93c330109fa3433865fd888b845f0739cc1ade
|
||||
DIST micro-2.0.13.tar.gz 563438 BLAKE2B f3d1876e9eff95fa59d52cc324c4682609c80fff4be8b37fdc701c452df54f35fe57502b0dac7d8aa07f7d02496c3c7ed8f06bba515466a631a39b1816eceba3 SHA512 b4b1dd3b03c906ee5c0bf9d0b576efea2a527fcdb0fe40338c78515fd5f6a4eb22bd9541567bb5956c4087e749775a1e8c33a73d185f7a6b00ba91e405d6a117
|
||||
|
@ -1,39 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit go-module optfeature desktop xdg
|
||||
|
||||
DESCRIPTION="Modern and intuitive terminal-based text editor"
|
||||
HOMEPAGE="https://github.com/zyedidia/micro"
|
||||
SRC_URI="https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
|
||||
|
||||
LICENSE="MIT Apache-2.0 BSD MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
|
||||
|
||||
BDEPEND="dev-vcs/git"
|
||||
|
||||
src_compile() {
|
||||
ego build -v -work -x -o ${PN} -ldflags \
|
||||
"-X github.com/zyedidia/micro/v2/internal/util.Version=${PV} -X github.com/zyedidia/micro/v2/internal/util.CompileDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
|
||||
./cmd/micro
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin ${PN}
|
||||
doman ./assets/packaging/micro.1
|
||||
domenu assets/packaging/micro.desktop
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Update desktop file mime cache
|
||||
xdg_pkg_postinst
|
||||
|
||||
optfeature_header "Clipboard support with display servers:"
|
||||
optfeature "Xorg" x11-misc/xsel x11-misc/xclip
|
||||
optfeature "Wayland" gui-apps/wl-clipboard
|
||||
}
|
@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit go-module optfeature desktop xdg
|
||||
|
||||
DESCRIPTION="Modern and intuitive terminal-based text editor"
|
||||
HOMEPAGE="https://github.com/zyedidia/micro"
|
||||
SRC_URI="https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
|
||||
|
||||
LICENSE="MIT Apache-2.0 BSD MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
|
||||
|
||||
BDEPEND="dev-vcs/git"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.0.12-no-strip.patch
|
||||
)
|
||||
|
||||
src_compile() {
|
||||
# We build/install this way for bug #915628 (highlighting)
|
||||
emake VERSION=${PV} build
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/bin
|
||||
emake GOBIN="${ED}"/usr/bin install
|
||||
doman ./assets/packaging/micro.1
|
||||
domenu assets/packaging/micro.desktop
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Update desktop file mime cache
|
||||
xdg_pkg_postinst
|
||||
|
||||
optfeature_header "Clipboard support with display servers:"
|
||||
optfeature "Xorg" x11-misc/xsel x11-misc/xclip
|
||||
optfeature "Wayland" gui-apps/wl-clipboard
|
||||
}
|
@ -1,39 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit go-module optfeature desktop xdg
|
||||
|
||||
DESCRIPTION="Modern and intuitive terminal-based text editor"
|
||||
HOMEPAGE="https://github.com/zyedidia/micro"
|
||||
SRC_URI="https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
|
||||
|
||||
LICENSE="MIT Apache-2.0 BSD MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
|
||||
|
||||
BDEPEND="dev-vcs/git"
|
||||
|
||||
src_compile() {
|
||||
ego build -v -work -x -o ${PN} -ldflags \
|
||||
"-X github.com/zyedidia/micro/v2/internal/util.Version=${PV} -X github.com/zyedidia/micro/v2/internal/util.CompileDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
|
||||
./cmd/micro
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin ${PN}
|
||||
doman ./assets/packaging/micro.1
|
||||
domenu assets/packaging/micro.desktop
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Update desktop file mime cache
|
||||
xdg_pkg_postinst
|
||||
|
||||
optfeature_header "Clipboard support with display servers:"
|
||||
optfeature "Xorg" x11-misc/xsel x11-misc/xclip
|
||||
optfeature "Wayland" gui-apps/wl-clipboard
|
||||
}
|
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST apheleia-4.0.tar.gz 170327 BLAKE2B 82e5b545045ef8e5e17dd6930efe21c6eb5d04f6e22d0ce07e13af7c09237b93c09ff756e8e024751ecfc46d0809e408bfdc14e192cd9ded5cce955cd67a66bb SHA512 5cc5a12a8418372ade1ba968e34d8eae067d2c3401aeabd860b562a66a6efd1cc1b21eba6ff1d1e96a4e7aff18d26097e8758774f3fa2d5e663bdb9407647936
|
||||
DIST apheleia-4.1.tar.gz 178011 BLAKE2B c48b9f98e7d985b8a6a30c8945ce92d512eecd9b8ec5403f26870ca3a38cefb40d35e7757875964898e537eb65b48d85573be909685dc4dc06f56584d989b1e7 SHA512 37e946651aa084cf322eaa45c3fd72cc3d6089da237b2ce02f2ba5481eb60c63030b654c78a614c70943b2825df184249ac8fe53a013f75cde54c31062dd0c6b
|
||||
|
@ -0,0 +1,28 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
NEED_EMACS=26
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Reformat GNU Emacs buffers stably without moving point"
|
||||
HOMEPAGE="https://github.com/radian-software/apheleia/"
|
||||
|
||||
if [[ "${PV}" == *9999* ]] ; then
|
||||
inherit git-r3
|
||||
|
||||
EGIT_REPO_URI="https://github.com/radian-software/${PN}.git"
|
||||
else
|
||||
SRC_URI="https://github.com/radian-software/${PN}/archive/v${PV}.tar.gz
|
||||
-> ${P}.tar.gz"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
|
||||
DOCS=( README.md CHANGELOG.md )
|
||||
SITEFILE="50${PN}-gentoo.el"
|
@ -1,3 +1,2 @@
|
||||
DIST buttercup-1.31.tar.gz 91816 BLAKE2B 2a2569a3750b4ebf7ffdf7a0812be322b1f71b3579e35e55de5097a221ab342808349b8cc0e5f958b855aca709fe0b1e83efd005895c52e8dcf59a25960c05e9 SHA512 b7a779b610295d4ce24e537c4a3b4fd8b23c2fa8bcbd3ca622fe96681cf294dcc9eaea082441f23efa75a13c54cc768c63bcff1e0bb8bd7d1971c75c10c21e5e
|
||||
DIST buttercup-1.32.tar.gz 91941 BLAKE2B d957351054ae9f67ad0e37b8526c269b1fb7fd8fcd81c74d8a74a488158fc766a75aaf641f670e8ceedb8916bf28449c00f492c0fe7dd276070053d4a5bf1d4a SHA512 9b4dd181d37197ceaabcd322109d5df993e1c45dcbcde51a713e6f26053fbedabdd437a5cfef2e9ae8c28fde03d4e8a61f2e93cea1e65be6434a60cc650e68ae
|
||||
DIST buttercup-1.33.tar.gz 91925 BLAKE2B d17788f34b001fffa6322d0d3d1f397a32708c1906e993581ef299e6e3897fce90bea186e1cedde4c86c63083e0cc53d016a8c3bd431e7f18a36e70d0ecbd061 SHA512 95fb4031663ed0fa7a023c924ce8bf4b077ace65f0680a7a8ecfdfa5359b30e6d42b27ad857ed1b24ea405c7a49c7b182d337e2bf1c37d971bebba98b37f4f12
|
||||
DIST buttercup-1.34.tar.gz 92551 BLAKE2B 51335027d4ee799e80563355eee1dbadddf2bf92e5790eb7afb2fbfd5a53fdc17ab09eec75b5e6712faac4f03e29c6493914f848a584f594710d9c5a379e4361 SHA512 8aa788b5937ecb89d7a8e486d28df78cb582024c438d6e5ec9ad582b17351b116bca87771a0e8d7386e8357d39f6ca8b109612258e55ca16497f4189eddb7a99
|
||||
|
@ -1,28 +0,0 @@
|
||||
# Copyright 2022-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Behaviour-driven Elisp testing"
|
||||
HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
|
||||
SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}"/emacs-${P}
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv sparc x86"
|
||||
|
||||
DOCS=( docs/{running,writing}-tests.md )
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
src_test() {
|
||||
${EMACS} ${EMACSFLAGS} -L . -l buttercup \
|
||||
-f buttercup-run-discover || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
elisp_src_install
|
||||
dobin bin/${PN}
|
||||
}
|
@ -1,28 +0,0 @@
|
||||
# Copyright 2022-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Behaviour-driven Elisp testing"
|
||||
HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
|
||||
SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}"/emacs-${P}
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~riscv sparc x86"
|
||||
|
||||
DOCS=( docs/{running,writing}-tests.md )
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
src_test() {
|
||||
${EMACS} ${EMACSFLAGS} -L . -l buttercup \
|
||||
-f buttercup-run-discover || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
elisp_src_install
|
||||
dobin bin/${PN}
|
||||
}
|
@ -0,0 +1,38 @@
|
||||
# Copyright 2022-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Behaviour-driven Elisp testing"
|
||||
HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
|
||||
|
||||
if [[ "${PV}" == *9999* ]] ; then
|
||||
inherit git-r3
|
||||
|
||||
EGIT_REPO_URI="https://github.com/jorgenschaefer/emacs-${PN}.git"
|
||||
else
|
||||
SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz
|
||||
-> ${P}.tar.gz"
|
||||
S="${WORKDIR}/emacs-${P}"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
|
||||
DOCS=( docs/{running,writing}-tests.md )
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
src_test() {
|
||||
${EMACS} ${EMACSFLAGS} -L . -l buttercup \
|
||||
-f buttercup-run-discover || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
elisp_src_install
|
||||
|
||||
dobin "bin/${PN}"
|
||||
}
|
@ -1,2 +1,3 @@
|
||||
DIST jinx-1.1.tar.gz 33820 BLAKE2B 457214768c7220376a8f1e5c05eedf855fdd560b265ca0431840aee05428d1cf3576e3ef0214cf64b164984adb0951e7932271dd80b6b0d06ed740172335c5fe SHA512 3bb1981557e35d3834834cbdc0fc1360b5a931f0e16cc68c2eb0739956db9e8e97d615236e575758cbb282087a7baad3c956fc9e628679a791ca744e8365355b
|
||||
DIST jinx-1.2.tar.gz 33991 BLAKE2B 37661f5d02bb3f1a1813bd5d4e78b6c6c115ef40fa1f346685956a02486870fbccb570490e05029550e281e0be02bde12f6cdd5b3bf6dc67041cab294759585d SHA512 bc5caa73a348c3a5aae6322290823c60f48127b915e173ae08385ee979e94d4d05c733ad0003c5ac4702828de5dffd2dfb88c7da720bafa4a85665657579e0d0
|
||||
DIST jinx-1.3.tar.gz 34055 BLAKE2B c91652d0791ace223013f0ac42d3b917d3fff6cd5920d27bcf48f65ead3a7d29bc7090af107619ceedc243f34c7984a2dadb8fa667d6a825c8a21107de5f186a SHA512 14f03352e16cbcdbfa4c0fe9c00a2a496d7086a0a7dee9c82c5673069e98b0d9b472722a8e90f03815770bf8f054349833e3e7d035deb53a4fa9d05fa54899da
|
||||
|
@ -0,0 +1,45 @@
|
||||
# Copyright 2023-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
NEED_EMACS=27.1
|
||||
inherit edo elisp toolchain-funcs
|
||||
|
||||
DESCRIPTION="Enchanted Spell Checker for GNU Emacs"
|
||||
HOMEPAGE="https://github.com/minad/jinx"
|
||||
|
||||
SRC_URI="
|
||||
https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
RDEPEND="
|
||||
app-text/enchant:2
|
||||
>=app-emacs/compat-29.1.4.0
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
ELISP_TEXINFO="${PN}.texi"
|
||||
|
||||
src_compile() {
|
||||
edo $(tc-getCC) -fPIC -Wall -Wextra -shared \
|
||||
$($(tc-getPKG_CONFIG) --cflags --libs enchant-2) \
|
||||
${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o jinx-mod.so jinx-mod.c
|
||||
elisp-org-export-to texinfo README.org
|
||||
elisp_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
elisp-make-autoload-file
|
||||
elisp_src_install
|
||||
|
||||
elisp-modules-install "${PN}" jinx-mod.so
|
||||
doinfo jinx.info
|
||||
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST ibus-typing-booster-2.24.11.tar.gz 12321813 BLAKE2B 3757d6d43fb0837c10ad4641f72a3f09f2664e78905ebf98a36f723c07a43e1de85fd916a5c24aa13806d093a87d673f585234a36b4d8fc7cc8c8fc1a8d5d2d9 SHA512 9cc906061aaa8e4720e48296158c990b2411aad26f0ebf71e58bc202b2470d100541174e4e007c55e89c9b7540e21ef9107045dcff0e86ffba30cfd9acded989
|
||||
DIST ibus-typing-booster-2.25.0.tar.gz 12346383 BLAKE2B 6bde5bebf641ae475634db8fc1d7f606905a593c8e6651a98af8147aa190d94e2db89e05c63da5d306f9188f7721d40059782f267efde0c5039551bf9d6fa1c3 SHA512 1559dcaa3f06c191993af84f317b7cf965f3f5539a43dffd86dfcca6f4bfe2fb1104d619bd7e4d1b83133c5e215bb993a65674555437b5311ee756fe70f4318e
|
||||
DIST ibus-typing-booster-2.25.1.tar.gz 12351484 BLAKE2B 012c4300e186da54d6b1692cfd71669b49a38a85eaaf232ff934979835651fc6b75ea46016dd71d7f6d13d4cc63f94411808895b1aa762ca2ebc5a98bc3a4729 SHA512 98965fc11dca5b1ab52e18e19c4bd43d782cebc609524420e801421850cdb7235ebf9b28322829e23d845c689bb6501080653b429cf465018f8923c9b46dc231
|
||||
DIST ibus-typing-booster-2.25.3.tar.gz 12388617 BLAKE2B 44cbaa162ac76fb36f37117ebf0aa49b390dde89214ecac423e55a1a16b41df30ffd02039534e9873d54616ca68cca363c238429beb08cab1cc2955748a0b96c SHA512 df1ff9cd939c7fb72c616b239a5526060ab6840bae2c01c9e6ce338ac28cea0d4f525632f138e226b12ff6389574996fc523fe1722917db9f73d395927db9a4c
|
||||
|
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="8"
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
PYTHON_REQ_USE="sqlite(+)"
|
||||
|
||||
inherit gnome2-utils python-single-r1 xdg
|
||||
|
||||
DESCRIPTION="Completion input method for IBus"
|
||||
HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
|
||||
SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
RESTRICT="test"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
dev-libs/m17n-lib
|
||||
$(python_gen_cond_dep '
|
||||
app-i18n/ibus[python(+),${PYTHON_USEDEP}]
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
dev-python/pyenchant[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
dev-python/pyxdg[${PYTHON_USEDEP}]
|
||||
')"
|
||||
RDEPEND="${DEPEND}
|
||||
>=dev-db/m17n-db-1.7"
|
||||
BDEPEND="sys-devel/gettext
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
xdg_pkg_preinst
|
||||
gnome2_schemas_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
gnome2_schemas_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
}
|
Binary file not shown.
@ -1,94 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..10} )
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
|
||||
inherit desktop optfeature python-single-r1 xdg
|
||||
|
||||
DESCRIPTION="A spaced-repetition memory training program (flash cards)"
|
||||
HOMEPAGE="https://apps.ankiweb.net"
|
||||
SRC_URI="https://apps.ankiweb.net/downloads/archive/${P}-source.tgz -> ${P}.tgz"
|
||||
|
||||
LICENSE="AGPL-3+ BSD MIT GPL-3+ CC-BY-SA-3.0 Apache-2.0 CC-BY-2.5"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
$(python_gen_cond_dep '
|
||||
>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
|
||||
>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
|
||||
>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
|
||||
dev-python/beautifulsoup4[${PYTHON_USEDEP}]
|
||||
dev-python/decorator[${PYTHON_USEDEP}]
|
||||
dev-python/jsonschema[${PYTHON_USEDEP}]
|
||||
dev-python/markdown[${PYTHON_USEDEP}]
|
||||
dev-python/requests[${PYTHON_USEDEP}]
|
||||
dev-python/send2trash[${PYTHON_USEDEP}]
|
||||
')
|
||||
"
|
||||
BDEPEND="test? (
|
||||
${RDEPEND}
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
')
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch
|
||||
"${FILESDIR}"/${PN}-2.1.15-mpv-args.patch
|
||||
"${FILESDIR}"/${PN}-2.1.15-unescape.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s/updates=True/updates=False/" \
|
||||
aqt/profiles.py || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:;
|
||||
}
|
||||
|
||||
src_test() {
|
||||
sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${BROOT}/usr/bin/nosetests\":" \
|
||||
-i tools/tests.sh || die
|
||||
sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${BROOT}/usr/bin/nosetests3\":" \
|
||||
-i tools/tests.sh || die
|
||||
sed -e "s:which nosetests3:which ${BROOT}/usr/bin/nosetests3:" \
|
||||
-i tools/tests.sh || die
|
||||
./tools/tests.sh || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
doicon ${PN}.png
|
||||
domenu ${PN}.desktop
|
||||
doman ${PN}.1
|
||||
|
||||
dodoc README.md README.development
|
||||
python_domodule aqt anki
|
||||
python_newscript runanki anki
|
||||
|
||||
# Localization files go into the anki directory:
|
||||
python_moduleinto anki
|
||||
python_domodule locale
|
||||
|
||||
# not sure if this is correct, but
|
||||
# site-packages/aqt/mediasrv.py wants the directory
|
||||
insinto /usr/share/anki
|
||||
doins -r web
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
optfeature "LaTeX in cards" "app-text/texlive app-text/dvipng"
|
||||
optfeature "Record sound" "dev-python/pyaudio media-sound/lame"
|
||||
optfeature "Playback sound" media-video/mpv media-video/mplayer
|
||||
}
|
@ -1,95 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..11} )
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
|
||||
inherit desktop optfeature python-single-r1 xdg
|
||||
|
||||
DESCRIPTION="A spaced-repetition memory training program (flash cards)"
|
||||
HOMEPAGE="https://apps.ankiweb.net"
|
||||
SRC_URI="https://apps.ankiweb.net/downloads/archive/${P}-source.tgz -> ${P}.tgz"
|
||||
|
||||
LICENSE="AGPL-3+ BSD MIT GPL-3+ CC-BY-SA-3.0 Apache-2.0 CC-BY-2.5"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
$(python_gen_cond_dep '
|
||||
>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
|
||||
>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
|
||||
>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
|
||||
dev-python/beautifulsoup4[${PYTHON_USEDEP}]
|
||||
dev-python/decorator[${PYTHON_USEDEP}]
|
||||
dev-python/jsonschema[${PYTHON_USEDEP}]
|
||||
dev-python/markdown[${PYTHON_USEDEP}]
|
||||
dev-python/requests[${PYTHON_USEDEP}]
|
||||
dev-python/send2trash[${PYTHON_USEDEP}]
|
||||
')
|
||||
"
|
||||
BDEPEND="test? (
|
||||
${RDEPEND}
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
')
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch
|
||||
"${FILESDIR}"/${PN}-2.1.15-mpv-args.patch
|
||||
"${FILESDIR}"/${PN}-2.1.15-unescape.patch
|
||||
"${FILESDIR}"/${PN}-2.1.15-fix-prefs.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s/updates=True/updates=False/" \
|
||||
aqt/profiles.py || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:;
|
||||
}
|
||||
|
||||
src_test() {
|
||||
sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${BROOT}/usr/bin/nosetests\":" \
|
||||
-i tools/tests.sh || die
|
||||
sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${BROOT}/usr/bin/nosetests3\":" \
|
||||
-i tools/tests.sh || die
|
||||
sed -e "s:which nosetests3:which ${BROOT}/usr/bin/nosetests3:" \
|
||||
-i tools/tests.sh || die
|
||||
./tools/tests.sh || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
doicon ${PN}.png
|
||||
domenu ${PN}.desktop
|
||||
doman ${PN}.1
|
||||
|
||||
dodoc README.md README.development
|
||||
python_domodule aqt anki
|
||||
python_newscript runanki anki
|
||||
|
||||
# Localization files go into the anki directory:
|
||||
python_moduleinto anki
|
||||
python_domodule locale
|
||||
|
||||
# not sure if this is correct, but
|
||||
# site-packages/aqt/mediasrv.py wants the directory
|
||||
insinto /usr/share/anki
|
||||
doins -r web
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
optfeature "LaTeX in cards" "app-text/texlive app-text/dvipng"
|
||||
optfeature "Record sound" "dev-python/pyaudio media-sound/lame"
|
||||
optfeature "Playback sound" media-video/mpv media-video/mplayer
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
--- anki-2.1.0beta25/aqt/mediasrv.py
|
||||
+++ anki-2.1.0beta25/aqt/mediasrv.py
|
||||
@@ -13,7 +13,7 @@
|
||||
# locate web folder in source/binary distribution
|
||||
def _getExportFolder():
|
||||
# running from source?
|
||||
- srcFolder = os.path.join(os.path.dirname(__file__), "..")
|
||||
+ srcFolder = os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "share", "anki")
|
||||
webInSrcFolder = os.path.abspath(os.path.join(srcFolder, "web"))
|
||||
if os.path.exists(webInSrcFolder):
|
||||
return webInSrcFolder
|
@ -1,17 +0,0 @@
|
||||
https://bugs.gentoo.org/869917#c3
|
||||
https://github.com/ankitects/anki/commit/d2ae874d9e1615d09afc912275cc3b27776a1392
|
||||
|
||||
--- a/aqt/preferences.py
|
||||
+++ b/aqt/preferences.py
|
||||
@@ -77,8 +77,8 @@ class Preferences(QDialog):
|
||||
f.hwAccel.setVisible(False)
|
||||
else:
|
||||
f.hwAccel.setChecked(self.mw.pm.glMode() != "software")
|
||||
- f.lrnCutoff.setValue(qc['collapseTime']/60.0)
|
||||
- f.timeLimit.setValue(qc['timeLim']/60.0)
|
||||
+ f.lrnCutoff.setValue(int(qc['collapseTime']/60.0))
|
||||
+ f.timeLimit.setValue(int(qc['timeLim']/60.0))
|
||||
f.showEstimates.setChecked(qc['estTimes'])
|
||||
f.showProgress.setChecked(qc['dueCounts'])
|
||||
f.nightMode.setChecked(qc.get("nightMode", False))
|
||||
|
@ -1,26 +0,0 @@
|
||||
--- a/anki/mpv.py
|
||||
+++ b/anki/mpv.py
|
||||
@@ -104,9 +104,9 @@ class MPVBase:
|
||||
"""
|
||||
self.argv = [self.executable]
|
||||
self.argv += self.default_argv
|
||||
- self.argv += ["--input-ipc-server", self._sock_filename]
|
||||
+ self.argv += ["--input-ipc-server="+self._sock_filename]
|
||||
if self.window_id is not None:
|
||||
- self.argv += ["--wid", str(self.window_id)]
|
||||
+ self.argv += ["--wid="+str(self.window_id)]
|
||||
|
||||
def _start_process(self):
|
||||
"""Start the mpv process.
|
||||
diff --git a/anki/sound.py b/anki/sound.py
|
||||
index aa3431b1..a5fce446 100644
|
||||
--- a/anki/sound.py
|
||||
+++ b/anki/sound.py
|
||||
@@ -124,7 +124,6 @@ class MpvManager(MPV):
|
||||
def setMpvConfigBase(base):
|
||||
mpvConfPath = os.path.join(base, "mpv.conf")
|
||||
MpvManager.default_argv += [
|
||||
- "--no-config",
|
||||
"--include="+mpvConfPath,
|
||||
]
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff --git a/aqt/reviewer.py b/aqt/reviewer.py
|
||||
index f01fcbd9f..5aaf26669 100644
|
||||
--- a/aqt/reviewer.py
|
||||
+++ b/aqt/reviewer.py
|
||||
@@ -359,7 +359,7 @@ Please run Tools>Empty Cards""")
|
||||
cor = stripHTML(cor)
|
||||
# ensure we don't chomp multiple whitespace
|
||||
cor = cor.replace(" ", " ")
|
||||
- cor = parser.unescape(cor)
|
||||
+ cor = html.unescape(cor)
|
||||
cor = cor.replace("\xa0", " ")
|
||||
cor = cor.strip()
|
||||
given = self.typedAnswer
|
@ -0,0 +1,379 @@
|
||||
# Copyright 2021-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CRATES="
|
||||
adler@1.0.2
|
||||
ahash@0.4.8
|
||||
ahash@0.8.7
|
||||
aho-corasick@1.1.2
|
||||
android-tzdata@0.1.1
|
||||
android_system_properties@0.1.5
|
||||
ansi_colours@1.2.2
|
||||
anstream@0.6.7
|
||||
anstyle@1.0.4
|
||||
anstyle-parse@0.2.3
|
||||
anstyle-query@1.0.2
|
||||
anstyle-wincon@3.0.2
|
||||
anyhow@1.0.79
|
||||
argh@0.1.12
|
||||
argh_derive@0.1.12
|
||||
argh_shared@0.1.12
|
||||
arrayref@0.3.7
|
||||
arrayvec@0.7.4
|
||||
autocfg@1.1.0
|
||||
base64@0.13.1
|
||||
base64@0.21.7
|
||||
bet@1.0.2
|
||||
bincode@1.3.3
|
||||
bit_field@0.10.2
|
||||
bitflags@1.3.2
|
||||
bitflags@2.4.1
|
||||
block@0.1.6
|
||||
bstr@1.9.0
|
||||
bumpalo@3.14.0
|
||||
bytemuck@1.14.0
|
||||
byteorder@1.5.0
|
||||
cc@1.0.83
|
||||
cfg-if@1.0.0
|
||||
char_reader@0.1.1
|
||||
chrono@0.4.31
|
||||
clap@4.4.16
|
||||
clap-help@1.1.0
|
||||
clap_builder@4.4.16
|
||||
clap_complete@4.4.6
|
||||
clap_derive@4.4.7
|
||||
clap_lex@0.6.0
|
||||
clap_mangen@0.2.17
|
||||
cli-log@2.0.0
|
||||
clipboard-win@4.5.0
|
||||
clipboard_macos@0.1.0
|
||||
color_quant@1.1.0
|
||||
colorchoice@1.0.0
|
||||
coolor@0.9.0
|
||||
core-foundation-sys@0.8.6
|
||||
crc32fast@1.3.2
|
||||
crokey@0.6.3
|
||||
crokey-proc_macros@0.6.3
|
||||
crossbeam@0.8.4
|
||||
crossbeam-channel@0.5.11
|
||||
crossbeam-deque@0.8.5
|
||||
crossbeam-epoch@0.9.18
|
||||
crossbeam-queue@0.3.11
|
||||
crossbeam-utils@0.8.19
|
||||
crossterm@0.27.0
|
||||
crossterm_winapi@0.9.1
|
||||
crunchy@0.2.2
|
||||
csv@1.3.0
|
||||
csv-core@0.1.11
|
||||
csv2svg@0.2.0
|
||||
custom_error@1.9.2
|
||||
data-url@0.3.1
|
||||
deranged@0.3.11
|
||||
deser-hjson@2.2.4
|
||||
directories@4.0.1
|
||||
directories-next@2.0.0
|
||||
dirs-sys@0.3.7
|
||||
dirs-sys-next@0.1.2
|
||||
doc-comment@0.3.3
|
||||
either@1.9.0
|
||||
equivalent@1.0.1
|
||||
errno@0.3.8
|
||||
error-code@2.3.1
|
||||
exr@1.71.0
|
||||
fallible-iterator@0.2.0
|
||||
fallible-streaming-iterator@0.1.9
|
||||
fastrand@2.0.1
|
||||
fdeflate@0.3.3
|
||||
file-size@1.0.3
|
||||
flate2@1.0.28
|
||||
float-cmp@0.9.0
|
||||
flume@0.11.0
|
||||
fnv@1.0.7
|
||||
fontconfig-parser@0.5.3
|
||||
fontdb@0.15.0
|
||||
form_urlencoded@1.2.1
|
||||
gethostname@0.3.0
|
||||
getrandom@0.2.12
|
||||
gif@0.12.0
|
||||
git2@0.14.4
|
||||
glassbench@0.4.1
|
||||
glob@0.3.1
|
||||
half@2.2.1
|
||||
hashbrown@0.9.1
|
||||
hashbrown@0.14.3
|
||||
hashlink@0.6.0
|
||||
heck@0.4.1
|
||||
home@0.5.9
|
||||
iana-time-zone@0.1.59
|
||||
iana-time-zone-haiku@0.1.2
|
||||
id-arena@2.2.1
|
||||
idna@0.5.0
|
||||
image@0.24.8
|
||||
imagesize@0.12.0
|
||||
include_dir@0.7.3
|
||||
include_dir_macros@0.7.3
|
||||
indexmap@2.1.0
|
||||
is_executable@1.0.1
|
||||
itoa@1.0.10
|
||||
jobserver@0.1.27
|
||||
jpeg-decoder@0.3.1
|
||||
js-sys@0.3.67
|
||||
kurbo@0.9.5
|
||||
lazy-regex@3.1.0
|
||||
lazy-regex-proc_macros@3.1.0
|
||||
lazy_static@1.4.0
|
||||
lebe@0.5.2
|
||||
lfs-core@0.11.2
|
||||
libc@0.2.152
|
||||
libgit2-sys@0.13.5+1.4.5
|
||||
libredox@0.0.1
|
||||
libsqlite3-sys@0.20.1
|
||||
libz-sys@1.1.14
|
||||
line-wrap@0.1.1
|
||||
linked-hash-map@0.5.6
|
||||
linux-raw-sys@0.4.12
|
||||
lock_api@0.4.11
|
||||
log@0.4.20
|
||||
malloc_buf@0.0.6
|
||||
memchr@2.7.1
|
||||
memmap2@0.6.2
|
||||
memmap2@0.8.0
|
||||
memoffset@0.6.5
|
||||
memoffset@0.7.1
|
||||
minimad@0.13.0
|
||||
miniz_oxide@0.7.1
|
||||
mio@0.8.10
|
||||
nix@0.22.3
|
||||
nix@0.26.4
|
||||
normpath@1.1.1
|
||||
num-traits@0.2.17
|
||||
objc@0.2.7
|
||||
objc-foundation@0.1.1
|
||||
objc_id@0.1.1
|
||||
once_cell@1.19.0
|
||||
onig@6.4.0
|
||||
onig_sys@69.8.1
|
||||
open@1.7.1
|
||||
opener@0.6.1
|
||||
parking_lot@0.12.1
|
||||
parking_lot_core@0.9.9
|
||||
pathdiff@0.2.1
|
||||
percent-encoding@2.3.1
|
||||
phf@0.11.2
|
||||
phf_generator@0.11.2
|
||||
phf_macros@0.11.2
|
||||
phf_shared@0.11.2
|
||||
pico-args@0.5.0
|
||||
pkg-config@0.3.28
|
||||
plist@1.6.0
|
||||
png@0.17.11
|
||||
powerfmt@0.2.0
|
||||
proc-macro2@1.0.76
|
||||
proc-status@0.1.1
|
||||
qoi@0.4.1
|
||||
quick-xml@0.31.0
|
||||
quote@1.0.35
|
||||
rand@0.8.5
|
||||
rand_core@0.6.4
|
||||
rayon@1.8.0
|
||||
rayon-core@1.12.0
|
||||
rctree@0.5.0
|
||||
redox_syscall@0.4.1
|
||||
redox_users@0.4.4
|
||||
regex@1.10.2
|
||||
regex-automata@0.4.3
|
||||
regex-syntax@0.6.29
|
||||
regex-syntax@0.8.2
|
||||
resvg@0.36.0
|
||||
rgb@0.8.37
|
||||
roff@0.2.1
|
||||
roxmltree@0.18.1
|
||||
rusqlite@0.24.2
|
||||
rustix@0.38.30
|
||||
rustybuzz@0.10.0
|
||||
ryu@1.0.16
|
||||
safemem@0.3.3
|
||||
same-file@1.0.6
|
||||
scopeguard@1.2.0
|
||||
secular@1.0.1
|
||||
serde@1.0.195
|
||||
serde_derive@1.0.195
|
||||
serde_json@1.0.111
|
||||
serde_spanned@0.6.5
|
||||
signal-hook@0.3.17
|
||||
signal-hook-mio@0.2.3
|
||||
signal-hook-registry@1.4.1
|
||||
simd-adler32@0.3.7
|
||||
simplecss@0.2.1
|
||||
siphasher@0.3.11
|
||||
slotmap@1.0.7
|
||||
smallvec@1.12.0
|
||||
snafu@0.7.5
|
||||
snafu-derive@0.7.5
|
||||
spin@0.9.8
|
||||
splitty@1.0.1
|
||||
str-buf@1.0.6
|
||||
strict@0.1.4
|
||||
strict@0.2.0
|
||||
strict-num@0.1.1
|
||||
strsim@0.10.0
|
||||
svg@0.13.1
|
||||
svgtypes@0.12.0
|
||||
syn@1.0.109
|
||||
syn@2.0.48
|
||||
syntect-no-panic@4.6.1
|
||||
tempfile@3.9.0
|
||||
termimad@0.28.2
|
||||
termimad@0.29.0
|
||||
terminal-clipboard@0.4.1
|
||||
terminal-light@1.2.0
|
||||
termux-clipboard@0.1.0
|
||||
thiserror@1.0.56
|
||||
thiserror-impl@1.0.56
|
||||
tiff@0.9.1
|
||||
time@0.3.31
|
||||
time-core@0.1.2
|
||||
time-macros@0.2.16
|
||||
tiny-skia@0.11.3
|
||||
tiny-skia-path@0.11.3
|
||||
tinyvec@1.6.0
|
||||
tinyvec_macros@0.1.1
|
||||
toml@0.8.8
|
||||
toml_datetime@0.6.5
|
||||
toml_edit@0.21.0
|
||||
trash@3.2.0
|
||||
ttf-parser@0.19.2
|
||||
umask@2.1.0
|
||||
unicode-bidi@0.3.14
|
||||
unicode-bidi-mirroring@0.1.0
|
||||
unicode-ccc@0.1.2
|
||||
unicode-ident@1.0.12
|
||||
unicode-normalization@0.1.22
|
||||
unicode-properties@0.1.0
|
||||
unicode-script@0.5.5
|
||||
unicode-vo@0.1.0
|
||||
unicode-width@0.1.11
|
||||
url@2.5.0
|
||||
usvg@0.36.0
|
||||
usvg-parser@0.36.0
|
||||
usvg-text-layout@0.36.0
|
||||
usvg-tree@0.36.0
|
||||
utf8parse@0.2.1
|
||||
uzers@0.11.3
|
||||
vcpkg@0.2.15
|
||||
version_check@0.9.4
|
||||
walkdir@2.4.0
|
||||
wasi@0.11.0+wasi-snapshot-preview1
|
||||
wasm-bindgen@0.2.90
|
||||
wasm-bindgen-backend@0.2.90
|
||||
wasm-bindgen-macro@0.2.90
|
||||
wasm-bindgen-macro-support@0.2.90
|
||||
wasm-bindgen-shared@0.2.90
|
||||
weezl@0.1.7
|
||||
which@4.4.2
|
||||
winapi@0.3.9
|
||||
winapi-i686-pc-windows-gnu@0.4.0
|
||||
winapi-util@0.1.6
|
||||
winapi-wsapoll@0.1.1
|
||||
winapi-x86_64-pc-windows-gnu@0.4.0
|
||||
windows@0.44.0
|
||||
windows-core@0.52.0
|
||||
windows-sys@0.48.0
|
||||
windows-sys@0.52.0
|
||||
windows-targets@0.42.2
|
||||
windows-targets@0.48.5
|
||||
windows-targets@0.52.0
|
||||
windows_aarch64_gnullvm@0.42.2
|
||||
windows_aarch64_gnullvm@0.48.5
|
||||
windows_aarch64_gnullvm@0.52.0
|
||||
windows_aarch64_msvc@0.42.2
|
||||
windows_aarch64_msvc@0.48.5
|
||||
windows_aarch64_msvc@0.52.0
|
||||
windows_i686_gnu@0.42.2
|
||||
windows_i686_gnu@0.48.5
|
||||
windows_i686_gnu@0.52.0
|
||||
windows_i686_msvc@0.42.2
|
||||
windows_i686_msvc@0.48.5
|
||||
windows_i686_msvc@0.52.0
|
||||
windows_x86_64_gnu@0.42.2
|
||||
windows_x86_64_gnu@0.48.5
|
||||
windows_x86_64_gnu@0.52.0
|
||||
windows_x86_64_gnullvm@0.42.2
|
||||
windows_x86_64_gnullvm@0.48.5
|
||||
windows_x86_64_gnullvm@0.52.0
|
||||
windows_x86_64_msvc@0.42.2
|
||||
windows_x86_64_msvc@0.48.5
|
||||
windows_x86_64_msvc@0.52.0
|
||||
winnow@0.5.34
|
||||
x11-clipboard@0.8.1
|
||||
x11rb@0.12.0
|
||||
x11rb-protocol@0.12.0
|
||||
xmlparser@0.13.6
|
||||
xmlwriter@0.1.0
|
||||
xterm-query@0.1.0
|
||||
xterm-query@0.2.0
|
||||
yaml-rust@0.4.5
|
||||
zerocopy@0.7.32
|
||||
zerocopy-derive@0.7.32
|
||||
zune-inflate@0.2.54
|
||||
"
|
||||
|
||||
inherit bash-completion-r1 cargo
|
||||
|
||||
DESCRIPTION="A new way to see and navigate directory trees"
|
||||
HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
|
||||
SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
${CARGO_CRATE_URIS}"
|
||||
|
||||
LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="X"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/libgit2:=
|
||||
sys-libs/zlib
|
||||
X? ( x11-libs/libxcb:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND=">=virtual/rust-1.65"
|
||||
|
||||
QA_FLAGS_IGNORED="usr/bin/${PN}"
|
||||
|
||||
src_configure() {
|
||||
export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
|
||||
local myfeatures=( $(usev X clipboard) )
|
||||
|
||||
cargo_src_configure --no-default-features
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
local mandate=$(date -r man/page +'%Y/%m/%d' || die)
|
||||
sed -e "s|#version|${PV}|" \
|
||||
-e "s|#date|${mandate}|" \
|
||||
man/page > "${T}"/${PN}.1 || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cargo_src_install
|
||||
|
||||
doman "${T}"/${PN}.1
|
||||
|
||||
local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
|
||||
cd ${build_dir[0]} || die
|
||||
|
||||
newbashcomp ${PN}.bash ${PN}
|
||||
newbashcomp br.bash br
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins _${PN}
|
||||
doins _br
|
||||
|
||||
insinto /usr/share/fish/vendor_completions.d
|
||||
doins ${PN}.fish
|
||||
doins br.fish
|
||||
}
|
@ -1,2 +1,2 @@
|
||||
DIST faq-0.0.7-deps.tar.xz 127305840 BLAKE2B d22ca978db27714b5a7112c73579e71ba2e4be94db82eebd8030ff3a108a534cdc014e85d3e1e5d832469d5e2124a61eba380c2fe1ff44102e575bc965ad5d41 SHA512 240d8c8ea04ff3b0a518741fe83f6002389be34d68d5ac4231b9a8c7646605bdd7a5381cf2f40e7f6bb4490e9ed7c6f80fc59d3ec2e52d0ac9d0319f627bace2
|
||||
DIST faq-0.0.7-deps.tar.xz 44607684 BLAKE2B 0a8c415affa370f13438d786832e8d57dc60eb079d3ff352657dcd95eabf5ec13c66fddce71f25936eb2066dab3040a0233ea528bbf428ae0c3078cfaec85798 SHA512 71897643356b5fde8850c2dd44d84415f67776eb3d3a7dc18378af2067ce9a66b87f21b57b1dae49f6eef46b33b2813d76342b58f93bd47741f4cb45f3ab7208
|
||||
DIST faq-0.0.7.tar.gz 70481 BLAKE2B 54e76fa5df833bffd5fc764cba2d20599bd0119bd34f011eb787d5c1f2659c6d20adea4d774a4b69894d5441baa10d3eb3ee9143f041fe9d6307ad67587abf71 SHA512 49bac1e1b58b3f058f5b5a751ba107e07b59e5422e69affe02da687cc8aa025a758ba7c1c5fae3a5441d437ef604aa06879b978ce62093b2e6549a7133936a65
|
||||
|
@ -1,3 +1,3 @@
|
||||
DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
|
||||
DIST fastfetch-2.7.1.tar.gz 1000565 BLAKE2B 061d2175bdca879bb4ef1a2f29fd73b99a7325fb8de66f05eb1203008c34ef20ff122e57a785ee0a5abb0251004023958abb1d158bc49cd1b34f9e02f3d1c6bc SHA512 55d897af532141d429aa5b58ab1516347f14597bf249b70f0d5ab27d11e235911858143fc32356255bef201cb44cdd7698e8d49094fb7e61c2e425a6c8ac5fa1
|
||||
DIST fastfetch-2.8.5.tar.gz 1010575 BLAKE2B 4e300bfb0361c7ab73b5a3853c2c484e1027b0eaf683f707e427d4831b8815a1c8f689be0ddf3815d31906f2260229a80b6abf41c712ac897cdcd713ab25f82a SHA512 411351ec4c600d59f06269b584a1bfb4975e8046dbb06952dd8a5cbb39c7daedb641a9518b031dd0cdd3e200a4d33e01e1f33523fd657deaa5d53b92b7a5384c
|
||||
DIST fastfetch-2.8.6.tar.gz 1013523 BLAKE2B b55d70f51000fe10ed04caf7c5c88d52618420b11522233c447f8b71c8ea53f38d46ab0669a6969c07bfbbfd8c9f1442a453f612578c1ae345d50a7e702b7ffb SHA512 3695401d379c1bb120512b0245de48c91ac197306dc73253e96a8e196ef428253943c333492f85b5f142fdb34beda9b6c0ec6e148df0fff4a5042ef1845e3f98
|
||||
|
@ -1,2 +1,2 @@
|
||||
DIST mkcert-1.4.4-deps.tar.xz 17089596 BLAKE2B 5688409591b4e0425664b6fa28419231eba5ddfc84cb1f5353592e595b10c36f2d8398452b61537e1339851be6b1eb767968224b6016de3bc55eadb235ef73f3 SHA512 62826be3b765e74f039fab42c2b201c5f2a4b9bf263a0f8c8e2afea260dfc4aebcf4f12c7aef1d518d7bf0f527928affc5a62bfe71ebce2757c805231e885b99
|
||||
DIST mkcert-1.4.4-deps.tar.xz 5897176 BLAKE2B fb9e744107e292c3465b35337f8b9ec9a466d2c4b0dc6cec8b5711e58a3fb91b7f09865bf21eb9645e20ac12e7c51f02e952336ea0f42a10abc924ae4fc134ad SHA512 737a8863a9e531c6a1be8b5cda28c1d88adc341a4a115fb67701b393c5600f5f9e3f59f26807e8cf8987c04d5eb85074f52115e3e31f8a13f69bc76f99dffefe
|
||||
DIST mkcert-1.4.4.tar.gz 17604 BLAKE2B bf98e655f32d72f7f18857cb2591685b7e70d658e4ef5251ba590b035865ca3976a5f72ebaa6334cdef2e0f4758ae1884b46d662b45d986ec2d92afe73d67038 SHA512 480672618df409f153535f42ed4777447635b2ac78e38d9cc62aa9baa47b074aa01fa94ade4666f9ad31bf870caec53e5f0de69791c5e094a911d59f82382b05
|
||||
|
Binary file not shown.
@ -1,3 +1,6 @@
|
||||
DIST drawio-22.1.21-icon-r1.svg 1194 BLAKE2B 624a024e95ff1a68ac298b64d0e633f46411f7ec142d8b2a7d639c7e6a66a1f7c695f67b28a64e323ec1dea36ec4d657e2ee9119cd58f1c84f0d9cb9b5d9755d SHA512 ce010d61c5de3322d4e3c66c87ae199b7d15e68ee7253078f001eccb3b725c0290426978cfd81a4d06276b8b50ea8bd650213a50eb72432451afe536790eb39e
|
||||
DIST drawio-23.1.5-icon-r1.svg 1194 BLAKE2B 624a024e95ff1a68ac298b64d0e633f46411f7ec142d8b2a7d639c7e6a66a1f7c695f67b28a64e323ec1dea36ec4d657e2ee9119cd58f1c84f0d9cb9b5d9755d SHA512 ce010d61c5de3322d4e3c66c87ae199b7d15e68ee7253078f001eccb3b725c0290426978cfd81a4d06276b8b50ea8bd650213a50eb72432451afe536790eb39e
|
||||
DIST drawio-desktop-bin-amd64-22.1.21.deb 96067454 BLAKE2B 4359f16e9932bd0b356cb8e800dab018462f943c81f604cc32837c6fcf1d1eda051380a0efdb122cf08d38d6f9ea6d87fa89de41d11ff33fd132fec037d0ff25 SHA512 2c99cefeb9a483e9a687eb1d3945549dda932303e8e7d45e80cc37103659c88e9eaba33b5b663fb96c331800424d24c16e11d670231f04d42dc30119db731ee5
|
||||
DIST drawio-desktop-bin-amd64-23.1.5.deb 96278524 BLAKE2B 589cb585a687d40d2ae763492f0478ad6ee8acd642ecd00a9cd129c0e68bb297477c6b7709de13186d5ad643ee2ddb5d19c2e5d95574bfe49152958de02e44cf SHA512 9ae538f079a4eaa6c191270ed6f3ffc506a5921df109dbedfb7d9e3a4b2b61ebc884a33aca2f894bb0fe532e0069df62e267284250349facfd1d6e5bde7b824c
|
||||
DIST drawio-desktop-bin-arm64-22.1.21.deb 91108260 BLAKE2B ff13736806866249ef55ff7dabed173996b910d25f31f72e9755ef22f3e67162aa080046e4fb5af9801b8ddaefe19cdae578ce6a9d314013b01211832b71ded2 SHA512 5d273b55839858ab4afb18f9ceab1a8004af7843e73a15944be5991d09b821dc4f9fcf46a8dfca6b1a47d7d6e70e4e905e4dfe13e03fe842b6c1b40fc92164d7
|
||||
DIST drawio-desktop-bin-arm64-23.1.5.deb 90820726 BLAKE2B e937b1fa7675b3ed895776fbbf5b97c2d96d9fdc658789cad6fa7c2633af5257c61850c1e1f3537b4f3b47261f781dcadb316100b53101e1f5979bf6e9572c76 SHA512 94608a667a55f6e82321d2fd0e668e88dc27a74e7bd8fbd65317fdb02cd11fb4c0d990d3dc513a9a7584d69204a8d7e7f1b842a3c46938ad38671b44da68d399
|
||||
|
@ -0,0 +1,112 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CHROMIUM_LANGS="
|
||||
af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he
|
||||
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
|
||||
sv sw ta te th tr uk ur vi zh-CN zh-TW
|
||||
"
|
||||
|
||||
inherit chromium-2 desktop unpacker xdg
|
||||
|
||||
DESCRIPTION="draw.io diagramming and whiteboarding desktop app"
|
||||
HOMEPAGE="https://www.drawio.com/"
|
||||
|
||||
SRC_URI="
|
||||
amd64? ( https://github.com/jgraph/drawio-desktop/releases/download/v${PV}/drawio-amd64-${PV}.deb
|
||||
-> ${PN}-amd64-${PV}.deb )
|
||||
arm64? ( https://github.com/jgraph/drawio-desktop/releases/download/v${PV}/drawio-arm64-${PV}.deb
|
||||
-> ${PN}-arm64-${PV}.deb )
|
||||
https://raw.githubusercontent.com/jgraph/drawio-desktop/bdf5a4de3331e8dabab2be4c8f7b1a5427118f3f/build/icon.svg
|
||||
-> drawio-${PV}-icon-r1.svg
|
||||
"
|
||||
S="${WORKDIR}"
|
||||
|
||||
KEYWORDS="-* ~amd64"
|
||||
|
||||
# These are the licenses used by node_modules packages, drawio and drawio-desktop repositories
|
||||
LICENSE="
|
||||
0BSD Apache-2.0 BSD BSD-2 CC0-1.0 GPL-2 ISC PYTHON WTFPL-2 MIT ZLIB
|
||||
"
|
||||
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND="
|
||||
>=app-accessibility/at-spi2-core-2.46.0:2
|
||||
dev-libs/expat
|
||||
dev-libs/glib:2
|
||||
dev-libs/nspr
|
||||
>=dev-libs/nss-3
|
||||
media-libs/alsa-lib
|
||||
media-libs/mesa
|
||||
net-print/cups
|
||||
sys-apps/dbus
|
||||
sys-libs/glibc
|
||||
x11-libs/cairo
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libdrm
|
||||
x11-libs/libX11
|
||||
x11-libs/libxcb
|
||||
x11-libs/libXcomposite
|
||||
x11-libs/libXdamage
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libxkbcommon
|
||||
x11-libs/libXrandr
|
||||
x11-libs/pango
|
||||
"
|
||||
|
||||
QA_PREBUILT="opt/drawio/*"
|
||||
|
||||
pkg_pretend() {
|
||||
chromium_suid_sandbox_check_kernel_config
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# cleanup languages
|
||||
pushd "opt/drawio/locales" > /dev/null || die
|
||||
chromium_remove_language_paks
|
||||
popd > /dev/null || die
|
||||
|
||||
#Fix mimetype
|
||||
sed -i \
|
||||
-e 's*<icon name="x-office-document" />*<icon name="application-vnd.jgraph.mxfile"/>*g' \
|
||||
-e '4 i <sub-class-of type="text/xml"/>' \
|
||||
"usr/share/mime/packages/drawio.xml" || die "couldn't modify drawio.xml"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local destdir="/opt/drawio"
|
||||
|
||||
# Copy icons
|
||||
local IC_SIZE
|
||||
for IC_SIZE in 16 32 48 64 96 128 192 256 512 1024
|
||||
do
|
||||
newicon -s "${IC_SIZE}" "usr/share/icons/hicolor/${IC_SIZE}x${IC_SIZE}/apps/drawio.png" drawio.png
|
||||
newicon -s "${IC_SIZE}" -c mimetypes "usr/share/icons/hicolor/${IC_SIZE}x${IC_SIZE}/apps/drawio.png" \
|
||||
application-vnd.jgraph.mxfile.png
|
||||
done
|
||||
newicon -s scalable "${DISTDIR}/drawio-${PV}-icon-r1.svg" drawio.svg
|
||||
newicon -s scalable -c mimetypes "${DISTDIR}/drawio-${PV}-icon-r1.svg" application-vnd.jgraph.mxfile.svg
|
||||
|
||||
# Create a desktop entry and associate it with the drawio mime type
|
||||
domenu usr/share/applications/drawio.desktop
|
||||
|
||||
# MIME descriptor for .drawio and .vsdx files
|
||||
insinto /usr/share/mime/packages
|
||||
doins "usr/share/mime/packages/drawio.xml"
|
||||
|
||||
exeinto "${destdir}"
|
||||
doexe opt/drawio/chrome-sandbox opt/drawio/chrome_crashpad_handler opt/drawio/drawio opt/drawio/*.so*
|
||||
|
||||
insinto "${destdir}"
|
||||
insopts -m0644
|
||||
doins opt/drawio/*.pak opt/drawio/*.bin opt/drawio/*.json opt/drawio/*.dat
|
||||
insopts -m0755
|
||||
doins -r opt/drawio/locales opt/drawio/resources
|
||||
|
||||
dosym "${destdir}"/drawio /usr/bin/drawio
|
||||
}
|
@ -1,2 +1 @@
|
||||
DIST gtg-0.5.tar.gz 2229259 BLAKE2B e724cbd015a6f0b6fee62c52283b56244490efb7df4e57b2e30745f58fbc41442b008f5c81b53cfd001f04a92ff53a14e2117d6c12d0d5a35fe49158b5f736fa SHA512 631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a
|
||||
DIST gtg-0.6.tar.gz 2361876 BLAKE2B 48f4d589b19181c4e5586254a3411fe2e25126d0f16b2d1294b8bff3f7a86aee7a34762781d9819760ce2e6b36ebded225a478a1bc86aa4c17217b165dae2802 SHA512 68a5229c17b85b87a9a134a08e5e86fbf24d28d6ce55e848c17eef650620d6f56172ee495cb113f4279b34c19127ae03981e2feec5a39dc51be49e387e458600
|
||||
|
@ -1,52 +0,0 @@
|
||||
From 1809d10663ae3d8f69c04138b66f9b4e66ee14f6 Mon Sep 17 00:00:00 2001
|
||||
From: Neui <neuisen@googlemail.com>
|
||||
Date: Mon, 15 Nov 2021 01:53:40 +0100
|
||||
Subject: [PATCH] Revert meson plugin translation apply thing
|
||||
|
||||
Since meson 0.60, the `build_always_stale` option was removed:
|
||||
https://github.com/mesonbuild/meson/commit/6b1a80024c79876dc3b75f2b525be24ca8fe671a
|
||||
|
||||
However, meson doesn't make such files depend on the translation .po
|
||||
files, which is a known bug:
|
||||
https://github.com/mesonbuild/meson/issues/2621
|
||||
|
||||
So with that option taken away, I tried passing a list to the input
|
||||
which includes all .po files, since I saw it only uses the first element
|
||||
for the translations, but that fails when trying to generate po files.
|
||||
|
||||
Since it seems you can't dynamically add dependencies after the fact,
|
||||
this seems like a dead end, so I am reverting this for now to make it
|
||||
compile on meson 0.60.
|
||||
---
|
||||
GTG/plugins/meson.build | 4 +---
|
||||
docs/contributors/translating.md | 3 +++
|
||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/GTG/plugins/meson.build b/GTG/plugins/meson.build
|
||||
index eb20f0b85..556885280 100644
|
||||
--- a/GTG/plugins/meson.build
|
||||
+++ b/GTG/plugins/meson.build
|
||||
@@ -24,9 +24,7 @@ foreach plugin : gtg_plugins
|
||||
install_dir: plugin_install_dir,
|
||||
type: 'desktop',
|
||||
args: ['--keyword=name', '--keyword=short-description', '--keyword=description'],
|
||||
- build_by_default: true,
|
||||
- build_always_stale: true
|
||||
- # build always because otherwise new translations won't be applied
|
||||
+ build_by_default: true
|
||||
)
|
||||
subdir(plugin.underscorify())
|
||||
endforeach
|
||||
diff --git a/docs/contributors/translating.md b/docs/contributors/translating.md
|
||||
index 0af3e5f19..184f98843 100644
|
||||
--- a/docs/contributors/translating.md
|
||||
+++ b/docs/contributors/translating.md
|
||||
@@ -75,5 +75,8 @@ Make sure to this AFTER COMMITING YOUR CHANGES!
|
||||
* During launching, it might complain about certain files not being found in [`po/POTFILES.in`][POTFILES.IN].
|
||||
It is safe to remove the lines from that file and re-run until it works.
|
||||
It would be useful to comment about that if you're submitting your translation, just in case.
|
||||
+* Plugin related strings don't update after updating the translation.
|
||||
+ The cause is unknown, but you can delete the plugin files to re-generate
|
||||
+ them using the new translations: `rm -f .local_build/GTG/plugins/*.gtg-plugin`
|
||||
|
||||
[POTFILES.IN]: ../../po/POTFILES.in
|
@ -1,69 +0,0 @@
|
||||
From ee709d2722a75f11b5f6c9d7cd9b4a925107e54f Mon Sep 17 00:00:00 2001
|
||||
From: Neui <neuisen@googlemail.com>
|
||||
Date: Wed, 21 Apr 2021 01:58:40 +0200
|
||||
Subject: [PATCH] Remove Gdk.Cursor.new depredation warnings
|
||||
|
||||
Gdk.Cursor.new has been replaced by Gdk.Cursor.new_for_display, which
|
||||
needs an additional display.
|
||||
It was only used to set the cursor on windows, which has an display
|
||||
associated with it, so now it is created when needed rather than being
|
||||
cached.
|
||||
---
|
||||
GTG/gtk/editor/taskview.py | 12 ++++++------
|
||||
GTG/plugins/unmaintained/tomboy/tomboy.py | 4 +++-
|
||||
2 files changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/GTG/gtk/editor/taskview.py b/GTG/gtk/editor/taskview.py
|
||||
index 7f73fbb3..4b510499 100644
|
||||
--- a/GTG/gtk/editor/taskview.py
|
||||
+++ b/GTG/gtk/editor/taskview.py
|
||||
@@ -74,10 +74,6 @@ class TaskView(Gtk.TextView):
|
||||
# Timeout in milliseconds
|
||||
PROCESSING_DELAY = 250
|
||||
|
||||
- # Mouse cursors
|
||||
- CURSOR_HAND = Gdk.Cursor.new(Gdk.CursorType.HAND2)
|
||||
- CURSOR_NORMAL = Gdk.Cursor.new(Gdk.CursorType.XTERM)
|
||||
-
|
||||
|
||||
def __init__(self, req: Requester, clipboard) -> None:
|
||||
super().__init__()
|
||||
@@ -601,7 +597,9 @@ class TaskView(Gtk.TextView):
|
||||
tags = view.get_iter_at_location(x, y)[1].get_tags()
|
||||
|
||||
# Reset cursor and hover states
|
||||
- window.set_cursor(self.CURSOR_NORMAL)
|
||||
+ cursor = Gdk.Cursor.new_for_display(window.get_display(),
|
||||
+ Gdk.CursorType.XTERM)
|
||||
+ window.set_cursor(cursor)
|
||||
|
||||
if self.hovered_tag:
|
||||
try:
|
||||
@@ -615,7 +613,9 @@ class TaskView(Gtk.TextView):
|
||||
try:
|
||||
tag = tags[0]
|
||||
tag.set_hover()
|
||||
- window.set_cursor(self.CURSOR_HAND)
|
||||
+ cursor = Gdk.Cursor.new_for_display(window.get_display(),
|
||||
+ Gdk.CursorType.HAND2)
|
||||
+ window.set_cursor(cursor)
|
||||
self.hovered_tag = tag
|
||||
|
||||
except (AttributeError, IndexError):
|
||||
diff --git a/GTG/plugins/unmaintained/tomboy/tomboy.py b/GTG/plugins/unmaintained/tomboy/tomboy.py
|
||||
index 33ec9264..28c4226a 100644
|
||||
--- a/GTG/plugins/unmaintained/tomboy/tomboy.py
|
||||
+++ b/GTG/plugins/unmaintained/tomboy/tomboy.py
|
||||
@@ -337,6 +337,8 @@ class TomboyPlugin():
|
||||
# cursor changes to a hand
|
||||
|
||||
def realize_callback(widget):
|
||||
- eventbox.window.set_cursor(Gdk.Cursor.new(Gdk.HAND2))
|
||||
+ cursor = Gdk.Cursor.new_for_display(eventbox.window.get_display(),
|
||||
+ Gdk.CursorType.HAND2)
|
||||
+ eventbox.window.set_cursor(cursor)
|
||||
eventbox.connect("realize", realize_callback)
|
||||
return eventbox
|
||||
--
|
||||
2.30.0
|
||||
|
@ -1,55 +0,0 @@
|
||||
From 522f79e4ed58ea821dd939daa856a2d9dfd6f934 Mon Sep 17 00:00:00 2001
|
||||
From: Neui <neuisen@googlemail.com>
|
||||
Date: Sun, 2 May 2021 01:08:37 +0200
|
||||
Subject: [PATCH] Use Gdk.Cursor.new_from_name()
|
||||
|
||||
Because GDK4 dropped new_for_display in favour of new_from_name.
|
||||
---
|
||||
GTG/gtk/editor/taskview.py | 8 ++++----
|
||||
GTG/plugins/unmaintained/tomboy/tomboy.py | 4 ++--
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/GTG/gtk/editor/taskview.py b/GTG/gtk/editor/taskview.py
|
||||
index 4b510499..1313ead8 100644
|
||||
--- a/GTG/gtk/editor/taskview.py
|
||||
+++ b/GTG/gtk/editor/taskview.py
|
||||
@@ -597,8 +597,8 @@ class TaskView(Gtk.TextView):
|
||||
tags = view.get_iter_at_location(x, y)[1].get_tags()
|
||||
|
||||
# Reset cursor and hover states
|
||||
- cursor = Gdk.Cursor.new_for_display(window.get_display(),
|
||||
- Gdk.CursorType.XTERM)
|
||||
+ cursor = Gdk.Cursor.new_from_name(window.get_display(),
|
||||
+ 'text')
|
||||
window.set_cursor(cursor)
|
||||
|
||||
if self.hovered_tag:
|
||||
@@ -613,8 +613,8 @@ class TaskView(Gtk.TextView):
|
||||
try:
|
||||
tag = tags[0]
|
||||
tag.set_hover()
|
||||
- cursor = Gdk.Cursor.new_for_display(window.get_display(),
|
||||
- Gdk.CursorType.HAND2)
|
||||
+ cursor = Gdk.Cursor.new_from_name(window.get_display(),
|
||||
+ 'pointer')
|
||||
window.set_cursor(cursor)
|
||||
self.hovered_tag = tag
|
||||
|
||||
diff --git a/GTG/plugins/unmaintained/tomboy/tomboy.py b/GTG/plugins/unmaintained/tomboy/tomboy.py
|
||||
index 28c4226a..d81cd58c 100644
|
||||
--- a/GTG/plugins/unmaintained/tomboy/tomboy.py
|
||||
+++ b/GTG/plugins/unmaintained/tomboy/tomboy.py
|
||||
@@ -337,8 +337,8 @@ class TomboyPlugin():
|
||||
# cursor changes to a hand
|
||||
|
||||
def realize_callback(widget):
|
||||
- cursor = Gdk.Cursor.new_for_display(eventbox.window.get_display(),
|
||||
- Gdk.CursorType.HAND2)
|
||||
+ cursor = Gdk.Cursor.new_from_name(eventbox.window.get_display(),
|
||||
+ 'pointer')
|
||||
eventbox.window.set_cursor(cursor)
|
||||
eventbox.connect("realize", realize_callback)
|
||||
return eventbox
|
||||
--
|
||||
2.30.0
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue